diff --git a/src/subpackage/wallet/pages/douyin_withdraw/index.vue b/src/subpackage/wallet/pages/douyin_withdraw/index.vue
index 2264b47..f11b299 100644
--- a/src/subpackage/wallet/pages/douyin_withdraw/index.vue
+++ b/src/subpackage/wallet/pages/douyin_withdraw/index.vue
@@ -5,14 +5,14 @@
title="微信平台可提现资金"
:balance="formatMoney(balanceInfo.total_amount_of_wechat)"
type="wx"
- @click:extract="applyBtn(1, balanceInfo.total_amount_of_wechat)"
+ @click:extract="applyBtn(1)"
>
@@ -35,6 +35,7 @@ export default {
},
data(){
return {
+ balance: '',
brand_id: '',
balanceInfo: {
/**
@@ -46,7 +47,9 @@ export default {
}
},
onLoad(options){
- this.brand_id = options.brand_id || '';
+ this.brand_id = options?.brand_id || '';
+ this.balance = options?.balance ?? '';
+
},
onShow(){
this.getDouyinWalletBalance(this.brand_id);
@@ -58,9 +61,10 @@ export default {
},
// 申请提现
// md【241024】 241113新增 0抖音;1微信
- applyBtn(source, balance){
- if(!isNaN(balance) && balance < 0)return showModal({
- content: '系统检测到您在欧轩有未支付的账单,请先完成支付后再提现。点击“前往”跳转钱包页面',
+ applyBtn(source){
+ let { balance } = this;
+ if(!isNaN(balance) && Number(balance) < 0)return showModal({
+ content: '系统检测到您在欧轩有未支付的账单,请先完成支付后再提现。',
confirmText: '前往',
success: res=>{
if(res.confirm)routeTo();
diff --git a/src/subpackage/wallet/pages/index/index.vue b/src/subpackage/wallet/pages/index/index.vue
index 04beb4d..0cc02a3 100644
--- a/src/subpackage/wallet/pages/index/index.vue
+++ b/src/subpackage/wallet/pages/index/index.vue
@@ -20,7 +20,7 @@
-
+
充值成功!
充值记录
@@ -112,7 +112,9 @@ export default {
})
},
dyBtnClick(){
- routeTo(`/subpackage/wallet/pages/douyin_withdraw/index?brand_id=${this.brand_id ?? ''}`, 'nT');
+ let { brand_id, balance } = this;
+ let _qryStr = `brand_id=${brand_id ?? ''}&balance=${balance ?? 0}`;
+ routeTo(`/subpackage/wallet/pages/douyin_withdraw/index?${_qryStr}`, 'nT');
},
bfBtnClick(){
routeTo(`/subpackage/wallet/pages/baofu_withdraw/index?brand_id=${this.brand_id ?? ''}`, 'nT');
diff --git a/src/subpackage/wallet/pages/index/recharge_record.vue b/src/subpackage/wallet/pages/index/recharge_record.vue
index 6d5cbb9..d557240 100644
--- a/src/subpackage/wallet/pages/index/recharge_record.vue
+++ b/src/subpackage/wallet/pages/index/recharge_record.vue
@@ -13,16 +13,12 @@
{{ e.pay_time || '-' }}
{{ e.pay_type || '-' }}
{{ e.trans_no || '-' }}
- {{ e.optsourse || '-' }}
+
+ {{ e.optsourse || '-' }} ({{ e.optname }})
+
-