From f1f46840131e1fd212245ed1b717d9f3d17c35e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Fri, 26 May 2023 14:11:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/CommodityDetails/CommodityDetails.vue | 3 ++-
 pages/ServiceDetails/ServiceDetails.vue     | 4 +++-
 pages/appointmenttime/appointmenttime.vue   | 3 ++-
 pages/hospitalcare/hospitalcare.vue         | 3 ++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pages/CommodityDetails/CommodityDetails.vue b/pages/CommodityDetails/CommodityDetails.vue
index ce71e23..387476e 100644
--- a/pages/CommodityDetails/CommodityDetails.vue
+++ b/pages/CommodityDetails/CommodityDetails.vue
@@ -473,7 +473,8 @@
 																			title: '支付成功',
 																			type: 'success',
 																			duration: 1000,
-																			url: `/pages/orderDetails/orderDetails?goodsOrderId=${id}`
+																			url: `/pages/CommodityOrder/CommodityOrder`
+																			// url: `/pages/orderDetails/orderDetails?goodsOrderId=${id}`
 																		})
 																},
 																fail: function(err) {
diff --git a/pages/ServiceDetails/ServiceDetails.vue b/pages/ServiceDetails/ServiceDetails.vue
index 2a97d52..0664986 100644
--- a/pages/ServiceDetails/ServiceDetails.vue
+++ b/pages/ServiceDetails/ServiceDetails.vue
@@ -45,6 +45,7 @@
 				<view class="contacts" v-if="list.hospitalBedNumber">·病床号：{{list.hospitalBedNumber}}</view>
 				<view class="contacts" v-if="list.companionStartDate&&list.companionEndDate">
 					·时间：{{list.companionStartDate}} - {{list.companionEndDate}}</view>
+				<view class="contacts" v-if="list.createTime">·数量：{{list.companionDays}}</view>
 				<view class="contacts" v-if="list.createTime">·下单时间：{{list.createTime}}</view>
 			</view>
 			<view class="" v-else>
@@ -57,7 +58,8 @@
 			</view>
 		</view>
 		<view class="Package">套餐信息：
-			<span>￥{{list.nurseItemPrice}}</span>
+			<span v-if="list.orderType!='COMPANION_IN_HOSPITAL'">￥{{list.nurseItemPrice}}</span>
+			<span v-else>￥{{list.nurseItemPrice}} ✖ {{list.companionDays}}</span>
 			<view class="detail">
 				·{{list.nurseItemName}}
 			</view>
diff --git a/pages/appointmenttime/appointmenttime.vue b/pages/appointmenttime/appointmenttime.vue
index 4923d5e..c3a727d 100644
--- a/pages/appointmenttime/appointmenttime.vue
+++ b/pages/appointmenttime/appointmenttime.vue
@@ -344,7 +344,8 @@
 											}
 											that.timer = setTimeout(e => {
 												uni.redirectTo({
-													url: `/pages/ServiceDetails/ServiceDetails?orderNo=${obj.orderNo}`
+													url: `/pages/Nursingstationserviceorder/Nursingstationserviceorder`
+													// url: `/pages/ServiceDetails/ServiceDetails?orderNo=${obj.orderNo}`
 												})
 											}, 1500)
 										},
diff --git a/pages/hospitalcare/hospitalcare.vue b/pages/hospitalcare/hospitalcare.vue
index 3a04c05..560e1dc 100644
--- a/pages/hospitalcare/hospitalcare.vue
+++ b/pages/hospitalcare/hospitalcare.vue
@@ -140,7 +140,8 @@
 										}
 										that.timer = setTimeout(e => {
 											uni.redirectTo({
-												url: `/pages/ServiceDetails/ServiceDetails?orderNo=${obj.orderNo}`
+												url: `/pages/Nursingstationserviceorder/Nursingstationserviceorder`
+												// url: `/pages/ServiceDetails/ServiceDetails?orderNo=${obj.orderNo}`
 											})
 										}, 1500)
 									},