diff --git a/Laravel/app/Http/Controllers/API/H5/ComboController.php b/Laravel/app/Http/Controllers/API/H5/ComboController.php
index 9f67f37..78a554a 100644
--- a/Laravel/app/Http/Controllers/API/H5/ComboController.php
+++ b/Laravel/app/Http/Controllers/API/H5/ComboController.php
@@ -48,6 +48,10 @@ class ComboController extends Controller
     $combo_item = $request->post('combo_item');
     $checkup_type_id = $request->post('checkup_type_id');
     $keshi_name=$request->post('keshi_name');
+    $price_range=$request->post('price_range');
+    $sort_price=$request->post('sort_price');
+    $sort_sale_count=$request->post('sort_sale_count');
+
 
     $hospital = DB::table('hospitals')->select('id', 'name', 'address', 'latitude', 'longitude')->where(['id' => $hospital])->first();
     $user = DB::table('web_users')->where(['openid' => $openid, 'status' => 1, 'is_del' => 0])->first();
@@ -59,7 +63,7 @@ class ComboController extends Controller
     $canshu = [];
     $canshu[]=$person->sex;
     $sql = '';
-    if (isset($combo_price)) {
+    if (isset($combo_price) and !isset($price_range)) {
       $price_list = [
         "1" => [0, 299],
         "2" => [300, 999],
@@ -71,8 +75,13 @@ class ComboController extends Controller
       $sql = "  and (a.price>=? and a.price<=?) ";
       $canshu[] = $price_list[$combo_price][0];
       $canshu[] = $price_list[$combo_price][1];
-
     }
+    if (isset($price_range) and !isset($combo_price)) {
+      $sql = "  and (a.price>=? and a.price<=?) ";
+      $canshu[] = $price_range[0];
+      $canshu[] = $price_range[1];
+    }
+
     if(isset($checkup_type_id)){
       $sql = $sql . "  and a.checkup_type_id=? ";
       $canshu[] = $checkup_type_id;
@@ -92,9 +101,12 @@ class ComboController extends Controller
       $sql = $sql . "  and a.name like ? ";
       $canshu[] = '%'.$search.'%';
     }
-    if (!isset($combo_sort)) {
-      $sql = $sql . " order by a.order  ";
-    }
+
+    if(isset($sort_price) and $sort_price==1) $combo_sort=3;
+    if(isset($sort_price) and $sort_price==2) $combo_sort=4;
+    if(isset($sort_sale_count) and $sort_sale_count==1) $combo_sort=7;
+    if(isset($sort_sale_count) and $sort_sale_count==2) $combo_sort=8;
+
     if (isset($combo_sort)) {
       if ($combo_sort == 1) {
         $sql = $sql . "  ";
@@ -114,7 +126,15 @@ class ComboController extends Controller
       if ($combo_sort == 6) {
         $sql = $sql . "  order by b.count ";
       }
-
+      if ($combo_sort == 7) {
+        $sql = $sql . "  order by a.sale_count ";
+      }
+      if ($combo_sort == 8) {
+        $sql = $sql . "  order by a.sale_count desc";
+      }
+    }
+    if (!isset($combo_sort)) {
+      $sql = $sql . " order by a.order  ";
     }
     if(isset($keshi_name)){
       $combo_ids=DB::table('combo_items')->where(['status'=>1,'keshi_name'=>$keshi_name]) ->pluck('combo_id')->toArray();
@@ -208,12 +228,46 @@ select combo_id as c_id,count(*) as count from combo_items where status in(1) gr
       'id' => $doctor,
       'name' => '张大夫'
     ];
+    //获取套餐价格分布
+    $step = 500;
+    $maxPrice = 20000 + $step;
+    $result=DB::select("SELECT FLOOR(price / ?) * ? AS price_range_start, COUNT(*) AS count
+        FROM combos
+        WHERE price >= 0 AND price < ?
+        GROUP BY price_range_start;",[$step,$step,$maxPrice]);
+    $price_ranges = [];
+    for ($i = 0; $i <= 20000; $i += $step) {
+      $price_ranges[$i] = 0;
+    }
+    foreach ($result as $row) {
+      if (isset($price_ranges[$row->price_range_start])) {
+        $price_ranges[$row->price_range_start] = $row->count;
+      }
+    }
+    $formatted_price_ranges = [];
+    $formatted_price_ranges[]=['start' => 0,
+      'count' => 0];
+    foreach ($price_ranges as $start => $count) {
+      // 如果你想包括结束值，可以添加 'end' 键，例如：'end' => $start + 99
+      $formatted_price_ranges[] = [
+        'start' => $start,
+        'count' => $count
+      ];
+    }
 
+    $price_max_min=DB::select("SELECT
+    MAX(price) AS highest_price,
+    MIN(price) AS lowest_price
+FROM combos;");
     return \Yz::Return(true, '获取成功', [
       'list' => $combos,
       'hospital' => $hospital_info,
       'doctor' => $doctor_info,
       'info' => $info,
+      'price_range' => $formatted_price_ranges,
+      'price_max_min' =>isset($price_range)?$price_range:[0,$maxPrice],
+      'price_max' =>$maxPrice,
+      'step' => $step,
     ]);
   }
 
diff --git a/h5/common/PriceRange.vue b/h5/common/PriceRange.vue
index 5f57210..fee6c53 100644
--- a/h5/common/PriceRange.vue
+++ b/h5/common/PriceRange.vue
@@ -2,18 +2,18 @@
 	<view>
 		<view>
 			 
-			<view class="chart_wrapper" id="line">折线图</view>
+			<view class="chart_wrapper" id="line"></view>
 			<view class="huakuai_k">
 				<view class="huakuai_value">
 					<view>￥{{rang0}}</view>
 					<view>￥{{rang1}}</view>
 				</view>
 				<view>
-					<slider @changing="huakuai0_change" activeColor="#5ab6b8" block-color="#5ab6b8" block-size="18" backgroundColor="#5ab6b8" class="huakuai0"  max="99999" :value="rang0" >
+					<slider @change="huakuai0SendValue" @changing="huakuai0_change" activeColor="#5ab6b8" block-color="#5ab6b8" block-size="18" backgroundColor="#5ab6b8" class="huakuai0" :step="step"  :max="rangMax" :value="rang0" >
 			 
 					</slider>
 				</view>
-				<view class="huakuai1"><slider @changing="huakuai1_change" block-size="18"  block-color="#5ab6b8" activeColor="#5ab6b8" backgroundColor="#5ab6b8" max="99999" :value="rang1"  /></view>
+				<view class="huakuai1"><slider @change="huakuai1SendValue" @changing="huakuai1_change" block-size="18"  block-color="#5ab6b8" activeColor="#5ab6b8" backgroundColor="#5ab6b8" :step="step"  :max="rangMax" :value="rang1"  /></view>
 				
 			</view>
 		</view>
@@ -23,13 +23,66 @@
 <script setup>
 	import {
 		ref,
-		onMounted
+		onMounted,defineEmits,watch 
 	} from 'vue'
 	import * as echarts from 'echarts';
-	let rang0=ref(0);
-	let rang1=ref(99999);
+	const props = defineProps({
+	  dataInfo: {
+	    type: Object,
+	    required: true
+	  } ,
+	  rangDate: {
+	    type: Array,
+	    required: true
+	  },
+	  step: {
+	    type: Number,
+	    required: true
+	  }, 
+	  rangMax: {
+	    type: Number,
+	    required: true
+	  }
+	  })
+	 let rang0=ref(0);
+	 let rang1=ref(0);
+	 let rangMax=ref(0);
+	 rangMax.value=Number(props.rangMax);
+	 rang0.value=Number(props.rangDate[0])
+	 rang1.value=Number(props.rangDate[1])
+ watch(() => props.rangDate, (newrangDate) => {
+	 console.log(props.rangDate);
+   rang0.value=newrangDate[0]
+   rang1.value=newrangDate[1]
+     
+       
+ }, { immediate: false });
+	
+	const emit = defineEmits(['huakuaiValue']);
+	const  huakuai0SendValue=(e)=> { 
+		rang0.value= rang0.value=e.detail.value
+		if(rang0.value>rang1.value){
+					 let temp=0
+					 temp=rang0.value
+					 rang0.value=rang1.value
+					 rang1.value=temp
+		}
+	  emit('huakuaiValue', [rang0.value,rang1.value]);
+	}
+	const  huakuai1SendValue=(e)=>{
+		rang1.value= rang1.value=e.detail.value
+		if(rang0.value>rang1.value){
+					 let temp=0
+					 temp=rang0.value
+					 rang0.value=rang1.value
+					 rang1.value=temp
+		}
+	  emit('huakuaiValue', [rang0.value,rang1.value]);
+	  
+	}
 	onMounted(() => {
 		drawChart()
+		 
 	})
 	const huakuai0_change=(e)=>{
 		 rang0.value=e.detail.value
@@ -52,11 +105,24 @@
 	const drawChart = () => {
 		let chartDom = document.getElementById('line');
 		let myChart = echarts.init(chartDom);
+		let xdata=[];
+		let ydata=[];
+		 props.dataInfo.forEach((v,i)=>{
+			 xdata.push(v.i)
+			 ydata.push(v.count)
+		 })
 	 let option = {
+		  grid: {
+		     left: '10%',
+		     right: '10%',
+		     top: '0%',
+		     bottom: '0%',
+		     containLabel: true
+		   },
 	   xAxis: {
 	     type: 'category',
 	     boundaryGap: false,
-	     data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+	     data:xdata,
 		  axisLine: { show: false }, // 隐藏X轴线
 		     axisTick: { show: false }, // 隐藏X轴刻度
 		     axisLabel: { show: false } // 隐藏X轴标签
@@ -70,7 +136,7 @@
 	   },
 	   series: [
 	     {
-	       data: [0,8, 12,7 ,33, 5,5],
+	       data: ydata,
 	       type: 'line',
 		   lineStyle: {
 		         width: 0 ,// 隐藏线条，设置线条宽度为0
@@ -96,13 +162,14 @@
 
 <style scoped>
 	.chart_wrapper{
-		height: 200rpx;
+		height: 100rpx;
 		width: 100% !important;
+		/* border:1px solid #ccc; */
 	}
 	.huakuai_k{
 	   position: relative;
 	   width: 100%;
-	   top:-120rpx;
+	   top:-40rpx;
 	}
 	.huakuai0{
 		position: relative;
diff --git a/h5/pages.json b/h5/pages.json
index 09493a3..ecad039 100644
--- a/h5/pages.json
+++ b/h5/pages.json
@@ -83,6 +83,13 @@
 				"navigationBarBackgroundColor": "#D8EDF2",
 				"navigationBarTextStyle": "black"
 			}
+		},{
+			"path": "pages/main/tj/tjzx_new",
+			"style": {
+				"navigationBarTitleText": "体检套餐加项",
+				"navigationBarBackgroundColor": "#D8EDF2",
+				"navigationBarTextStyle": "black"
+			}
 		},
 		{
 			"path": "pages/buy/done/done",
diff --git a/h5/pages/main/combo/combo_new.vue b/h5/pages/main/combo/combo_new.vue
index e78503b..108922d 100644
--- a/h5/pages/main/combo/combo_new.vue
+++ b/h5/pages/main/combo/combo_new.vue
@@ -1,1103 +1,1151 @@
 <script setup>
-import DraggableButton from "@/pages/components/goHome.vue";
-import PriceRange from "@/common/PriceRange.vue";
-/**
- * name：
- * user：sa0ChunLuyu
- * date：2024年8月7日 20:05:05
- */
-import { ref, computed, nextTick } from "vue";
-import { $image, $api, $response } from "@/api";
-import { onShow,onLoad } from "@dcloudio/uni-app";
-import { useStore } from "@/store";
-const $store = useStore();
-
-const $props = defineProps({
-  groupId: {
-    type: String,
-    default: "",
-  },
-});
-
-const combo_active = ref("");
-const person_active = ref("");
-let popup = ref(null);
-let popup_new=ref(null);
-let selectKey = ref(""); // 整个选择的key
-let sortIndex = ref(0); // 排序的索引
-let comboIndex = ref(null); // 套餐类型索引
-let crowdIndex = ref(null); // 适用人群索引
-let priceIndex = ref(null); // 套餐价格索引
-let projectIds = ref([]); // 项目id集合
-let screenObj = ref({}); // 筛选条件
-let combo_select = ref({}); // 套餐筛选条件
-let comboIds = ref([]); // 套餐对比列表
-let popupMultiple = ref(false); // 多选弹窗
-let multipleList = ref([]); // 多选列表
-let multipleIndex = ref(0); // 多选索引
-let itemIds = ref([]); // 项目id集合
-let itemId = ref(""); // 项目id
-let comboId = ref(""); // 套餐id
-
-const selectItemClick = async (index, key) => {
-  // 选择套餐条件
-  let data = combo_select.value;
-  if (selectKey.value == "sort_list") {
-	  	 combo_list.value.list=[]
-    if (sortIndex.value == index) {
-      sortIndex.value = 0;
-    } else {
-      sortIndex.value = index;
-    }
-    screenObj.value.combo_sort = data[selectKey.value][index]?.id;
-  } else if (selectKey.value == "combo_type") {
-    if (comboIndex.value == index) {
-      comboIndex.value = null;
-      delete screenObj.value.combo_type;
-    } else {
-      comboIndex.value = index;
-      screenObj.value.combo_type = data[selectKey.value][index]?.id;
-    }
-  } else if (selectKey.value == "combo_crowd") {
-    if (crowdIndex.value == index) {
-      crowdIndex.value = null;
-      delete screenObj.value.combo_crowd;
-    } else {
-      crowdIndex.value = index;
-      screenObj.value.combo_crowd = data[selectKey.value][index]?.id;
-    }
-  } else {
-    if (key == "combo_price") {
-      if (priceIndex.value == index) {
-        priceIndex.value = null;
-        return;
-      }
-      priceIndex.value = index;
-    } else {
-      if (projectIds.value?.includes(index)) {
-        projectIds.value.splice(projectIds.value.indexOf(index), 1);
-      } else {
-        projectIds.value.push(index);
-      }
-    }
-    return;
-  }
-  await getComboList();
-  popup.value.close();
-};
-const selectDone = async () => {
-  if (priceIndex.value === null) {
-    delete screenObj.value.combo_price;
-  } else {
-    screenObj.value.combo_price =
-      combo_select.value["combo_price"][priceIndex.value]?.id;
-  }
-  if (projectIds.value.length) {
-    screenObj.value.combo_item = projectIds.value;
-  } else {
-    delete screenObj.value.combo_item;
-  }
-  await getComboList();
-  popup_new.value.close();
-};
-
-const remake = () => {
-  // 重置筛选
-  delete screenObj.value.combo_price;
-  delete screenObj.value.combo_item;
-  priceIndex.value = null;
-  projectIds.value = [];
-};
-const getComboSelect = async () => {
-  uni.showLoading();
-  const response = await $api("GetComboSort");
-  uni.hideLoading();
-  $response(response, async () => {
-    combo_select.value = response.data;
-    if ("sort_list" in combo_select.value) {
-      selectKey.value = "sort_list";
-      sortIndex.value = 0;
-    }
-    await getComboList();
-  });
-};
-
-const combo_list = ref({
-  list: [],
-  hospital: {
-    id: 1,
-  },
-  doctor: {
-    id: 0,
-  },
-  info: {
-    name: "",
-  },
-});
-
-const combo_list_computed = computed(() => {
-  let list = [];
-  for (let i in combo_list.value.list) {
-    let push = false;
-    if (!combo_active.value) {
-      push = true;
-    } else {
-      if (combo_list.value.list[i].combo_type === combo_active.value) {
-        push = true;
-      }
-    }
-    if (!!push) {
-      if (!person_active.value) {
-        push = true;
-      } else {
-        if (combo_list.value.list[i].person_type === person_active.value) {
-          push = true;
-        } else {
-          push = false;
-        }
-      }
-    }
-    if (!!push) {
-      list.push(combo_list.value.list[i]);
-    }
-  }
-  return list;
-});
-let combo_list_k=ref(null)
-const getComboList = async (e) => {
-  uni.showLoading();
-  let obj = {
-    doctor: $store.save.doctor,
-    hospital: hospital_active.value,
-    search: e?.value,
-	keshi_name:keshi_name.value
-  };
-  if ($store.getCheckupTypeId()) {
-    let b = $store.getCheckupTypeId();
-    console.log();
-    if (Object.keys(b).length != 0) {
-      screenObj.value.checkup_type_id = b.id;
-    }
-  }
-  if (screenObj.value) {
-    obj = Object.assign(obj, screenObj.value);
-  }
-
-  const response = await $api("ComboList", obj);
-  uni.hideLoading();
-  $response(response, () => {
+	import DraggableButton from "@/pages/components/goHome.vue";
+	import PriceRange from "@/common/PriceRange.vue";
+	/**
+	 * name：
+	 * user：sa0ChunLuyu
+	 * date：2024年8月7日 20:05:05
+	 */
+	import {
+		ref,
+		computed,
+		nextTick
+	} from "vue";
+	import {
+		$image,
+		$api,
+		$response
+	} from "@/api";
+	import {
+		onShow,
+		onLoad
+	} from "@dcloudio/uni-app";
+	import {
+		useStore
+	} from "@/store";
+	const $store = useStore();
+
+	const $props = defineProps({
+		groupId: {
+			type: String,
+			default: "",
+		},
+	});
+
+	const combo_active = ref("");
+	const person_active = ref("");
+	let tabs_active_id=ref(false); //激活tabsid
+	let popup = ref(null);
+	let popup_new = ref(null);
+	let selectKey = ref(""); // 整个选择的key
+	let sortIndex = ref(0); // 排序的索引
+	let comboIndex = ref(null); // 套餐类型索引
+	let sort_price_index=ref(null)
+	let sort_salecount_index=ref(null)
+	let crowdIndex = ref(null); // 适用人群索引
+	let priceIndex = ref(null); // 套餐价格索引
+	let projectIds = ref([]); // 项目id集合
+	let screenObj = ref({}); // 筛选条件
+	let combo_select = ref({}); // 套餐筛选条件
+	let comboIds = ref([]); // 套餐对比列表
+	let popupMultiple = ref(false); // 多选弹窗
+	let multipleList = ref([]); // 多选列表
+	let multipleIndex = ref(0); // 多选索引
+	let itemIds = ref([]); // 项目id集合
+	let itemId = ref(""); // 项目id
+	let comboId = ref(""); // 套餐id
+	let price_max_min=ref([]);
+
+	const selectItemClick = async (index, key) => {
+		// 选择套餐条件
+		let data = combo_select.value;
+		if (selectKey.value == "sort_list") {
+			combo_list.value.list = []
+			if (sortIndex.value == index) {
+				sortIndex.value = 0;
+			} else {
+				sortIndex.value = index;
+			}
+			screenObj.value.combo_sort = data[selectKey.value][index]?.id;
+		} else if (selectKey.value == "sort_sale_count") {
+			//清除综合排序
+			sortIndex.value = 0;
+			delete screenObj.value.combo_sort;
+			
+			if (sort_salecount_index.value == index) {
+				sort_salecount_index.value = null;
+				delete screenObj.value.sort_sale_count;
+			} else {
+				sort_salecount_index.value = index;
+				screenObj.value.sort_sale_count = data[selectKey.value][index]?.id;
+			}
+		} else if (selectKey.value == "sort_price") {
+			//清除综合排序
+			sortIndex.value = 0;
+			delete screenObj.value.combo_sort;
+			
+			if (sort_price_index.value == index) {
+				sort_price_index.value = null;
+				delete screenObj.value.sort_price;
+			} else {
+				sort_price_index.value = index;
+				screenObj.value.sort_price = data[selectKey.value][index]?.id;
+			}
+		} else {
+			if (key == "combo_price") {
+				if (priceIndex.value == index) {
+					priceIndex.value = null;
+					return;
+				}
+				priceIndex.value = index;
+			} else {
+				if (projectIds.value?.includes(index)) {
+					projectIds.value.splice(projectIds.value.indexOf(index), 1);
+				} else {
+					projectIds.value.push(index);
+				}
+			}
+			return;
+		}
+		await getComboList();
+		popup.value.close();
+	};
+	const selectDone = async () => {
+		if (priceIndex.value === null) {
+			delete screenObj.value.combo_price;
+		} else {
+			screenObj.value.combo_price =
+				combo_select.value["combo_price"][priceIndex.value]?.id;
+		}
+		if (projectIds.value.length) {
+			screenObj.value.combo_item = projectIds.value;
+		} else {
+			delete screenObj.value.combo_item;
+		}
+		await getComboList();
+		popup_new.value.close();
+	};
  
-		combo_list.value = response.data;
- 
-
-  });
-};
-
-const contrastClick = async (item) => {
-  if (comboIds.value.includes(item.combo_id)) {
-    comboIds.value.splice(comboIds.value.indexOf(item.combo_id), 1);
-  } else {
-    if (comboIds.value.length < 3) {
-      comboIds.value.push(item.combo_id);
-    } else {
-      uni.showToast({
-        title: "最多对比3个套餐",
-        icon: "none",
-      });
-    }
-  }
-  $store.setComboContrast(comboIds.value);
-};
-
-const hospital_active = ref(0);
-const checkHospital = () => {
-  let hospital_id = $store.save.hospital;
-  comboIds.value = $store.getComboContrast() || [];
-  if (!hospital_id) {
-    hospital_id = $store.config.hospital[0].id;
-  }
-  hospital_active.value = hospital_id;
-  $store.saveInfo({
-    hospital: hospital_id,
-  });
-  getComboSelect();
-};
-
-const tabPatients = () => {
-  uni.navigateTo({
-    url: "/pages/user/choose/choose",
-  });
-};
-
-const open = (key) => {
-  if (key) {
-    // 点击三个筛选条件
-    selectKey.value = key;
-    popup.value.close();
-	popup_new.value.close();
-    let time = setTimeout(() => {
-      popup.value.open("top");
-      clearTimeout(time);
-    }, 400);
-  } else {
-    // 点击筛选
-    popup.value.close();
-	popup_new.value.close();
-    selectKey.value = "screen";
-    let time = setTimeout(() => {
-      popup_new.value.open("top");
-      clearTimeout(time);
-    }, 400);
-
-    // if (screenObj.value.combo_price) {
-    //   priceIndex.value = combo_select.value["combo_price"].findIndex(
-    //     (item) => item.id == screenObj.value.combo_price
-    //   );
-    // } else {
-    //   priceIndex.value = null;
-    // }
-
-    // if (screenObj.value.combo_item?.length) {
-    //   projectIds.value = [...screenObj.value.combo_item];
-    // } else {
-    //   projectIds.value = [];
-    // }
-  }
-};
-
-
-
-const config_ref = ref(null);
-const configRef = (e) => {
-  if (!config_ref.value) {
-    config_ref.value = e;
-    checkHospital();
-  }
-};
-
-const select_drawer_ref = ref(null);
-const selectDrawerRef = (e) => {
-  select_drawer_ref.value = e;
-};
-
-onShow(() => {
-	$store.setDuoXuanYi({});
-	 itemIds.value = [];
-  if (!!config_ref.value) {
-    checkHospital();
-  }
-});
-let keshi_name=ref(null);
-onLoad((e)=>{
-	keshi_name.value=e.keshi_name
-})
-
-const buyClick = async (item) => {
-  let checkup_type_id=$store.getCheckupTypeId();
-  console.log("----",checkup_type_id.id);
-  if(checkup_type_id.id=="" || checkup_type_id.id==undefined){
-	  $store.setCheckupTypeId({
-	  	id: item.checkup_type_id
-	  });
-  }
-  comboId.value = item.combo_id;
-  if (item.duo_xuan_yi.length > 0) {
-    popupMultiple.value.open("center");
-    multipleIndex.value = 0;
-    itemIds.value = [];
-    $store.setDuoXuanYi([]);
-    itemId.value = "";
-    multipleList.value = item.duo_xuan_yi;
-    return;
-  }
-  toDetail();
-};
-
-const nextItemClick = () => {
-  if (!itemId.value) {
-    uni.$lu.toast("请选择项目");
-    return;
-  }
-  itemIds.value.push({
-    item_id: itemId.value,
-    zu_name: multipleList.value[multipleIndex.value]["0"]["zu_name"],
-  });
-  if (multipleIndex.value == multipleList.value.length - 1) {
-    toDetail();
-    return;
-  }
-  itemId.value = "";
-  multipleIndex.value = multipleIndex.value + 1;
-};
- 
-const toDetail = () => {
-  // 跳转到套餐详情
-  let query = "?comboId=" + comboId.value;
-  if ($props.groupId) {
-    // 团检把团检ID加上
-    query += "&groupId=" + $props.groupId;
-  }
-  $store.setDuoXuanYi(itemIds.value);
-  // 个检只要套餐ID
-  // 预约 跳转到个检/团检套餐详情
-  popupMultiple.value.close();
-  uni.navigateTo({
-    url: "/pages/main/tj/tjxq" + query,
-  });
-};
-
-const toRouter = () => {
-  if (!comboIds.value.length) {
-    uni.showToast({
-      title: "请先选择套餐",
-      icon: "none",
-    });
-    return;
-  }
-  uni.navigateTo({
-    url: "/pages/main/combo/tcdb",
-  });
-};
+	const remake = () => {
+		// 重置筛选
+		delete screenObj.value.combo_price;
+		delete screenObj.value.combo_item;
+		delete screenObj.value.price_range
+		delete screenObj.value.combo_crowd
+		delete screenObj.value.combo_type
+		price_max_min.value=[0,combo_list.value.price_max];
+		priceIndex.value = null;
+		projectIds.value = [];
+		comboIndex.value=null
+		crowdIndex.value=null
+	};
+	const getComboSelect = async () => {
+		uni.showLoading();
+		const response = await $api("GetComboSort");
+		uni.hideLoading();
+		$response(response, async () => {
+			combo_select.value = response.data;
+			combo_select.value.sort_sale_count=[{id:1,name:"销量从低到高"},{id:2,name:"销量从高到低"}]
+			combo_select.value.sort_price=[{id:1,name:"价格从低到高"},{id:2,name:"价格从高到低"}]
+			if ("sort_list" in combo_select.value) {
+				selectKey.value = "sort_list";
+				sortIndex.value = 0;
+			}
+			await getComboList();
+		});
+	};
+
+	const combo_list = ref({
+		list: [],
+		hospital: {
+			id: 1,
+		},
+		doctor: {
+			id: 0,
+		},
+		info: {
+			name: "",
+		},
+	});
+
+	const combo_list_computed = computed(() => {
+		let list = [];
+		for (let i in combo_list.value.list) {
+			let push = false;
+			if (!combo_active.value) {
+				push = true;
+			} else {
+				if (combo_list.value.list[i].combo_type === combo_active.value) {
+					push = true;
+				}
+			}
+			if (!!push) {
+				if (!person_active.value) {
+					push = true;
+				} else {
+					if (combo_list.value.list[i].person_type === person_active.value) {
+						push = true;
+					} else {
+						push = false;
+					}
+				}
+			}
+			if (!!push) {
+				list.push(combo_list.value.list[i]);
+			}
+		}
+		return list;
+	});
+	let combo_list_k = ref(null)
+	const getComboList = async (e) => {
+		uni.showLoading();
+		let obj = {
+			doctor: $store.save.doctor,
+			hospital: hospital_active.value,
+			search: e?.value,
+			keshi_name: keshi_name.value
+		};
+		if ($store.getCheckupTypeId()) {
+			let b = $store.getCheckupTypeId();
+			console.log();
+			if (Object.keys(b).length != 0) {
+				screenObj.value.checkup_type_id = b.id;
+			}
+		}
+		if (screenObj.value) {
+			obj = Object.assign(obj, screenObj.value);
+		}
+
+		const response = await $api("ComboList", obj);
+		uni.hideLoading();
+		$response(response, () => {
+			combo_list.value = response.data;
+			price_max_min.value=combo_list.value.price_max_min
+		});
+	};
+
+	const contrastClick = async (item) => {
+		if (comboIds.value.includes(item.combo_id)) {
+			comboIds.value.splice(comboIds.value.indexOf(item.combo_id), 1);
+		} else {
+			if (comboIds.value.length < 3) {
+				comboIds.value.push(item.combo_id);
+			} else {
+				uni.showToast({
+					title: "最多对比3个套餐",
+					icon: "none",
+				});
+			}
+		}
+		$store.setComboContrast(comboIds.value);
+	};
+
+	const hospital_active = ref(0);
+	const checkHospital = () => {
+		let hospital_id = $store.save.hospital;
+		comboIds.value = $store.getComboContrast() || [];
+		if (!hospital_id) {
+			hospital_id = $store.config.hospital[0].id;
+		}
+		hospital_active.value = hospital_id;
+		$store.saveInfo({
+			hospital: hospital_id,
+		});
+		getComboSelect();
+	};
+
+	const tabPatients = () => {
+		uni.navigateTo({
+			url: "/pages/user/choose/choose",
+		});
+	};
+
+	const open = (key) => {
+		if (key) {
+			// 点击三个筛选条件
+			selectKey.value = key;
+			popup.value.close();
+			popup_new.value.close();
+			let time = setTimeout(() => {
+				popup.value.open("top");
+				clearTimeout(time);
+			}, 400);
+		} else {
+			// 点击筛选
+			popup.value.close();
+			popup_new.value.close();
+			selectKey.value = "screen";
+			 
+			let time = setTimeout(() => {
+				
+				popup_new.value.open("top");
+				clearTimeout(time);
+			}, 400);
+
+			// if (screenObj.value.combo_price) {
+			//   priceIndex.value = combo_select.value["combo_price"].findIndex(
+			//     (item) => item.id == screenObj.value.combo_price
+			//   );
+			// } else {
+			//   priceIndex.value = null;
+			// }
+
+			// if (screenObj.value.combo_item?.length) {
+			//   projectIds.value = [...screenObj.value.combo_item];
+			// } else {
+			//   projectIds.value = [];
+			// }
+		}
+	};
+
+
+
+	const config_ref = ref(null);
+	const configRef = (e) => {
+		if (!config_ref.value) {
+			config_ref.value = e;
+			checkHospital();
+		}
+	};
+
+	const select_drawer_ref = ref(null);
+	const selectDrawerRef = (e) => {
+		select_drawer_ref.value = e;
+	};
+
+	onShow(() => {
+		$store.setDuoXuanYi({});
+		itemIds.value = [];
+		if (!!config_ref.value) {
+			checkHospital();
+		}
+	});
+	let keshi_name = ref(null);
+	onLoad((e) => {
+		keshi_name.value = e.keshi_name
+	})
+
+	const buyClick = async (item) => {
+		let checkup_type_id = $store.getCheckupTypeId();
+		console.log("----", checkup_type_id.id);
+		if (checkup_type_id.id == "" || checkup_type_id.id == undefined) {
+			$store.setCheckupTypeId({
+				id: item.checkup_type_id
+			});
+		}
+		comboId.value = item.combo_id;
+		if (item.duo_xuan_yi.length > 0) {
+			popupMultiple.value.open("center");
+			multipleIndex.value = 0;
+			itemIds.value = [];
+			$store.setDuoXuanYi([]);
+			itemId.value = "";
+			multipleList.value = item.duo_xuan_yi;
+			return;
+		}
+		toDetail();
+	};
+
+	const nextItemClick = () => {
+		if (!itemId.value) {
+			uni.$lu.toast("请选择项目");
+			return;
+		}
+		itemIds.value.push({
+			item_id: itemId.value,
+			zu_name: multipleList.value[multipleIndex.value]["0"]["zu_name"],
+		});
+		if (multipleIndex.value == multipleList.value.length - 1) {
+			toDetail();
+			return;
+		}
+		itemId.value = "";
+		multipleIndex.value = multipleIndex.value + 1;
+	};
+
+	const toDetail = () => {
+		// 跳转到套餐详情
+		let query = "?comboId=" + comboId.value;
+		if ($props.groupId) {
+			// 团检把团检ID加上
+			query += "&groupId=" + $props.groupId;
+		}
+		$store.setDuoXuanYi(itemIds.value);
+		// 个检只要套餐ID
+		// 预约 跳转到个检/团检套餐详情
+		popupMultiple.value.close();
+		uni.navigateTo({
+			url: "/pages/main/tj/tjxq" + query,
+		});
+	};
+
+	const toRouter = () => {
+		if (!comboIds.value.length) {
+			uni.showToast({
+				title: "请先选择套餐",
+				icon: "none",
+			});
+			return;
+		}
+		uni.navigateTo({
+			url: "/pages/main/combo/tcdb",
+		});
+	};
+	const ComboTypeClickFunc=(id)=>{
+		if(comboIndex.value==id){
+			comboIndex.value=null
+			delete screenObj.value.combo_type
+		}else{
+			comboIndex.value=id
+			screenObj.value.combo_type=comboIndex.value
+		}
+		
+	}
+	const ComboCrowdClickFunc=(id)=>{
+		if(crowdIndex.value==id){
+			crowdIndex.value=null
+			delete screenObj.value.combo_crowd
+		}else{
+			crowdIndex.value=id
+			screenObj.value.combo_crowd=crowdIndex.value
+		}
+	}
+	const CheckItemClickFunc=(id)=>{
+		if (projectIds.value?.includes(id)) {
+			projectIds.value.splice(projectIds.value.indexOf(id), 1);
+		} else {
+			projectIds.value.push(id);
+		}
+		
+	}
+	const getHuaKuaiValue=(value)=>{
+		screenObj.value.price_range=value 
+		price_max_min.value=value
+		console.log(price_max_min.value);
+	}
+	const tabsClickFunc=(value)=>{
+		 tabs_active_id.value=value
+	}
 </script>
 <template>
-  <DraggableButton />
-  <view style="background-color: #d8eef3;">
-    <view v-if="!!$store.config">
-      <view :ref="configRef"></view>
-    </view>
-
-    <view class="header_wrapper">
-      <view
-        @click="toRouter"
-        class="center fixed pt-10rpx box-border left-40rpx bottom-5% rounded-full w-110rpx h-110rpx bg-#239EA3 flex-col"
-      >
-        <uni-badge :text="comboIds.length" absolute="rightTop" size="small">
-          <image
-            src="@/static/assets/slices/duibi.png"
-            mode="widthFix"
-            class="w-42rpx"
-          />
-        </uni-badge>
-        <text class="text-22rpx text-#fff -mt-5rpx">对比</text>
-      </view>
-
-      <view v-if="!!combo_list.hospital.id" class="hospital_wrapper">
-        <view class="hospital_icon_wrapper">
-          <image src="@/static/assets/dingwei@2x.png"></image>
-        </view>
-        <view class="hospital_name_wrapper">{{
-          combo_list.hospital.name
-        }}</view>
-        <view class="hospital_select_wrapper">
-          <image src="@/static/assets/gengduo@2x.png"></image>
-        </view>
-      </view>
-      <view
-        v-if="!!combo_list.info.name"
-        class="user_wrapper"
-        @click="tabPatients()"
-      >
-        <view class="user_title_wrapper">体检人：</view>
-        <view class="user_name_wrapper">{{ combo_list.info.name }}</view>
-        <view v-if="combo_list.info.count > 1" class="user_choose_wrapper">
-          <image src="@/static/assets/qiehuan@2x.png"></image>
-        </view>
-      </view>
-    </view>
- 
-    <view class="bg-#d8edf2" style="margin-top: -10rpx;">
-      <uni-search-bar
-        class="search"
-        radius="100" 
-        placeholder="请输入关键字搜索"
-        @clear="getComboList()"
-        @cancel="getComboList()"
-        @confirm="getComboList"
-      />
-    </view>
-	<view class="top_button_row">
-		<view class="top_button top_button_active">选择套餐</view>
-		<view class="top_button">专家定制</view>
-		<view class="top_button">项目自选</view>
-	</view>
-    <view class="select_wrapper flex" v-if="selectKey">
-      <template v-for="(value, key, index) in combo_select" :key="index">
-        <view
-          @click="open(key)"
-          class="flex-1 center text-#2f2f2f text-26rpx line-height-[1]"
-          v-if="key != 'combo_price' && key != 'combo_item'"
-          :class="{
+	<DraggableButton />
+	<view style="background-color: #d8eef3; padding-top: 20rpx;">
+		<view v-if="!!$store.config">
+			<view :ref="configRef"></view>
+		</view>
+
+		<view class="header_wrapper">
+			<view @click="toRouter"
+				class="center fixed pt-10rpx box-border left-40rpx bottom-5% rounded-full w-110rpx h-110rpx bg-#239EA3 flex-col">
+				<uni-badge :text="comboIds.length" absolute="rightTop" size="small">
+					<image src="@/static/assets/slices/duibi.png" mode="widthFix" class="w-42rpx" />
+				</uni-badge>
+				<text class="text-22rpx text-#fff -mt-5rpx">对比</text>
+			</view>
+
+			<view v-if="!!combo_list.hospital.id" class="hospital_wrapper">
+				<view class="hospital_icon_wrapper">
+					<image src="@/static/assets/dingwei@2x.png"></image>
+				</view>
+				<view class="hospital_name_wrapper">{{combo_list.hospital.name}}</view>
+				<view class="hospital_select_wrapper">
+					<image src="@/static/assets/gengduo@2x.png"></image>
+				</view>
+			</view>
+			<view v-if="!!combo_list.info.name" class="user_wrapper" @click="tabPatients()">
+				<view class="user_title_wrapper">体检人：</view>
+				<view class="user_name_wrapper">{{ combo_list.info.name }}</view>
+				<view v-if="combo_list.info.count > 1" class="user_choose_wrapper">
+					<image src="@/static/assets/qiehuan@2x.png"></image>
+				</view>
+			</view>
+		</view>
+
+		<view class="bg-#d8edf2" style="margin-top: -10rpx;">
+			<uni-search-bar class="search" radius="100" placeholder="请输入关键字搜索" @clear="getComboList()"
+				@cancel="getComboList()" @confirm="getComboList" />
+		</view>
+		<view class="top_button_row">
+			<view @click="tabsClickFunc(0)" :class="['top_button',{'top_button_active':tabs_active_id==false}]">选择套餐</view>
+			<view @click="tabsClickFunc(1)" :class="['top_button',{'top_button_active':tabs_active_id==true}]">专家定制</view>
+			<view class="top_button">项目自选</view>
+		</view>
+		<view class="select_wrapper flex" v-if="selectKey">
+			<template v-for="(value, key, index) in combo_select" :key="index">
+				<view @click="open(key)" class="flex-1 center text-#2f2f2f text-26rpx line-height-[1]"
+					v-if="key != 'combo_price' && key != 'combo_item' && key != 'combo_type' && key != 'combo_crowd'"  :class="{
             '!text-#239EA3': selectKey == key,
-          }"
-        >
-          <view v-if="key == 'sort_list'">
-            {{ value[sortIndex]?.name || "综合排序" }}
-          </view>
-          <view v-if="key == 'combo_type'">
-            {{ value[comboIndex]?.name || "套餐类型" }}
-          </view>
-          <view v-if="key == 'combo_crowd'">
-            {{ value[crowdIndex]?.name || "适用人群" }}
-          </view>
-          <view class="select_item_icon_wrapper">
-            <image src="@/static/assets/xuanzegengduo@2x.png"></image>
-          </view>
-        </view>
-      </template>
-      <view
-        @click="open()"
-        :class="{
+          }">
+					<view v-if="key == 'sort_list'">
+						{{ value[sortIndex]?.name || "综合排序" }}
+					</view>
+					<view v-if="key == 'sort_sale_count'">
+						{{ value[sort_salecount_index]?.name || "按销量" }}
+					</view>
+					<view v-if="key == 'sort_price'">
+						{{ value[sort_price_index]?.name || "按价格" }}
+					</view>
+					<view class="select_item_icon_wrapper">
+						<image src="@/static/assets/xuanzegengduo@2x.png"></image>
+					</view>
+				</view>
+			</template>
+			<view @click="open()" :class="{
           '!text-#239EA3': selectKey == 'screen',
-        }"
-        class="mx-20rpx center text-#2f2f2f text-26rpx"
-      >
-        <view>筛选</view>
-        <view class="select_item_icon2_wrapper">
-          <image src="@/static/assets/shaixuan@2x.png"></image>
-        </view>
-      </view>
-    </view>
-    <view class="list_wrapper" ref="combo_list_k">
-      <view class="combo_wrapper" v-for="(i, k) in combo_list_computed" :key="k">
-		<view style="display: flex;">
-			<view class="combo_info_wrapper">
-			  <view class="combo_content_wrapper">
-			    <view class="combo_name_wrapper">{{ i.name }}</view>
-			    <view class="combo_tags_wrapper">
-			      <view class="combo_tag_wrapper" v-for="(ii, kk) in i.tag" :key="kk" :style="{  color: ii.text_color, background: '#fff',}">
-			        {{ ii.text }} 
-			      </view>
-			    </view>
-			    <view class="combo_desc_wrapper">
-			      {{ i.tags2?.join(" | ") }} 
-			    </view>
-			    <view class="combo_price_wrapper">
-			      <view class="combo_price_box_wrapper">
-			        <view class="combo_true_price_wrapper">
-			          <text class="combo_true_price_icon_wrapper">¥</text>
-			          <text class="combo_true_price_number_wrapper">{{ i.price }}</text>
-			        </view>
-			        <view class="combo_original_price_wrapper">¥{{ i.original_price }}</view>
-			      </view>
-			      <!-- <view class="combo_count_wrapper">已售{{ i.count }}</view> -->
-			    </view>
-			  </view>
+        }" class="mx-20rpx center text-#2f2f2f text-26rpx">
+				<view>筛选</view>
+				<view class="select_item_icon2_wrapper">
+					<image src="@/static/assets/shaixuan@2x.png"></image>
+				</view>
 			</view>
-			<view class="combo_button_wrapper">
-			  <view @click="contrastClick(i)" class="combo_pick_button_wrapper">
-			     {{comboIds.includes(i.combo_id) ? "已加入" : "对比"}}
-			  </view>
-			  <view class="combo_buy_button_wrapper" @click="buyClick(i)">预约</view>
+		</view>
+		<view class="list_wrapper" ref="combo_list_k">
+			<view class="combo_wrapper" v-for="(i, k) in combo_list_computed" :key="k">
+				<view style="display: flex;">
+					<view class="combo_info_wrapper">
+						<view class="combo_content_wrapper">
+							<view style="display: flex;">
+								<view class="combo_name_wrapper">{{ i.name }} 
+								</view>
+								<view v-if="i.is_hot">
+									<image style="height: 32rpx;width: 24rpx;" src="@/static/assets/buy/huomiao.jpg"></image>
+								</view>
+							</view>
+							<view class="combo_tags_wrapper">
+								<view class="combo_tag_wrapper" v-for="(ii, kk) in i.tag" :key="kk"
+									:style="{  color: ii.text_color, background: '#fff',}">
+									{{ ii.text }}
+								</view>
+							</view>
+							<view class="combo_desc_wrapper">
+								{{ i.tags2?.join(" | ") }}
+							</view>
+							<view class="combo_price_wrapper">
+								<view class="combo_price_box_wrapper">
+									<view class="combo_true_price_wrapper">
+										<text class="combo_true_price_icon_wrapper">¥</text>
+										<text class="combo_true_price_number_wrapper">{{ i.price }}</text>
+									</view>
+									<view class="combo_original_price_wrapper">¥{{ i.original_price }}</view>
+								</view>
+								<!-- <view class="combo_count_wrapper">已售{{ i.count }}</view> -->
+							</view>
+						</view>
+					</view>
+					<view class="combo_button_wrapper">
+						<view @click="contrastClick(i)" class="combo_pick_button_wrapper">
+							{{comboIds.includes(i.combo_id) ? "已加入" : "对比"}}
+						</view>
+						<view class="combo_buy_button_wrapper" @click="buyClick(i)">预约</view>
+					</view>
+				</view>
+				<view class="combo_line_wrapper"></view>
 			</view>
 		</view>
-        <view class="combo_line_wrapper"></view>
-      </view>
-    </view>
-    <uni-popup ref="popupMultiple" class="w-full">
-      <view class="rounded-10rpx px-20rpx pb-55rpx box-border bg-#fff w-95vw">
-        <view
-          class="center relative pt-40rpx pb-30rpx text-36rpx rounded-t-15rpx box-border"
-        >
-          <text class="line-height-[1] text-32rpx">请选择</text>
-          <uni-icons
-            @click="popupMultiple.close()"
-            type="closeempty"
-            color="#A6A6A6"
-            size="26"
-            class="absolute right-40rpx"
-          ></uni-icons>
-        </view>
-        <view class="bg-#F8F8F8 px-20rpx box-border rounded-10rpx">
-          <view
-            v-for="(item, index) in multipleList[multipleIndex]['item_list']"
-            :key="index"
-            @click="itemId = item.item_id"
-            class="px-20rpx box-border b-b-1 b-#EAEAEA b-solid bs between h-100rpx"
-          >
-            <text class="text-#000000 text-30rpx">{{ item.item_name }}</text>
-            <view class="center">
-              <text class="text-#EC3D15 text-20rpx mt-10rpx mr-5rpx">¥</text>
-              <text class="text-#EC3D15 text-32rpx mb-0">{{ item.price }}</text>
-              <uni-icons
-                class="ml-28rpx"
-                color="#239EA3"
-                :type="itemId == item.item_id ? 'checkbox-filled' : 'circle'"
-                size="30"
-              ></uni-icons>
-            </view>
-          </view>
-        </view>
-        <view class="text-#239EA3 text-28rpx my-45rpx text-center"
-          >当前套餐包含一个可自由{{
+		<uni-popup ref="popupMultiple" class="w-full">
+			<view class="rounded-10rpx px-20rpx pb-55rpx box-border bg-#fff w-95vw">
+				<view class="center relative pt-40rpx pb-30rpx text-36rpx rounded-t-15rpx box-border">
+					<text class="line-height-[1] text-32rpx">请选择</text>
+					<uni-icons @click="popupMultiple.close()" type="closeempty" color="#A6A6A6" size="26"
+						class="absolute right-40rpx"></uni-icons>
+				</view>
+				<view class="bg-#F8F8F8 px-20rpx box-border rounded-10rpx">
+					<view v-for="(item, index) in multipleList[multipleIndex]['item_list']" :key="index"
+						@click="itemId = item.item_id"
+						class="px-20rpx box-border b-b-1 b-#EAEAEA b-solid bs between h-100rpx">
+						<text class="text-#000000 text-30rpx">{{ item.item_name }}</text>
+						<view class="center">
+							<text class="text-#EC3D15 text-20rpx mt-10rpx mr-5rpx">¥</text>
+							<text class="text-#EC3D15 text-32rpx mb-0">{{ item.price }}</text>
+							<uni-icons class="ml-28rpx" color="#239EA3"
+								:type="itemId == item.item_id ? 'checkbox-filled' : 'circle'" size="30"></uni-icons>
+						</view>
+					</view>
+				</view>
+				<view class="text-#239EA3 text-28rpx my-45rpx text-center">当前套餐包含一个可自由{{
             multipleList[multipleIndex]["item_list"].length
-          }}选1的体检项目，请<br />根据您的实际情况自行选择。</view
-        >
-        <view
-          class="w-270rpx h-80rpx bg-#239EA3 center text-#F8F8F8 text-30rpx rounded-10rpx mx-auto"
-          @click="nextItemClick()"
-          >{{
+          }}选1的体检项目，请<br />根据您的实际情况自行选择。</view>
+				<view class="w-270rpx h-80rpx bg-#239EA3 center text-#F8F8F8 text-30rpx rounded-10rpx mx-auto"
+					@click="nextItemClick()">{{
             multipleIndex == multipleList.length - 1 ? "确定" : "下一项"
-          }}</view
-        >
-      </view>
-    </uni-popup>
-    <uni-popup ref="popup" mask-background-color="transparent" :animation="false" >
-      <view class="pt-330rpx w-full h-100vh" @click="popup.close()">
-        <view class="bg-[rgba(0,0,0,0.3)] h-100%">
-          <view
-            class="bg-#fff"
-            :class="
+          }}</view>
+			</view>
+		</uni-popup>
+		<uni-popup ref="popup" mask-background-color="transparent" :animation="false">
+			<view class="pt-330rpx w-full h-100vh" @click="popup.close()">
+				<view class="bg-[rgba(0,0,0,0.3)] h-100%">
+					<view class="bg-#fff" :class="
               selectKey != 'sort_list'
                 ? 'flex pt20rpx px10rpx pb0 box-border flex-wrap'
                 : ''
-            "
-          >
-            <view
-              v-for="(val, index) in combo_select[selectKey]"
-              :key="index"
-              @click.stop="selectItemClick(index)"
-              :class="{
+            ">
+						<view v-for="(val, index) in combo_select[selectKey]" :key="index"
+							@click.stop="selectItemClick(index)" :class="{
                 'min-w-23% mx-1% mb-20rpx': selectKey != 'sort_list',
-              }"
-            >
-              <uni-list-item v-if="selectKey == 'sort_list'">
-                <template v-slot:body>
-                  <text
-                    class="text-26rpx"
-                    :class="{
+              }">
+							<uni-list-item v-if="selectKey == 'sort_list'">
+								<template v-slot:body>
+									<text class="text-26rpx" :class="{
                       '!text-#239EA3': sortIndex == index,
-                    }"
-                    >{{ val.name }}</text
-                  >
-                </template>
-              </uni-list-item>
-              <view
-                v-else
-                class="box-border px-28rpx py-20rpx text-26rpx center line-height-[1] rounded-5rpx"
-                :class="{
+                    }">{{ val.name }}</text>
+								</template>
+							</uni-list-item>
+							<view v-else
+								class="box-border px-28rpx py-20rpx text-26rpx center line-height-[1] rounded-5rpx"
+								:class="{
                   '!bg-#239EA3 !text-#fff':
-                    (selectKey == 'combo_type' && comboIndex == index) ||
-                    (selectKey == 'combo_crowd' && crowdIndex == index),
+                    (selectKey == 'sort_sale_count' && sort_salecount_index == index) ||
+                    (selectKey == 'sort_price' && sort_price_index == index),
                   '!text-#747474 !bg-#e0e0e0':
-                    (selectKey == 'combo_type' && comboIndex != index) ||
-                    (selectKey == 'combo_crowd' && crowdIndex != index),
-                }"
-                >{{ val.name }}</view
-              >
-            </view>
-          </view>
-        </view>
-      </view>
-    </uni-popup>
-    <uni-drawer :ref="selectDrawerRef" mode="right">
-      <view>
-        <scroll-view scroll-y="true">
-          <view>
-            <view class="select_group_wrapper">
-              <view class="text-30rpx bold">套餐价格</view>
-              <view class="select_group_line_wrapper mt-20rpx">
-                <view
-                  v-for="(val, index) in combo_select['combo_price']"
-                  :key="index"
-                  @click.stop="selectItemClick(index, 'combo_price')"
-                  class="min-w-31% mx-1% mb-20rpx"
-                >
-                  <view
-                    class="box-border px-20rpx py-20rpx text-22rpx center line-height-[1] rounded-5rpx"
-                    :class="{
+                    (selectKey == 'sort_sale_count' && sort_salecount_index != index) ||
+                    (selectKey == 'sort_price' && sort_price_index != index),
+                }">{{ val.name }}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<uni-drawer :ref="selectDrawerRef" mode="right">
+			<view>
+				<scroll-view scroll-y="true">
+					<view>
+						<view class="select_group_wrapper">
+							<view class="text-30rpx bold">套餐价格</view>
+							<view class="select_group_line_wrapper mt-20rpx">
+								<view v-for="(val, index) in combo_select['combo_price']" :key="index"
+									@click.stop="selectItemClick(index, 'combo_price')"
+									class="min-w-31% mx-1% mb-20rpx">
+									<view
+										class="box-border px-20rpx py-20rpx text-22rpx center line-height-[1] rounded-5rpx"
+										:class="{
                       '!bg-#239EA3 !text-#fff':
                         selectKey == 'screen' && priceIndex == index,
                       '!text-#747474 !bg-#e0e0e0':
                         selectKey == 'screen' && priceIndex != index,
