From ab711b1bae4cd61607949a352f0a2cb624c1274f Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 10 十月 2024 16:26:03 +0800
Subject: [PATCH] update

---
 sub_pages/customer/shopping/confirm.vue |   52 ++++++++++++++++++++++------------------------------
 1 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/sub_pages/customer/shopping/confirm.vue b/sub_pages/customer/shopping/confirm.vue
index 97a123e..662ac88 100644
--- a/sub_pages/customer/shopping/confirm.vue
+++ b/sub_pages/customer/shopping/confirm.vue
@@ -335,6 +335,7 @@
 									await tmp.$store.dispatch('sign_add', 'shopping')
 									uni.navigateBack()
 								} else if (data) {
+									// #ifndef PUB_CUSTOMER_DEV
 									wx.requestPayment({
 										...data,
 										async success(res) {
@@ -362,41 +363,32 @@
 											// uni.navigateBack()
 										}
 									})
-									
+									// #endif
 									// openEmbeddedMiniProgram,需要小程序基础库版本不低于 2.26.2
 									
 									// #ifdef PUB_CUSTOMER_DEV
 									var param = {
-										cusid: "平台分配的商户号",
-										appid: "平台分配的appid",
-										orgid: "平台分配的机构号",										
-										version: "12",									
-										trxamt: "1",								
-										reqsn: "商户唯一订单号",				
-										notify_url: "服务器异步通知页面路径",	
-										body: "标题",
-										remark: "备注",	
-										validtime: "订单有效时间",	
-										limit_pay: "no_credit",	
-										randomstr: "随机字符串",	
-										paytype: "W06",
-										signtype: "签名方式",	
-										sign: "签名,参考2.1"
+										// cusid: "平台分配的商户号",
+										// appid: "平台分配的appid",
+										// orgid: "平台分配的机构号",										
+										// version: "12",									
+										// trxamt: "1",								
+										// reqsn: "商户唯一订单号",				
+										// notify_url: "服务器异步通知页面路径",	
+										// body: "标题",
+										// remark: "备注",	
+										// validtime: "订单有效时间",	
+										// limit_pay: "no_credit",	
+										// randomstr: "随机字符串",	
+										// paytype: "W06",
+										// signtype: "签名方式",	
+										// sign: "签名,参考2.1",
+										...data,
 									}
-									if (compareVersion(version, '2.26.2') >= 0) {
-									
-										wx.openEmbeddedMiniProgram({			
-											appId: 'wxef277996acc166c3',			
-											extraData: param
-										})
-										
-									} else {
-										wx.navigateToMiniProgram({
-											appId: 'wxef277996acc166c3',
-											extraData: param
-										})
-									
-									}
+									wx.openEmbeddedMiniProgram({
+										appId: 'wxef277996acc166c3',			
+										extraData: param
+									})
 									// #endif
 
 								}

--
Gitblit v1.9.3