Revert "调整"

This reverts commit e53c5aaef9d6ceb870d47005792a21059fc6c18c.

pagesFinance/user/withdrawal/businessInfo.vue

@@ -355,29 +355,11 @@
 						</view>
 						<view class="classFFF" v-if="!(electricityPriceX&&info.rewardProportion)">自动转换</view>
 				
+				
+				
 					</span>
 				</view>
-				<view class="withdraw-head" >
-					<b class="asterisk">提现手续费
-					
-					<view class="tooltip">
-						<u-icon name="info-circle"></u-icon>
-						  <view class="tooltiptext">银行提现收取{{info.tradingRate}}手续费</view>
-					
-					</view>
-					</b>
-					<span>
-							<view class="uni-input">{{tradingAmount2?showNumJP(tradingAmount2):0}}元</view>
-					
-					</span>
-				</view>
-				<view class="withdraw-head" >
-					<b class="asterisk">实际到账金额</b>
-					<span>
-							<view class="uni-input">{{paymentAmount2?showNumJP(paymentAmount2):0}}元</view>
-					
-					</span>
-				</view>
+				
 			</view>	
 			<view class="withdraw" v-if="info.applicationType==1">
 
@@ -521,42 +503,19 @@
 
 					</span>
 
-				</view>
-				<view class="withdraw-head ">
-					<b>大写金额</b>
-				
-					<span class="withdraw-input" style="width: 63%;">
-				
-						<view  class="classFFF" v-show="applicationAmountDX">{{applicationAmountDX}}</view>
-						<view class="classFFF" v-show="!applicationAmountDX">自动转换</view>
-				
-				
-				
-					</span>
-				</view>
-				
-				<view class="withdraw-head" >
-					<b class="asterisk">提现手续费
-					
-					<view class="tooltip">
-						<u-icon name="info-circle"></u-icon>
-						  <view class="tooltiptext">银行提现收取{{info.tradingRate}}手续费</view>
-					
-					</view>
-					</b>
-					<span>
-							<view class="uni-input">{{tradingAmount?showNumJP(tradingAmount):0}}元</view>
-					
-					</span>
-				</view>
-				<view class="withdraw-head border-n" >
-					<b class="asterisk">实际到账金额</b>
-					<span>
-							<view class="uni-input">{{paymentAmount?showNumJP(paymentAmount):0}}元</view>
-					
-					</span>
 				</view>
-				
+				<view class="withdraw-head border-n">
+					<b>大写金额</b>
+
+					<span class="withdraw-input" style="width: 63%;">
+
+						<view  class="classFFF" v-show="applicationAmountDX">{{applicationAmountDX}}</view>
+						<view class="classFFF" v-show="!applicationAmountDX">自动转换</view>
+
+
+
+					</span>
+				</view>
 				
 			
 			</view>
@@ -794,40 +753,8 @@
 			this.endTime =parseUnixTime(new Date(), '{y}-{m}-{d} {h}:{i}:00')
 			this.getStationList()
 		},
