1

pages/microShop/wdCase.vue

@@ -12,7 +12,7 @@
 			<view class="cashBox_top">
 				<text style="font-size: 12px;">账户剩余余额</text>
 				<view style="display: flex;flex-direction: row;align-items: flex-end;">
-					<text style="font-size: 30px;">{{cash.CommissionWithdrawal}}</text>
+					<text style="font-size: 30px;">{{cash.Commission}}</text>
 					<text style="font-size: 15px;margin-left: 5px;">元</text>	
 				</view>
 				<view style="display: flex;flex-direction: row;align-items: center;justify-content: space-between;">
@@ -22,17 +22,17 @@
 						<u-icon name="warning-o" size="24" color="#ffffff"></u-icon>
 					</view>
 				</view>
-				<!-- <Text style='font-size: 18px;margin-top: 10px;'>账户剩余余额：{{cash.CommissionWithdrawal}}元</Text>
+				<!-- <Text style='font-size: 18px;margin-top: 10px;'>账户剩余余额：{{cash.Commission}}元</Text>
 				<Text style='font-size: 14px;color:#333 ;margin-top: 10px;'>今日剩余提现金额:{{cash.CanRemitMoney==-1?'不限':cash.CanRemitMoney+'元'}}</Text>
-				<Text style='font-size: 14px;color:#333 ;margin-top: 10px;'>最少提现额度:{{cash.MinimumWithdrawalLimit}}元</Text>
-				<Text style='font-size: 14px;color:#333 ;margin-top: 10px;'>手续费:{{cash.WithdrawFee}}%</Text> -->
+				<Text style='font-size: 14px;color:#333 ;margin-top: 10px;'>最少提现额度:{{cash.IsWithdrawAll}}元</Text>
+				<Text style='font-size: 14px;color:#333 ;margin-top: 10px;'>手续费:{{cash.WithdrawalFree}}%</Text> -->
 				
 			</view>
 			<view class="tixian" style="margin-top: 10px;">
 				<text>提现金额</text>
 			</view>
 			<view class="tixian" style="background: #F7F5F5;padding: 0 20px;">
-				<text style='font-size: 12px;color: #FF3F47;'>￥ <Text style='font-size: 18px;color:#000000;margin-left: 5px;'>{{cash.CommissionWithdrawal}}</Text> </text>
+				<text style='font-size: 12px;color: #FF3F47;'>￥ <Text style='font-size: 18px;color:#000000;margin-left: 5px;'>{{cash.Commission}}</Text> </text>
 			</view>
 			<Text style='font-size: 14px;color:#333 ;margin: 10px 0;display: inline-block;width: 94%;'>手续费扣除:{{msg.Fee}}元</Text>
 			<view class="txmode">
@@ -113,8 +113,8 @@
 					
 					<view style="width: 100%;height: 760rpx;padding: 20rpx;display: flex;flex-direction: column;">
 						<text style="font-size: 12px;">今日剩余提现金额:{{cash.CanRemitMoney==-1?'无限制':cash.CanRemitMoney+'元'}}</text>
-						<Text style='font-size: 14px;color:#333 ;margin-top: 10px;'>最少提现额度:{{cash.MinimumWithdrawalLimit}}元</Text>
-						<Text style='font-size: 14px;color:#333 ;margin-top: 10px;'>手续费:{{cash.WithdrawFee}}%</Text> 
+						<Text style='font-size: 14px;color:#333 ;margin-top: 10px;'>最少提现额度:{{cash.IsWithdrawAll}}元</Text>
+						<Text style='font-size: 14px;color:#333 ;margin-top: 10px;'>手续费:{{cash.WithdrawalFree}}%</Text> 
 					</view>
 					<view class="agreement_bottom" :style="{background:mainColor}" @click="read">
 						<Text style='color: #fff;'>确定</Text>
@@ -191,7 +191,7 @@
 				uni.showNavigationBarLoading();
 				this.request2(
 					{
-						url: '/api/AppletUser/GetUserDistrbutorWithdrawDepositBalance',
+						url: '/api/AppletSmallShops/GetSmallShopsWithdrawDepositBalance',
 						data: {}
 					},
 							
@@ -203,18 +203,18 @@
 						x.checked = false
 					})
 					this.list = WayList
-					this.msg.AppliedMoney = Number(this.cash.CommissionWithdrawal)
-					this.msg.Fee =   (Number(this.cash.WithdrawFee*0.01*this.msg.AppliedMoney)).toFixed(2);
+					this.msg.AppliedMoney = Number(this.cash.Commission)
+					this.msg.Fee =   (Number(this.cash.WithdrawalFree*0.01*this.msg.AppliedMoney)).toFixed(2);
 				  }
 				);
 			},
 			allmoney(){
-				// this.msg.AppliedMoney = Number(this.cash.CommissionWithdrawal) 
-				// this.msg.Fee =   (Number(this.cash.WithdrawFee*0.01*this.msg.AppliedMoney)).toFixed(2);
+				// this.msg.AppliedMoney = Number(this.cash.Commission) 
+				// this.msg.Fee =   (Number(this.cash.WithdrawalFree*0.01*this.msg.AppliedMoney)).toFixed(2);
 			},
 			liedMoney(val){
 				this.msg.AppliedMoney = Number(val.target.value) 
-				this.msg.Fee =   (Number(this.cash.WithdrawFee*0.01*this.msg.AppliedMoney)).toFixed(2);
+				this.msg.Fee =   (Number(this.cash.WithdrawalFree*0.01*this.msg.AppliedMoney)).toFixed(2);
 			},
 			radioChange(item){
 				this.txmode = item.Name;
@@ -276,16 +276,16 @@
 					  	}
 					  }
 					  	
-					  if(that.cash.MinimumWithdrawalLimit!=-1){
-					  	if(that.msg.AppliedMoney<that.cash.MinimumWithdrawalLimit){
+					  if(that.cash.IsWithdrawAll!=-1){
+					  	if(that.msg.AppliedMoney<that.cash.IsWithdrawAll){
 					  		uni.showToast({
-					  			title: "提现金额大于等于"+that.cash.MinimumWithdrawalLimit,
+					  			title: "提现金额大于等于"+that.cash.IsWithdrawAll,
 					  			icon: "none"
 					  		});
 					  		return false
 					  	}
 					  }
-					  if(that.msg.AppliedMoney>that.cash.CommissionWithdrawal){
+					  if(that.msg.AppliedMoney>that.cash.Commission){
 					  	uni.showToast({
 					  		title: '余额不足',
 					  		icon: "none"
@@ -302,7 +302,7 @@
 					  that.prohibit = true;//禁止接口没回来时候的再次操作
 					  that.request2(
 					  	{
-					  		url: '/api/AppletUser/SetUserDistrbutorWithdrawDeposit',
+					  		url: '/api/AppletSmallShops/GetSmallShopsWithdrawDepositBalance',
 					  		data: that.msg
 					  	},
 					    (res) => {