-                    }"
-                    >{{ val.name }}</view
-                  >
-                </view>
-              </view>
-            </view>
-            <view class="select_group_wrapper">
-              <view class="text-30rpx bold">体检项目(多选)</view>
-              <view class="select_group_line_wrapper mt-20rpx">
-                <view
-                  v-for="(val, index) in combo_select['combo_item']"
-                  :key="index"
-                  @click.stop="selectItemClick(val.id, 'combo_item')"
-                  class="min-w-31% mx-1% mb-20rpx"
-                >
-                  <view
-                    class="box-border px-20rpx py-20rpx text-22rpx center line-height-[1] rounded-5rpx"
-                    :class="{
+                    }">{{ val.name }}</view>
+								</view>
+							</view>
+						</view>
+						<view class="select_group_wrapper">
+							<view class="text-30rpx bold">体检项目(多选)</view>
+							<view class="select_group_line_wrapper mt-20rpx">
+								<view v-for="(val, index) in combo_select['combo_item']" :key="index"
+									@click.stop="selectItemClick(val.id, 'combo_item')"
+									class="min-w-31% mx-1% mb-20rpx">
+									<view
+										class="box-border px-20rpx py-20rpx text-22rpx center line-height-[1] rounded-5rpx"
+										:class="{
                       '!bg-#239EA3 !text-#fff':
                         selectKey == 'screen' && projectIds.includes(val.id),
                       '!text-#747474 !bg-#e0e0e0':
                         selectKey == 'screen' && !projectIds.includes(val.id),