-		computed: {
-			paymentAmount2(){
-							 if(this.tradingAmount2){
-								 var a=((this.info.chargingProfitAmount+this.info.monthlyCardIncome-this.electricityPriceX)*this.info.rewardProportion/100).toFixed(2)
-								 
-								return (a*100-this.tradingAmount2*100)/100
-							 }else{
-								 return 0
-							 }
-			},
-			tradingAmount2(){
-							 if(this.info&&this.electricityPriceX&&this.info.rewardProportion){
-								 var a=((this.info.chargingProfitAmount+this.info.monthlyCardIncome-this.electricityPriceX)*this.info.rewardProportion/100).toFixed(2)
-								 var b=this.showNumJP(Math.ceil(a*100*this.info.tradingRate)/100)
-								  return b
-							 }else{
-								 return 0
-							 }
-			},
-			 tradingAmount(){
-				 if(this.info.applicationAmount){
-					 var a= this.showNumJP(Math.ceil(this.info.applicationAmount*100*this.info.tradingRate)/100)
-					  return a
-				 }else{
-					 return 0
-				 }
-			 },
-			paymentAmount(){
-							 if(this.tradingAmount){
-								return (this.info.applicationAmount*100-this.tradingAmount*100)/100
-							 }else{
-								 return 0
-							 }
-			},
+		computed: {
+			 
 			itemApplicationAmountSum(){
 				if (this.info.applicationAmount&&this.detailList&&this.detailList.length) {
 					var applicationAmount=0;

pagesFinance/user/withdrawal/businessView-1.vue

@@ -149,35 +149,13 @@
 					</span>
 
 				</view>
-				<view class="withdraw-head ">
+				<view class="withdraw-head border-n">
 					<b>大写金额</b>
 
 					<span>
 						<view class="uni-input">{{applicationAmountDX}}</view>
 					</span>
 
-				</view>
-			
-				<view class="withdraw-head" >
-					<b class="asterisk">提现手续费
-					
-					<view class="tooltip">
-						<u-icon name="info-circle"></u-icon>
-						  <view class="tooltiptext">银行提现收取{{info.tradingRate}}手续费</view>
-					
-					</view>
-					</b>
-					<span>
-							<view class="uni-input">{{info.tradingAmount?showNumJP(info.tradingAmount):0}}元</view>
-					
-					</span>
-				</view>
-				<view class="withdraw-head border-n" >
-					<b class="asterisk">实际到账金额</b>
-					<span>
-							<view class="uni-input">{{info.paymentAmount?showNumJP(info.paymentAmount):0}}元</view>
-					
-					</span>
 				</view>
 			</view>
 		 

pagesFinance/user/withdrawal/businessView-2.vue

@@ -72,7 +72,7 @@
 				
 					</span>
 				</view>
-				<view class="withdraw-head "  v-if="info.applicationType==2" >
+				<view class="withdraw-head border-n"  v-if="info.applicationType==2" >
 					<b>大写金额</b>
 				
 					<span>
@@ -80,27 +80,7 @@
 					</span>
 				
 				</view>
-				<view class="withdraw-head" >
-					<b class="asterisk">提现手续费
-					
-					<view class="tooltip">
-						<u-icon name="info-circle"></u-icon>
-						  <view class="tooltiptext">银行提现收取{{info.tradingRate}}手续费</view>
-					
-					</view>
-					</b>
-					<span>
-							<view class="uni-input">{{info.tradingAmount?showNumJP(info.tradingAmount):0}}元</view>
-					
-					</span>
-				</view>
-				<view class="withdraw-head border-n" >
-					<b class="asterisk">实际到账金额</b>
-					<span>
-							<view class="uni-input">{{info.paymentAmount?showNumJP(info.paymentAmount):0}}元</view>
-					
-					</span>
-				</view>
+				
 			</view>
 
 			

pagesFinance/user/withdrawal/businessView-3.vue

@@ -219,36 +219,14 @@
 					</span>
 
 				</view>
-				<view class="withdraw-head ">
+				<view class="withdraw-head border-n">
 					<b>大写金额</b>
 
 					<span>
 						<view class="uni-input">{{applicationAmountDX}}</view>
 					</span>
 
-				</view>
-				<view class="withdraw-head" >
-					<b class="asterisk">提现手续费
-					
-					<view class="tooltip">
-						<u-icon name="info-circle"></u-icon>
-						  <view class="tooltiptext">银行提现收取{{info.tradingRate}}手续费</view>
-					
-					</view>
-					</b>
-					<span>
-							<view class="uni-input">{{info.tradingAmount?showNumJP(info.tradingAmount):0}}元</view>
-					
-					</span>
-				</view>
-				<view class="withdraw-head border-n" >
-					<b class="asterisk">实际到账金额</b>
-					<span>
-							<view class="uni-input">{{info.paymentAmount?showNumJP(info.paymentAmount):0}}元</view>
-					
-					</span>
-				</view>
-				
+				</view>
 			</view>
 			<view class="withdraw" v-if="info.applicationType==3">
 				<view class="withdraw-head ">

pagesFinance/user/withdrawal/businessView.vue

@@ -84,37 +84,15 @@
 						</view>
 				
 					</span>
-				</view>
-				<view class="withdraw-head border-n"  v-if="info.applicationType==2" >
-					<b>大写金额</b>
-				
-					<span>
-						<view class="uni-input">{{applicationAmountDX}}</view>
-					</span>
-				
-				</view>
-				<view class="withdraw-head"  v-if="info.applicationType==2" >
-					<b class="asterisk">提现手续费
-					
-					<view class="tooltip">
-						<u-icon name="info-circle"></u-icon>
-						  <view class="tooltiptext">银行提现收取{{info.tradingRate}}手续费</view>
-					
-					</view>
-					</b>
-					<span>
-							<view class="uni-input">{{info.tradingAmount?showNumJP(info.tradingAmount):0}}元</view>
-					
-					</span>
-				</view>
-				<view class="withdraw-head"  v-if="info.applicationType==2" >
-					<b class="asterisk">实际到账金额</b>
-					<span>
-							<view class="uni-input">{{info.paymentAmount?showNumJP(info.paymentAmount):0}}元</view>
-					
-					</span>
 				</view>
+				<view class="withdraw-head border-n"  v-if="info.applicationType==2" >
+					<b>大写金额</b>
 				
+					<span>
+						<view class="uni-input">{{applicationAmountDX}}</view>
+					</span>
+				
+				</view>
 				
 			</view>
 
@@ -305,37 +283,15 @@
 						<view class="uni-input">{{info.applicationAmount}}元</view>
 					</span>
 
-				</view>
-				<view class="withdraw-head border-n">
-					<b>大写金额</b>
-				
-					<span>
-						<view class="uni-input">{{applicationAmountDX}}</view>
-					</span>
-				
-				</view>
-				<view class="withdraw-head" >
-					<b class="asterisk">提现手续费
-					
-					<view class="tooltip">
-						<u-icon name="info-circle"></u-icon>
-						  <view class="tooltiptext">银行提现收取{{info.tradingRate}}手续费</view>
-					
-					</view>
-					</b>
-					<span>
-							<view class="uni-input">{{info.tradingAmount?showNumJP(info.tradingAmount):0}}元</view>
-					
-					</span>
-				</view>
-				<view class="withdraw-head" >
-					<b class="asterisk">实际到账金额</b>
-					<span>
-							<view class="uni-input">{{info.paymentAmount?showNumJP(info.paymentAmount):0}}元</view>
-					
-					</span>
 				</view>
-				
+				<view class="withdraw-head border-n">
+					<b>大写金额</b>
+
+					<span>
+						<view class="uni-input">{{applicationAmountDX}}</view>
+					</span>
+
+				</view>
 			</view>
 			<view class="withdraw" v-if="info.applicationType==3">
 				<view class="withdraw-head ">

pagesFinance/user/withdrawal/cashoutInfo.vue

@@ -109,37 +109,13 @@
 							
 							</span>
 						</view>
-						
-						<view class="withdraw-head" style="height: 60px;" >
-							<b class="asterisk">大写金额</b>
-							<span>
-									<view class="uni-input">{{info.chargingProfitAmount?getDX(info.chargingProfitAmount)+'':'零元整'}}</view>
-							
-							</span>
-						</view>
-						<view class="withdraw-head" >
-							<b class="asterisk">提现手续费
-							
-							<view class="tooltip">
-								<u-icon name="info-circle"></u-icon>
-								  <view class="tooltiptext">银行提现收取{{info.tradingRate}}手续费</view>
-							
-							</view>
-							</b>
-							<span>
-									<view class="uni-input">{{info.tradingAmount?showNumJP(info.tradingAmount):0}}元</view>
-							
-							</span>
-						</view>
-						
-						<view class="withdraw-head" >
-							<b class="asterisk">实际到账金额</b>
-							<span>
-									<view class="uni-input">{{info.paymentAmount?showNumJP(info.paymentAmount):0}}元</view>
-							
-							</span>
-						</view>
-						
+						<view class="withdraw-head" style="height: 60px;" >
+							<b class="asterisk">大写金额</b>
+							<span>
+									<view class="uni-input">{{info.chargingProfitAmount?getDX(info.chargingProfitAmount)+'':'零元整'}}</view>
+							
+							</span>
+						</view>
 						
 					
 					

utils/index.js

@@ -22,15 +22,12 @@ export function DX(n) {
 	    n = Math.abs(n);  
 	 
 	    var s = '';  
-	
+	 
 	    for (var i = 0; i < fraction.length; i++)   
 	    {  
-			
-			var a=(n * 10).toFixed(2)
-			
-	        s += (digit[Math.floor(a * Math.pow(10, i)) % 10] + fraction[i]).replace(/零./, '');  
+			//console.log( 10.0 *n  )
+	        s += (digit[Math.floor(n * 10 * Math.pow(10, i)) % 10] + fraction[i]).replace(/零./, '');  
 	    }  
-	
 	    s = s || '整';  
 	    n = Math.floor(n);