电价导入

.env.dev.js

@@ -1,6 +1,8 @@
 const UNI_APP = {  
-	BASE_URL: 'https://charging.xiaoxinda.com/charging-station-test/',
-	BASE_URL: 'https://youdian.hbjp.com.cn/charging-station-server/',
+	
+	BASE_URL: 'https://youdian-test.hbjp.com.cn/charging-station-test/',
+	
+	//BASE_URL: 'https://youdian.hbjp.com.cn/charging-station-server/',
 	//BASE_URL: 'http://192.168.77.162:8081/charging-station/' ,
 	//BASE_URL: 'http://192.168.77.162:8081/charging-station/' ,
 	

.env.test.js

@@ -4,6 +4,7 @@ const UNI_APP = {
    //  BASE_URL: 'http://192.168.77.162:8080/charging-station/' ,
 	BASE_URL: 'https://charging.xiaoxinda.com/charging-station-test/',
    // BASE_URL: 'https://charging.xiaoxinda.com/charging-station-server/',
+   BASE_URL: 'https://youdian-test.hbjp.com.cn/charging-station-test/',
    
 
 	NODE_ENV :"test",

pagesFinance/user/withdrawal/businessInfo.vue

@@ -157,7 +157,7 @@
 				</view>
 			
 				
-				<view class="withdraw-head" v-if="info.applicationType!=2&&!isSecond" >
+				<view class="withdraw-head" v-if="info.applicationType!=2&&!isSecond&&!info.haveBill" >
 					<b class="asterisk"><text>*</text>电价</b>
 					<text class="unit" style="float: right;font-size: 16px;">元/度</text>
 					<span class="withdraw-input" style="width: 63%;">
@@ -191,7 +191,7 @@
 				
 				</view>
 			
-				<view class="withdraw-head" v-if="info.applicationType!=2&&!isSecond" >
+				<view class="withdraw-head" v-if="info.applicationType!=2&&!isSecond&&!info.haveBill" >
 					<b class="asterisk"><text>*</text>电量</b>
 					<text class="unit" style="float: right;font-size: 16px;">度</text>
 					<span class="withdraw-input" style="width: 63%;">
@@ -928,7 +928,13 @@
 			},
 			submit(status){
 				this.info.isSecond=(this.isSecond?1:0)
-				 this.info.applicationMonth= this.thismonth
+				 this.info.applicationMonth= this.thismonth
+				 
+				 if(this.electricityPriceX){
+					 this.info.electricityCost=this.electricityPriceX
+					 
+				 }
+				
 				if(this.info.applicationType==2){
 					if(this.info.rewardProportion&&this.electricityPriceX){
 						this.info.applicationAmount=((this.info.chargingProfitAmount+this.info.monthlyCardIncome-this.electricityPriceX)*this.info.rewardProportion/100).toFixed(2);
@@ -1260,7 +1266,12 @@
 					this.isReady=true;
 					this.info = res.data.record;
 					this.isSecond=	this.info.isSecond
-					this.thismonth=this.info.applicationMonth;
+					this.thismonth=this.info.applicationMonth;
+					
+					if(this.info.haveBill){
+						
+					}
+					
 					for(var i in  this.stationList){
 						if(this.stationList[i].id==this.info.stationId){
 							this.stationObj = this.stationList[i];