Merge branch 'main' of https://gitea.lihaink.cn/mkm/shop-applet
This commit is contained in:
commit
fd04b4e93c
|
@ -49,8 +49,8 @@
|
||||||
<view class='item acea-row row-between-wrapper' v-if="array.length>0">
|
<view class='item acea-row row-between-wrapper' v-if="array.length>0">
|
||||||
<view class='name'>开户银行</view>
|
<view class='name'>开户银行</view>
|
||||||
<view class='input'>
|
<view class='input'>
|
||||||
<input placeholder='请输入开户银行' v-model="mode.bank_name"
|
<input placeholder='请输入开户银行' v-model="mode.bank_name" placeholder-class='placeholder'
|
||||||
placeholder-class='placeholder' name="bank_address"></input>
|
name="bank_address"></input>
|
||||||
<!-- <picker @change="bindPickerChange" :value="index" :range="array" range-key="name">
|
<!-- <picker @change="bindPickerChange" :value="index" :range="array" range-key="name">
|
||||||
<text class='Bank'>{{array[index]["name"]}}</text>
|
<text class='Bank'>{{array[index]["name"]}}</text>
|
||||||
<text class='iconfont icon-qiepian38'></text>
|
<text class='iconfont icon-qiepian38'></text>
|
||||||
|
@ -68,15 +68,14 @@
|
||||||
name="extract_price" type='digit' v-model="extract_price"></input></view>
|
name="extract_price" type='digit' v-model="extract_price"></input></view>
|
||||||
</view>
|
</view>
|
||||||
<view class='tip mt25'>
|
<view class='tip mt25'>
|
||||||
当前可提现金额: <text
|
当前可提现金额: <text class="price">¥{{extract_money}}</text>, 暂存金额: ¥{{lock_money}}
|
||||||
class="price">¥{{extract_money}}</text>, 冻结金额: ¥{{lock_money}}
|
|
||||||
</view>
|
</view>
|
||||||
<view class='tip'>
|
<view class='tip'>
|
||||||
当前押金: ¥{{ot_margin}}
|
当前押金: ¥{{ot_margin}}
|
||||||
</view>
|
</view>
|
||||||
<view class='tip'>
|
<view class='tip'>
|
||||||
说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额<br/>
|
说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额<br />
|
||||||
提货付款订单完成后,该笔订单金额冻结时间为20分钟<br/>
|
提货付款订单完成后,该笔订单金额暂存时间为20分钟<br />
|
||||||
</view>
|
</view>
|
||||||
<view class="btn-submit">
|
<view class="btn-submit">
|
||||||
<button formType="submit" class='bnt b-color'>提现</button>
|
<button formType="submit" class='bnt b-color'>提现</button>
|
||||||
|
@ -113,15 +112,14 @@
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class='tip mt25'>
|
<view class='tip mt25'>
|
||||||
当前可提现金额: <text
|
当前可提现金额: <text class="price">¥{{extract_money}},</text>暂存金额: ¥{{lock_money}}
|
||||||
class="price">¥{{extract_money}},</text>冻结金额: ¥{{lock_money}}
|
|
||||||
</view>
|
</view>
|
||||||
<view class='tip'>
|
<view class='tip'>
|
||||||
当前押金: ¥{{ot_margin}}
|
当前押金: ¥{{ot_margin}}
|
||||||
</view>
|
</view>
|
||||||
<view class='tip'>
|
<view class='tip'>
|
||||||
说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额<br/>
|
说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额<br />
|
||||||
提货付款订单完成后,该笔订单金额冻结时间为20分钟<br/>
|
提货付款订单完成后,该笔订单金额暂存时间为20分钟<br />
|
||||||
</view>
|
</view>
|
||||||
<button formType="submit" class='bnt b-color'>提现</button>
|
<button formType="submit" class='bnt b-color'>提现</button>
|
||||||
</view>
|
</view>
|
||||||
|
@ -166,15 +164,14 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class='tip mb25'>
|
<view class='tip mb25'>
|
||||||
当前可提现金额: <text
|
当前可提现金额: <text class="price">¥{{extract_money}}</text>, 暂存金额: ¥{{lock_money}}
|
||||||
class="price">¥{{extract_money}}</text>, 冻结金额: ¥{{lock_money}}
|
|
||||||
</view>
|
</view>
|
||||||
<view class='tip'>
|
<view class='tip'>
|
||||||
当前押金: ¥{{ot_margin}}
|
当前押金: ¥{{ot_margin}}
|
||||||
</view>
|
</view>
|
||||||
<view class='tip'>
|
<view class='tip'>
|
||||||
说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额<br/>
|
说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额<br />
|
||||||
提货付款订单完成后,该笔订单金额冻结时间为20分钟<br/>
|
提货付款订单完成后,该笔订单金额暂存时间为20分钟<br />
|
||||||
</view>
|
</view>
|
||||||
<view class="btn-submit">
|
<view class="btn-submit">
|
||||||
<button formType="submit" class='bnt b-color'>提现</button>
|
<button formType="submit" class='bnt b-color'>提现</button>
|
||||||
|
@ -223,7 +220,7 @@
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
extract_money:"",
|
extract_money: "",
|
||||||
lock_money: "",
|
lock_money: "",
|
||||||
ot_margin: "",
|
ot_margin: "",
|
||||||
lock_time: "",
|
lock_time: "",
|
||||||
|
@ -295,7 +292,7 @@
|
||||||
this.merId = options.mer_id
|
this.merId = options.mer_id
|
||||||
this.source = options.source;
|
this.source = options.source;
|
||||||
let data = this.$store.state.app.userInfo;
|
let data = this.$store.state.app.userInfo;
|
||||||
if(typeof data == 'string') data = JSON.parse(data);
|
if (typeof data == 'string') data = JSON.parse(data);
|
||||||
this.merInfo = data.mer_info;
|
this.merInfo = data.mer_info;
|
||||||
this.getApply()
|
this.getApply()
|
||||||
if (this.isLogin) {
|
if (this.isLogin) {
|
||||||
|
@ -317,8 +314,8 @@
|
||||||
this.mode.bank_name = res.data.financial_bank_bank
|
this.mode.bank_name = res.data.financial_bank_bank
|
||||||
this.mode.bank_address = res.data.financial_bank_branch
|
this.mode.bank_address = res.data.financial_bank_branch
|
||||||
this.mode.mer_name = res.data.financial_bank_name
|
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;
|
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.extract_money = res.data.extract_money
|
||||||
this.lock_money = res.data.lock_money
|
this.lock_money = res.data.lock_money
|
||||||
this.ot_margin = res.data.ot_margin
|
this.ot_margin = res.data.ot_margin
|
||||||
this.lock_time = res.data.lock_time
|
this.lock_time = res.data.lock_time
|
||||||
|
@ -489,18 +486,20 @@
|
||||||
// 提现申请
|
// 提现申请
|
||||||
// that.postCreate(e.detail.value.extract_price)
|
// that.postCreate(e.detail.value.extract_price)
|
||||||
Toast(res.message)
|
Toast(res.message)
|
||||||
setTimeout(()=>{
|
setTimeout(() => {
|
||||||
uni.navigateBack({
|
uni.navigateBack({
|
||||||
delta: 1
|
delta: 1
|
||||||
})}, 1000)
|
})
|
||||||
|
}, 1000)
|
||||||
|
|
||||||
console.log(res);
|
console.log(res);
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
Toast(err)
|
Toast(err)
|
||||||
setTimeout(()=>{
|
setTimeout(() => {
|
||||||
uni.navigateBack({
|
uni.navigateBack({
|
||||||
delta: 1
|
delta: 1
|
||||||
})}, 1000)
|
})
|
||||||
|
}, 1000)
|
||||||
|
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
@ -803,6 +802,7 @@
|
||||||
uni-toast.uni-mask {
|
uni-toast.uni-mask {
|
||||||
background-color: rgba(0, 0, 0, 0.5) !important;
|
background-color: rgba(0, 0, 0, 0.5) !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.saomaCode {
|
.saomaCode {
|
||||||
z-index: 1;
|
z-index: 1;
|
||||||
position: fixed;
|
position: fixed;
|
||||||
|
@ -816,5 +816,4 @@
|
||||||
text-align: center;
|
text-align: center;
|
||||||
line-height: 87.72rpx;
|
line-height: 87.72rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
</style>
|
</style>
|
Loading…
Reference in New Issue