调整

config/.env.dev.js

@@ -3,13 +3,13 @@ const UNI_APP = {
 	//BASE_URL: 'http://36.134.122.108/railroad-server/',
 
 	BASE_URL: 'https://charging.xiaoxinda.com/electric-manager-api/', //test
-	//BASE_URL: 'https://dgj.hbjp.com.cn/electric-manager-api/',
+	BASE_URL: 'https://dgj.hbjp.com.cn/electric-manager-api/',
 	
-	//BASE_URL:'http://192.168.77.162:8081/electric-manager-api/', //sz
+	BASE_URL:'http://192.168.77.162:8081/electric-manager-api/', //sz
 	
 	NODE_ENV :"dev",
 	SIMPLE_RUN:true,// 无视权限控制跳转页面   ， 用于样式人员快速访问各种功能 ，快速测试等
-	 openId:"1240",//开发人员2
+	 openId:"1242",//开发人员2
 	// openId:"55555",//测试人员 开发环境
 	//openId:"oLowyuNkSxqovYoobKbeHB1nSkm0", //sz
 	//openId:"oK9Wr57rAcNzihDN2PEdptprT0As", 

pages/deductionRecord/deductionDetails.vue

@@ -143,7 +143,7 @@
 						
 					</template>
 					 
-					<template v-if="contractItem.id&&tenantBalanceRecord.extraJson.sharedKwh!=null">
+					<template v-if="contractItem.id&&tenantBalanceRecord.extraJson.sharedKwh!=null&&tenantBalanceRecord.extraJson.unitSharedMethod==null">
 						
 						
 						<table class="border-table" >
@@ -209,7 +209,7 @@
 						
 						
 					</template>
-					<template v-if="contractItem.id&&tenantBalanceRecord.extraJson.pubilcKwh!=null">
+					<template v-if="contractItem.id&&tenantBalanceRecord.extraJson.unitSharedMethod!=null">
 						
 						<template v-if="row.extraJson.publicSharedMethod == null">
 							

pages/managementList/applicantsList.vue

@@ -223,7 +223,7 @@
 					status:key
 				}).then((res) => {
 					uni.hideLoading();
-					if(key){
+					if(key==1){
 						this.getAuthorizedUserDetails(node.createBy)
 						this.userName=node.createByName
 					}
@@ -295,9 +295,7 @@
 </script>
 
 <style>
-	page{
-		padding-bottom: 100px;
-	}
+
 </style>
 
 

pages/managementList/applyAuthorisation.vue

@@ -21,6 +21,14 @@
 					 
 				</view>
 			</view>	
+			<view class="bottom">
+				<u-divider  border-color=" rgba(119,119,119,1)">
+					温馨提示</u-divider>
+				<view class="view">
+					<img class="view1" src="@/assets/img/apply-look.png">
+					<img  class="view2" src="@/assets/img/apply-text.png">
+				</view>
+			</view>	
 		</view>	
 		<view v-if="!step">
 			<u-navbar title="填写申请人信息" title-color="#101010" :is-back="false" >
@@ -50,9 +58,12 @@
 					<view class="title">
 						姓名<span>*</span>
 					</view>
-					<view class="value">
+					<view class="value" v-if="!step3">
 						<input type="text" v-model="name" placeholder="请填写姓名" />
 					</view>
+					<view class="value" v-if="step3">
+						{{name}}
+					</view>
 					
 				</view>
 				
@@ -60,10 +71,14 @@
 					<view class="title">
 						联系电话<span>*</span>
 					</view>
-					<view class="value">
+					<view class="value" v-if="!step3">
 						<input type="text" v-model="phone"  placeholder="请填写手机号码" />
 					</view>
 					
+					<view class="value" v-if="step3">
+						{{phone}}
+					</view>
+					
 				</view>
 				<!-- <view class="item">
 					<view class="title">
@@ -228,11 +243,11 @@
 				}).then((res) => {
 					this.title=res.data.information.title
 					this.information=res.data.information;
+					var allCheck=res.data.allCheck
 					uni.hideLoading();
 					//this.show=true
 					var info=res.data.applicationInfo;
-					
-					if(info&&info.status==1){
+					if(info&&info.status==1||allCheck){
 						this.step=true
 						this.meterList=res.data.meterList
 						var  img=require('@/assets/img/controlCover.png')
@@ -320,6 +335,7 @@
 	}
 	.main2{
 		margin: 24rpx 0;
+		padding-bottom: 300rpx;
 		.item{
 			margin: 32rpx ;
 			padding: 32rpx ; 
@@ -425,4 +441,33 @@
 	  }
   }
 
+ .bottom{
+	  position: fixed;
+	  left: 0;
+	  right: 0;
+	  bottom: 0;
+	 
+	  padding: 20rpx 32rpx;
+	 
+	  .view{
+		   background-color: #fff;
+		   border-radius: 12px;
+		   background: linear-gradient(180deg, rgba(24,90,198,1) 0%,rgba(22,119,255,1) 100%);
+		   margin: 32rpx;
+		   padding: 24rpx 0;
+		       white-space: pre;
+			       display: flex;
+			       align-items: flex-end;
+			       justify-content: center;
+	  }
+	  .view1{
+		  height: 80rpx;
+		  
+	  }
+	  .view2{
+	  		 height: 56rpx;
+			
+	  }
+	 
+  }
 </style>

pages/managementList/managementList.vue

@@ -356,9 +356,7 @@
 </script>
 
 <style>
-	page{
-		padding-bottom: 100px;
-	}
+	
 </style>