From 828d1feeee9ff45c0c4fd6a2b36e41ccd8f11be7 Mon Sep 17 00:00:00 2001 From: Fox-33 <1466778434@qq.com> Date: Tue, 23 Sep 2025 17:33:10 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/model/partner.js | 8 ++++++ config.js | 3 ++ pages_order/partner/withdraw.vue | 60 ++++++++++++++++++++++++++++++++++++---- utils/share.js | 3 +- 4 files changed, 68 insertions(+), 6 deletions(-) diff --git a/api/model/partner.js b/api/model/partner.js index 7a2739d..4b2fecd 100644 --- a/api/model/partner.js +++ b/api/model/partner.js @@ -25,6 +25,14 @@ const api = { limit : 500, showLoading : true, }, + // 钱包-领取提现金额 + getMoney: { + url: '/partner/getMoney', + method: 'POST', + auth: true, + limit : 500, + showLoading : true, + }, // 我的团队-获取直推用户列表 queryDirectList: { url: '/partner/queryDirectList', diff --git a/config.js b/config.js index 11c6b64..859935d 100644 --- a/config.js +++ b/config.js @@ -39,6 +39,9 @@ const defaultConfig = { endpoint: 'oss-cn-shenzhen.aliyuncs.com', } }, + //商户号 + mchId : '1722176565', + appId : 'wxee64675d48680dd4', } diff --git a/pages_order/partner/withdraw.vue b/pages_order/partner/withdraw.vue index 70bc41d..23a4664 100644 --- a/pages_order/partner/withdraw.vue +++ b/pages_order/partner/withdraw.vue @@ -97,19 +97,69 @@ transferAmount, } - await this.$fetch('cashout', params) + const result = await this.$fetch('cashout', params) - uni.showToast({ - icon: 'success', - title: '提交成功', + console.log('cashout', result) + + // 拉起微信收款确认页面 + if (!wx.canIUse('requestMerchantTransfer')) { + wx.showModal({ + content: '你的微信版本过低,请更新至最新版本。', + showCancel: false, + }); + return + } + + // 在真机环境中,调用API + wx.requestMerchantTransfer({ + mchId: this.$config.mchId, + appId: wx.getAccountInfoSync().miniProgram.appId, + package: result.packageInfo, + success: (res) => { + uni.showToast({ + title: '提现申请已提交', + icon: 'success' + }) + this.form.transferAmount = null + this.form.userName = null + + this.$api('getMoney', { + id : result.outBillNo, + }).then(res => { + this.$store.commit('getUserInfo') + this.$store.commit('getUserCenterData') + }) + }, + fail: (res) => { + console.log('fail:', res); + uni.showToast({ + title: '提现失败,请稍后再试', + icon: 'none' + }) + }, + complete: (res) => { + console.log('requestMerchantTransfer完成:', res); + } }); + + // uni.showToast({ + // icon: 'success', + // title: '提交成功', + // }); + setTimeout(() => { this.$utils.navigateBack() }, 800) } catch (err) { - console.log('onSave err', err) + console.log('cashout err', err) + const { message } = err + + message && uni.showToast({ + icon: 'none', + title: message, + }); } }, }, diff --git a/utils/share.js b/utils/share.js index abb5461..65c7403 100644 --- a/utils/share.js +++ b/utils/share.js @@ -25,7 +25,8 @@ function share() { //微信分享 'updateTimelineShareData', 'updateAppMessageShareData', 'onMenuShareWeibo', - 'getLocation' + 'getLocation', + 'requestMerchantTransfer', ] });