From 098057b2def3924606c0fa5856883d78cfc646cf Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 10 May 2025 10:07:27 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E3=80=90MALL=20=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E3=80=91=E4=BD=A3=E9=87=91=E6=8F=90=E7=8E=B0=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BB=A5=E5=8F=8A=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E6=9B=B4=E5=A4=9A=20API=20=E8=87=AA=E5=8A=A8=E6=89=93?=
 =?UTF-8?q?=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/account-type-select.vue        | 13 +++--
 pages/commission/withdraw.vue                 | 49 ++++++++++++-------
 sheep/platform/pay.js                         | 28 ++++++-----
 3 files changed, 57 insertions(+), 33 deletions(-)

diff --git a/pages/commission/components/account-type-select.vue b/pages/commission/components/account-type-select.vue
index cbbfc6db..c39c7a72 100644
--- a/pages/commission/components/account-type-select.vue
+++ b/pages/commission/components/account-type-select.vue
@@ -58,7 +58,7 @@
 
   const typeList = [
     {
-      icon: '/static/img/shop/pay/wechat.png',
+      icon: '/static/img/shop/pay/wallet.png',
       title: '钱包余额',
       value: '1',
     },
@@ -69,19 +69,24 @@
     },
     {
       icon: '/static/img/shop/pay/wechat.png',
-      title: '微信账户', // 微信手动转账
+      title: '微信收款码', // 微信手动转账
       value: '3',
     },
     {
       icon: '/static/img/shop/pay/alipay.png',
-      title: '支付宝账户',
+      title: '支付宝收款码', // 支付宝手动转账
       value: '4',
     },
     {
-      icon: '/static/img/shop/pay/wechat.png',
+      icon: '/static/img/shop/pay/wechat_api.png',
       title: '微信零钱', // 微信 API 转账
       value: '5',
     },