-                    }"
-                    >{{ val.name }}</view
-                  >
-                </view>
-              </view>
-            </view>
-            <view class="around">
-              <view
-                class="w-40% text-26rpx h-60rpx center rounded-full bg-#239EA3 text-#fff"
-                @click="remake()"
-                >重置</view
-              >
-              <view
-                class="w-40% text-26rpx h-60rpx center rounded-full bg-#239EA3 text-#fff"
-                @click="selectDone()"
-                >确定</view
-              >
-            </view>
-          </view>
-        </scroll-view>
-      </view>
-    </uni-drawer>
-	<uni-popup ref="popup_new" mask-background-color="transparent" :animation="false" :mask-click="false">
-	  <view class="pt-292rpx w-full h-100vh"  >
-	    <view class="bg-[rgba(0,0,0,0.3)] h-100%">
-	      <view class="popup_new_main">
-			  <PriceRange></PriceRange>
-			  <view class="around">
-			    <view
-			      class="w-40% text-26rpx h-60rpx center rounded-full bg-#239EA3 text-#fff"
-			      @click="remake()"
-			      >重置</view
-			    >
-			    <view
-			      class="w-40% text-26rpx h-60rpx center rounded-full bg-#239EA3 text-#fff"
-			      @click="selectDone()"
-			      >确定</view
-			    >
-			  </view>
-		  </view>
-	    </view>
-	  </view>
-	</uni-popup>
-  </view>
+                    }">{{ val.name }}</view>
+								</view>
+							</view>
+						</view>
+						<view class="around">
+							<view class="w-40% text-26rpx h-60rpx center rounded-full bg-#239EA3 text-#fff"
+								@click="remake()">重置</view>
+							<view class="w-40% text-26rpx h-60rpx center rounded-full bg-#239EA3 text-#fff"
+								@click="selectDone()">确定</view>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+		</uni-drawer>
+		<uni-popup   ref="popup_new" mask-background-color="transparent" :animation="false" :mask-click="false">
+			<view class="pt-292rpx w-full h-100vh">
+				<view class="bg-[rgba(0,0,0,0.3)] h-100%">
+					<view class="popup_new_main">
+						<view class="shaixuan_title">套餐类型</view>
+						<view style="display: flex;flex-wrap: wrap; ">
+							<view v-for="(item,index) in combo_select.combo_type" @click="ComboTypeClickFunc(item.id)" :class="['shaixuan_button',{'shaixuan_button_active': comboIndex==item.id}]">
+								{{item.name}}
+							</view>
+						</view>
+
+						<view class="shaixuan_title">价格区间</view>
+						<PriceRange @huakuaiValue="getHuaKuaiValue"   :step="combo_list.step" :rangDate="price_max_min" :rangMax="combo_list.price_max" :dataInfo="combo_list.price_range"></PriceRange>
+						<view style="margin-top: -70rpx;">
+							<view class="shaixuan_title">适用人群</view>
+							<view style="display: flex;flex-wrap: wrap; ">
+								<view v-for="(item,index) in combo_select.combo_crowd" @click="ComboCrowdClickFunc(item.id)" :class="['shaixuan_button',{'shaixuan_button_active': crowdIndex==item.id}]">
+									{{item.name}}
+								</view>
+							</view>
+						</view>
+						<view >
+							<view class="shaixuan_title">体检项目</view>
+							<view style="display: flex;flex-wrap: wrap; ">
+								<view v-for="(item,index) in combo_select.combo_item"  @click="CheckItemClickFunc(item.id)"  :class="['shaixuan_button',{'shaixuan_button_active': projectIds.includes(item.id)}]">
+									{{item.name}}
+								</view>
+							</view>
+						</view>
+						<view class="around" style="margin-top: 40rpx;">
+							<view class="w-40% text-26rpx h-60rpx center rounded-full bg-#239EA3 text-#fff"
+								@click="remake()">重置</view>
+							<view class="w-40% text-26rpx h-60rpx center rounded-full bg-#239EA3 text-#fff"
+								@click="selectDone()">确定</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
 </template>
 <style scoped>
