diff --git a/src/pages.json b/src/pages.json index df82c08..807b35a 100644 --- a/src/pages.json +++ b/src/pages.json @@ -761,7 +761,7 @@ { "path": "pages/douyin_withdraw/index", "style" : { - "navigationBarTitleText": "抖音提现" + "navigationBarTitleText": "平台提现" } }, { diff --git a/src/subpackage/wallet/pages/douyin_withdraw/apply.vue b/src/subpackage/wallet/pages/douyin_withdraw/apply.vue index f6a84ce..8119da8 100644 --- a/src/subpackage/wallet/pages/douyin_withdraw/apply.vue +++ b/src/subpackage/wallet/pages/douyin_withdraw/apply.vue @@ -34,6 +34,11 @@ 联系电话 + + + *证件号码 + + @@ -41,6 +46,7 @@ 温馨提示 1、账户请预留一定的余额,避免余额不足导致退款失败! 2、提现申请成功提交后,预计在3~7个工作日内进行处理。 + 3、提现需要扣除1元/次手续费。 确认提现 @@ -82,14 +88,25 @@ export default { account: '', bank_name: '', bank_address: '', - mobile: '' - } + mobile: '', + // 20241113 【ID1001577】商家助手小程序-抖音提现申请增加证件号码输入 + credentials_number: '' // 证件号码 + }, + // md【241024】 241113新增 + source: '', // 提现源:0抖音;1微信 } }, async onLoad(options){ let _bid = options.brand_id || ''; this.brand_id = _bid; - await this.getDouyinWalletBalance(_bid); + + // md【241024】 241113新增 + let { source } = options; + if(![ 0, 1 ].includes(+source))return showNone('缺少参数 source'); + this.source = +source; + + await this.getDouyinWalletBalance(_bid, +source); + if(this.isEmptyInfo())this.getStorageAndSet(); }, methods: { @@ -144,8 +161,10 @@ export default { }, // 提现申请确认 dyConfirmExtract(e){ + let { brand_id, source } = this; this.douyinWalletExtract({ - brand_id: this.brand_id, + brand_id, + source, ...e, }) }, @@ -154,7 +173,7 @@ export default { return _infoValues.every(item=>item === ''); }, infoCheck(){ - let { amount, account_name_of_bank, account, bank_name, bank_address, mobile } = this.info; + let { amount, account_name_of_bank, account, bank_name, bank_address, mobile, credentials_number } = this.info; let _amount = +(amount ?? 0); if(_amount <= 0){ showNone('提现金额不正确'); @@ -180,13 +199,19 @@ export default { showNone('支行名称不能为空'); return false } + + if(credentials_number === ''){ + showNone('证件号码不能为空'); + return false + } + return true }, /** * http://api.ouxuan.net:61080/project/11/interface/api/2195 * @param {String} brand_id 品牌id * */ - getDouyinWalletBalance(brand_id){ + getDouyinWalletBalance(brand_id, source){ showLoad(); return servers.get({ url: WALLET_API.withdrawalOfDouyinOrg_totalAmount, @@ -196,8 +221,11 @@ export default { failMsg: '获取钱包余额失败' }) .then(res=>{ + hideLoad(); - let _balance = +res.total_amount ?? 0; + let _balance = 0; + if(source === 0)_balance = +res.total_amount_of_douyin ?? 0; + if(source === 1)_balance = +res.total_amount_of_wechat ?? 0; return this.balance = _balance * 0.01; }) .catch(hideLoad) @@ -212,6 +240,11 @@ export default { * @param {String} bank_address // 银行地址 * @param {String} mobile 手机号 * @param {Number} status // 0未处理,1已处理 + * md【241024】 241113新增 + * @param {Number} source // 提现源:0抖音;1微信 + * // 20241113 【ID1001577】商家助手小程序-抖音提现申请增加证件号码输入 + * @param {String} credentials_number // 证件号码 + * * */ douyinWalletExtract({ brand_id, @@ -221,7 +254,9 @@ export default { bank_name, bank_address, mobile, - status = 0 + status = 0, + credentials_number, + source, }){ showLoad(); servers.post({ @@ -235,6 +270,8 @@ export default { bank_address, mobile, status, + credentials_number, + source, }, failMsg: '申请提现失败' }) @@ -242,7 +279,7 @@ export default { hideLoad(); this.$refs.walletModalSuccess.alert(); setTimeout(_=>{ - this.getDouyinWalletBalance(brand_id); + this.getDouyinWalletBalance(brand_id, source); }, 1200); }) .catch(hideLoad) @@ -250,7 +287,6 @@ export default { } } - \ No newline at end of file diff --git a/src/subpackage/wallet/pages/douyin_withdraw/record.vue b/src/subpackage/wallet/pages/douyin_withdraw/record.vue index 01941e7..5fd1d9e 100644 --- a/src/subpackage/wallet/pages/douyin_withdraw/record.vue +++ b/src/subpackage/wallet/pages/douyin_withdraw/record.vue @@ -12,10 +12,12 @@ name="提现金额" :tag="getTagTxt(e.status)" >{{ formatAmount(e.amount || 0) }} + {{ getSourceTxt(e.source) }} {{ e.number || '-' }} {{ e.request_time || '-' }} {{ e.account_name_of_bank || '-' }} {{ e.account || '-' }} + {{ e.credentials_number || '-' }} {{ e.updated_at || '-' }} {{ e.remark || '-' }} @@ -65,6 +67,10 @@ export default { }); }, methods: { + getSourceTxt(source = ''){ + return source === 0 ? '抖音平台' : + source === 1 ? '微信平台' : '-'; + }, formatAmount(num = 0){ let _num = Number(num) || 0; return _num * 0.01; diff --git a/src/subpackage/wallet/pages/index/index.vue b/src/subpackage/wallet/pages/index/index.vue index 7dd37cd..55d9589 100644 --- a/src/subpackage/wallet/pages/index/index.vue +++ b/src/subpackage/wallet/pages/index/index.vue @@ -10,9 +10,10 @@ 温馨提示: - 如需要分账账户可以自己单独提现,请访问 {{ oxAddress }} + 1、如需要宝付分账账户可以自己单独提现,请访问 {{ oxAddress }} 复制 - \r\n账户为宝付的商户号,密码为申请时预留的手机号码 + \r\n 账户为宝付的商户号,密码为申请时预留的手机号码 + \r\n 2、平台提现为平台版抖音小程序、平台版微信小程序的分账结算金额提现。 diff --git a/src/subpackage/wallet/pages/index/modules/wallet_info.vue b/src/subpackage/wallet/pages/index/modules/wallet_info.vue index 807e312..f450eb1 100644 --- a/src/subpackage/wallet/pages/index/modules/wallet_info.vue +++ b/src/subpackage/wallet/pages/index/modules/wallet_info.vue @@ -26,8 +26,9 @@ 宝付提现 - - 抖音提现 + + + 平台提现