From 6dd1a191d22e8c3dd5ec985e356c495f6332a1ea Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 09 十月 2024 15:54:34 +0800
Subject: [PATCH] update 订单支付-确认收货

---
 pages/order/order-detail.vue |   55 +++++++++++++++++++++++++------------------------------
 1 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index 3b6c0b3..53b8a64 100644
--- a/pages/order/order-detail.vue
+++ b/pages/order/order-detail.vue
@@ -264,7 +264,7 @@
 						await this.$message.confirm('是否确定收货')
 
 						var tryCallWx = false
-						// #ifdef MP
+						// #ifdef MPOLD
 						let tmp = this
 						if (wx.openBusinessView && tmp.dto && tmp.dto.paymentTrId) {
 							tryCallWx = true
@@ -332,6 +332,8 @@
 							this.$message.hideLoading()
 							if (code === 0) {
 								this.getDetail()
+								this.$store.dispatch('getCurrentInfo')
+								this.$message.showToast('收货成功')
 							}
 						}
 
@@ -354,6 +356,8 @@
 						if (code === 0) {
 							//微信接口
 							let that = this
+							// #ifndef PUB_CUSTOMER_DEV
+							
 							wx.requestPayment({
 								...data,
 								async success(res) {
@@ -366,39 +370,30 @@
 									that.$message.showToast('支付失败')
 								}
 							})
+							// #endif
 							// #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