修改功能

apis/pagejs/tenantElectricityMeter.js

@@ -59,3 +59,13 @@ export function electricityMeterList(data) {
    	})
    } 
    
+
+  export function updateMeter(data) {
+   	var url='/mobile/tenantElectricityMeter/updateMeter';
+   	return request({
+   		method: 'post',
+   		data: data,
+   		url: url
+   	})
+   } 
+   

pages/billingRules/billingRules.vue

@@ -100,11 +100,12 @@
 				
 				
 			</view>
-			
+			<u-divider  nonetext="没有找到相关内容"
+				border-color="#CFD2D5">已经到底了</u-divider>
 			
 		</view>
 		<!-- 规则 -->
-		
+	
 
 
 	</view>

pages/index/index.vue

@@ -169,10 +169,11 @@
 			:show-cancel-button="true" ref="uModal" :asyncClose="true" title="客服电话" content="400-8899-619"
 			:content-style="{fontSize: '24px',color: '#101010'}"></u-modal>
 			
-		<u-divider border-color="#bbbbbb" half-width="80"
+		<u-divider border-color="#bbbbbb" half-width="80" style="margin-bottom: 60rpx;"
 		 @click="openModalBl=true"
 		 color="#777777">荆鹏电管家 服务热线 <text
 				class="tel">400-8899-619</text></u-divider>
+				
 		<Tabbar :current="0" ref="tabbarMain"  :prefetchNum="prefetchNum" ></Tabbar>
 	</view>
 

pages/meterManagement/equipmentDetails.vue

@@ -106,7 +106,7 @@
 							{{meterDetail.customer}}
 						</view>
 					</view>
-					<view class="infos-item">
+					<view class="infos-item" v-if="false">
 						<view class="item-title">
 							使用单位简称
 
@@ -115,7 +115,7 @@
 							荆鹏软件	
 						</view>
 					</view>
-					<view class="infos-item">
+					<view class="infos-item" v-if="false">
 						<view class="item-title">
 								使用单位联系人
 						</view>
@@ -139,7 +139,8 @@
 					
 				</view>
 			</view>
-
+			<u-divider  nonetext="没有找到相关内容"
+				border-color="#CFD2D5">已经到底了</u-divider>
 		</view>
 		
 		<!-- 账户信息弹窗 -->
@@ -230,7 +231,43 @@
 		},
 		methods: {
 			submit(){
+				var sz=['name','installationAddress','installationAddressSimple']
+				var sz2=['name','address','addressSimple']
+				
+				var bl=false;
+				var obj={
+					id:this.updateByMeter.id
+				};
+				for(var i in sz){
+					var key=sz[i]
+					var key2=sz2[i]
+					//console.log(key,this.updateByMeter[key],this.findByMeter[key])
+					if(this.updateByMeter[key]!=this.findByMeter[key]){
+						bl=true;
+						//console.log('aaa')
+					}
+					obj[key2]=this.updateByMeter[key]
+				}
 				
+				if(bl){
+					uni.showLoading({
+						title: "加载中",
+						mask: true,
+					})
+					API_Electricity.updateMeter(obj).then((response) => {
+						
+						
+						this.getMeterDetails(obj.id);
+					
+					}).catch(error => {
+						uni.showToast({
+							title: error,
+							icon: "none"
+						})
+					})
+				}else{
+					
+				}
 			},
 			getMeterDetails(meterId){
 				uni.showLoading({
@@ -244,7 +281,9 @@
 					this.meterDetail=response.data.meter;
 					
 					this.findByMeter=response.data.meter;
-					this.updateByMeter=response.data.meter;
+					this.updateByMeter={
+						...this.findByMeter
+					};
 					
 				}).catch(error => {
 					uni.showToast({

pages/meterManagement/meterManagement.vue

@@ -362,23 +362,31 @@
 				})
 			},
 			updateByMeterMethod(){
+				
 				var sz=['name','installationAddress','installationAddressSimple']
+				var sz2=['name','address','addressSimple']
+				
 				var bl=false;
+				var obj={
+					id:this.updateByMeter.id
+				};
 				for(var i in sz){
 					var key=sz[i]
+					var key2=sz2[i]
+					//console.log(key,this.updateByMeter[key],this.findByMeter[key])
 					if(this.updateByMeter[key]!=this.findByMeter[key]){
 						bl=true;
+						//console.log('aaa')
 					}
+					obj[key2]=this.updateByMeter[key]
 				}
+				
 				if(bl){
 					uni.showLoading({
 						title: "加载中",
 						mask: true,
 					})
-					API_Electricity.bindMeter({
-						meterNo:this.meterNo,
-						contractId:this.contractId,
-					}).then((response) => {
+					API_Electricity.updateMeter(obj).then((response) => {
 						
 						
 						this.contractList()
@@ -419,10 +427,10 @@
 				})
 			},
 			getScanCode(item) {
-				if(this.timeEnd(item.contractEndTime)){
+				if(this.timeEnd(item.endTime)){
 					uni.showModal({
 						showCancel:false,
-						content:"当前合同租赁期已结束",
+						content:"缴费有效期已结束，不可修改",
 						title:"提示"
 					})
 					return 
@@ -479,7 +487,9 @@
 					console.log(response)
 					this.bindShow=true;
 					this.findByMeter=response.data.meter;
-					this.updateByMeter=response.data.meter;
+					this.updateByMeter={
+						...this.findByMeter
+					};
 				}).catch(error => {
 					uni.hideLoading()
 					uni.showModal({
@@ -603,12 +613,12 @@
 		 }
 		 .content{
 			 display: flex;
-			 
+			 padding: 8rpx 0;
 			 .details{
 			 			 
 			 			 .details-item{
 			 				 display: flex;
-			 				 margin-top: 8rpx;
+			 				 margin-top: 16rpx;
 			 			 }
 			 			 
 			 			 .details-title{

pages/recharge/accountRecharge.vue

@@ -227,6 +227,9 @@
 				<button class="btn" @click="submit">{{submitType==2?'查看对公转账信息':'立即支付'}}</button>
 			</view>
 		</view>
+		<u-divider  nonetext="没有找到相关内容"
+			border-color="#CFD2D5">已经到底了</u-divider>
+			
 <img id="qrcode" style="display: none;">
 		<u-modal v-model="showModel" :show-cancel-button="true"  @confirm="homePage"
 			confirm-text="刷新余额" title="扫码支付">