-.select_done_wrapper {
-  color: #ffffff;
-  background: #239ea3;
-  width: calc(100% - 60rpx);
-  margin: 50rpx auto 0;
-  height: 50rpx;
-  line-height: 50rpx;
-  text-align: center;
-  border-radius: 6rpx;
-}
-
-.select_group_item_wrapper {
-  padding: 10rpx 20rpx;
-  border: 1rpx solid #239ea3;
-  font-size: 22rpx;
-  margin: 20rpx 20rpx 0 0;
-  border-radius: 6rpx;
-  color: #239ea3;
-}
-
-.select_group_item_wrapper.active {
-  color: #ffffff;
-  background: #239ea3;
-}
-
-.select_group_line_wrapper {
-  display: flex;
-  align-items: center;
-  flex-wrap: wrap;
-}
-
-.select_group_wrapper {
-  margin: 20rpx;
-}
-
-.list_wrapper {
-  padding-top: 30rpx;
-  height: calc(100vh - 100rpx - 10rpx - 70rpx - 80rpx - 30rpx - 30rpx);
-  width: 750rpx;
-  overflow-y: auto;
-  padding-bottom: 30rpx;
-  margin: 0 auto;
-  overflow-x: hidden;
-  -ms-overflow-style: none;
-  scrollbar-width: none;
-  overflow: -moz-scrollbars-none;
-  overflow-y: scroll;
-  background-color: #fff;
-}
-
-.list_wrapper::-webkit-scrollbar {
-  display: none;
-}
-
-.combo_line_wrapper {
-  width: 710rpx;
-  height: 1rpx;
-  background: #e1ecee;
-  margin: 26rpx 0rpx 0rpx 0;
-}
-
-.combo_pick_button_wrapper {
-  width: 160rpx;
-  height: 60rpx;
-  background: #e1ecee;
-  border-radius: 30rpx;
-  font-weight: 400;
-  font-size: 28rpx;
-  color: #239ea3;
-  text-align: center;
-  line-height: 60rpx;
-}
-
-.combo_buy_button_wrapper {
-  width: 160rpx;
-  height: 60rpx;
-  background: #239ea3;
-  border-radius: 30rpx;
-  font-weight: 400;
-  font-size: 28rpx;
-  color: #ffffff;
-  text-align: center;
-  line-height: 60rpx; 
-}
-
-.combo_button_wrapper {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: space-around;
- 
-}
-
-.combo_count_wrapper {
-  font-weight: 500;
-  font-size: 18rpx;
-  color: #8b8b8b;
-  line-height: 1;
-}
-
-.combo_original_price_wrapper {
-  font-weight: 500;
-  font-size: 18rpx;
-  color: #8b8b8b;
-  line-height: 1;
-  text-decoration-line: line-through;
-  margin-left: 10rpx;
-}
-
-.combo_true_price_wrapper {
-  font-weight: 500;
-  font-size: 18rpx;
-  color: #ec3d15;
-  line-height: 1;
-}
-
-.combo_true_price_number_wrapper {
-  font-size: 38rpx;
-}
-
-.combo_price_wrapper {
-  display: flex;
-  align-items: end;
-  justify-content: space-between;
-  margin-top: 21rpx;
-}
-
-.combo_price_box_wrapper {
-  display: flex;
-  align-items: end;
-}
-
-.combo_wrapper {
-  /* height: 196rpx; */
-  width:calc(750rpx - 80rpx) ;
-  margin: 0 auto;
-  background-color: #fff;
-  padding: 0rpx 40rpx 30rpx 40rpx;
-}
-
-.combo_tags_wrapper {
-  display: flex;
-  align-items: center;
-  margin-top: 13rpx;
-}
-
-.combo_desc_wrapper {
-  font-weight: 500;
-  font-size: 20rpx;
-  color: #8b8b8b;
-  line-height: 1;
-  margin-top: 18rpx;
-}
-
-.combo_tag_wrapper {
-  padding-left: 13rpx;
-  padding-right: 13rpx;
-  height: 30rpx;
-  line-height: 30rpx;
-  border-radius: 5rpx;
-  font-weight: 400;
-  font-size: 18rpx;
-  color: #47abd8;
-  margin:10rpx  8rpx 10rpx 0rpx;
-  border: 1rpx solid #009da5;
-}
-
-.combo_name_wrapper {
-  font-weight: 400;
-  font-size: 32rpx;
-  color: #0e0e0e;
-  line-height: 1;
-}
-
-.combo_content_wrapper { 
-  margin-left: 30rpx;
-  width: calc(750rpx - 190rpx - 30rpx - 20rpx - 55rpx);
-}
-
-.combo_info_wrapper {
-  display: flex;
-  align-items: center;
-  width: 750rpx;
-  margin: 0 auto;
-}
-
-.combo_cover_wrapper {
-  width: 190rpx;
-  height: 190rpx;
-  margin-left: 20rpx;
-}
-
-.combo_cover_wrapper image {
-  width: 190rpx;
-  height: 190rpx;
-  display: block;
-  object-fit: contain;
-}
-
-.select_item_line_wrapper {
-  position: absolute;
-  width: 95rpx;
-  height: 10rpx;
-  background: linear-gradient(to bottom, #ffffff00, #1b9a9f);
-  border-radius: 5rpx;
-  bottom: 0;
-  left: 50%;
-  transform: translateX(calc(-50% - 8px));
-  opacity: 0;
-}
-
-.select_wrapper {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  width: 750rpx;
-  height: 80rpx;
-  background: #eef7f7;
-  box-shadow: 0rpx -1rpx 1rpx 0rpx rgba(0, 0, 0, 0.1);
-  margin: 0 auto;
-  position: relative;
-  z-index: 999;
-}
-
-.select_item_icon_wrapper {
-  width: 18rpx;
-  height: 9rpx;
-  margin-left: 9rpx;
-  filter: grayscale(100%);
-}
-
-.select_item_icon_wrapper image {
-  width: 18rpx;
-  height: 9rpx;
-  display: block;
-  object-fit: contain;
-}
-
-.select_item_icon2_wrapper {
-  width: 26rpx;
-  height: 23rpx;
-  margin-left: 7rpx;
-}
-
-.select_item_icon2_wrapper image {
-  width: 26rpx;
-  height: 23rpx;
-  display: block;
-  object-fit: contain;
-}
-
-.select_item_name_wrapper {
-  font-weight: 400;
-  font-size: 26rpx;
-  color: #2f2f2f;
-  line-height: 1;
-}
-
-.select_item_wrapper {
-  width: 25%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  position: relative;
-  height: 80rpx;
-}
-
-.select_item_wrapper.active .select_item_name_wrapper {
-  color: #239ea3;
-  font-weight: bold;
-}
-
-.select_item_wrapper.active .select_item_icon_wrapper {
-  filter: grayscale(0%);
-}
-
-.select_item_wrapper.active .select_item_line_wrapper {
-  opacity: 1;
-}
-
-.doctor_name_wrapper {
-  font-weight: 400;
-  font-size: 24rpx;
-  line-height: 1;
-  color: #ffffff;
-  border-bottom: 1rpx solid #ffffff;
-}
-
-.doctor_tip_wrapper {
-  font-weight: 400;
-  font-size: 22rpx;
-  line-height: 1;
-  color: #ffffff;
-}
-
-.doctor_wrapper {
-  display: flex;
-  align-items: center;
-  width: 710rpx;
-  height: 70rpx;
-  background: #239ea3;
-  border-radius: 15rpx 15rpx 0rpx 0rpx;
-  padding-left: 24rpx;
-}
-
-.user_choose_wrapper {
-  width: 50rpx;
-  height: 50rpx;
-  margin-left: 30rpx;
-}
-
-.user_choose_wrapper image {
-  width: 50rpx;
-  height: 50rpx;
-  display: block;
-  object-fit: contain;
-}
-
-.user_title_wrapper {
-  font-weight: 400;
-  font-size: 28rpx;
-  color: #239ea3;
-  line-height: 1;
-}
-
-.user_name_wrapper {
-  font-weight: 400;
-  font-size: 28rpx;
-  color: #0d0d0d;
-  line-height: 1;
-}
-
-.user_wrapper {
-  height: 80rpx;
-  padding-left: 40rpx;
-  padding-right: 20rpx;
-  background: #ffffff;
-  border-radius: 40rpx 0 0 40rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.header_wrapper {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  width: 750rpx;
-  height: 100rpx;
-  background: #d8edf2;
-  margin: 0 auto;
-  position: relative;
-  z-index: 999;
-}
-
-.hospital_wrapper {
-  display: flex;
-  align-items: center;
-  width: 50%;
-}
-
-.hospital_icon_wrapper {
-  width: 48rpx;
-  height: 48rpx;
-  margin-left: 20rpx;
-}
-
-.hospital_icon_wrapper image {
-  width: 48rpx;
-  height: 48rpx;
-  display: block;
-  object-fit: contain;
-}
-
-.hospital_name_wrapper {
-  font-weight: 400;
-  font-size: 28rpx;
-  color: #484747;
-  margin-left: 9rpx;
-  line-height: 1;
-}
-
-.hospital_select_wrapper {
-  width: 24rpx;
-  height: 14rpx;
-  margin-left: 19rpx;
-}
-
-.hospital_select_wrapper image {
-  width: 24rpx;
-  height: 14rpx;
-  display: block;
-  object-fit: contain;
-}
-.popup_new_main{
-	background-color: #fff;
-	border-radius:  0rpx 0rpx 20rpx 20rpx;
-	padding: 20rpx;
-}
-.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;
-}
-.search{
-	 
-}
-</style>
+	.select_done_wrapper {
+		color: #ffffff;
+		background: #239ea3;
+		width: calc(100% - 60rpx);
+		margin: 50rpx auto 0;
+		height: 50rpx;
+		line-height: 50rpx;
+		text-align: center;
+		border-radius: 6rpx;
+	}
+
+	.select_group_item_wrapper {
+		padding: 10rpx 20rpx;
+		border: 1rpx solid #239ea3;
+		font-size: 22rpx;
+		margin: 20rpx 20rpx 0 0;
+		border-radius: 6rpx;
+		color: #239ea3;
+	}
+
+	.select_group_item_wrapper.active {
+		color: #ffffff;
+		background: #239ea3;
+	}
+
+	.select_group_line_wrapper {
+		display: flex;
+		align-items: center;
+		flex-wrap: wrap;
+	}
+
+	.select_group_wrapper {
+		margin: 20rpx;
+	}
+
+	.list_wrapper {
+		padding-top: 30rpx;
+		height: calc(100vh - 100rpx - 10rpx - 70rpx - 80rpx - 30rpx - 30rpx);
+		width: 750rpx;
+		overflow-y: auto;
+		padding-bottom: 30rpx;
+		margin: 0 auto;
+		overflow-x: hidden;
+		-ms-overflow-style: none;
+		scrollbar-width: none;
+		overflow: -moz-scrollbars-none;
+		overflow-y: scroll;
+		background-color: #fff;
+	}
+
+	.list_wrapper::-webkit-scrollbar {
+		display: none;
+	}
+
+	.combo_line_wrapper {
+		width: 710rpx;
+		height: 1rpx;
+		background: #e1ecee;
+		margin: 26rpx 0rpx 0rpx 0;
+	}
+
+	.combo_pick_button_wrapper {
+		width: 160rpx;
+		height: 60rpx;
+		background: #e1ecee;
+		border-radius: 30rpx;
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #239ea3;
+		text-align: center;
+		line-height: 60rpx;
+	}
+
+	.combo_buy_button_wrapper {
+		width: 160rpx;
+		height: 60rpx;
+		background: #239ea3;
+		border-radius: 30rpx;
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #ffffff;
+		text-align: center;
+		line-height: 60rpx;
+	}
+
+	.combo_button_wrapper {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: space-around;
+
+	}
+
+	.combo_count_wrapper {
+		font-weight: 500;
+		font-size: 18rpx;
+		color: #8b8b8b;
+		line-height: 1;
+	}
+
+	.combo_original_price_wrapper {
+		font-weight: 500;
+		font-size: 18rpx;
+		color: #8b8b8b;
+		line-height: 1;
+		text-decoration-line: line-through;
+		margin-left: 10rpx;
+	}
+
+	.combo_true_price_wrapper {
+		font-weight: 500;
+		font-size: 18rpx;
+		color: #ec3d15;
+		line-height: 1;
+	}
+
+	.combo_true_price_number_wrapper {
+		font-size: 38rpx;
+	}
+
+	.combo_price_wrapper {
+		display: flex;
+		align-items: end;
+		justify-content: space-between;
+		margin-top: 21rpx;
+	}
+
+	.combo_price_box_wrapper {
+		display: flex;
+		align-items: end;
+	}
+
+	.combo_wrapper {
+		/* height: 196rpx; */
+		width: calc(750rpx - 80rpx);
+		margin: 0 auto;
+		background-color: #fff;
+		padding: 0rpx 40rpx 30rpx 40rpx;
+	}
+
+	.combo_tags_wrapper {
+		display: flex;
+		align-items: center;
+		margin-top: 13rpx;
+	}
+
+	.combo_desc_wrapper {
+		font-weight: 500;
+		font-size: 20rpx;
+		color: #8b8b8b;
+		line-height: 1;
+		margin-top: 18rpx;
+	}
+
+	.combo_tag_wrapper {
+		padding-left: 13rpx;
+		padding-right: 13rpx;
+		height: 30rpx;
+		line-height: 30rpx;
+		border-radius: 5rpx;
+		font-weight: 400;
+		font-size: 18rpx;
+		color: #47abd8;
+		margin: 10rpx 8rpx 10rpx 0rpx;
+		border: 1rpx solid #009da5;
+	}
+
+	.combo_name_wrapper {
+		font-weight: 400;
+		font-size: 32rpx;
+		color: #0e0e0e;
+		line-height: 32rpx;
+		 
+	}
+
+	.combo_content_wrapper {
+		margin-left: 30rpx;
+		width: calc(750rpx - 190rpx - 30rpx - 20rpx - 55rpx);
+	}
+
+	.combo_info_wrapper {
+		display: flex;
+		align-items: center;
+		width: 750rpx;
+		margin: 0 auto;
+	}
+
+	.combo_cover_wrapper {
+		width: 190rpx;
+		height: 190rpx;
+		margin-left: 20rpx;
+	}
+
+	.combo_cover_wrapper image {
+		width: 190rpx;
+		height: 190rpx;
+		display: block;
+		object-fit: contain;
+	}
+
+	.select_item_line_wrapper {
+		position: absolute;
+		width: 95rpx;
+		height: 10rpx;
+		background: linear-gradient(to bottom, #ffffff00, #1b9a9f);
+		border-radius: 5rpx;
+		bottom: 0;
+		left: 50%;
+		transform: translateX(calc(-50% - 8px));
+		opacity: 0;
+	}
+
+	.select_wrapper {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		width: 750rpx;
+		height: 80rpx;
+		background: #eef7f7;
+		box-shadow: 0rpx -1rpx 1rpx 0rpx rgba(0, 0, 0, 0.1);
+		margin: 0 auto;
+		position: relative;
+		z-index: 999;
+	}
+
+	.select_item_icon_wrapper {
+		width: 18rpx;
+		height: 9rpx;
+		margin-left: 9rpx;
+		filter: grayscale(100%);
+	}
+
+	.select_item_icon_wrapper image {
+		width: 18rpx;
+		height: 9rpx;
+		display: block;
+		object-fit: contain;
+	}
+
+	.select_item_icon2_wrapper {
+		width: 26rpx;
+		height: 23rpx;
+		margin-left: 7rpx;
+	}
+
+	.select_item_icon2_wrapper image {
+		width: 26rpx;
+		height: 23rpx;
+		display: block;
+		object-fit: contain;
+	}
+
+	.select_item_name_wrapper {
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #2f2f2f;
+		line-height: 1;
+	}
+
+	.select_item_wrapper {
+		width: 25%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		position: relative;
+		height: 80rpx;
+	}
+
+	.select_item_wrapper.active .select_item_name_wrapper {
+		color: #239ea3;
+		font-weight: bold;
+	}
+
+	.select_item_wrapper.active .select_item_icon_wrapper {
+		filter: grayscale(0%);
+	}
+
+	.select_item_wrapper.active .select_item_line_wrapper {
+		opacity: 1;
+	}
+
+	.doctor_name_wrapper {
+		font-weight: 400;
+		font-size: 24rpx;
+		line-height: 1;
+		color: #ffffff;
+		border-bottom: 1rpx solid #ffffff;
+	}
+
+	.doctor_tip_wrapper {
+		font-weight: 400;
+		font-size: 22rpx;
+		line-height: 1;
+		color: #ffffff;
+	}
+
+	.doctor_wrapper {
+		display: flex;
+		align-items: center;
+		width: 710rpx;
+		height: 70rpx;
+		background: #239ea3;
+		border-radius: 15rpx 15rpx 0rpx 0rpx;
+		padding-left: 24rpx;
+	}
+
+	.user_choose_wrapper {
+		width: 50rpx;
+		height: 50rpx;
+		margin-left: 30rpx;
+	}
+
+	.user_choose_wrapper image {
+		width: 50rpx;
+		height: 50rpx;
+		display: block;
+		object-fit: contain;
+	}
+
+	.user_title_wrapper {
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #fff;
+		line-height: 1;
+	}
+
+	.user_name_wrapper {
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #fff;
+		line-height: 1;
+	}
+
+	.user_wrapper {
+		height: 80rpx;
+		padding-left: 40rpx;
+		padding-right: 20rpx;
+		margin-right: 20rpx;
+		background: #009ea7;
+		border-radius: 40rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.header_wrapper {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		width: 710rpx;
+		height: 100rpx;
+		background: #d8edf2;
+		margin: 0 auto;
+		position: relative;
+		z-index: 999;
+		background-color: #fff;
+		margin-left: 20rpx;
+		margin-right: 20rpx;
+		border-radius: 20rpx;
+	}
+
+	.hospital_wrapper {
+		display: flex;
+		align-items: center;
+		width: 40%;
+	}
+
+	.hospital_icon_wrapper {
+		width: 48rpx;
+		height: 48rpx;
+		margin-left: 20rpx;
+	}
+
+	.hospital_icon_wrapper image {
+		width: 48rpx;
+		height: 48rpx;
+		display: block;
+		object-fit: contain;
+	}
+
+	.hospital_name_wrapper {
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #484747;
+		margin-left: 9rpx;
+		line-height: 1;
+	}
+
+	.hospital_select_wrapper {
+		width: 24rpx;
+		height: 14rpx;
+		margin-left: 19rpx;
+	}
+
+	.hospital_select_wrapper image {
+		width: 24rpx;
+		height: 14rpx;
+		display: block;
+		object-fit: contain;
+	}
+
+	.popup_new_main {
+		background-color: #fff;
+		border-radius: 0rpx 0rpx 20rpx 20rpx;
+		padding: 40rpx 20rpx 20rpx 20rpx;
+	}
+
+	.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;
+	}
+
+	.search {}
+
+	.shaixuan_title {
+		font-size: 26rpx;
+		margin-top: 20rpx;
+		margin-bottom: 10rpx;
+	}
+
+	.shaixuan_button {
+		font-size: 24rpx;
+		padding-left: 10rpx;
+		background-color: #ccc;
+		margin: 10rpx;
+		padding: 5rpx 10rpx;
+		border-radius: 5rpx;
+		background-color: #f3f3f3;
+		color: #1e1a19;
+	}
+	.shaixuan_button_active{
+		background-color: #009da5;
+		color: #fff;
+	}
+</style>
\ No newline at end of file
diff --git a/h5/pages/main/tj/tjzx_new.vue b/h5/pages/main/tj/tjzx_new.vue
new file mode 100644
index 0000000..d88f219
--- /dev/null
+++ b/h5/pages/main/tj/tjzx_new.vue
@@ -0,0 +1,590 @@
+<script setup>
+import DraggableButton from "@/pages/components/goHome.vue";
+/**
+ * name：
+ * user：sa0ChunLuyu
+ * date：2024年9月11日 19:24:50
+ */
+import { ref } from "vue";
+import { $api, $response, $image } from "@/api";
+import { onShow } from "@dcloudio/uni-app";
+import { useStore } from "@/store";
+
+// comboId 套餐ID 没有套餐ID就是个人自选项目
+// itemIds 自选ID
+const $props = defineProps({
+  comboId: {
+    type: String,
+    default: "",
+  },
+  itemIds: {
+    type: String,
+    default: "",
+  },
+  personId: {
+    type: String,
+    default: "",
+  },
+  groupId: {
+    type: String,
+    default: "",
+  },
+  wj: {
+  	type: String,
+  	default: "",
+  },
+});
+
+const $store = useStore();
+
+let wj = ref(""); //
+let leftList = ref({}); // 左侧列表
+let tabIndex = ref(""); // 默认选中
+let rightLeft = ref([]); // 右侧列表
+let selectIds = ref([]); // 选中id列表
+let headImg = ref(""); // 头部图片
+let packagePrice = ref(0); //套餐折扣价格
+let packageOriginalPrice = ref(0); //套餐原始价格
+let optionalPrice = ref(0); //自选折扣价格
+let optionalOriginalPrice = ref(0); //自选原始价格
+let totalPrice = ref(0); // 总折扣价格
+let totalOriginalPrice = ref(0); // 总原始价格
+let total = ref(0); // 总项目数
+let comboId = ref(""); // 套餐id
+let recommendPackageList = ref([]); // 推荐套餐列表
+let popup = ref(null); // 推荐套餐弹窗
+let popupTip = ref(null); // 剩余额度提示弹窗
+let groupLength = ref(0); // 团检自带的套餐数量
+let status = ref(0); // 1个检套餐 2个检自选 3团检套餐 4团检自选
+let personId = ref(""); // 就诊人ID
+let groupId = ref(""); // 团检id
+let losePrice = ref(0); // 剩余金额
+// let query = ref(""); // 参数
+
+const getComboRecommend = async () => {
+  // 获取推荐套餐
+  const response = await $api("ComboRecommend", {
+    person_id: personId.value,
+    item_ids: selectIds.value,
+  });
+  $response(response, () => {
+    recommendPackageList.value = response.data.combos;
+    if (recommendPackageList.value.length > 0) {
+      popup.value.open("center");
+    } else {
+      toDetails();
+    }
+    uni.hideLoading();
+  });
+};
+
+const getAllItems = async (e) => {
+  // 获取全部项目
+  const response = await $api("GetAllItems", {
+    search: e?.value,
+  });
+  $response(response, () => {
+    leftList.value = response.data.list;
+    if (Object.keys(leftList.value).length) {
+      let keys = Object.keys(leftList.value);
+      tabIndex.value = keys[0];
+      rightLeft.value = leftList.value[keys[0]].children;
+      headImg.value = leftList.value[keys[0]].head_img;
+    }
+  });
+};
+
+const getBuyInfo = async () => {
+  // 获取购买信息
+  uni.showLoading({
+    title: "加载中",
+  });
+  let obj = {
+    item_ids: selectIds.value,
+    hospital: $store.save_info.hospital,
+    person_id: personId.value,
+    group_id: groupId.value,
+    combo_id: comboId.value,
+	wj: wj.value,
+  };
+  if (comboId.value) {
+    obj.combo_id = comboId.value;
+  }
+  const response = await $api("BuyInfo", obj);
+  console.log(response)
+  if(response.status===false){
+	   uni.hideLoading();
+	   uni.$lu.toast(response.msg);
+	  return false;
+  }
+  $response(response, () => {
+
+    groupLength.value = response.data.group_info
+      ? response.data.group_info[0]?.items?.length
+      : 0;
+    packagePrice.value = response.data.combo_info.price;
+    packageOriginalPrice.value = response.data.combo_info.original_price;
+    optionalPrice.value = response.data.items_info.price;
+    optionalOriginalPrice.value = response.data.items_info.original_price;
+    totalPrice.value = response.data.true_price;
+    totalOriginalPrice.value = response.data.original_price;
+    total.value = response.data.pay_item_count;
+    losePrice.value = response.data.lose_price;
+    if (status.value == 4 && groupLength.value) {
+      // 团检无套餐ID的情况下需要判断一下 是否有团检自带套餐
+      status.value = 3;
+    }
+    uni.hideLoading();
+  });
+};
+
+const confirm = async () => {
+  // 确定
+  // status 1个检套餐 2个检自选 3团检套餐 4团检自选
+  if (status.value == 3) {
+    // 团检套餐
+    // query.value = "?groupId=" +
+    //   groupId.value +
+    //   "&itemIds=" +
+    //   itemIds +
+    //   "&comboId=" +
+    //   comboId.value;
+  }
+  if (status.value == 4) {
+    // 团检自选
+    if (!selectIds.value.length) {
+      uni.$lu.toast("请选择项目");
+      return;
+    }
+    if (!groupLength.value) {
+      // 团检项目为空的话需要弹推荐套餐
+      getComboRecommend();
+      return;
+    }
+  }
+
+  if (status.value == 1) {
+    // 个检套餐
+    // query.value = "?itemIds=" + itemIds + "&comboId=" + comboId.value;
+  }
+
+  if (status.value == 2) {
+    // 个检自选
+    // query.value = "?itemIds=" + itemIds + "&personId=" + personId.value;
+    if (!selectIds.value.length) {
+      uni.$lu.toast("请选择项目");
+      return;
+    }
+    // 自选触发推荐套餐
+    getComboRecommend();
+    return;
+  }
+  toDetails();
+};
+
+const toDetails = (state) => {
+  // 去详情页
+  if (losePrice.value > 0 && !state) {
+  //  popupTip.value.open("center"); // 弹剩余额度提醒
+    //return;
+  }
+  const itemIds = selectIds.value.length > 0 ? selectIds.value.join(",") : "";
+  let query = "?comboId=" + comboId.value + "&itemIds=" + itemIds;
+  if (groupId.value) {
+    query += "&groupId=" + groupId.value;
+  }
+  if($props.wj){
+  	query +="&wj="+$props.wj
+  }
+  console.log($props.comboId || $props.itemIds ? 2 : 1);
+  let delta = 0;
+  if (groupId.value) {
+    if (groupLength.value) {
+      delta = 2;
+    } else {
+      if ($props.comboId || $props.itemIds) {
+        delta = 2;
+      } else {
+        delta = 1;
+      }
+    }
+  } else {
+    if ($props.comboId || $props.itemIds) {
+      delta = 2;
+    } else {
+      delta = 1;
+    }
+  }
+  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) => {
+  if (item) {
+    comboId.value = item.combo_id;
+	selectIds.value=[];
+    await getBuyInfo();
+  }
+  // 预约套餐
+  popup.value.close(); // 关闭推荐套餐弹窗
+  toDetails();
+};
+
+const mountedAction = async () => {
+  selectIds.value = $props.itemIds ? $props.itemIds.split(",") : [];
+  comboId.value = $props.comboId || "";
+  personId.value = $store.getUser().person_id || "";
+  groupId.value = $props.groupId || "";
+  wj.value = $props.wj || "";
+  
+  if (groupId.value) {
+    if (comboId.value) {
+      // 团检套餐
+      status.value = 3;
+    } else {
+      // 团检自选
+      status.value = 4;
+    }
+  } else {
+    if (comboId.value) {
+      // 个检套餐
+      status.value = 1;
+    } else {
+      // 个检自选
+      status.value = 2;
+    }
+  }
+
+  console.log(status.value, "1个检套餐 2个检自选 3团检套餐 4团检自选");
+
+  await getAllItems(); // 获取全部项目
+  // await getComboRecommend();
+  await getBuyInfo(); // 获取购买信息
+};
+
+const config_ref = ref(null);
+const configRef = (e) => {
+  if (!config_ref.value) {
+    config_ref.value = e;
+    mountedAction();
+  }
+};
+const XuanZeItem= async (item)=>{
+    let doi=""
+	if(selectIds.value.includes(item.id)){
+	  selectIds.value.splice(selectIds.value.indexOf(item.id),1);
+	   doi="del"
+	}else{
+	  selectIds.value.push(item.id);
+       doi="add"
+	}
+ let a= await getBuyInfo()
+ if(a===false){
+	 if(doi=="add"){
+		  selectIds.value.splice(selectIds.value.indexOf(item.id),1);
+	 }
+	 if(doi=="del"){
+	 		selectIds.value.push(item.id);
+	 }
+	
+ }
+
+}
+onShow(() => {
+  if (!!config_ref.value) {
+    mountedAction();
+  }
+});
+</script>
+<template>
+  <DraggableButton />
+  <view>
+    <view v-if="!!$store.config">
+      <view :ref="configRef"></view>
+    </view>
+  </view>
+  <uni-popup ref="popupTip">
+    <view
+      class="mb-70rpx bg-#fff text-center box-border pt-80rpx pb-50rpx px-65rpx w-90vw rounded-15rpx"
+    >
+      <view
+        class="w-full text-center text-##090909 text-26rpx line-height-[50rpx]"
+        >您还剩余
+        {{ losePrice }}
+        元体检额度尚未使用，确认提交后剩余体检额度将无法使用!</view
+      >
+      <view class="mt-50rpx between">
+        <button
+          type="primary"
+          @click="toDetails(1)"
+          class="w-196rpx h-68rpx center text-#fff text-24rpx !bg-#239EA3 rounded-8rpx"
+        >
+          我想好了
+        </button>
+        <button
+          @click="popupTip.close()"
+          class="w-196rpx h-68rpx center text-#239EA3 text-24rpx !bg-#D9F3F2 rounded-8rpx"
+        >
+          我再想想
+        </button>
+      </view>
+    </view>
+  </uni-popup>
+  <uni-popup ref="popup">
+    <view class="bg-#fff rounded-15rpx w-95vw px-20rpx box-border">
+      <view class="center relative pt-47rpx pb-32rpx text-36rpx">
+        <text class="line-height-[1]">推荐套餐</text>
+        <uni-icons
+          @click="popup.close()"
+          type="closeempty"
+          color="#A6A6A6"
+          size="26"
+          class="absolute right-40rpx top-30rpx"
+        ></uni-icons>
+      </view>
+      <view
+        v-for="(item, index) in recommendPackageList"
+        :key="index"
+        class="pt-40rpx pb-15rpx box-border b-0 b-t-1 b-solid b-#E1ECEE"
+      >
+        <view class="flex w-full">
+          <image
+            v-if="item.cover"
+            :src="$image(item.cover)"
+            class="w-190rpx h-190rpx mr-37rpx"
+            mode="widthFix"
+          />
+          <view class="flex flex-col grow">
+            <text
+              >{{ item.name }}</text
+            >
+            <view class="mt-13rpx mb-18rpx">
+              <uni-tag
+                v-for="(val, i) in item.tags"
+                :key="i"
+                size="small"
+                :inverted="true"
+                :text="val.text"
+                class="mr-8rpx"
+                :custom-style="
+                  'background-color:' +
+                  val.color +
+                  ';border-color:' +
+                  val.color +
+                  '; color:' +
+                  val.text_color +
+                  ';'
+                "
+              />
+            </view>
+            <view>
+              <text
+                v-for="(val, i) in item.tags2"
+                :key="i"
+                class="text-#8B8B8B text-20rpx line-height-[1] px-5rpx b-0 b-r-2 b-solid b-#8B8B8B"
+                >{{ val }}</text
+              >
+            </view>
+            <view class="mt-20rpx w-full flex items-end">
+              <text class="text-18rpx text-#EC3D15">¥</text>
+              <text class="text-38rpx text-#EC3D15 mx-10rpx -mb-8rpx">{{
+                item.price
+              }}</text>
+              <text class="text-18rpx text-#878787 line-through">{{
+                item.original_price
+              }}</text>
+              <text class="text-18rpx text-#878787 ml-auto mr-55rpx"
+                >已售{{ item.count }}</text
+              >
+            </view>
+          </view>
+        </view>
+        <view class="between mt-30rpx">
+          <view class="text-#8B8B8B text-22rpx">
+            相似度
+            <text class="text-#239EA3">{{ item.recommend?.xiangsidu }}</text>
+            ，{{ item.recommend?.count > 0 ? "增加" : "减少" }}了
+            <text class="text-#239EA3">{{
+              Math.abs(item.recommend?.count)
+            }}</text>
+            个项目，{{
+              Number(item.recommend?.money.replace(/,/, "")) > 0
+                ? "增加"
+                : "减少"
+            }}了
+            <text class="text-#239EA3"
+              >￥{{ item.recommend?.money.replace(/-/, "") }}</text
+            >
+          </view>
+          <button
+            type="primary"
+            @click="buy(item)"
+            class="w-160rpx h-60rpx center text-#fff text-28rpx !bg-#239EA3 rounded-full"
+          >
+            预约
+          </button>
+        </view>
+      </view>
+      <view class="b-0 b-t-1 b-solid b-#E1ECEE pt-80rpx pb-70rpx">
+        <button
+          type="primary"
+          @click="buy()"
+          class="w-300rpx h-78rpx center text-#fff text-30rpx !bg-#239EA3 rounded-10rpx"
+        >
+          跳过
+        </button>
+      </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>
+    <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
+    class="fixed bottom-0 left-0 w-100% h-135rpx bg-gradient-to-r from-#7fcfd3 to-#aad7d7 px-20rpx py-30rpx box-border items-center flex justify-between"
+  >
+    <text
+      class="text-26rpx text-#121212 b-r-1 b-r-solid b-#8D9698 pr-12rpx mr-12rpx min-w-120rpx max-w-120rpx"
+    >
+      您需付费 \n{{ total }}个项目
+    </text>
+    <view class="grow">
+      <view class="flex items-end" v-if="comboId != 0">
+        <text class="text-18rpx text-#878787">套餐价格</text>
+        <text class="text-21rpx text-#ED6907 mx-20rpx"
+          >¥ {{ packagePrice }}</text
+        >
+        <text class="text-18rpx text-#878787 line-through"
+          >¥ {{ packageOriginalPrice }}</text
+        >
+      </view>
+      <view class="flex items-end">
+        <text class="text-18rpx text-#878787">自选项目价格</text>
+        <text class="text-21rpx text-#ED6907 mx-20rpx"
+          >¥ {{ optionalPrice || 0 }}</text
+        >
+        <text
+          v-if="optionalOriginalPrice"
+          class="text-18rpx text-#878787 line-through"
+          >¥ {{ optionalOriginalPrice }}</text
+        >
+      </view>
+      <view class="flex items-end">
+        <text class="text-18rpx text-#ED6907">合计费用</text>
+        <text class="text-24rpx text-#ED6907 ml-20rpx mr-5rpx">¥</text>
+        <text class="text-36rpx text-#ED6907 mr-20rpx font-bold">{{
+          totalPrice || 0
+        }}</text>
+        <text
+          v-if="totalOriginalPrice"
+          class="text-18rpx text-#878787 line-through"
+          >¥ {{ totalOriginalPrice }}</text
+        >
+      </view>
+    </view>
+    <button
+      type="primary"
+      @click="confirm()"
+      class="text-#F8F8F8 w-240rpx h-hull rounded-full !bg-#239EA3 !mx-0 text-30rpx"
+    >
+      确定
+    </button>
+  </view>
+</template>
+<style>
+.uni-tooltip-popup {
+  background-color: #fff;
+}
+</style>
diff --git a/h5/static/assets/buy/huomiao.jpg b/h5/static/assets/buy/huomiao.jpg
new file mode 100644
index 0000000..24fe964
Binary files /dev/null and b/h5/static/assets/buy/huomiao.jpg differ