From 231ade07c9fc5aa8a2330f5cccdeacb66709c784 Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Mon, 10 Mar 2025 11:54:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86bug=20,=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 h5/pages/main/order/src/order.vue   |  7 +++++--
 h5/pages/main/tj/tjzx.vue           | 31 ++++++++++++++++-------------
 h5/pages/main/tjyy/tjyy.vue         | 15 +++++++++-----
 h5/pages/main/yytjsj/yytjsj_new.vue |  1 +
 4 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/h5/pages/main/order/src/order.vue b/h5/pages/main/order/src/order.vue
index 244a0b5..8225d97 100644
--- a/h5/pages/main/order/src/order.vue
+++ b/h5/pages/main/order/src/order.vue
@@ -464,8 +464,11 @@
 				</view>
 				<view class="OrderInfoRow">
 					<view class="row_label">预约状态:</view>
-					<view class="row_value"><span v-if="OrderInfoDetail.appointment_number">已预约</span><span
-							v-else>预约未成功</span></view>
+					<view class="row_value">
+						<span v-if="OrderInfoDetail.appointment_number && [2,4].includes(OrderInfoDetail.status)">已预约</span>
+						<span v-if="!OrderInfoDetail.appointment_number">未预约</span>
+						<span v-if="OrderInfoDetail.appointment_number && [5].includes(OrderInfoDetail.status)">已取消</span>
+					</view>
 				</view>
 				<view class="OrderInfoRow">
 					<view class="row_label">下单时间:</view>
diff --git a/h5/pages/main/tj/tjzx.vue b/h5/pages/main/tj/tjzx.vue
index 06b199d..a7abf0f 100644
--- a/h5/pages/main/tj/tjzx.vue
+++ b/h5/pages/main/tj/tjzx.vue
@@ -234,20 +234,23 @@
 				delta = 1;
 			}
 		}
-		uni.navigateBack({
-			delta: delta,
-			success: () => {
-				let time = setTimeout(
-					() => {
-						clearTimeout(time);
-						uni.navigateTo({
-							url: "/pages/main/tj/tjxq" + query,
-						});
-					},
-					delta == 2 ? 800 : 500
-				);
-			},
-		});
+		uni.redirectTo({
+			url: "/pages/main/tj/tjxq" + query,
+		})
+		// uni.navigateBack({
+		// 	delta: delta,
+		// 	success: () => {
+		// 		let time = setTimeout(
+		// 			() => {
+		// 				clearTimeout(time);
+		// 				uni.navigateTo({
+		// 					url: "/pages/main/tj/tjxq" + query,
+		// 				});
+		// 			},
+		// 			delta == 2 ? 800 : 500
+		// 		);
+		// 	},
+		// });
 	};
 
 	const buy = async (item) => {
diff --git a/h5/pages/main/tjyy/tjyy.vue b/h5/pages/main/tjyy/tjyy.vue
index 2334b8d..6c27ae0 100644
--- a/h5/pages/main/tjyy/tjyy.vue
+++ b/h5/pages/main/tjyy/tjyy.vue
@@ -396,6 +396,11 @@ const DelItem=(item)=>{
 	 	}
 	 });
 }
+//自选项展开关闭
+const ZiXuanShow=()=>{
+	
+	zixuan_item_show.value= !zixuan_item_show.value
+}
 
 onShow(() => {
   if (!!config_ref.value) {
@@ -669,7 +674,7 @@ const toRouter = (url, status, index) => {
             (comboInfo && comboInfo?.items?.length) || groupInfo?.items?.length
           "
         >
-          <view class="text-#0E0E0E text-26rpx mb-20rpx font-700" style="border-bottom: 1px solid #DBDCDC;padding-bottom: 16rpx;">套餐名称</view>
+          <view class="text-#0E0E0E   mb-20rpx font-700" style="border-bottom: 1px solid #DBDCDC;padding-bottom: 16rpx;">套餐名称</view>
 		  <view style="display: flex; justify-content: space-between;">
 			  <view>
 				  <text class="text-#0E0E0E font-900">
@@ -694,12 +699,12 @@ const toRouter = (url, status, index) => {
 			  				  </text>
 			  </view>
 		  </view>
-		  <view v-if="itemsInfo && itemsInfo?.items?.length && zixuan_item_show==false" style="display: flex; justify-content: space-between;">
+		  <view v-if="itemsInfo && itemsInfo?.items?.length  " style="display: flex; justify-content: space-between;">
 			  <view>
 				  <view style="display: flex;justify-content: space-between;width: 650rpx;">
-					 <view style="display: flex;" @click="zixuan_item_show=true">
+					 <view style="display: flex;" @click="ZiXuanShow()">
 					 		<view><text class="text-#0E0E0E font-900"> 自选项目</text>  	</view>
-						<uni-icons type="right" color="#239ea3" size="20"></uni-icons>
+						<uni-icons :type="zixuan_item_show?'bottom':'right'" color="#239ea3" size="20"></uni-icons>
 
 					 </view>	
 					 <view>
@@ -718,7 +723,7 @@ const toRouter = (url, status, index) => {
 
         <view
           class="pt-42rpx pb-36rpx b-0 b-solid b-b-1 b-#E1ECEE"
-          v-if="(itemsInfo && itemsInfo?.items?.length && !comboInfo) ||  zixuan_item_show==true "
+          v-if="(itemsInfo && itemsInfo?.items?.length &&  !comboInfo && !groupInfo) || (itemsInfo && itemsInfo?.items?.length && zixuan_item_show==true ) "
         >
           <view class="text-#0E0E0E text-26rpx mb-20rpx font-700" style="border-bottom: 1px solid #DBDCDC;padding-bottom: 16rpx;">自选项目</view>
           <view
diff --git a/h5/pages/main/yytjsj/yytjsj_new.vue b/h5/pages/main/yytjsj/yytjsj_new.vue
index a348ce4..57823d6 100644
--- a/h5/pages/main/yytjsj/yytjsj_new.vue
+++ b/h5/pages/main/yytjsj/yytjsj_new.vue
@@ -83,6 +83,7 @@
 		$api,
 		$response
 	} from "@/api";
+	import wx from "weixin-js-sdk";
 	import {
 		useStore
 	} from "@/store";