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] =?UTF-8?q?fix(=E6=8F=90=E7=8E=B0=E7=8A=B6=E6=80=81):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8F=90=E7=8E=B0=E7=8A=B6=E6=80=81=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=80=BB=E8=BE=91=E5=B9=B6=E6=B7=BB=E5=8A=A0=E5=95=86?=
 =?UTF-8?q?=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 @@
             </view>
             <view class="record-amount">
               <text class="amount">+{{ item.money }}</text>
-              <text class="status" :class="item.withdrawal.status === '1' && withdrawStatus === '0' ? 'status-available' : 'status-received'" v-if="item.withdrawal">{{ getText(item.withdrawal) }}</text>
+
+
+
+              <text class="status" 
+              :class="item.withdrawal.status === '1' 
+              && item.withdrawal.withdrawStatus === '0' ? 'status-available' : 'status-received'" 
+              v-if="item.withdrawal && item.withdrawal.status != '1'">{{ getText(item.withdrawal) }}</text>
+
+              
+
             </view>
           </view>
         </view>
@@ -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({