From 14a52315c4bdcd7d04208f41696ffd3771dd8183 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期二, 04 六月 2024 18:02:17 +0800
Subject: [PATCH] feat(支付): 权益平台配置

---
 pages/pay/discountpay.vue |   57 ++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/pages/pay/discountpay.vue b/pages/pay/discountpay.vue
index bd0169b..15038c8 100644
--- a/pages/pay/discountpay.vue
+++ b/pages/pay/discountpay.vue
@@ -10,15 +10,15 @@
 			</view>
 		</view>
 
-		<view v-if="discountInfo.shopDiscount!=1&&money*(1-discountInfo.shopDiscount)>=0.01"
+    <!--		<view v-if="discountInfo.shopDiscount!=1&&money*(1-discountInfo.shopDiscount)>=0.01"
 			class="bg-fff u-m-h-32 u-m-t-20 u-p-h-32 u-br-10">
 			<view class="u-p-v-32 u-flex u-row-between u-border-bottom u-font-30 color-333">
 				<view>{{discountInfo.memberGradeName}}涓撳睘鎶樻墸</view>
 				<view>-{{ money*(1-discountInfo.shopDiscount).toFixed(2) }}</view>
 			</view>
-		</view>
+		</view>-->
 		<view v-if="canUseIntegral||canUseCoupon" class="u-p-h-32 bg-fff u-m-h-32 u-br-10">
-			<view class="u-font-28 u-m-t-32">閫夋嫨浼樻儬鏂瑰紡</view>
+<!--			<view class="u-font-28 u-m-t-32">閫夋嫨浼樻儬鏂瑰紡</view>
 			<view v-if="canUseIntegral" class="u-p-v-24 u-border-bottom u-flex u-m-t-10">
 				<image class="item-icon" style="align-self: flex-start;position: relative;top: -3rpx;"
 					src="/static/integral.png" mode=""></image>
@@ -29,7 +29,7 @@
 				</view>
 				<input-number @handleCount="changeInt" :value="canUseInt" :min="0" :max="maxIntegral">
 				</input-number>
-			</view>
+			</view>-->
 			<view v-if="canUseCoupon" class="u-flex u-p-v-32">
 				<image class="item-icon" src="/static/coupon-icon.png" mode=""></image>
 				<view class="u-font-30 u-flex-1 u-m-h-16">浼樻儬鍒�</view>
@@ -94,7 +94,7 @@
 			<key-bord @changeMoney="changeMoney" :num.sync="money" @close="bordShow = false" @pay="pay"></key-bord>
 		</u-popup>
 		<!-- 鏀粯楠岃瘉鐮� -->
-		<u-popup :show="codeShow" closeable mode="center" @close="codeShow = false">
+<!--		<u-popup :show="codeShow" closeable mode="center" @close="codeShow = false">
 			<view class="u-p-h-40 u-p-b-40">
 				<view class="u-text-center u-p-t-20 u-m-b-30 u-font-34">璇疯緭鍏ユ墜鏈洪獙璇佺爜</view>
 				<view class="u-text-center u-m-b-20 color-666">{{ shopInfo.shop_name }}</view>
@@ -104,7 +104,7 @@
 				<u-code-input @finish="bankPay" v-model="smscode" mode="box" :focus="true"></u-code-input>
 			</view>
 
-		</u-popup>
+		</u-popup>-->
 	</view>
 </template>
 
@@ -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) {
@@ -371,24 +373,29 @@
 				})
 			},
 			// 寰俊鏀粯
-			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)
-			},
+      wxPay(res) {
+        setTimeout(() => {
+          WeixinJSBridge.invoke(
+              'getBrandWCPayRequest', {
+                "appId": res.appId, //鍏紬鍙稩D锛岀敱鍟嗘埛浼犲叆
+                "timeStamp": res.timeStamp, //鏃堕棿鎴筹紝鑷�1970骞翠互鏉ョ殑绉掓暟
+                "nonceStr": res.nonceStr, //闅忔満涓�
+                "package": res.package,
+                "signType": res.signType, //寰俊绛惧悕鏂瑰紡锛�
+                "paySign": res.paySign //寰俊绛惧悕
+              },
+              (res) => {
+                if (res.err_msg == "get_brand_wcpay_request:ok") {
+                  // 浣跨敤浠ヤ笂鏂瑰紡鍒ゆ柇鍓嶇杩斿洖,寰俊鍥㈤槦閮戦噸鎻愮ず锛�
+                  //res.err_msg灏嗗湪鐢ㄦ埛鏀粯鎴愬姛鍚庤繑鍥瀘k锛屼絾骞朵笉淇濊瘉瀹冪粷瀵瑰彲闈犮��
+                  uni.navigateTo({
+                    url: `/pages/pay/paySuccess?orderId=${this.orderId}&youHuiInfo=${JSON
+                        .stringify(this.youHuiInfo)}`
+                  })
+                }
+              });
+        }, 200)
+      },
 			//鏀粯瀹濇敮浠�
 			aliPay(res) {
 				ap.tradePay({

--
Gitblit v1.9.1