+    {
+      icon: '/static/img/shop/pay/alipay_api.png',
+      title: '支付宝余额', // 支付宝 API 转账
+      value: '6',
+    },
   ];
 
   function onChange(e) {
diff --git a/pages/commission/withdraw.vue b/pages/commission/withdraw.vue
index 163fe1a6..b725972b 100644
--- a/pages/commission/withdraw.vue
+++ b/pages/commission/withdraw.vue
@@ -49,18 +49,18 @@
         />
       </view>
       <!-- 提现账号 -->
-      <view class="card-title" v-show="['2', '3', '4', '5'].includes(state.accountInfo.type)">
+      <view class="card-title" v-show="['2', '6'].includes(state.accountInfo.type)">
         提现账号
       </view>
       <view
         class="input-box ss-flex ss-col-center border-bottom"
-        v-show="['2', '3', '4'].includes(state.accountInfo.type)"
+        v-show="['2', '6'].includes(state.accountInfo.type)"
       >
         <view class="unit" />
         <uni-easyinput
           :inputBorder="false"
           class="ss-flex-1 ss-p-l-10"
-          v-model="state.accountInfo.accountNo"
+          v-model="state.accountInfo.userAccount"
           placeholder="请输入提现账号"
         />
       </view>
@@ -73,27 +73,29 @@
         <view class="unit" />
         <view class="upload-img">
           <s-uploader
-            v-model:url="state.accountInfo.accountQrCodeUrl"
+            v-model:url="state.accountInfo.qrCodeUrl"
             fileMediatype="image"
             limit="1"
             mode="grid"
             :imageStyles="{ width: '168rpx', height: '168rpx' }"
-            @success="(payload) => (state.accountInfo.accountQrCodeUrl = payload.tempFilePaths[0])"
+            @success="(payload) => (state.accountInfo.qrCodeUrl = payload.tempFilePaths[0])"
           />
         </view>
       </view>
       <!-- 持卡人姓名 -->
-      <view class="card-title" v-show="state.accountInfo.type === '2'">持卡人</view>
+      <view class="card-title" v-show="['2', '5', '6'].includes(state.accountInfo.type)">
+        收款款真名
+      </view>
       <view
         class="input-box ss-flex ss-col-center border-bottom"
-        v-show="state.accountInfo.type === '2'"
+        v-show="['2', '5', '6'].includes(state.accountInfo.type)"
       >
         <view class="unit" />
         <uni-easyinput
           :inputBorder="false"
           class="ss-flex-1 ss-p-l-10"
-          v-model="state.accountInfo.name"
-          placeholder="请输入持卡人姓名"
+          v-model="state.accountInfo.userName"
+          placeholder="请输入收款款真名"
         />
       </view>
       <!-- 提现银行 -->
@@ -162,7 +164,7 @@
 </template>
 
 <script setup>
-  import { computed, onBeforeMount, reactive } from 'vue';
+  import { onBeforeMount, reactive } from 'vue';
   import sheep from '@/sheep';
   import accountTypeSelect from './components/account-type-select.vue';
   import { fen2yuan } from '@/sheep/hooks/useGoods';
@@ -170,19 +172,18 @@
   import BrokerageApi from '@/sheep/api/trade/brokerage';
   import DictApi from '@/sheep/api/system/dict';
   import SLayout from '@/sheep/components/s-layout/s-layout.vue';
+  import { goBindWeixin } from '@/sheep/platform/pay';
 
   const headerBg = sheep.$url.css('/static/img/shop/user/withdraw_bg.png');
   const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
 
-  const userStore = sheep.$store('user');
-  const userInfo = computed(() => userStore.userInfo);
   const state = reactive({
     accountInfo: {
       // 提现表单
       type: undefined,
-      accountNo: undefined,
-      accountQrCodeUrl: undefined,
-      name: undefined,
+      userAccount: undefined,
+      userName: undefined,
+      qrCodeUrl: undefined,
       bankName: undefined,
       bankAddress: undefined,
     },
@@ -218,11 +219,25 @@
       sheep.$helper.toast('请选择提现方式');
       return;
     }
+    let openid;
+    if (state.accountInfo.type === '5') {
+      openid = await sheep.$platform.useProvider('wechat').getOpenid();
+      // 如果获取不到 openid，微信无法发起支付，此时需要引导
+      if (!openid) {
+        goBindWeixin();
+        return;
+      }
+    }
+
     // 提交请求
-    let { code } = await BrokerageApi.createBrokerageWithdraw({
+    const data = {
       ...state.accountInfo,
       price: state.accountInfo.price * 100,
-    });
+    };
+    if (state.accountInfo.type === '5') {
+      data.userAccount = openid;
+    }
+    let { code } = await BrokerageApi.createBrokerageWithdraw(data);
     if (code !== 0) {
       return;
     }
diff --git a/sheep/platform/pay.js b/sheep/platform/pay.js
index 5f20fa20..35d20508 100644
--- a/sheep/platform/pay.js
+++ b/sheep/platform/pay.js
@@ -235,7 +235,7 @@ export default class SheepPay {
     if (code !== 0) {
       return;
     }
-    
+
     uni.requestPayment({
       provider: 'alipay',
       orderInfo: data.displayContent, // 直接使用返回的支付参数
@@ -264,7 +264,7 @@ export default class SheepPay {
 
     // 解析支付参数
     const payConfig = JSON.parse(data.displayContent);
-    
+
     // 调用微信支付
     uni.requestPayment({
       provider: 'wxpay',
@@ -283,7 +283,7 @@ export default class SheepPay {
           sheep.$helper.toast('支付失败：' + err.errMsg);
           that.payResult('fail');
         }
-      }
+      },
     });
   }
 
@@ -294,15 +294,7 @@ export default class SheepPay {
 
   // 引导绑定微信
   bindWeixin() {
-    uni.showModal({
-      title: '微信支付',
-      content: '请先绑定微信再使用微信支付',
-      success: function (res) {
-        if (res.confirm) {
-          sheep.$platform.useProvider('wechat').bind();
-        }
-      },
-    });
+    goBindWeixin();
   }
 }
 
@@ -383,3 +375,15 @@ export function goPayResult(id, orderType, resultType) {
     payState: resultType,
   });
 }
+
+export function goBindWeixin() {
+  uni.showModal({
+    title: '微信支付',
+    content: '请先绑定微信再使用微信支付',
+    success: function (res) {
+      if (res.confirm) {
+        sheep.$platform.useProvider('wechat').bind();
+      }
+    },
+  });
+}