完善

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;

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>

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 {

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
+			  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>

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,11 +485,18 @@
 			</view>
 		</view>
 	</uni-popup>
+	<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="mt-20rpx flex min-h-100%" style="background-color: #eef7f7;">
+		<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="{
@@ -544,13 +568,46 @@
 				确认项目
 			</view>
 		</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;