From 2640a9e7cb2d6d5dbb5da86139458e5267271f2c Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期二, 16 四月 2024 16:52:33 +0800
Subject: [PATCH] feat(支付): 云商通快捷支付打开

---
 pages/pay/scanpay.vue     |   28 ++++++++--------------------
 pages/pay/discountpay.vue |   20 +++-----------------
 2 files changed, 11 insertions(+), 37 deletions(-)

diff --git a/pages/pay/discountpay.vue b/pages/pay/discountpay.vue
index df0683a..32604c9 100644
--- a/pages/pay/discountpay.vue
+++ b/pages/pay/discountpay.vue
@@ -357,7 +357,9 @@
 									this.aliPay(res.paymentData)
 								}
 							} else if (res.toPayMethod == 3) {
-								window.location.href = res.paymentUrl
+								// window.location.href = res.paymentUrl
+                this.smscode = ''
+                this.codeShow = true
 							}
 						}
 					} catch (e) {
@@ -372,22 +374,6 @@
 			},
 			// 寰俊鏀粯
       wxPay(res) {
-        /*setTimeout(() => {
-          wx.chooseWXPay({
-            timestamp: res.timeStamp, // 鏀粯绛惧悕鏃堕棿鎴�
-            nonceStr: res.nonceStr, // 鏀粯绛惧悕闅忔満涓诧紝涓嶉暱浜� 32 浣�
-            package: res.package, // 缁熶竴鏀粯鎺ュ彛杩斿洖鐨刾repay_id鍙傛暟鍊硷紝鎻愪氦鏍煎紡濡傦細prepay_id=\*\*\*锛�
-            signType: res.signType, // 寰俊鏀粯V3鐨勪紶鍏� RSA ,寰俊鏀粯V2鐨勪紶鍏ユ牸寮忎笌V2缁熶竴涓嬪崟鐨勭鍚嶆牸寮忎繚鎸佷竴鑷�
-            paySign: res.paySign, // 鏀粯绛惧悕
-            success: function(res) {
-              // 鏀粯鎴愬姛鍚庣殑鍥炶皟鍑芥暟
-              uni.navigateTo({
-                url: `/pages/pay/paySuccess?orderId=${this.orderId}&youHuiInfo=${JSON
-                  .stringify(this.youHuiInfo)}`
-              })
-            }
-          });
-        }, 200)*/
         setTimeout(() => {
           WeixinJSBridge.invoke(
               'getBrandWCPayRequest', {
diff --git a/pages/pay/scanpay.vue b/pages/pay/scanpay.vue
index 15e5350..790e6d5 100644
--- a/pages/pay/scanpay.vue
+++ b/pages/pay/scanpay.vue
@@ -91,7 +91,7 @@
               parseFloat((couponInfo.thresholdValue / 100).toFixed(2))
             }}鍏冨噺{{ parseFloat((couponInfo.discount / 100).toFixed(2)) }}鍏�
           </view>
-          <u-radio @change="radioChange($event,3)" :name="bankCard.id" activeColor="#D41F28"
+          <u-radio @change="radioChange($event,3, bankCard.id)" :name="3" activeColor="#D41F28"
                    :customStyle="{ marginLeft: '10rpx' }">
           </u-radio>
         </view>
@@ -307,9 +307,12 @@
         this.getUserInfo()
       }
     },
-    radioChange(e, item) {
+    radioChange(e, item, bankCardId) {
       this.bordShow = false
       this.payWay = item
+      if(bankCardId){
+        this.bankCardId = bankCardId
+      }
     },
     // 鏇存柊閲戦
     changeMoney(str) {
@@ -583,7 +586,9 @@
                 this.aliPay(res.paymentData)
               }
             } else if (res.toPayMethod == 3) {
-              window.location.href = res.paymentUrl
+              // window.location.href = res.paymentUrl
+              this.smscode = ''
+              this.codeShow = true
             }
           } catch (e) {
             //TODO handle the exception
@@ -597,23 +602,6 @@
     },
     // 寰俊鏀粯
     wxPay(res) {
-      /*setTimeout(() => {
-        wx.chooseWXPay({
-          timestamp: res.timeStamp, // 鏀粯绛惧悕鏃堕棿鎴�
-          nonceStr: res.nonceStr, // 鏀粯绛惧悕闅忔満涓诧紝涓嶉暱浜� 32 浣�
-          package: res.package, // 缁熶竴鏀粯鎺ュ彛杩斿洖鐨刾repay_id鍙傛暟鍊硷紝鎻愪氦鏍煎紡濡傦細prepay_id=\*\*\*锛�
-          signType: res.signType, // 寰俊鏀粯V3鐨勪紶鍏� RSA ,寰俊鏀粯V2鐨勪紶鍏ユ牸寮忎笌V2缁熶竴涓嬪崟鐨勭鍚嶆牸寮忎繚鎸佷竴鑷�
-          paySign: res.paySign, // 鏀粯绛惧悕
-          success: function (res) {
-            // 鏀粯鎴愬姛鍚庣殑鍥炶皟鍑芥暟
-            uni.navigateTo({
-              url: `/pages/pay/paySuccess?orderId=${this.orderId}&youHuiInfo=${JSON
-                  .stringify(this.youHuiInfo)}`
-            })
-          }
-        });
-      }, 200)*/
-
       setTimeout(() => {
         WeixinJSBridge.invoke(
             'getBrandWCPayRequest', {

--
Gitblit v1.9.1