From 6609db102c9832e847da9a5790a18d1a23982c05 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Wed, 6 Mar 2024 10:33:55 +0800
Subject: [PATCH] 1

---
 pages/users/embody/embody.vue | 185 +++++++++++++++++-----------------
 1 file changed, 92 insertions(+), 93 deletions(-)

diff --git a/pages/users/embody/embody.vue b/pages/users/embody/embody.vue
index de7703c..bcdffcd 100644
--- a/pages/users/embody/embody.vue
+++ b/pages/users/embody/embody.vue
@@ -20,37 +20,37 @@
 			<view class='wrapper'>
 				<view :hidden='currentTab != 0' class='list'>
 					<form @submit="subCash" report-submit='true'>
-            <block v-if="merInfo.is_company">
-              <view class='item acea-row row-between-wrapper'>
-              	<view class='name'>公司名称</view>
-              	<view class='input'>
-                  <text class='Bank'>{{mode.mer_name}}</text>
-                  <text class='iconfont icon-qiepian38'></text>
-                </view>
-              </view>
-              <view class='item acea-row row-between-wrapper'>
-              	<view class='name'>对公账号</view>
-              	<view class='input'><input v-model="mode.bank_code" type='number' placeholder='请填写对公账号'
-              			placeholder-class='placeholder' name="bank_code"></input></view>
-              </view>
-            </block>
-            <block v-else>
-              <view class='item acea-row row-between-wrapper'>
-              	<view class='name'>持卡人</view>
-              	<view class='input'><input v-model="mode.mer_name" placeholder='请输入持卡人姓名'
-              			placeholder-class='placeholder' name="mer_name"></input></view>
-              </view>
-              <view class='item acea-row row-between-wrapper'>
-              	<view class='name'>银行卡号</view>
-              	<view class='input'><input v-model="mode.bank_code" type='number' placeholder='请填写银行卡号'
-              			placeholder-class='placeholder' name="bank_code"></input></view>
-              </view>
-            </block>
+						<block v-if="merInfo.is_company">
+							<view class='item acea-row row-between-wrapper'>
+								<view class='name'>公司名称</view>
+								<view class='input'>
+									<text class='Bank'>{{mode.mer_name}}</text>
+									<text class='iconfont icon-qiepian38'></text>
+								</view>
+							</view>
+							<view class='item acea-row row-between-wrapper'>
+								<view class='name'>对公账号</view>
+								<view class='input'><input v-model="mode.bank_code" type='number' placeholder='请填写对公账号'
+										placeholder-class='placeholder' name="bank_code"></input></view>
+							</view>
+						</block>
+						<block v-else>
+							<view class='item acea-row row-between-wrapper'>
+								<view class='name'>持卡人</view>
+								<view class='input'><input v-model="mode.mer_name" placeholder='请输入持卡人姓名'
+										placeholder-class='placeholder' name="mer_name"></input></view>
+							</view>
+							<view class='item acea-row row-between-wrapper'>
+								<view class='name'>银行卡号</view>
+								<view class='input'><input v-model="mode.bank_code" type='number' placeholder='请填写银行卡号'
+										placeholder-class='placeholder' name="bank_code"></input></view>
+							</view>
+						</block>
 						<view class='item acea-row row-between-wrapper' v-if="array.length>0">
 							<view class='name'>开户银行</view>
 							<view class='input'>
-                <input placeholder='请输入开户银行' v-model="mode.bank_name"
-                		placeholder-class='placeholder' name="bank_address"></input>
+								<input placeholder='请输入开户银行' v-model="mode.bank_name" placeholder-class='placeholder'
+									name="bank_address"></input>
 								<!-- <picker @change="bindPickerChange" :value="index" :range="array" range-key="name">
 									<text class='Bank'>{{array[index]["name"]}}</text>
 									<text class='iconfont icon-qiepian38'></text>
@@ -68,15 +68,14 @@
 									name="extract_price" type='digit' v-model="extract_price"></input></view>
 						</view>
 						<view class='tip mt25'>
