From 6bc53a7251d5a323475757358d00ff051f166497 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 10 三月 2025 10:24:17 +0800
Subject: [PATCH] fix: 二期需求

---
 packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue |   84 +++++++++++++++++++++++++++++------------
 1 files changed, 59 insertions(+), 25 deletions(-)

diff --git a/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue b/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue
index 1146842..c825572 100644
--- a/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue
+++ b/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue
@@ -24,6 +24,7 @@
 import { useQuery } from '@tanstack/vue-query';
 import { Toast as NutToast } from '@nutui/nutui-taro';
 import { onMounted, reactive, ref, computed } from 'vue';
+import Taro from '@tarojs/taro';
 
 defineOptions({
   name: 'SelectPayTypeView',
@@ -85,10 +86,12 @@
       state.msg = '璇峰湪寰俊涓墦寮�';
       state.show = true;
     }
+  } else if (Taro.getEnv() === Taro.ENV_TYPE.WEAPP) {
+    handleWeixinPayByMini();
   }
 }
 
-async function handleWeixinPayByJsApi() {
+async function getPayOrderForJsAPI() {
   try {
     let params: GetPayOrderForJsAPIInput = {
       orderNo: props.orderNo,
@@ -97,32 +100,63 @@
       attach: Date.now().toString(),
     };
     let res = await blLifeRecharge.services.getPayOrderForJsAPI(params);
-    //@ts-ignore
-    if (res && WeixinJSBridge) {
+    return res;
+  } catch (error) {}
+}
+
+async function handleWeixinPayByJsApi() {
+  try {
+    let res = await getPayOrderForJsAPI();
+
+    if (res) {
       //@ts-ignore
-      WeixinJSBridge.invoke(
-        'getBrandWCPayRequest',
-        {
-          appId: props.appId, //鍏紬鍙稩D锛岀敱鍟嗘埛浼犲叆
-          timeStamp: res.timestamp, //鏃堕棿鎴筹紝鑷�1970骞翠互鏉ョ殑绉掓暟
-          nonceStr: res.nonceStr, //闅忔満涓�
-          package: res.package,
-          signType: res.signType, //寰俊绛惧悕鏂瑰紡锛�
-          paySign: res.paySign, //寰俊绛惧悕
-        },
-        function (res) {
-          if (res.err_msg == 'get_brand_wcpay_request:ok') {
-            // 浣跨敤浠ヤ笂鏂瑰紡鍒ゆ柇鍓嶇杩斿洖,寰俊鍥㈤槦閮戦噸鎻愮ず锛�
-            //res.err_msg灏嗗湪鐢ㄦ埛鏀粯鎴愬姛鍚庤繑鍥瀘k锛屼絾骞朵笉淇濊瘉瀹冪粷瀵瑰彲闈狅紝鍟嗘埛闇�杩涗竴姝ヨ皟鐢ㄥ悗绔煡鍗曠‘璁ゆ敮浠樼粨鏋溿��
-          } else if (res.err_msg == 'system:access_denied') {
-            state.msg = '璇峰湪鎵嬫満寰俊涓墦寮�';
-            state.show = true;
-          } else {
-            // state.msg = res.err_msg;
-            // state.show = true;
+      if (WeixinJSBridge) {
+        //@ts-ignore
+        WeixinJSBridge.invoke(
+          'getBrandWCPayRequest',
+          {
+            appId: props.appId, //鍏紬鍙稩D锛岀敱鍟嗘埛浼犲叆
+            timeStamp: res.timestamp, //鏃堕棿鎴筹紝鑷�1970骞翠互鏉ョ殑绉掓暟
+            nonceStr: res.nonceStr, //闅忔満涓�
+            package: res.package,
+            signType: res.signType, //寰俊绛惧悕鏂瑰紡锛�
+            paySign: res.paySign, //寰俊绛惧悕
+          },
+          function (res) {
+            if (res.err_msg == 'get_brand_wcpay_request:ok') {
+              // 浣跨敤浠ヤ笂鏂瑰紡鍒ゆ柇鍓嶇杩斿洖,寰俊鍥㈤槦閮戦噸鎻愮ず锛�
+              //res.err_msg灏嗗湪鐢ㄦ埛鏀粯鎴愬姛鍚庤繑鍥瀘k锛屼絾骞朵笉淇濊瘉瀹冪粷瀵瑰彲闈狅紝鍟嗘埛闇�杩涗竴姝ヨ皟鐢ㄥ悗绔煡鍗曠‘璁ゆ敮浠樼粨鏋溿��
+            } else if (res.err_msg == 'system:access_denied') {
+              state.msg = '璇峰湪鎵嬫満寰俊涓墦寮�';
+              state.show = true;
+            } else {
+              // state.msg = res.err_msg;
+              // state.show = true;
+            }
           }
-        }
-      );
+        );
+      }
+    }
+  } catch (error) {}
+}
+
+async function handleWeixinPayByMini() {
+  try {
+    let res = await getPayOrderForJsAPI();
+
+    if (res) {
+      Taro.requestPayment({
+        timeStamp: res.timestamp,
+        nonceStr: res.nonceStr,
+        package: res.package,
+        signType: res.signType as any,
+        paySign: res.paySign,
+        success: function (res) {
+          console.log('res: ', res);
+          // if(res.errMsg)
+        },
+        fail: function (res) {},
+      });
     }
   } catch (error) {}
 }

--
Gitblit v1.9.1