From aee5272d23ade39f178d6b3c2032a29db6752aca Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期一, 21 十月 2024 13:18:52 +0800
Subject: [PATCH] update 首页定位

---
 pages/order/order.vue |   67 +++++++++++++++++++--------------
 1 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/pages/order/order.vue b/pages/order/order.vue
index 7c5142f..4847452 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -94,7 +94,7 @@
 		},
 		async onShow() {
 			// 支付回调
-			// #ifdef PUB_CUSTOMER_DEV
+			// #ifdef PUB_CUSTOMER
 			let options = wx.getEnterOptionsSync();
 			if (options.scene == '1038' && options.referrerInfo.appId == 'wxef277996acc166c3') {
 				// 代表从收银台小程序返回
@@ -244,7 +244,7 @@
 					case 'confirm': {
 						await this.$message.confirm('是否确定收货')
 						var tryCallWx = false
-						// #ifdef MP
+						// #ifdef MPOLD
 						let tmp = this
 						if (wx.openBusinessView && item.paymentTrId) {
 							tryCallWx = true
@@ -313,6 +313,9 @@
 							this.$message.hideLoading()
 							if (code === 0) {
 								this.refreshList()
+								//刷新积分
+								this.$store.dispatch('getCurrentInfo')
+								this.$message.showToast('收货成功')
 							}
 						}
 
@@ -334,6 +337,7 @@
 						if (code === 0) {
 							//微信接口
 							let that = this
+							// #ifndef PUB_CUSTOMER
 							wx.requestPayment({
 								...data,
 								async success(res) {
@@ -349,39 +353,44 @@
 									that.$message.showToast('支付失败')
 								}
 							})
-							// #ifdef PUB_CUSTOMER_DEV
+							// #endif
+							// #ifdef PUB_CUSTOMER
 							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
+							})
+							// if (compareVersion(version, '2.26.2') >= 0) {
 
-								wx.openEmbeddedMiniProgram({
-									appId: 'wxef277996acc166c3',
-									extraData: param
-								})
+							// 	wx.openEmbeddedMiniProgram({
+							// 		appId: 'wxef277996acc166c3',
+							// 		extraData: param
+							// 	})
 
-							} else {
-								wx.navigateToMiniProgram({
-									appId: 'wxef277996acc166c3',
-									extraData: param
-								})
+							// } else {
+							// 	wx.navigateToMiniProgram({
+							// 		appId: 'wxef277996acc166c3',
+							// 		extraData: param
+							// 	})
 
-							}
+							// }
 							// #endif
 
 						}

--
Gitblit v1.9.3