优惠券显示

.env.dev.js

@@ -1,16 +1,17 @@
 const UNI_APP = {  
 	 BASE_URL: 'https://charging.xiaoxinda.com/charging-station-test/',
+	//BASE_URL: 'https://51team.xiaoxinda.com/charging-station-server/',
+	// BASE_URL: 'http://192.168.77.162:8080/charging-station/' ,
 	
-	 //BASE_URL: 'http://192.168.77.162:8080/charging-station/' ,
 	NODE_ENV :"dev",
 	SIMPLE_RUN:true,// 无视权限控制跳转页面   ， 用于样式人员快速访问各种功能 ，快速测试等
 	//openId:"oHjCawsxTJkxixR74OVp7aCKahj8",//测试用openId  
 	//openId:"oHjCawgwCGen5k1-hAsimdEX5lZo",
 	//openId:"1000",
-	openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",
+	openId:"oK9Wr59rru-i3bm7dtTtxnkR-i4s",
 	//小鹏管家appid
 	//VUE_APP_WXAPPID:"wx7e70eb62a8459869",
-		VUE_APP_WXAPPID:"wx3afdb1b60188c1e5",
+	VUE_APP_WXAPPID:"wx3afdb1b60188c1e5",
 }  
 
 module.exports = UNI_APP;

pagesFinance/detailed/details.vue

@@ -24,9 +24,10 @@
  			<view class="details-row" v-if="detail.deviceType!='0'" >
  				<p>服务费</p>
    				
-				<span>{{(detail.surplusAmount*100-detail.record.discountAmount*100)/100}}元
-				<span v-if="couponObj&&couponObj.status=='1'">({{detail.surplusAmount}}-{{detail.record.discountAmount}})</span>
+				<span v-if="detail.record">{{detail.surplusAmount}}元
 				
+<!-- 				<span v-if="couponObj&&couponObj.status=='1'">({{detail.surplusAmount}}-{{detail.record.discountAmount}})</span>
+ -->				
  				</span>
  			</view>
  			<view class="details-row" v-if="couponObj&&couponObj.status=='1'" >
@@ -35,7 +36,12 @@
  					{{couponObj.useText}}	
  				</span>
  			</view>
-			
+			<view class="details-row" v-if="couponObj&&couponObj.status=='1'&&detail.record" >
+				<p>实际减免 </p>
+				<span>
+					{{detail.record.discountAmount}}元	
+				</span>
+			</view>
 		
  		</view>
 		
@@ -102,7 +108,16 @@
 			
 		</view>
 		
+		<view class="details">
+			<view class="details-title">
+				<h4>充电用户</h4>
+			</view>
 		
+			<view class="details-row"><p>用户昵称</p><span>{{detail.chargeUserName?detail.chargeUserName:'未命名'}}</span></view>
+			<view class="details-row"><p>手机号码</p><span>{{detail.chargeUserPhone}}</span></view>
+ 			
+			
+		</view>
 		
 		
 		

pagesFinance/share/details.vue

@@ -25,11 +25,11 @@
 			</view>
 			<view class="details-row"   v-if="detail.deviceType!='0'"  >
 				<p>服务费</p>
-				<span>{{(detail.surplusAmount*100-detail.discountAmount*100)/100}}元
+				<span>{{detail.surplusAmount}}元
 				
 			<!-- 	<span>{{detail.surplusAmount-detail.discountAmount}}元 -->
-				<span v-if="couponObj&&couponObj.status=='1'">({{detail.surplusAmount}}-{{detail.discountAmount}})</span>
-				
+<!-- 				<span v-if="couponObj&&couponObj.status=='1'">({{detail.surplusAmount}}-{{detail.discountAmount}})</span>
+ -->				
 				</span>
 			</view>
 			<view class="details-row" v-if="couponObj&&couponObj.status=='1'" >
@@ -39,7 +39,12 @@
 				</span>
 			</view>
 			
-		
+		<view class="details-row" v-if="couponObj&&couponObj.status=='1'&&detail.discountAmount" >
+			<p>实际减免</p>
+			<span>
+				{{detail.discountAmount}}元
+			</span>
+		</view>
 			
 		</view>
 		<view class="details">

pagesFinance/user/pileManagement.vue

@@ -234,7 +234,15 @@
 					this.sprList=res.data.sprList
 					this.gunList=res.data.gunList
 					this.price=res.data.price;
-					this.deviceUser=res.data.deviceUser;
+					if(res.data.stationPerson!=null|| res.data.stationPhone!=null ){
+						this.deviceUser={
+							realName:res.data.stationPerson?res.data.stationPerson:'',
+							phone:res.data.stationPhone?res.data.stationPhone:''
+						};
+					}else{
+						this.deviceUser=null
+					}
+				
 					uni.hideLoading()
 					 
 				}).catch(error => {