From 13ae5ab43d665828bf97c9a4ae6be37107c88fb9 Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Thu, 2 Nov 2023 14:14:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesB/CommodityDetails/CommodityDetails.vue |  2 +-
 pagesB/confirmation/confirmation.vue         |  2 +-
 pagesB/orderDetails/orderDetails.vue         | 53 ++++++++++++++++++--
 3 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/pagesB/CommodityDetails/CommodityDetails.vue b/pagesB/CommodityDetails/CommodityDetails.vue
index 40a8108..070f7b5 100644
--- a/pagesB/CommodityDetails/CommodityDetails.vue
+++ b/pagesB/CommodityDetails/CommodityDetails.vue
@@ -491,7 +491,7 @@
 																			title: '取消支付',
 																			type: 'error',
 																			duration: 1000,
-																			url: `/pagesB/orderDetails/orderDetails?goodsOrderId=${id}`
+																			url: `/pagesB/orderDetails/orderDetails?goodsOrderId=${id}&delta=${1}`
 																		})
 																}
 															});
diff --git a/pagesB/confirmation/confirmation.vue b/pagesB/confirmation/confirmation.vue
index c5ee043..abf5a05 100644
--- a/pagesB/confirmation/confirmation.vue
+++ b/pagesB/confirmation/confirmation.vue
@@ -348,7 +348,7 @@
 									}
 									that.timer = setTimeout(e => {
 										uni.redirectTo({
-											url: `/pagesB/orderDetails/orderDetails?goodsOrderId=${that.id}`
+											url: `/pagesB/orderDetails/orderDetails?goodsOrderId=${that.id}&delta=${2}`
 										})
 									}, 1500)
 								}
diff --git a/pagesB/orderDetails/orderDetails.vue b/pagesB/orderDetails/orderDetails.vue
index ee175fd..494da45 100644
--- a/pagesB/orderDetails/orderDetails.vue
+++ b/pagesB/orderDetails/orderDetails.vue
@@ -161,11 +161,13 @@
 					goodsOrderId: null,
 					patientId: '',
 					openid: null,
-					// orderType: 'HEALTH_CONSULTATION',
-					// orderStatus: 'WAIT_PAY',
+					// 健康咨询
+					orderType: '',
+					orderStatus: '',
+					
+					
 					orderTypeList: [
-						'INTEGRAL_EXCHANGE',//商城 
-						'DIRECT_BUY',
+			
 					],
 					// orderStatus: '',
 					pageSize: 15,
@@ -314,6 +316,49 @@
 			this.goodsOrderinfo()
 		},
 		onLoad(options) {
+			//2健康咨询  1商品
+			if(options.delta=='2'){
+				this.orderTypeList={
+					goodsOrderId: null,
+					patientId: '',
+					openid: null,
+					// 健康咨询
+					orderType: 'HEALTH_CONSULTATION',
+					orderStatus: 'WAIT_PAY',
+					
+					
+					// orderTypeList: [
+					// 	'INTEGRAL_EXCHANGE',//商城 
+					// 	'DIRECT_BUY',
+					// ],
+					// orderStatus: '',
+					pageSize: 15,
+					pageNum: 1,
+					goodsName: '',
+				}
+				
+				
+			}else if(options.delta=='1'){
+				this.orderTypeList={
+					goodsOrderId: null,
+					patientId: '',
+					openid: null,
+					// 健康咨询
+					// orderType: 'HEALTH_CONSULTATION',
+					// orderStatus: 'WAIT_PAY',
+					
+					
+					orderTypeList: [
+						'INTEGRAL_EXCHANGE',//商城 
+						'DIRECT_BUY',
+					],
+					// orderStatus: '',
+					pageSize: 15,
+					pageNum: 1,
+					goodsName: '',
+				}
+				
+			}
 			console.log(options,'88')
 			this.baseurl = baseurl
 			this.orderTypeList.goodsOrderId = options.goodsOrderId