-							当前可提现金额: <text
-								class="price">￥{{extract_money}}</text>, 冻结金额: ￥{{lock_money}}
+							当前可提现金额: <text class="price">￥{{extract_money}}</text>, 暂存金额: ￥{{lock_money}}
 						</view>
-            <view class='tip'>
-            		当前押金: ￥{{ot_margin}}
-            </view>
 						<view class='tip'>
-								说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额<br/>
-                提货付款订单完成后，该笔订单金额冻结时间为20分钟<br/>
+							当前押金: ￥{{ot_margin}}
+						</view>
+						<view class='tip'>
+							说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额<br />
+							提货付款订单完成后，该笔订单金额暂存时间为20分钟<br />
 						</view>
 						<view class="btn-submit">
 							<button formType="submit" class='bnt b-color'>提现</button>
@@ -113,15 +112,14 @@
 							</view>
 
 							<view class='tip mt25'>
-								当前可提现金额: <text
-									class="price">￥{{extract_money}},</text>冻结金额: ￥{{lock_money}}
+								当前可提现金额: <text class="price">￥{{extract_money}},</text>暂存金额: ￥{{lock_money}}
 							</view>
-              <view class='tip'>
-              		当前押金: ￥{{ot_margin}}
-              </view>
 							<view class='tip'>
-								说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额<br/>
-                提货付款订单完成后，该笔订单金额冻结时间为20分钟<br/>
+								当前押金: ￥{{ot_margin}}
+							</view>
+							<view class='tip'>
+								说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额<br />
+								提货付款订单完成后，该笔订单金额暂存时间为20分钟<br />
 							</view>
 							<button formType="submit" class='bnt b-color'>提现</button>
 						</view>
@@ -166,16 +164,15 @@
 							</view>
 						</view>
 						<view class='tip mb25'>
-							当前可提现金额: <text
-								class="price">￥{{extract_money}}</text>, 冻结金额: ￥{{lock_money}}
-							</view>
-             <view class='tip'>
-             		当前押金: ￥{{ot_margin}}
-             </view>
-							<view class='tip'>
-								说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额<br/>
-                提货付款订单完成后，该笔订单金额冻结时间为20分钟<br/>
-							</view>
+							当前可提现金额: <text class="price">￥{{extract_money}}</text>, 暂存金额: ￥{{lock_money}}
+						</view>
+						<view class='tip'>
+							当前押金: ￥{{ot_margin}}
+						</view>
+						<view class='tip'>
+							说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额<br />
+							提货付款订单完成后，该笔订单金额暂存时间为20分钟<br />
+						</view>
 						<view class="btn-submit">
 							<button formType="submit" class='bnt b-color'>提现</button>
 						</view>
@@ -197,7 +194,7 @@
 		getLisApplyAPI,
 		getAccountApplyAPI,
 		postAccountApplyAPI,
