调整

pagesFinance/user/applicationDetails.vue

@@ -103,15 +103,15 @@
 				<view class="withdraw-head">
 					<b>包月卡分润笔数</b>
 					<span>
-						{{info.monthlyCardIncome}}笔
+					{{info.monthlyCardTotal}}笔
 
 					</span>
 				</view>
 				<view class="withdraw-head border-n">
 					<b>包月卡收益</b>
 					<span>
-						{{info.monthlyCardTotal}}元
-
+						{{info.monthlyCardIncome?info.monthlyCardIncome.toFixed(2):0}}元
+						
 					</span>
 				</view>
 
@@ -149,7 +149,7 @@
 					<span>
 						<view class="uni-input" v-if="!info.invoiceType">无</view>
 						
-						<view class="uni-input" v-else>{{list1[info.invoiceType].name}}</view>
+						<view class="uni-input" v-else>{{invoiceTypeName}}</view>
 					</span>
 				</view>
 <view class="withdraw-head border-n ">
@@ -296,6 +296,20 @@
 				this.getInfo()
 			}
 		},computed: {
+			invoiceTypeName(){
+				
+				var info =this.list1.find(item=>{
+					console.log(item.value==this.info.invoiceType)
+					return item.value==this.info.invoiceType
+				})
+				
+				if(info){
+					return info.name
+				}
+				return''
+			},
+			
+			
 			applicationAmountDX() {
 				if (this.info.applicationAmount) {
 					var c = DX(this.info.applicationAmount)

pagesFinance/user/applicationForWithdrawal.vue

@@ -129,7 +129,7 @@
 				<view class="withdraw-head">
 					<b>充电分成</b>
 					<span  class="classFFF" >
-						{{info.chargingProfitAmount}}元
+						{{info.chargingProfitAmount?info.chargingProfitAmount.toFixed(2):0}}元
 
 					</span>
 				</view>
@@ -149,14 +149,14 @@
 				<view class="withdraw-head">
 					<b>包月卡分润笔数</b>
 					<span  class="classFFF"  >
-						{{info.monthlyCardIncome}}笔
+						{{info.monthlyCardTotal}}笔
 
 					</span>
 				</view>
 				<view class="withdraw-head border-n">
 					<b>包月卡收益</b>
 					<span  class="classFFF" >
-						{{info.monthlyCardTotal}}元
+						{{info.monthlyCardIncome?info.monthlyCardIncome.toFixed(2):0}}元
 
 					</span>
 				</view>
@@ -170,14 +170,17 @@
 				<view class="withdraw-head">
 					<b>合伙人总收入</b>
 					<span  class="classFFF" >
-						{{info.totalIncome}}元
+						{{info.totalIncome?info.totalIncome.toFixed(2):0}}元
 
 					</span>
 				</view>
 				<view class="withdraw-head border-n">
 					<b>合伙人总收益</b>
-					<span  class="classFFF" >
-						{{info.totalProfitAmount}}元
+					<span   >
+						<view class="classFFF" v-show="electricityPriceX">{{(info.chargingProfitAmount+info.monthlyCardIncome-electricityPriceX).toFixed(2)}}元</view>
+						<view class="classFFF" v-show="!electricityPriceX">自动计算出结果</view>
+						
+						
 
 					</span>
 				</view>
@@ -454,6 +457,7 @@
 			this.getStationList()
 		},
 		computed: {
+			 
 			itemApplicationAmountSum(){
 				if (this.info.applicationAmount&&this.detailList&&this.detailList.length) {
 					var applicationAmount=0;

pagesFinance/user/withdrawRecord.vue

@@ -99,8 +99,9 @@
 				return name.substring(5);
 			},
 			gotoItem(item){
+				
 				this.uuid=new Date().getTime()
-				if(item.status=='-1'){
+				if(this.info.status&&item.status=='-1'){
 					this.gotoUrl('pagesFinance/user/applicationForWithdrawal?id='+item.id+"&uuid="+this.uuid)
 				}else{
 					this.gotoUrl('pagesFinance/user/applicationDetails?id='+item.id)