From 18fe52ed15f6075d1a0506aab66f990e430383cf Mon Sep 17 00:00:00 2001
From: xuxy <1059738716@qq.com>
Date: 星期六, 05 十月 2024 17:55:18 +0800
Subject: [PATCH] add 前端支持新支付类别

---
 pages/order/order-detail.vue |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index 72f611f..4178662 100644
--- a/pages/order/order-detail.vue
+++ b/pages/order/order-detail.vue
@@ -18,6 +18,19 @@
 				salesTypeList: [],
 			};
 		},
+		
+		async onShow() {
+			// 支付回调
+			// #ifdef PUB_CUSTOMER_DEV
+			let options = wx.getEnterOptionsSync();
+			if (options.scene == '1038' && options.referrerInfo.appId == 'wxef277996acc166c3') {
+				// 代表从收银台小程序返回
+				let extraData = options.referrerInfo.extraData;
+				this.getDetail()
+				return
+			}
+			// #endif
+		},
 		onUnload() {
 			this.timer && clearTimeout(this.timer)
 		},
@@ -263,7 +276,7 @@
 									// 发送请求
 									if (info.extraData && info.extraData.status === 'fail') {
 										tmp.$message.showToast('支付和确认收货需要是同一微信号,请联系实际支付人登录确认')
-										
+
 									} else if (info.extraData && info.extraData.status === 'cancel') {
 
 									} else {
@@ -346,6 +359,40 @@
 									that.$message.showToast('支付失败')
 								}
 							})
+							// #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"
+							}
+							if (compareVersion(version, '2.26.2') >= 0) {
+							
+								wx.openEmbeddedMiniProgram({
+									appId: 'wxef277996acc166c3',
+									extraData: param
+								})
+							
+							} else {
+								wx.navigateToMiniProgram({
+									appId: 'wxef277996acc166c3',
+									extraData: param
+								})
+							
+							}
+							// #endif
+							
 
 						}
 
@@ -476,10 +523,13 @@
 				// 	this.$message.showToast('未选择需要售后的商品')
 				// 	return
 				// }
-				if (isNaN(parseFloat(this.submitForm.num)) || this.submitForm.num <= 0) {
+				if (isNaN(parseInt(this.submitForm.num)) || this.submitForm.num <= 0 || parseInt(this.submitForm
+					.num) <= 0) {
 					this.$message.showToast('售后数量需要大于0')
 					return
 				}
+				this.submitForm.num = parseInt(this.submitForm.num) || 1
+
 				if (!this.submitForm.salesType) {
 					this.$message.showToast('未填写售后类型')
 					return

--
Gitblit v1.9.3