提现的提交

pages/microShop/wdCase.vue

@@ -22,17 +22,18 @@
 						<u-icon name="warning-o" size="24" color="#ffffff"></u-icon>
 					</view>
 				</view>
-				<!-- <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.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.Commission}}</Text> </text>
+				<view style='font-size: 12px;color: #FF3F47;display: flex;flex-direction: row;align-items: center;'>￥ 
+					<Text style='font-size: 18px;color:#000000;margin-left: 5px;' v-if='cash.IsWithdrawAll == 1'>{{cash.Commission}}</Text> 
+					 
+					<input type="text" v-model="msg.AppliedMoney"  v-if='cash.IsWithdrawAll == 0' @input='liedMoney'/>
+				</view>
 			</view>
 			<Text style='font-size: 14px;color:#333 ;margin: 10px 0;display: inline-block;width: 94%;'>手续费扣除:{{msg.Fee}}元</Text>
 			<view class="txmode">
@@ -113,7 +114,7 @@
 					
 					<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.IsWithdrawAll}}元</Text>
+						<Text style='font-size: 14px;color:#333 ;margin-top: 10px;'>最少提现额度:{{cash.MinWithdrawal}}元</Text>
 						<Text style='font-size: 14px;color:#333 ;margin-top: 10px;'>手续费:{{cash.WithdrawalFree}}%</Text> 
 					</view>
 					<view class="agreement_bottom" :style="{background:mainColor}" @click="read">
@@ -233,68 +234,72 @@
 			},
 			getapply(){
 				
-				let that = this
+				let that = this;
+				  
+				if(that.msg.AppliedMoney<0){
+					uni.showToast({
+						title: "请输入提现金额",
+						icon: "none"
+					});
+					return false
+				}
+				if(that.txmode==''){
+					uni.showToast({
+						title: "请选择提现方式",
+						icon: "none"
+					});
+					return false
+				}
+				if(that.msg.WithdrawalWay==2|| that.msg.WithdrawalWay==3 || that.msg.WithdrawalWay==4){
+					if(that.msg.AccountName==''){
+						uni.showToast({
+							title: "账户名称不能为空",
+							icon: "none"
+						});
+						return false
+					}
+					if(that.msg.AccountNumber==''){
+						uni.showToast({
+							title: "账户号不能为空",
+							icon: "none"
+						});
+						return false
+					}
+					if(that.msg.BankName=='' && that.msg.WithdrawalWay==4){
+						uni.showToast({
+							title: "银行名称不能为空",
+							icon: "none"
+						});
+						return false
+					}
+				}
+					
+				if(that.cash.MinWithdrawal!=-1){
+					if(that.msg.AppliedMoney<that.cash.MinWithdrawal){
+						uni.showToast({
+							title: "提现金额大于等于"+that.cash.MinWithdrawal,
+							icon: "none"
+						});
+						return false
+					}
+				}
+				if(that.msg.AppliedMoney>that.cash.Commission){
+					uni.showToast({
+						title: '余额不足',
+						icon: "none"
+					});
+					return false
+				}
 				uni.requestSubscribeMessage({
 				  tmplIds: that.cash.template_message_list,
 				  complete (res) { 
 					  console.log(that.msg.AppliedMoney)
-					  if(that.msg.AppliedMoney<0){
-					  	uni.showToast({
-					  		title: "请输入提现金额",
-					  		icon: "none"
-					  	});
-					  	return false
-					  }
-					  if(that.txmode==''){
-					  	uni.showToast({
-					  		title: "请选择提现方式",
-					  		icon: "none"
-					  	});
-					  	return false
-					  }
-					  if(that.msg.WithdrawalWay==2|| that.msg.WithdrawalWay==3 || that.msg.WithdrawalWay==4){
-					  	if(that.msg.AccountName==''){
-					  		uni.showToast({
-					  			title: "账户名称不能为空",
-					  			icon: "none"
-					  		});
-					  		return false
-					  	}
-					  	if(that.msg.AccountNumber==''){
-					  		uni.showToast({
-					  			title: "账户号不能为空",
-					  			icon: "none"
-					  		});
-					  		return false
-					  	}
-					  	if(that.msg.BankName=='' && that.msg.WithdrawalWay==4){
-					  		uni.showToast({
-					  			title: "银行名称不能为空",
-					  			icon: "none"
-					  		});
-					  		return false
-					  	}
-					  }
-					  	
-					  if(that.cash.IsWithdrawAll!=-1){
-					  	if(that.msg.AppliedMoney<that.cash.IsWithdrawAll){
-					  		uni.showToast({
-					  			title: "提现金额大于等于"+that.cash.IsWithdrawAll,
-					  			icon: "none"
-					  		});
-					  		return false
-					  	}
-					  }
-					  if(that.msg.AppliedMoney>that.cash.Commission){
-					  	uni.showToast({
-					  		title: '余额不足',
-					  		icon: "none"
-					  	});
-					  	return false
-					  }
+					
+					  
 					  
 					  that.msg.Fee =   Number(that.msg.Fee);
 					  that.msg.RemitMoney = that.msg.AppliedMoney - that.msg.Fee; //最终提现要减去 手续费
+					  
 					  uni.showLoading({
 					  	title:'加载中',
 					  	icon:'none'
@@ -302,7 +307,7 @@
 					  that.prohibit = true;//禁止接口没回来时候的再次操作
 					  that.request2(
 					  	{
-					  		url: '/api/AppletSmallShops/GetSmallShopsWithdrawDepositBalance',
+					  		url: '/api/AppletSmallShops/SetSmallShopsWithdrawDeposit',
 					  		data: that.msg
 					  	},
 					    (res) => {

pages/share/cash/cash.vue

@@ -24,7 +24,10 @@
 				<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>
+				<view style='font-size: 12px;color: #FF3F47;display: flex;flex-direction: row;align-items: center;'>￥
+					<Text style='font-size: 18px;color:#000000;margin-left: 5px;' v-if='cash.IsWithdrawAll == 1'>{{cash.CommissionWithdrawal}}</Text> 
+					<input type="text" v-model="msg.AppliedMoney"  v-if='cash.IsWithdrawAll == 0' @input='liedMoney' style="margin-left: 5px;"/>
+				</view>
 			</view>
 			<Text style='font-size: 14px;color:#333 ;margin: 10px 0;display: inline-block;width: 94%;'>手续费扣除:{{msg.Fee}}元</Text>
 			<view class="txmode">