From d75c8b6f0fd1f8428a322aba2d73c036c28946c1 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Wed, 19 Mar 2025 09:59:31 +0800 Subject: [PATCH 1/3] finish tid1894 --- src/subpackage/wallet/pages/baofu_withdraw/index.vue | 20 ++++++++++++++++---- src/subpackage/wallet/pages/index/index.vue | 4 +++- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/subpackage/wallet/pages/baofu_withdraw/index.vue b/src/subpackage/wallet/pages/baofu_withdraw/index.vue index 9fe989e..61c31e3 100644 --- a/src/subpackage/wallet/pages/baofu_withdraw/index.vue +++ b/src/subpackage/wallet/pages/baofu_withdraw/index.vue @@ -29,7 +29,7 @@ import bfWithdraw from '../../components/bf_withdraw.vue'; import wallet_modal_success from '../../components/wallet_modal_success.vue'; import { WALLET_API } from '../../js/api'; import servers from '../../js/server'; -import { routeTo, showLoad, hideLoad } from '@/utils/util'; +import { routeTo, showLoad, hideLoad, showModal } from '@/utils/util'; import { mapState} from 'vuex'; export default { computed: { @@ -42,15 +42,18 @@ export default { }, data(){ return { - accountLs: [] + accountLs: [], + brand_id: '', + balance: '', } }, onLoad(options){ this.brand_id = options.brand_id ?? ''; + this.balance = options.balance ?? ''; // this.getWalletBalance(options.brand_id); console.log('brandInfo', this.brandInfo); this.getPayAssureConfigs({ - appid: this.brandInfo?.brand?.mini_wechat_appid ?? 'wxc141a743225e7885' + appid: this.brandInfo?.brand?.mini_wechat_appid ?? '' }); }, methods: { @@ -59,7 +62,16 @@ export default { this.$refs?.baofuItem?.[index]?.refreshItem(false); }, extractBtn(i){ - let { accountLs } = this; + let { accountLs, balance } = this; + + if(!isNaN(balance) && Number(balance) < 0)return showModal({ + content: '系统检测到您在欧轩有未支付的账单，请先完成支付后再提现。', + confirmText: '前往', + success: res=>{ + if(res.confirm)routeTo(); + } + }) + let _curItem = accountLs[i]; let _type = this.getBaoFuV2AccountTypeForChinese(_curItem.baofu_v2_config) === '个人' ? '1' : '2'; this.$refs.bfWithdraw.alert({ diff --git a/src/subpackage/wallet/pages/index/index.vue b/src/subpackage/wallet/pages/index/index.vue index 34175d7..52d2980 100644 --- a/src/subpackage/wallet/pages/index/index.vue +++ b/src/subpackage/wallet/pages/index/index.vue @@ -116,7 +116,9 @@ export default { routeTo(`/subpackage/wallet/pages/douyin_withdraw/index?${_qryStr}`, 'nT'); }, bfBtnClick(){ - routeTo(`/subpackage/wallet/pages/baofu_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/baofu_withdraw/index?${_qryStr}`, 'nT'); }, // 获取支付信息 From b6413896b93b08e208a8ede8212812aba400f255 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Wed, 19 Mar 2025 11:03:49 +0800 Subject: [PATCH 2/3] vtest 1.1.66 for tid1894 --- src/subpackage/wallet/pages/index/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/subpackage/wallet/pages/index/index.vue b/src/subpackage/wallet/pages/index/index.vue index 52d2980..c7d3e95 100644 --- a/src/subpackage/wallet/pages/index/index.vue +++ b/src/subpackage/wallet/pages/index/index.vue @@ -119,7 +119,6 @@ export default { let { brand_id, balance } = this; let _qryStr = `brand_id=${brand_id ?? ''}&balance=${balance ?? 0}`; routeTo(`/subpackage/wallet/pages/baofu_withdraw/index?${_qryStr}`, 'nT'); - }, // 获取支付信息 getPayInfo({ brand_id, pay_amount }){ From 5bbda7ecb72015d2dc1c3999570f21a27c895419 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Wed, 19 Mar 2025 11:11:31 +0800 Subject: [PATCH 3/3] vformal 1.1.66 for tid1894 --- src/js/api.js | 4 ++-- src/manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/js/api.js b/src/js/api.js index 7762a45..c2eb919 100644 --- a/src/js/api.js +++ b/src/js/api.js @@ -1,5 +1,5 @@ -export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`; // 测试 -// export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`; // 正式 +// export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`; // 测试 +export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`; // 正式 // export const ORIGIN = `http://192.168.1.135:9090`; // 20210927 测试 diff --git a/src/manifest.json b/src/manifest.json index 7ac6737..7182d0a 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -73,7 +73,7 @@ // } // }, /* 正式 wxf1294b279ad1b845 */ - "appid" : "wx7106e84614cf0060", + "appid" : "wxf1294b279ad1b845", "setting" : { "urlCheck" : false, "minified" : true,