-		
+
 	} from '@/api/user.js'
 	import {
 		extractCash,
@@ -223,10 +220,10 @@
 		},
 		data() {
 			return {
-				extract_money:"",
-        lock_money: "",
-        ot_margin: "",
-        lock_time: "",
+				extract_money: "",
+				lock_money: "",
+				ot_margin: "",
+				lock_time: "",
 				mode: {
 					bank_address: "",
 					bank_code: "",
@@ -263,7 +260,7 @@
 				array: [], //提现银行
 				minPrice: 0.00, //最低提现金额
 				userInfo: [],
-        merInfo: {}, //商户信息
+				merInfo: {}, //商户信息
 				isClone: false,
 				isAuto: false, //没有授权的不会自动授权
 				isShowAuth: false, //是否隐藏授权
@@ -294,9 +291,9 @@
 		onLoad(options) {
 			this.merId = options.mer_id
 			this.source = options.source;
-      let data = this.$store.state.app.userInfo;
-      if(typeof data == 'string') data = JSON.parse(data);
-      this.merInfo = data.mer_info;
+			let data = this.$store.state.app.userInfo;
+			if (typeof data == 'string') data = JSON.parse(data);
+			this.merInfo = data.mer_info;
 			this.getApply()
 			if (this.isLogin) {
 				this.getUserInfo();
@@ -312,16 +309,16 @@
 				try {
 					const res = await getAdminApplyAPI(this.merId)
 					// this.mode.real_name = res.data.financial_bank_name
-          this.mode.real_name = res.data.financial_bank_name
+					this.mode.real_name = res.data.financial_bank_name
 					this.mode.bank_code = res.data.financial_bank_code
 					this.mode.bank_name = res.data.financial_bank_bank
 					this.mode.bank_address = res.data.financial_bank_branch
-          this.mode.mer_name = res.data.financial_bank_name
-          if(this.merInfo.is_company && !this.mode.mer_name) this.mode.mer_name = this.merInfo.company_name;
-					this.extract_money=res.data.extract_money
-          this.lock_money = res.data.lock_money
-          this.ot_margin = res.data.ot_margin
-          this.lock_time = res.data.lock_time
+					this.mode.mer_name = res.data.financial_bank_name
+					if (this.merInfo.is_company && !this.mode.mer_name) this.mode.mer_name = this.merInfo.company_name;
+					this.extract_money = res.data.extract_money
+					this.lock_money = res.data.lock_money
+					this.ot_margin = res.data.ot_margin
+					this.lock_time = res.data.lock_time
 					// console.log(this.extract_money)
 				} catch (err) {
 					//TODO handle the exception
@@ -428,17 +425,17 @@
 					if (value.bank_code.length == 0) return this.$util.Tips({
 						title: '请填写对公账号'
 					});
-          if (!this.mode.bank_name) return this.$util.Tips({
-          	title: '请填写开户银行'
-          });
-          if (!this.mode.bank_address) return this.$util.Tips({
-          	title: '请填写开户网点'
-          });
+					if (!this.mode.bank_name) return this.$util.Tips({
+						title: '请填写开户银行'
+					});
+					if (!this.mode.bank_address) return this.$util.Tips({
+						title: '请填写开户网点'
+					});
 					// if (that.index == 0) return this.$util.Tips({
 					// 	title: "请选择银行"
 					// });
 					value.extract_type = 'bank';
-          value.bank_name = this.mode.bank_name;
+					value.bank_name = this.mode.bank_name;
 					// value.bank_name = (that.array && that.array.length) ? that.array[that.index].name : '';
 				} else if (that.currentTab == 1) { //微信
 					value.extract_type = 'weixin';
@@ -484,24 +481,26 @@
 					financial_bank_branch: this.mode.bank_address,
 					financial_type: 1
 				}
-			  console.log(mode);
+				console.log(mode);
 				postCreateApplyAPI(this.merId, mode).then(res => {
 					// 提现申请
 					// that.postCreate(e.detail.value.extract_price)
 					Toast(res.message)
-					setTimeout(()=>{
+					setTimeout(() => {
 						uni.navigateBack({
 							delta: 1
-						})}, 1000)
+						})
+					}, 1000)
 
 					console.log(res);
 				}).catch(err => {
 					Toast(err)
-					setTimeout(()=>{
+					setTimeout(() => {
 						uni.navigateBack({
 							delta: 1
-						})}, 1000)
-					
+						})
+					}, 1000)
+
 				})
 			},
 			async postCreate(price) {
@@ -803,18 +802,18 @@
 	uni-toast.uni-mask {
 		background-color: rgba(0, 0, 0, 0.5) !important;
 	}
+
 	.saomaCode {
-	  z-index: 1;
-	  position: fixed;
-	  bottom: 175.44rpx;
-	  right: 28.07rpx;
-	  width: 87.72rpx;
-	  height: 87.72rpx;
-	  border-radius: 175.44rpx;
-	  background-image: linear-gradient(90deg, #FA6514 0%, #E93323 100%);
-	  color: #fff;
-	  text-align: center;
-	  line-height: 87.72rpx;
+		z-index: 1;
+		position: fixed;
+		bottom: 175.44rpx;
+		right: 28.07rpx;
+		width: 87.72rpx;
+		height: 87.72rpx;
+		border-radius: 175.44rpx;
+		background-image: linear-gradient(90deg, #FA6514 0%, #E93323 100%);
+		color: #fff;
+		text-align: center;
+		line-height: 87.72rpx;
 	}
-	
 </style>
\ No newline at end of file