From 300122f4d99851599436c4e11d695393ed2b2c3a Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Sat, 15 Feb 2025 17:02:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 h5/common/Top.vue              |   6 +-
 h5/pages/buy/choose/choose.vue |   2 +-
 h5/pages/main/combo/combo.vue  |  27 +++--
 h5/pages/main/ctime/ctime.vue  |  28 ++++-
 h5/pages/main/tj/tjzx.vue      | 191 +++++++++++++++++++++------------
 5 files changed, 165 insertions(+), 89 deletions(-)

diff --git a/h5/common/Top.vue b/h5/common/Top.vue
index f2cafdb..29ed02f 100644
--- a/h5/common/Top.vue
+++ b/h5/common/Top.vue
@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view class="header_wrapper" v-if="info">
+		<view class="header_wrapper11" v-if="info">
 			<view v-if="1" class="hospital_wrapper">
 				<view class="hospital_icon_wrapper">
 					<image src="@/static/assets/dingwei@2x.png"></image>
@@ -152,11 +152,11 @@
 		justify-content: center;
 	}
 	
-	.header_wrapper {
+	.header_wrapper11 {
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		width: 680rpx;
+ 
 		height: 90rpx;
 		background: #d8edf2;
 		margin: 0 auto;
diff --git a/h5/pages/buy/choose/choose.vue b/h5/pages/buy/choose/choose.vue
index 1df4ac8..8c9a3d2 100644
--- a/h5/pages/buy/choose/choose.vue
+++ b/h5/pages/buy/choose/choose.vue
@@ -113,7 +113,7 @@
 				<view class="button_icon_wrapper">
 					<image :src="$image(i.logo)"></image>
 				</view>
-				<view :class="['button_name_wrapper',{'active':i.id==1}]">{{ i.name }}</view>
+				<view :class="['button_name_wrapper',{'active':i.id==99}]">{{ i.name }}</view>
 				<view class="button_right_wrapper">
 					<uni-icons type="right" size="20"></uni-icons>
 				</view>
diff --git a/h5/pages/main/combo/combo.vue b/h5/pages/main/combo/combo.vue
index 8ae095e..3757127 100644
--- a/h5/pages/main/combo/combo.vue
+++ b/h5/pages/main/combo/combo.vue
@@ -24,9 +24,15 @@
 	import {
 		useStore
 	} from "@/store";
+ 
+	
 	const $store = useStore();
 
 	const $props = defineProps({
+		tabs: {
+			type: String,
+			default: "",
+		},
 		groupId: {
 			type: String,
 			default: "",
@@ -320,6 +326,9 @@
 		if (!!config_ref.value) {
 			checkHospital();
 		}
+		if($props.tabs==1){
+			tabsClickFunc(1)
+		}
 	});
 	let keshi_name = ref(null);
 	onLoad((e) => {
@@ -433,7 +442,7 @@
 		 tabs_active_id.value=value
 		 if(value==2){
 			 uni.navigateTo({
-			 	url: "/pages/main/tj/tjzx?" + "comboId="  + "&itemIds="
+			 	url: "/pages/main/tj/tjzx?" + "comboId="  + "&itemIds="+"&type=zx"
 			 });
 		 }
 		 if(value==1){
@@ -462,7 +471,7 @@
 				</uni-badge>
 				<text class="text-22rpx text-#fff -mt-5rpx">对比</text>
 			</view>
-            <Top></Top>
+          
 		<!-- 	<view v-if="!!combo_list.hospital.id" class="hospital_wrapper">
 				<view class="hospital_icon_wrapper">
 					<image src="@/static/assets/dingwei@2x.png"></image>
@@ -478,7 +487,7 @@
 				</view>
 			</view> -->
 		</view>
-
+  <Top></Top>
 		<view class="bg-#d8edf2" style="margin-top: -10rpx;">
 			<uni-search-bar class="search" radius="100" placeholder="请输入关键字搜索" @clear="getComboList()"
 				@cancel="getComboList()" @confirm="getComboList" />
@@ -1064,19 +1073,7 @@
 	}
 
 	.header_wrapper {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		width: 710rpx;
-		height: 90rpx;
-		background: #d8edf2;
-		margin: 0 auto;
-		position: relative;
 		 
-		background-color: #fff;
-		margin-left: 20rpx;
-		margin-right: 20rpx;
-		border-radius: 20rpx;
 	}
 
 	.hospital_wrapper {
diff --git a/h5/pages/main/ctime/ctime.vue b/h5/pages/main/ctime/ctime.vue
index 24d808d..c77be05 100644
--- a/h5/pages/main/ctime/ctime.vue
+++ b/h5/pages/main/ctime/ctime.vue
@@ -71,6 +71,7 @@
 	let tj_date = ref(null);
 	let tj_time = ref(null);
 	let tj_plan_id = ref(null); //体检号源id
+	let yytjInfo = ref({}); // 预约信息
 
 	let weekList = ref(null);
 
@@ -136,7 +137,14 @@
 				itemSelected.value.type = 'tj'
 				selectedTime.value = orderInfo.value.appointment_time
 				selectedDate.value = orderInfo.value.appointment_date
-
+				yytjInfo.value.nmr_list=[]
+				yytjInfo.value.nmr_list.push({
+				  item_id: -1,
+				  name: "体检时间",
+				  time:selectedDate.value+' '+selectedTime.value,
+				  id: orderInfo.value.plan_id,
+				});
+				 $store.setYytjInfo(yytjInfo.value);
 				GetDayPlanListFunc()
 			//}
 			
@@ -379,7 +387,11 @@ const DateChange=(date)=>{
 	if (itemSelected.value.type == 'tj') {
 			  tj_time.value = null
 			  tj_date.value = date
-			  doctor_name.value = null //清空体检医生
+			  temp = $store.getYytjInfo()
+			  if(date!=temp.doctor_date){
+				   doctor_name.value = null //清空体检医生
+			  }
+			 
 		GetDayPlanListFunc()
 	}
 }
@@ -390,7 +402,7 @@ const DateChange=(date)=>{
 		temp = $store.getYytjInfo()
 		temp.doctor_name = ""
 		$store.setYytjInfo(temp)
-
+		yytjInfo.value = $store.getYytjInfo();
 		GetOrderInfo()
 	});
 	let OrderId=ref(0)
@@ -403,6 +415,16 @@ const DateChange=(date)=>{
 		if (temp.doctor_name != null && temp.doctor_name != '') {
 			doctor_name.value = temp.doctor_name
 		}
+		if(temp.nmr_list && temp.nmr_list[0].name=='体检时间' && temp.nmr_list[0].time==''){
+			tj_time.value = null
+			tj_date.value = null
+			tj_plan_id.value=null
+		}
+		if(temp.doctor_date){
+			selectedTime.value = null
+			DateChange(temp.doctor_date)
+		}
+		
 
 	})
 </script>
diff --git a/h5/pages/main/tj/tjzx.vue b/h5/pages/main/tj/tjzx.vue
index 2c52d94..c734f36 100644
--- a/h5/pages/main/tj/tjzx.vue
+++ b/h5/pages/main/tj/tjzx.vue
@@ -1,5 +1,6 @@
 <script setup>
 	import DraggableButton from "@/pages/components/goHome.vue";
+	import Top from "../../../common/Top.vue";
 	/**
 	 * name：
 	 * user：sa0ChunLuyu
@@ -23,6 +24,10 @@
 	// comboId 套餐ID 没有套餐ID就是个人自选项目
 	// itemIds 自选ID
 	const $props = defineProps({
+		type: {
+			type: String,
+			default: "",
+		},
 		comboId: {
 			type: String,
 			default: "",
@@ -335,6 +340,18 @@
 	    await getBuyInfo()
 		popupItemList.value.close()
 	}
+	const tabsClickFunc=(value)=>{
+		if(value==0){
+			uni.navigateTo({
+				url: "/pages/main/combo/combo"
+			});
+		}
+		if(value==1){
+			uni.navigateTo({
+				url: "/pages/main/combo/combo?tabs=1"
+			});
+		}
+	}
 	onShow(() => {
 		if (!!config_ref.value) {
 			mountedAction();
@@ -468,89 +485,129 @@
 			</view>
 		</view>
 	</uni-popup>
-	<view class="bg-#d8edf2">
-		<uni-search-bar class="search" radius="100" placeholder="请输入关键字搜索" @clear="getAllItems()"
-			@cancel="getAllItems()" @confirm="getAllItems" />
-	</view>
-	<view class="mt-20rpx flex min-h-100%" style="background-color: #eef7f7;">
-		<view class="min-w-214rpx max-w-214rpx mr-20rpx min-h-100% text-center">
-			<view class="w-100% rounded-r-full text-#0E0E0E text-25rpx px-20rpx w-100% center h-84rpx box-border"
-				v-for="(item, index) in leftList" :key="index" :class="{
-          'bg-gradient-to-r from-#edf6f5 to-#bbdfe2': tabIndex == index,
-        }" @click="
-          () => {
-            tabIndex = index;
-            rightLeft = item.children;
-            headImg = item.head_img;
-          }
-        ">
-				{{ item.title }}
-			</view>
-			<view style="height: 150rpx;"></view>
+	<view class="tjzx_main">
+		<Top v-if="$props.type=='zx'" ></Top>
+		<view class="bg-#d8edf2">
+			<uni-search-bar class="search" radius="100" placeholder="请输入关键字搜索" @clear="getAllItems()"
+				@cancel="getAllItems()" @confirm="getAllItems" />
 		</view>
-		<view class="grow min-h-100% bg-#fff pb-200rpx">
-
-			<view v-for="(item, index) in rightLeft" :key="index" :class="{
-          '!b-0': index == rightLeft.length - 1,
-        }" class="flex justify-between center py-30rpx px-20rpx b-b-1px b-b-solid b-b-#e5e5e5">
-				<view class="w-40% text-#0E0E0E text-24rpx flex items-center">
-					<text>{{ item.title }}</text>
-					<uni-tooltip>
-						<!-- 定义插槽，插槽名为 content -->
-						<template v-slot:content>
-							<!-- 在这里编写自定义的 HTML 或组件 -->
-							<view class="w-30vw">
-								<text>{{ item.desc }}</text>
-							</view>
-						</template>
-
-						<!-- 触发提示的按钮 -->
-						<uni-icons color="#009fa8" type="help-filled" size="14"></uni-icons>
-					</uni-tooltip>
+		<view class="top_button_row" v-if="$props.type=='zx'">
+			<view @click="tabsClickFunc(0)" class="top_button">选择套餐</view>
+			<view @click="tabsClickFunc(1)" class="top_button">专家定制</view>
+			<view @click="tabsClickFunc(2)" class="top_button top_button_active">项目自选</view>
+		</view>
+		<view class="mt-0rpx flex min-h-100%" style="background-color: #eef7f7;">
+			<view class="min-w-214rpx max-w-214rpx mr-20rpx min-h-100% text-center">
+				<view class="w-100% rounded-r-full text-#0E0E0E text-25rpx px-20rpx w-100% center h-84rpx box-border"
+					v-for="(item, index) in leftList" :key="index" :class="{
+		      'bg-gradient-to-r from-#edf6f5 to-#bbdfe2': tabIndex == index,
+		    }" @click="
+		      () => {
+		        tabIndex = index;
+		        rightLeft = item.children;
+		        headImg = item.head_img;
+		      }
+		    ">
+					{{ item.title }}
 				</view>
-				<view class="w-58% items-end flex justify-between" @click="XuanZeItem(item)">
-					<text class="text-#EC3D15 text-26rpx">¥ {{ item.price }}</text>
-					<text class="text-#9e9d9d text-20rpx line-through">¥ {{ item.original_price }}</text>
-					<view :class="{
-              '!bg-#009fa8 !b-#008e99': selectIds.includes(item.id),
-            }" class="w-24rpx h-24rpx b-1 b-solid b-#c3e9eb bg-#ccecee rounded-8rpx center">
-						<image v-if="selectIds.includes(item.id)" class="w-20rpx" src="@/static/assets/select.png"
-							mode="widthFix" />
+				<view style="height: 150rpx;"></view>
+			</view>
+			<view class="grow min-h-100% bg-#fff pb-200rpx">
+		
+				<view v-for="(item, index) in rightLeft" :key="index" :class="{
+		      '!b-0': index == rightLeft.length - 1,
+		    }" class="flex justify-between center py-30rpx px-20rpx b-b-1px b-b-solid b-b-#e5e5e5">
+					<view class="w-40% text-#0E0E0E text-24rpx flex items-center">
+						<text>{{ item.title }}</text>
+						<uni-tooltip>
+							<!-- 定义插槽，插槽名为 content -->
+							<template v-slot:content>
+								<!-- 在这里编写自定义的 HTML 或组件 -->
+								<view class="w-30vw">
+									<text>{{ item.desc }}</text>
+								</view>
+							</template>
+		
+							<!-- 触发提示的按钮 -->
+							<uni-icons color="#009fa8" type="help-filled" size="14"></uni-icons>
+						</uni-tooltip>
+					</view>
+					<view class="w-58% items-end flex justify-between" @click="XuanZeItem(item)">
+						<text class="text-#EC3D15 text-26rpx">¥ {{ item.price }}</text>
+						<text class="text-#9e9d9d text-20rpx line-through">¥ {{ item.original_price }}</text>
+						<view :class="{
+		          '!bg-#009fa8 !b-#008e99': selectIds.includes(item.id),
+		        }" class="w-24rpx h-24rpx b-1 b-solid b-#c3e9eb bg-#ccecee rounded-8rpx center">
+							<image v-if="selectIds.includes(item.id)" class="w-20rpx" src="@/static/assets/select.png"
+								mode="widthFix" />
+						</view>
 					</view>
 				</view>
 			</view>
 		</view>
-	</view>
-
-	<view style="z-index: 999;"
-		class="fixed bottom-0 left-0 w-100% h-150rpx bg-gradient-to-r from-#02b4bd to-#ABD7D7 px-20rpx py-30rpx box-border items-center flex justify-between">
-		<view style="position: relative;" class="w-110rpx h-129rpx ml-60rpx mt-5rpx" @click="openPopupItemList()">
-			<image class="w-110rpx h-129rpx" src="@/static/assets/buy/xiong.png" mode="widthFix" />
-			<view class="yuandian">
-				{{ selectIds.length }}
+		
+		<view style="z-index: 999;"
+			class="fixed bottom-0 left-0 w-100% h-150rpx bg-gradient-to-r from-#02b4bd to-#ABD7D7 px-20rpx py-30rpx box-border items-center flex justify-between">
+			<view style="position: relative;" class="w-110rpx h-129rpx ml-60rpx mt-5rpx" @click="openPopupItemList()">
+				<image class="w-110rpx h-129rpx" src="@/static/assets/buy/xiong.png" mode="widthFix" />
+				<view class="yuandian">
+					{{ selectIds.length }}
+				</view>
 			</view>
-		</view>
-		<view class="grow" style="margin-left: 10rpx;">
-			<view class="flex items-end">
-				<text class="text-46rpx text-#e95513 ml-20rpx mr-5rpx">¥</text>
-				<text class="text-46rpx text-#e95513 mr-10rpx font-bold">{{
-          optionalPrice || 0
-        }}</text>
-				<text v-if="optionalOriginalPrice" class="text-26rpx text-#3e3a39 line-through">¥
-					{{ optionalOriginalPrice }}</text>
+			<view class="grow" style="margin-left: 10rpx;">
+				<view class="flex items-end">
+					<text class="text-46rpx text-#e95513 ml-20rpx mr-5rpx">¥</text>
+					<text class="text-46rpx text-#e95513 mr-10rpx font-bold">{{
+		      optionalPrice || 0
+		    }}</text>
+					<text v-if="optionalOriginalPrice" class="text-26rpx text-#3e3a39 line-through">¥
+						{{ optionalOriginalPrice }}</text>
+				</view>
+			</view>
+			<view @click="confirm()" class="button">
+				确认项目
 			</view>
-		</view>
-		<view @click="confirm()" class="button">
-			确认项目
 		</view>
 	</view>
+	
 </template>
 <style>
 	.uni-tooltip-popup {
 		background-color: #fff;
 	}
 </style>
-<style>
+<style scoped>
+	.search{
+		margin-top: -10rpx;
+	}
+	.tjzx_main{
+		padding-top: 20rpx;
+		background-color: #D8EEF3;
+	}
+	.top_button_row {
+		display: flex;
+		justify-content: space-between;
+		padding-left: 20rpx;
+		padding-right: 20rpx;
+	  
+	}
+	.top_button {
+		color: #666;
+		background-color: #fff;
+		padding: 6rpx 40rpx;
+		border-radius: 15rpx;
+		margin-top: -6rpx;
+		margin-bottom: 8rpx;
+		font-size: 28rpx;
+		width: 140rpx;
+		text-align: center;
+	}
+	
+	.top_button_active {
+		background-color: #009ea7;
+		color: #fff;
+	}
+	
 	.button {
 		color: #00828e;
 		background-color: #fff;