From de36dc7c144e7afa05d8590bb6601218aa5ef58c Mon Sep 17 00:00:00 2001
From: lzx_win <2602107437@qq.com>
Date: Tue, 23 Sep 2025 16:21:37 +0800
Subject: [PATCH 1/4] 1
---
subPages/user/promote.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/subPages/user/promote.vue b/subPages/user/promote.vue
index c0f00b0..85c7426 100644
--- a/subPages/user/promote.vue
+++ b/subPages/user/promote.vue
@@ -43,7 +43,7 @@
推广人数
- {{ userInfo.price }}
+ {{ userInfo.commission }}
总佣金
@@ -68,7 +68,7 @@
余额
- ¥88.32
+ ¥{{ userInfo.price || 0 }}
From dd999ae6e0d833e402d86db1363ec411a7ea5d87 Mon Sep 17 00:00:00 2001
From: lzx_win <2602107437@qq.com>
Date: Tue, 23 Sep 2025 18:17:51 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix(=E6=8F=90=E7=8E=B0=E7=8A=B6=E6=80=81):?=
=?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E6=8F=90=E7=8E=B0=E7=8A=B6=E6=80=81?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91=E5=B9=B6=E6=B7=BB=E5=8A=A0?=
=?UTF-8?q?=E5=95=86=E6=88=B7=E8=BD=AC=E8=B4=A6=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
修正提现状态显示条件，避免错误显示可用状态
新增requestMerchantTransfer方法处理商户转账请求
---
subPages/user/promote.vue | 38 +++++++++++++++++++++++++++++++++++++-
1 file changed, 37 insertions(+), 1 deletion(-)
diff --git a/subPages/user/promote.vue b/subPages/user/promote.vue
index 85c7426..7a93b87 100644
--- a/subPages/user/promote.vue
+++ b/subPages/user/promote.vue
@@ -86,7 +86,16 @@
+{{ item.money }}
- {{ getText(item.withdrawal) }}
+
+
+
+ {{ getText(item.withdrawal) }}
+
+
+
@@ -159,6 +168,33 @@ export default {
this.userInfo = res.result
}
},
+ requestMerchantTransfer(item) {
+ if (!wx.canIUse('requestMerchantTransfer')) {
+ wx.showModal({
+ content: '你的微信版本过低，请更新至最新版本。',
+ showCancel: false,
+ });
+ return
+ }
+ wx.requestMerchantTransfer({
+ mchId: '1673516176',//万能墙商户号
+ appId: wx.getAccountInfoSync().miniProgram.appId,
+ package: item.packageInfo,
+ success: (res) => {
+ // res.err_msg将在页面展示成功后返回应用时返回ok，并不代表提款成功
+ console.log('success:', res);
+ this.getData()
+
+ this.$api('requestMerchantTransfer', {
+ id : item.id,
+ })
+ },
+ fail: (res) => {
+ console.log('fail:', res);
+ this.getData()
+ },
+ });
+ },
// 去二维码
goQrcode() {
uni.navigateTo({
From ed36885b82512e9e69117c1dc96ee7ba7a20be52 Mon Sep 17 00:00:00 2001
From: lzx_win <2602107437@qq.com>
Date: Tue, 23 Sep 2025 18:19:53 +0800
Subject: [PATCH 3/4] =?UTF-8?q?feat(=E7=94=A8=E6=88=B7=E9=A1=B5=E9=9D=A2):?=
=?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=E5=BE=AE=E4=BF=A1=E6=8F=90=E7=8E=B0?=
=?UTF-8?q?=E9=A2=86=E5=8F=96=E6=8C=89=E9=92=AE=E5=B9=B6=E8=B0=83=E6=95=B4?=
=?UTF-8?q?=E9=87=91=E9=A2=9D=E6=98=BE=E7=A4=BA=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
在提现记录中，当状态为可领取且提现方式为微信时显示领取按钮
调整金额显示区域的布局为垂直排列并添加间距
---
subPages/user/promote.vue | 23 +++++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/subPages/user/promote.vue b/subPages/user/promote.vue
index 7a93b87..e29f24f 100644
--- a/subPages/user/promote.vue
+++ b/subPages/user/promote.vue
@@ -87,7 +87,23 @@
+{{ item.money }}
-
+
+
+ 领取
+