From 526146b5bea59f78bf0bca803ca62c8fe82e9f26 Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Sat, 11 Jan 2025 23:02:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../API/H5/CheckUpTypeController.php          |   11 +-
 h5/config.js                                  |    4 +-
 h5/manifest.json                              |   11 +
 h5/pages.json                                 |   32 +-
 h5/pages/buy/choose/choose.vue                |   11 +-
 h5/pages/main/combo/combo(旧).vue             | 1068 ++++++++
 h5/pages/main/combo/combo.vue                 | 2204 +++++++++--------
 h5/pages/main/combo/combo_new.vue             | 1170 ---------
 h5/pages/main/order/order_new.vue             |  281 +++
 h5/pages/main/tj/tjxq(旧).vue                 |  558 +++++
 h5/pages/main/tj/tjxq.vue                     |  409 +--
 h5/pages/main/tj/tjxq_new.vue                 |  567 -----
 .../main/tjyy/{tjyy_new.vue => tjyy(旧).vue}  |  270 +-
 h5/pages/main/tjyy/tjyy.vue                   |  270 +-
 14 files changed, 3581 insertions(+), 3285 deletions(-)
 create mode 100644 h5/pages/main/combo/combo(旧).vue
 delete mode 100644 h5/pages/main/combo/combo_new.vue
 create mode 100644 h5/pages/main/order/order_new.vue
 create mode 100644 h5/pages/main/tj/tjxq(旧).vue
 delete mode 100644 h5/pages/main/tj/tjxq_new.vue
 rename h5/pages/main/tjyy/{tjyy_new.vue => tjyy(旧).vue} (71%)

diff --git a/Laravel/app/Http/Controllers/API/H5/CheckUpTypeController.php b/Laravel/app/Http/Controllers/API/H5/CheckUpTypeController.php
index ab06b7a..4237bd7 100644
--- a/Laravel/app/Http/Controllers/API/H5/CheckUpTypeController.php
+++ b/Laravel/app/Http/Controllers/API/H5/CheckUpTypeController.php
@@ -11,7 +11,16 @@ class CheckUpTypeController extends Controller
     //H5获取体检类型名称和logo
   public function GetList()
   {
-    $list=DB::table('checkup_type')->where(['status'=>1,'is_del'=>0])->get();
+    $ids = [7,1,4];
+    $sortedIds = implode(',', array_map('intval', $ids));
+    $list=DB::table('checkup_type')->where(['status'=>1,'is_del'=>0])
+      ->orderByRaw("FIELD(id, {$sortedIds})")
+      ->get();
+    foreach($list as $k=>$v){
+      if($v->name=='健康体检'){
+        $v->name='预约体检';
+      }
+    }
      return \Yz::Return(true,"查询完成",['list'=>$list]);
   }
 }
diff --git a/h5/config.js b/h5/config.js
index c936f2b..7ad1149 100644
--- a/h5/config.js
+++ b/h5/config.js
@@ -1,6 +1,6 @@
 const app_type = 'gzh'
-//const base_url = "https://api.hainan2024.sa0.online" //开发环境
-const base_url="https://tj-h5.hnxdfe.com"  //正式环境
+//const base_url = "" //开发环境
+const base_url="http://124.225.137.54:39081"  //测试环境
 const config = {
 	api_map_url: base_url + '/api/ApiMap/h5',
 	base_assets_url: base_url,
diff --git a/h5/manifest.json b/h5/manifest.json
index 29327de..5a8d77f 100644
--- a/h5/manifest.json
+++ b/h5/manifest.json
@@ -57,6 +57,17 @@
     },
     "vueVersion" : "3",
     "h5" : {
+		 "devServer": {
+		            "proxy": {
+		                "/api": {
+		                    "target": "http://124.225.137.54:39081",
+		                    "changeOrigin": true,
+		                    "pathRewrite": {
+		                        "^/api": ""
+		                    }
+		                }
+		            }
+		        },
         "router" : {
             "base" : "/h5/"
         },
diff --git a/h5/pages.json b/h5/pages.json
index 6c1b0cc..87e7617 100644
--- a/h5/pages.json
+++ b/h5/pages.json
@@ -14,14 +14,6 @@
 				"navigationBarTextStyle": "white"
 			}
 		},
-		{
-			"path": "pages/main/combo/combo_new",
-			"style": {
-				"navigationBarTitleText": "套餐",
-				"navigationBarBackgroundColor": "#239EA3",
-				"navigationBarTextStyle": "white"
-			}
-		},
 		{
 			"path": "pages/main/combo/tcdb",
 			"style": {
@@ -115,14 +107,7 @@
 				"navigationBarBackgroundColor": "#239EA3",
 				"navigationBarTextStyle": "white"
 			}
-		},{
-			"path": "pages/main/tj/tjxq_new",
-			"style": {
-				"navigationBarTitleText": "套餐详情",
-				"navigationBarBackgroundColor": "#239EA3",
-				"navigationBarTextStyle": "white"
-			}
-		},
+		}, 
 		{
 			"path": "pages/main/questionnaire/index",
 			"style": {
@@ -211,12 +196,7 @@
 			"style": {
 				"navigationBarTitleText": "体检预约"
 			}
-		},{
-			"path": "pages/main/tjyy/tjyy_new",
-			"style": {
-				"navigationBarTitleText": "体检预约"
-			}
-		},
+		}, 
 		{
 			"path": "pages/user/pick/pick",
 			"style": {
@@ -322,6 +302,14 @@
 				"navigationBarTitleText" : "",
 				"enablePullDownRefresh" : false
 			}
+		},
+		{
+			"path" : "pages/main/order/order_new",
+			"style" : 
+			{
+				"navigationBarTitleText" : "",
+				"enablePullDownRefresh" : false
+			}
 		}
 
 	],
diff --git a/h5/pages/buy/choose/choose.vue b/h5/pages/buy/choose/choose.vue
index 00619ce..b17ae2b 100644
--- a/h5/pages/buy/choose/choose.vue
+++ b/h5/pages/buy/choose/choose.vue
@@ -103,7 +103,7 @@
 </script>
 <template>
 	<DraggableButton />
-	<view>
+	<view class="choose_main">
 		<view v-if="!!$store.config">
 			<view :ref="configRef"></view>
 		</view>
@@ -113,7 +113,7 @@
 				<view class="button_icon_wrapper">
 					<image :src="$image(i.logo)"></image>
 				</view>
-				<view class="button_name_wrapper">{{ i.name }}</view>
+				<view :class="['button_name_wrapper',{'active':i.id==1}]">{{ i.name }}</view>
 				<view class="button_right_wrapper">
 					<uni-icons type="right" size="20"></uni-icons>
 				</view>
@@ -122,6 +122,10 @@
 	</view>
 </template>
 <style scoped>
+	.choose_main{
+		background-color: #E0F1F5;
+		min-height: calc(100vh - 80rpx);
+	}
 	.button_list_wrapper {
 		width: 750rpx;
 		margin: 0 auto;
@@ -139,6 +143,9 @@
 		align-items: center;
 		justify-content: space-between;
 	}
+	.active{
+		color:#008F96 !important;
+	}
 
 	.button_icon_wrapper {
 		width: 82rpx;
diff --git a/h5/pages/main/combo/combo(旧).vue b/h5/pages/main/combo/combo(旧).vue
new file mode 100644
index 0000000..17260ac
--- /dev/null
+++ b/h5/pages/main/combo/combo(旧).vue
@@ -0,0 +1,1068 @@
+<script setup>
+import DraggableButton from "@/pages/components/goHome.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 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();
+  select_drawer_ref.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, () => {
+ 
+		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();
+    let time = setTimeout(() => {
+      popup.value.open("top");
+      clearTimeout(time);
+    }, 400);
+  } else {
+    // 点击筛选
+    popup.value.close();
+    selectKey.value = "screen";
+    select_drawer_ref.value.open();
+
+    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",
+  });
+};
+</script>
+<template>
+  <DraggableButton />
+  <view>
+    <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="relative z-999 pt-10rpx center">
+      <view class="doctor_wrapper">
+        <view class="doctor_tip_wrapper">
+          <text v-if="!!combo_list.doctor.id">已根据指定医生：</text>
+          <text v-else>可选择指定医生：</text>
+        </view>
+        <view class="doctor_name_wrapper">
+          {{ !!combo_list.doctor.id ? combo_list.doctor.name : "前往选择" }}
+        </view>
+        <view class="doctor_tip_wrapper">（自动筛选匹配套餐）</view>
+      </view>
+    </view> -->
+    <view class="bg-#d8edf2">
+      <uni-search-bar
+        class="search"
+        radius="100"
+        placeholder="请输入关键字搜索"
+        @clear="getComboList()"
+        @cancel="getComboList()"
+        @confirm="getComboList"
+      />
+    </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="{
+            '!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="{
+          '!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 class="combo_info_wrapper">
+          <view class="combo_cover_wrapper">
+            <image v-if="i.cover" :src="$image(i.cover)"></image>
+          </view>
+          <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: ii.color,
+                }"
+              >
+                {{ 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 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"
+          >当前套餐包含一个可自由{{
+            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()"
+          >{{
+            multipleIndex == multipleList.length - 1 ? "确定" : "下一项"
+          }}</view
+        >
+      </view>
+    </uni-popup>
+    <uni-popup ref="popup" mask-background-color="transparent" :animation="false">
+      <view class="pt-292rpx 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="{
+                '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="{
+                      '!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="{
+                  '!bg-#239EA3 !text-#fff':
+                    (selectKey == 'combo_type' && comboIndex == index) ||
+                    (selectKey == 'combo_crowd' && crowdIndex == 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="{
+                      '!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="{
+                      '!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>
+  </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;
+}
+
+.list_wrapper::-webkit-scrollbar {
+  display: none;
+}
+
+.combo_line_wrapper {
+  width: 710rpx;
+  height: 1rpx;
+  background: #e1ecee;
+  margin: 15rpx auto 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;
+  margin-left: 32rpx;
+  margin-right: 20rpx;
+}
+
+.combo_button_wrapper {
+  display: flex;
+  align-items: center;
+  justify-content: end;
+  margin-top: 27rpx;
+}
+
+.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: 307rpx;
+  width: 750rpx;
+  margin: 0 auto;
+}
+
+.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-right: 8rpx;
+}
+
+.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: #f1f7f7;
+  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;
+}
+</style>
diff --git a/h5/pages/main/combo/combo.vue b/h5/pages/main/combo/combo.vue
index 17260ac..8cd713d 100644
--- a/h5/pages/main/combo/combo.vue
+++ b/h5/pages/main/combo/combo.vue
@@ -1,1068 +1,1170 @@
 <script setup>
-import DraggableButton from "@/pages/components/goHome.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 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();
-  select_drawer_ref.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([]);
+	let zhuangjianType=ref(18);
+	let TiShiPopupRef=ref(null);//提示弹窗
+	let SelectedComboInfo=ref(null);//选中的套餐信息
+
+	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();
-    let time = setTimeout(() => {
-      popup.value.open("top");
-      clearTimeout(time);
-    }, 400);
-  } else {
-    // 点击筛选
-    popup.value.close();
-    selectKey.value = "screen";
-    select_drawer_ref.value.open();
-
-    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();
+		}
+	};
+
+	 
+
+	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) => {
+		SelectedComboInfo.value=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;
+		}
+		if(item.type_id==zhuangjianType.value){
+			TiShiPopupRef.value.open();
+			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
+		 if(value==1){
+			 comboIndex.value=zhuangjianType.value //设置筛选套餐类型为专家
+			 screenObj.value.combo_type=comboIndex.value
+		 }else{
+			 comboIndex.value=''
+			 delete screenObj.value.combo_type 
+		 }
+		  getComboList();
+	}
 </script>
 <template>
-  <DraggableButton />
-  <view>
-    <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="relative z-999 pt-10rpx center">
-      <view class="doctor_wrapper">
-        <view class="doctor_tip_wrapper">
-          <text v-if="!!combo_list.doctor.id">已根据指定医生：</text>
-          <text v-else>可选择指定医生：</text>
-        </view>
-        <view class="doctor_name_wrapper">
-          {{ !!combo_list.doctor.id ? combo_list.doctor.name : "前往选择" }}
-        </view>
-        <view class="doctor_tip_wrapper">（自动筛选匹配套餐）</view>
-      </view>
-    </view> -->
-    <view class="bg-#d8edf2">
-      <uni-search-bar
-        class="search"
-        radius="100"
-        placeholder="请输入关键字搜索"
-        @clear="getComboList()"
-        @cancel="getComboList()"
-        @confirm="getComboList"
-      />
-    </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 class="combo_info_wrapper">
-          <view class="combo_cover_wrapper">
-            <image v-if="i.cover" :src="$image(i.cover)"></image>
-          </view>
-          <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: ii.color,
-                }"
-              >
-                {{ 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 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"
-          >当前套餐包含一个可自由{{
+        }" 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 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 v-if="i.type_id!=zhuangjianType" class="combo_original_price_wrapper">¥{{ i.original_price }}</view>
+								    <view v-if="i.type_id==zhuangjianType" class="combo_original_price_wrapper2">预存款</view>
+								</view>
+								<!-- <view class="combo_count_wrapper">已售{{ i.count }}</view> -->
+							</view>
+						</view>
+					</view>
+					<view class="combo_button_wrapper">
+						<view v-if="i.type_id!=zhuangjianType" @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>
+		<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-292rpx 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="{
-                      '!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="{
-                      '!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>
-  </view>
+                    (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-popup   ref="popup_new" mask-background-color="transparent" :animation="false" :is-mask-click="true" >
+			<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 style=";height: 100%;" @click="popup_new.close()"></view>
+				</view>
+				
+			</view>
+		</uni-popup>
+		<uni-popup ref="TiShiPopupRef" style="z-index: 999;">
+			<view class="tishi_main">
+				<view class="tishi_title">套餐须知</view>
+				<view class="tishi_title2">专家定制套餐</view>
+				<view class="tishi_content">此套餐收费{{SelectedComboInfo.price}}元为预存款，可根据现场定制套餐后实际价格多退少补。</view>
+				<view class="tishi_button" @click="toDetail()">我已知晓</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;
-}
-
-.list_wrapper::-webkit-scrollbar {
-  display: none;
-}
-
-.combo_line_wrapper {
-  width: 710rpx;
-  height: 1rpx;
-  background: #e1ecee;
-  margin: 15rpx auto 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;
-  margin-left: 32rpx;
-  margin-right: 20rpx;
-}
-
-.combo_button_wrapper {
-  display: flex;
-  align-items: center;
-  justify-content: end;
-  margin-top: 27rpx;
-}
-
-.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: 307rpx;
-  width: 750rpx;
-  margin: 0 auto;
-}
-
-.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-right: 8rpx;
-}
-
-.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: #f1f7f7;
-  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;
-}
-</style>
+	.tishi_main{
+		background-color: #fff;
+		padding: 40rpx 50rpx;
+		width:600rpx;
+		border-radius: 40rpx;
+	}
+	.tishi_button{
+		width: 365rpx;
+		background-color: #009da5;
+		color:#fff;
+		text-align: center;
+		padding-top: 10rpx;
+		padding-bottom: 10rpx;
+		border-radius: 40rpx;
+		margin: 40rpx auto 10rpx auto;
+	}
+	.tishi_title{
+		text-align: center;
+		font-size: 30rpx;
+		font-weight: 600;
+		color:#2b2827;
+	}
+	.tishi_title2{
+		font-size: 28rpx;
+		margin-top: 30rpx;
+		font-weight: 600;
+		color:#3a3635;
+		border-left: 3px solid #009da5;
+		padding-left: 5rpx;
+	}
+	.tishi_content{
+		font-size: 28rpx;
+		margin-top: 30rpx;
+		color:#474241;
+	}
+	.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_original_price_wrapper2 {
+		font-weight: 500;
+		font-size: 18rpx;
+		color: #8b8b8b;
+		line-height: 1;
+		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: 998;
+	}
+
+	.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: 60rpx;
+		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: 90rpx;
+		background: #d8edf2;
+		margin: 0 auto;
+		position: relative;
+		 
+		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/combo/combo_new.vue b/h5/pages/main/combo/combo_new.vue
deleted file mode 100644
index e77209e..0000000
--- a/h5/pages/main/combo/combo_new.vue
+++ /dev/null
@@ -1,1170 +0,0 @@
-<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 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([]);
-	let zhuangjianType=ref(18);
-	let TiShiPopupRef=ref(null);//提示弹窗
-	let SelectedComboInfo=ref(null);//选中的套餐信息
-
-	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();
-	};
- 
-	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();
-		}
-	};
-
-	 
-
-	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) => {
-		SelectedComboInfo.value=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;
-		}
-		if(item.type_id=zhuangjianType.value){
-			TiShiPopupRef.value.open();
-			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
-		 if(value==1){
-			 comboIndex.value=zhuangjianType.value //设置筛选套餐类型为专家
-			 screenObj.value.combo_type=comboIndex.value
-		 }else{
-			 comboIndex.value=''
-			 delete screenObj.value.combo_type 
-		 }
-		  getComboList();
-	}
-</script>
-<template>
-	<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 == '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 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 v-if="i.type_id!=zhuangjianType" class="combo_original_price_wrapper">¥{{ i.original_price }}</view>
-								    <view v-if="i.type_id==zhuangjianType" class="combo_original_price_wrapper2">预存款</view>
-								</view>
-								<!-- <view class="combo_count_wrapper">已售{{ i.count }}</view> -->
-							</view>
-						</view>
-					</view>
-					<view class="combo_button_wrapper">
-						<view v-if="i.type_id!=zhuangjianType" @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>
-		<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()">{{
-            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="
-              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="{
-                '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="{
-                      '!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="{
-                  '!bg-#239EA3 !text-#fff':
-                    (selectKey == 'sort_sale_count' && sort_salecount_index == index) ||
-                    (selectKey == 'sort_price' && sort_price_index == index),
-                  '!text-#747474 !bg-#e0e0e0':
-                    (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-popup   ref="popup_new" mask-background-color="transparent" :animation="false" :is-mask-click="true" >
-			<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 style=";height: 100%;" @click="popup_new.close()"></view>
-				</view>
-				
-			</view>
-		</uni-popup>
-		<uni-popup ref="TiShiPopupRef" style="z-index: 999;">
-			<view class="tishi_main">
-				<view class="tishi_title">套餐须知</view>
-				<view class="tishi_title2">专家定制套餐</view>
-				<view class="tishi_content">此套餐收费{{SelectedComboInfo.price}}元为预存款，可根据现场定制套餐后实际价格多退少补。</view>
-				<view class="tishi_button" @click="toDetail()">我已知晓</view>
-			</view>
-		</uni-popup>
-	</view>
-</template>
-<style scoped>
-	.tishi_main{
-		background-color: #fff;
-		padding: 40rpx 50rpx;
-		width:600rpx;
-		border-radius: 40rpx;
-	}
-	.tishi_button{
-		width: 365rpx;
-		background-color: #009da5;
-		color:#fff;
-		text-align: center;
-		padding-top: 10rpx;
-		padding-bottom: 10rpx;
-		border-radius: 40rpx;
-		margin: 40rpx auto 10rpx auto;
-	}
-	.tishi_title{
-		text-align: center;
-		font-size: 30rpx;
-		font-weight: 600;
-		color:#2b2827;
-	}
-	.tishi_title2{
-		font-size: 28rpx;
-		margin-top: 30rpx;
-		font-weight: 600;
-		color:#3a3635;
-		border-left: 3px solid #009da5;
-		padding-left: 5rpx;
-	}
-	.tishi_content{
-		font-size: 28rpx;
-		margin-top: 30rpx;
-		color:#474241;
-	}
-	.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_original_price_wrapper2 {
-		font-weight: 500;
-		font-size: 18rpx;
-		color: #8b8b8b;
-		line-height: 1;
-		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: 998;
-	}
-
-	.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: 60rpx;
-		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: 90rpx;
-		background: #d8edf2;
-		margin: 0 auto;
-		position: relative;
-		 
-		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/order/order_new.vue b/h5/pages/main/order/order_new.vue
new file mode 100644
index 0000000..397ad82
--- /dev/null
+++ b/h5/pages/main/order/order_new.vue
@@ -0,0 +1,281 @@
+<template>
+	<view class="order_new_main">
+		<view v-if="!!$store.config">
+			<view :ref="configRef"></view>
+		</view>
+		<view class="header_wrapper">
+			<view v-if="1" class="hospital_wrapper">
+				<view class="hospital_icon_wrapper">
+					<image src="@/static/assets/dingwei@2x.png"></image>
+				</view>
+				<view class="hospital_name_wrapper">fdssf</view>
+				<!-- <view class="hospital_select_wrapper">
+					<image src="@/static/assets/gengduo@2x.png"></image>
+				</view> -->
+			</view>
+			<view v-if="1" class="user_wrapper" @click="tabPatients()">
+				<view class="user_title_wrapper">体检人：</view>
+				<view class="user_name_wrapper">324</view>
+				<view v-if="1" class="user_choose_wrapper">
+					<image src="@/static/assets/qiehuan@2x.png"></image>
+				</view>
+			</view>
+		</view>
+		<view>
+			<view class="haoyuan_row">
+				<view class="haoyuan_row_item">挂号预约</view>
+				<view class="haoyuan_row_item">医技预约</view>
+			</view>
+			<view class="order_select_k">
+				<view class="order_status_row">
+					<view :class="['order_status_button',{'active':active_status==1}]">未就诊</view>
+					<view :class="['order_status_button',{'active':active_status==2}]">已就诊</view>
+					<view :class="['order_status_button',{'active':active_status==3}]">已退号</view>
+				</view>
+				<view class="rili_row">
+					<uni-icons type="calendar" color="#009FA8" size="24"></uni-icons>
+					<view class="riqi_title">预约日期</view>
+					<uni-datetime-picker  :border="false"  type="datetimerange" rangeSeparator="至" />
+				</view>
+			</view>
+			<view class="order_k">
+				<view style="display: flex;border-bottom: 1px solid #DBDCDC;">
+					<uni-icons type="person" size="26"></uni-icons>
+					<view>预约日期</view>
+				</view>
+				<view class="order_info_line_wrapper">
+					<view class="order_info_label_wrapper">预约人：</view>
+					<view class="order_info_value_wrapper">{{ order_info.name }}</view>
+				</view>
+				<view class="order_info_line_wrapper">
+					<view class="order_info_label_wrapper">预约诊区：</view>
+					<view class="order_info_value_wrapper">
+						<span style="color:#008F96;font-weight: bold;">秀英院区 </span>
+						<span v-if="order_info.sex==1">健康管理中心(1楼男宾区)</span>
+						<span v-if="order_info.sex==2">健康管理中心(2楼女宾区)</span>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	 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();
+	 let active_status=ref(1);
+	 
+	 const config_ref = ref(null);
+	 const configRef = (e) => {
+	 	if (!config_ref.value) {
+	 		config_ref.value = e;
+	 		checkHospital();
+	 	}
+	 };
+	 const hospital_active = ref(0);
+	 const checkHospital = () => {
+	 	let hospital_id = $store.save.hospital;
+	  
+	 	if (!hospital_id) {
+	 		hospital_id = $store.config.hospital[0].id;
+	 	}
+	 	hospital_active.value = hospital_id;
+	 	$store.saveInfo({
+	 		hospital: hospital_id,
+	 	});
+	  
+	 };
+	 onShow(() => {  
+	 	if (!!config_ref.value) {
+	 		checkHospital();
+	 	}
+	 });
+</script>
+
+<style scoped>
+	.order_new_main{
+		background-color: #D8EEF3;
+		min-height: calc(100vh - 80rpx);
+		padding-top: 20rpx;
+	}
+	.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: 60rpx;
+		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: 90rpx;
+		background: #d8edf2;
+		margin: 0 auto;
+		position: relative;
+		 
+		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;
+	}
+	.haoyuan_row{
+		display: flex;
+		width: 100%;
+		justify-content: space-around;
+		background-color: #EEF7F7;
+		margin-top: 30rpx;
+		padding: 10rpx;
+	}
+	.haoyuan_row_item{
+		padding: 8rpx;
+		border-bottom: 2px solid #009ea7;
+		color: #009ea7;
+		font-size: 26rpx;
+	}
+    .order_status_row{
+		display: flex;
+		justify-content: space-between; 
+		padding: 20rpx 0rpx 20rpx 0rpx;
+		border-bottom: 1px solid #DBDCDC;
+	}
+	.order_status_button{
+		font-size: 26rpx;
+		padding: 6rpx 40rpx;
+		background-color: #EBEBEB;
+		border-radius: 20rpx;
+		color:#3E3A39;
+	}
+	.order_select_k{
+		background-color: #fff;
+		padding: 0rpx 40rpx;
+	}
+	.active{
+		background-color: #009ea7;
+		color: #fff;
+	}
+	.rili_row{
+		display: flex;
+		align-items: center;
+	}
+	.riqi_title{
+		padding-left: 6rpx;
+		font-size: 24rpx;
+		color:#727171;
+		margin-right: -70rpx;
+		z-index: 20;
+		background-color: #fff;
+		padding-right: 40rpx;
+	}
+	.order_k{
+		 background-color: #fff;
+		 margin: 20rpx;
+		 border-radius: 10rpx;
+		 padding: 30rpx;
+	}
+	.order_info_line_wrapper {
+		display: flex;
+		align-items: center;
+		font-weight: normal;
+		font-size: 26rpx;
+		color: #666666;
+		line-height: 50rpx;
+		margin-top: 10rpx;
+	}
+	.order_info_label_wrapper {
+		color: #9E9E9F;
+	}
+	.order_info_value_wrapper {
+		color: #3E3A39;
+	}
+</style>
+ 
diff --git a/h5/pages/main/tj/tjxq(旧).vue b/h5/pages/main/tj/tjxq(旧).vue
new file mode 100644
index 0000000..15202ab
--- /dev/null
+++ b/h5/pages/main/tj/tjxq(旧).vue
@@ -0,0 +1,558 @@
+<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";
+	const $store = useStore();
+
+	// groupId
+
+	let comboInfo = ref({}); // 套餐详情
+	let selectIds = ref([]); // 选中自选ID
+	let wj = ref(""); //
+	let itemsInfo = ref({}); // 自选项目详情
+	let comboId = ref(""); // 套餐id
+	let personId = ref(""); // 患者id
+	let groupId = ref(""); // 团检id
+	let tabIndex = ref(-1); // 标签索引
+	let totalPrice = ref(0); // 总折扣价格
+	let groupInfo = ref({}); // 团检信息
+	let status = ref(0); // 1个检套餐 2个检自选 3团检套餐 4团检自选
+	let buyText = ref("立即购买"); // 购买按钮文字
+	let notice = ref({}); // 体检须知
+	let losePrice = ref(0); // 剩余金额
+	let popupTip = ref(null); // 剩余额度提示弹窗
+
+	const GetReadmeDetails = async () => {
+		const response = await $api("GetReadme");
+		$response(response, () => {
+			notice.value = response.data || false;
+			if (tabIndex.value == 0) {
+				let num = 5;
+				buyText.value = "0" + num;
+				tabIndex.value = 1;
+				let timer = setInterval(() => {
+					num--;
+					buyText.value = "0" + num;
+					if (num == 0) {
+						buyText.value = "立即购买";
+						clearInterval(timer);
+					}
+				}, 1000);
+				return;
+			}
+			uni.hideLoading();
+		});
+	};
+
+	const $props = defineProps({
+		comboId: {
+			type: String,
+			default: "",
+		},
+		personId: {
+			type: String,
+			default: "",
+		},
+		groupId: {
+			type: String,
+			default: "",
+		},
+		itemIds: {
+			type: String,
+			default: "",
+		},
+		wj: {
+			type: String,
+			default: "",
+		},
+	});
+
+	const mountedAction = async () => {
+		selectIds.value = $props.itemIds ? $props.itemIds.split(",") : [];
+		wj.value = $props.wj || "";
+		comboId.value = $props.comboId || "";
+		personId.value = $store.getUser().person_id || "";
+		groupId.value = $props.groupId || "";
+		// 团检空项目 - 套餐列表 - 套餐详情 - 自选 - 弹剩余额度提醒 - 团检详情
+		//   ｜
+		//   自选   - 弹推荐套餐/剩余额度提醒 - 团检详情
+
+		// 团检有项目 - 团检详情 - 自选 - 团检详情
+
+		// comboId && person_id
+		// 个检 - 套餐列表 - 套餐详情 - 自选 - 个检详情
+		//  ｜
+		// 自选 - 弹推荐套餐 - 个检详情
+
+		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团检自选");
+		uni.showLoading({
+			title: "加载中",
+		});
+		getBuyInfo(); // 获取购买信息
+	};
+
+	const buy = () => {
+		
+		if (tabIndex.value == 0) {
+			if (losePrice.value > 0 && groupId.value.length>0) {
+			  popupTip.value.open("center"); // 弹剩余额度提醒
+			  return;
+			}
+			GetReadmeDetails();
+		}
+		if (tabIndex.value == 1 && buyText.value == "立即购买") {
+			$store.setBuyInfo({
+				combo_id: comboId.value,
+				person_id: personId.value,
+				group_id: groupId.value,
+				item_ids: selectIds.value,
+				hospital: $store.save_info.hospital,
+				duo_xuan_yi: $store.getDuoXuanYi(),
+				wj: wj.value,
+			});
+			if (!!$store.yytjInfo.doctor_name) {
+				$store.setYytjInfo({
+					doctor_name: $store.yytjInfo.doctor_name,
+					doctor_date: $store.yytjInfo.doctor_date,
+					doctor_id:$store.yytjInfo.doctor_id
+				});
+			} else {
+				$store.setYytjInfo({});
+			}
+			uni.setStorageSync("yytjInfoS", {});
+			uni.navigateTo({
+				url: "/pages/main/tjyy/tjyy",
+			});
+		}
+	};
+
+	const getBuyInfo = async () => {
+		// 获取购买信息
+		let obj = {
+			item_ids: selectIds.value,
+			combo_id: comboId.value,
+			hospital: $store.save_info.hospital,
+			person_id: personId.value,
+			group_id: groupId.value,
+			duo_xuan_yi: $store.getDuoXuanYi(),
+			wj: wj.value,
+		};
+		const response = await $api("BuyInfo", obj);
+		$response(response, () => {
+			uni.hideLoading();
+			if (groupId.value && response.data.group_info.length) {
+				// 团检
+				groupInfo.value = response.data.group_info[0];
+				if (response.data.group_info[0].items?.length) {
+					status.value = 3;
+				}
+				if(groupInfo.value.items?.length){
+					groupInfo.value.itemscount=0;
+					let itemscount=0
+					groupInfo.value.items.forEach((v,i)=>{
+						if(v.keshi_name!="材料费")
+						itemscount=itemscount+v.children.length
+					})
+					groupInfo.value.itemscount=itemscount
+				}
+			}
+			losePrice.value = response.data.lose_price;
+			comboInfo.value = response.data.combo_info;
+			itemsInfo.value = response.data.items_info;
+			if(itemsInfo.value.items?.length){
+				itemsInfo.value.itemscount=0;
+				let itemscount=0
+				itemsInfo.value.items.forEach((v,i)=>{
+					if(v.keshi_name!="材料费")
+					itemscount=itemscount+v.children.length
+				})
+				itemsInfo.value.itemscount=itemscount
+			}
+			totalPrice.value = response.data.true_price;
+			tabIndex.value = 0;
+			
+		});
+	};
+
+	const addCombo = () => {
+		// 增加项目
+		let itemIds = $props.itemIds ? $props.itemIds : "";
+		let query = "?comboId=" + comboId.value + "&itemIds=" + itemIds;
+		if (groupId.value) {
+			query += "&groupId=" + groupId.value;
+		}
+		if($props.wj){
+			query +="&wj="+$props.wj
+		}
+		uni.navigateTo({
+			url: "/pages/main/tj/tjzx?" + query,
+		});
+	};
+
+	const config_ref = ref(null);
+	const configRef = (e) => {
+		if (!config_ref.value) {
+			config_ref.value = e;
+			mountedAction();
+		}
+	};
+    const toreadme=()=>{
+		GetReadmeDetails();
+		 popupTip.value.close()
+	}
+	onShow(() => {
+		if (!!config_ref.value) {
+			mountedAction();
+		}
+	});
+</script>
+<template>
+	<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="toreadme()"
+	        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>
+	<DraggableButton />
+	<view>
+		<view v-if="!!$store.config">
+			<view :ref="configRef"></view>
+		</view>
+	</view>
+
+	<view class="px-30rpx box-border comboInfo">
+		<view class="pt-35rpx rounded-15rpx px-10rpx bg-#fff pb-30rpx box-border b-0 b-t-1 b-solid b-#E1ECEE">
+			<view class="flex w-full" v-if="status == 1">
+				<!-- 1个检套餐 显示套餐信息 -->
+				<image v-if="comboInfo.img" :src="$image(comboInfo.img)" class="w-190rpx h-190rpx mr-37rpx" mode="widthFix" />
+				<view class="flex flex-col grow">
+					<text>{{ comboInfo.combo_name }}</text>
+					<view class="mt-13rpx mb-18rpx">
+						<uni-tag v-for="(val, i) in comboInfo.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 v-if="comboInfo.tags2?.length">
+						<text v-for="(val, i) in comboInfo.tags2" :key="i"
+							class="text-#8B8B8B text-20rpx line-height-[1] px-5rpx b-0 b-solid b-#8B8B8B"
+							:class="i == comboInfo.tags2?.length - 1 ? 'b-r-0' : 'b-r-2'">{{ 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">{{
+              comboInfo.price
+            }}</text>
+						<text class="text-18rpx text-#878787 line-through">{{
+              comboInfo.original_price
+            }}</text>
+						<text class="text-18rpx text-#878787 ml-auto mr-55rpx">已售{{ comboInfo.sale_count }}</text>
+					</view>
+				</view>
+			</view>
+			<view v-if="status == 1" class="mt-25rpx pt-25rpx b-0 b-t-1 b-solid b-#E1ECEE bettween flex-col text-24rpx">
+				<!-- 1个检套餐显示 -->
+				<view>
+					<text class="text-#8B8B8B">适用人群：</text>
+					<text class="text-#0E0E0E">{{ comboInfo.crowd_name }}</text>
+				</view>
+				<view>
+					<text class="text-#8B8B8B">适用院区：</text>
+					<text class="text-#0E0E0E">{{ comboInfo.hospital_name }}</text>
+				</view>
+			</view>
+			<view v-if="status != 1" class="px-15rpx pt-10rpx">
+				<!-- 2个检自选 和 3团检套餐 4团检自选 都要显示头像和名字 -->
+				<view class="flex items-center">
+					<image src="@/static/assets/userm.png" class="w-70rpx h-70rpx mr-35rpx" />
+					<view class="flex items-center grow">
+						<text class="text-#707070 text-24rpx">您好，</text>
+						<text class="text-#0E0E0E text-32rpx">{{
+              groupId ? groupInfo.name : $store.getUser().name
+            }}</text>
+					</view>
+				</view>
+				<view v-if="status != 2" class="text-24rpx mt-40rpx">
+					<!-- 3团检套餐 4团检自选 都要显示单位部门等信息 -->
+					<view class="pb-30rpx">
+						<text class="text-#8B8B8B">单位名称：</text>
+						<text>{{ groupInfo.group_name }}</text>
+					</view>
+					<view class="pb-30rpx">
+						<text class="text-#8B8B8B">部门名称：</text>
+						<text>{{ groupInfo.bumen_name }}</text>
+					</view>
+					<view class="pb-30rpx" v-if="groupInfo.combo_name || comboInfo?.combo_name">
+						<text class="text-#8B8B8B">套餐名称：</text>
+						<text>{{ groupInfo.combo_name || comboInfo?.combo_name }}</text>
+					</view>
+					<view>
+						<text class="text-#8B8B8B">体检额度：</text>
+						<text>{{ groupInfo.tongshou_xiane }}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="pb-300rpx">
+			<view class="flex items-center justify-around px-30rpx mt-30rpx">
+				<text v-if="status == 1 || status == 3" @click="tabIndex = 0" :class="tabIndex == 0 ? 'active' : ''"
+					class="text-30rpx text-#2E2E2E">套餐内容</text>
+				<text v-else @click="tabIndex = 0" :class="tabIndex == 0 ? 'active' : ''"
+					class="text-30rpx text-#2E2E2E">自选内容</text>
+				<text @click="GetReadmeDetails" :class="tabIndex == 1 ? 'active' : ''"
+					class="text-30rpx text-#2E2E2E">体检须知</text>
+			</view>
+			<view v-if="tabIndex == 0" class="mt-20rpx bg-#fff py-40rpx px-14rpx box-border flex-col flex">
+				<!-- 套餐内容 -->
+				<view v-if="comboInfo?.items?.length" class="mb-20rpx">
+					<!-- 套餐项目 -->
+					<view class="text-#2E2E2E text-30rpx center mb-20rpx">套餐项目（{{ comboInfo?.tags[0]?.text }}）</view>
+					<view class="flex h-67rpx bg-#239ea3 text-#fff text-26rpx rounded-10rpx">
+						<view class="min-w-155rpx max-w-155rpx center b-0 b-r-4 b-solid b-#fff">检查项目</view>
+						<view class="grow center">检查指标意义</view>
+					</view>
+					<view v-for="(val, index) in comboInfo?.items" :key="index">
+						<view v-if="val.keshi_name != '材料费'">
+							<view class="flex h-55rpx bg-#9f9f9f text-#fff text-24rpx rounded-10rpx mt-10rpx">
+								<view class="min-w-155rpx max-w-155rpx center b-0 b-r-4 b-solid b-#fff"></view>
+								<view class="grow center">{{ val.keshi_name }}（{{ val.children.length }}）</view>
+							</view>
+							<view class="flex bg-#efefef text-#000 text-24rpx rounded-10rpx mt-10rpx" v-for="(v, i) in val.children"
+								:key="i">
+								<view
+									class="min-w-155rpx break-all max-w-155rpx center b-0 b-r-4 b-solid b-#fff p-10rpx box-border text-center">
+									{{ v.name }}
+								</view>
+								<view class="grow center p-10rpx box-border">{{
+                  v.desc || "-"
+                }}</view>
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<!-- 团检内自带的项目 -->
+				<view v-if="groupInfo?.items?.length" class="mb-20rpx">
+					<!-- 套餐 -->
+					<view class="text-#2E2E2E text-30rpx center mb-20rpx">套餐项目（{{ groupInfo.itemscount }}项）</view>
+					<view class="flex h-67rpx bg-#239ea3 text-#fff text-26rpx rounded-10rpx">
+						<view class="min-w-155rpx max-w-155rpx center b-0 b-r-4 b-solid b-#fff">检查项目</view>
+						<view class="grow center">检查指标意义</view>
+					</view>
+					<view v-for="(val, index) in groupInfo?.items" :key="index">
+						<view v-if="val.keshi_name != '材料费'">
+							<view class="flex h-55rpx bg-#9f9f9f text-#fff text-24rpx rounded-10rpx mt-10rpx">
+								<view class="min-w-155rpx max-w-155rpx center b-0 b-r-4 b-solid b-#fff"></view>
+								<view class="grow center">{{ val.keshi_name }}（{{ val.children.length }}）</view>
+							</view>
+							<view class="flex bg-#efefef text-#000 text-24rpx rounded-10rpx mt-10rpx" v-for="(v, i) in val.children"
+								:key="i">
+								<view
+									class="min-w-155rpx break-all max-w-155rpx center b-0 b-r-4 b-solid b-#fff p-10rpx box-border text-center">
+									{{ v.name }}
+								</view>
+								<view class="grow center p-10rpx box-border">{{
+                  v.desc || "-"
+                }}</view>
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<view v-if="itemsInfo.items?.length">
+					<!-- 自选 -->
+					<view class="text-#2E2E2E text-30rpx center mb-20rpx">自选项目（{{ itemsInfo.itemscount }}项）</view>
+					<view class="flex h-67rpx bg-#239ea3 text-#fff text-26rpx rounded-10rpx">
+						<view class="min-w-155rpx max-w-155rpx center b-0 b-r-4 b-solid b-#fff">检查项目</view>
+						<view class="grow center">检查指标意义</view>
+					</view>
+					<view v-for="(val, index) in itemsInfo.items" :key="index">
+						<view v-if="val.keshi_name != '材料费'">
+							<view class="flex h-55rpx bg-#9f9f9f text-#fff text-24rpx rounded-10rpx mt-10rpx">
+								<view class="min-w-155rpx max-w-155rpx center b-0 b-r-4 b-solid b-#fff"></view>
+								<view class="grow center">{{ val.keshi_name }}（{{ val.children.length }}）</view>
+							</view>
+							<view class="flex bg-#efefef text-#000 text-24rpx rounded-10rpx mt-10rpx" v-for="(v, i) in val.children"
+								:key="i">
+								<view
+									class="min-w-155rpx break-all max-w-155rpx center b-0 b-r-4 b-solid b-#fff p-10rpx box-border text-center">
+									{{ v.name }}
+								</view>
+								<view class="grow center p-10rpx box-border">{{ v.desc || "-" }}</view>
+							</view>
+						</view>
+
+					</view>
+				</view>
+			</view>
+			<view v-if="tabIndex == 1">
+				<!-- 体检须知 -->
+				<view style="box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(0, 0, 0, 0.04)"
+					class="rounded-15rpx mt-20rpx bg-#fff py-40rpx px-30rpx box-border flex-col flex">
+					<view class="text-#2E2E2E text-30rpx font-500 text-center">
+						体检须知
+					</view>
+					<view class="text-30rpx text-#2E2E2E">
+						<image class="w-5rpx h-26rpx" src="@/static/assets/slices/tjcol2x.png"></image>
+						体检须知
+					</view>
+
+					<view class="flex flex-justify-around text-#111111 text-28rpx pt-24rpx pb-50rpx">
+						<view class="flex flex-col flex-items-center">
+							<image class="w-80rpx h-80rpx" src="@/static/assets/slices/xgtc.png"></image>
+							选购套餐
+						</view>
+						<view class="pt-25rpx">
+							<image class="w-30rpx h-30rpx" src="@/static/assets/slices/lt.png"></image>
+						</view>
+						<view class="flex flex-col flex-items-center">
+							<image class="w-80rpx h-80rpx" src="@/static/assets/slices/yytj.png"></image>
+							预约体检
+						</view>
+						<view class="pt-25rpx">
+							<image class="w-30rpx h-30rpx" src="@/static/assets/slices/lt.png"></image>
+						</view>
+						<view class="flex flex-col flex-items-center">
+							<image class="w-80rpx h-80rpx" src="@/static/assets/slices/qwty.png"></image>
+							前往体检
+						</view>
+						<view class="pt-25rpx">
+							<image class="w-30rpx h-30rpx" src="@/static/assets/slices/lt.png"></image>
+						</view>
+						<view class="flex flex-col flex-items-center">
+							<image class="w-80rpx h-80rpx" src="@/static/assets/slices/lqbg.png"></image>
+							领取报告
+						</view>
+					</view>
+					<view class="pb-40rpx text-30rpx text-#2E2E2E">
+						<image class="w-5rpx h-26rpx" src="@/static/assets/slices/tjcol2x.png"></image>
+						体检注意事项
+					</view>
+					<view v-html="notice.content" class="text-28rpx" style="line-height: 50rpx;"></view>
+				</view>
+			</view>
+		</view>
+		<view class="fixed bottom-0 left-0 w-full bg-#fff p-30rpx box-border between">
+			<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 ml-56rpx">¥ {{ comboInfo.price }}</text>
+				</view>
+				<view class="flex items-end">
+					<text class="text-18rpx text-#878787">自选项目价格</text>
+					<text class="text-21rpx text-#ED6907 mx-20rpx">¥ {{ itemsInfo.price || 0 }}</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
+          }}</text>
+				</view>
+			</view>
+			<view class="flex">
+				<button @click="addCombo()" class="bg-#ED6907 text-30rpx text-#fff rounded-l-full px-34rpx w-200rpx h-full">
+					增加项目
+				</button>
+				<button @click="buy()" class="bg-#239EA3 text-30rpx text-#fff rounded-r-full px-34rpx w-200rpx h-full">
+					{{ buyText }}
+				</button>
+			</view>
+		</view>
+	</view>
+</template>
+<style scoped lang="scss">
+	.comboInfo {
+		position: relative;
+		z-index: 1;
+
+		&::after {
+			content: "";
+			width: 100%;
+			height: 50rpx;
+			background-color: #239ea3;
+			position: absolute;
+			left: 0;
+			top: 0;
+			z-index: -1;
+		}
+
+		.active {
+			color: #239ea3;
+			font-weight: bold;
+			position: relative;
+
+			&::after {
+				content: "";
+				width: 26rpx;
+				height: 3rpx;
+				background-color: #239ea3;
+				position: absolute;
+				left: 50%;
+				bottom: -10rpx;
+				transform: translateX(-50%);
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/h5/pages/main/tj/tjxq.vue b/h5/pages/main/tj/tjxq.vue
index 15202ab..6a75aab 100644
--- a/h5/pages/main/tj/tjxq.vue
+++ b/h5/pages/main/tj/tjxq.vue
@@ -31,6 +31,7 @@
 	let personId = ref(""); // 患者id
 	let groupId = ref(""); // 团检id
 	let tabIndex = ref(-1); // 标签索引
+	let total_original_price=ref(0);
 	let totalPrice = ref(0); // 总折扣价格
 	let groupInfo = ref({}); // 团检信息
 	let status = ref(0); // 1个检套餐 2个检自选 3团检套餐 4团检自选
@@ -38,6 +39,9 @@
 	let notice = ref({}); // 体检须知
 	let losePrice = ref(0); // 剩余金额
 	let popupTip = ref(null); // 剩余额度提示弹窗
+	let contentInfo=ref([])//详情信息
+	let active_keshi=ref([]);
+	let popupXuZhi=ref(null);
 
 	const GetReadmeDetails = async () => {
 		const response = await $api("GetReadme");
@@ -83,7 +87,13 @@
 			default: "",
 		},
 	});
-
+    const opendDetail=(index)=>{
+		if(active_keshi.value.indexOf(index)!== -1){
+			active_keshi.value.splice(active_keshi.value.indexOf(index), 1);
+		}else{
+			active_keshi.value.push(index)
+		}
+	}
 	const mountedAction = async () => {
 		selectIds.value = $props.itemIds ? $props.itemIds.split(",") : [];
 		wj.value = $props.wj || "";
@@ -125,16 +135,17 @@
 		getBuyInfo(); // 获取购买信息
 	};
 
-	const buy = () => {
+	const buy = async (step=0) => {
 		
-		if (tabIndex.value == 0) {
+		if (step == 1) {
 			if (losePrice.value > 0 && groupId.value.length>0) {
 			  popupTip.value.open("center"); // 弹剩余额度提醒
 			  return;
 			}
-			GetReadmeDetails();
+			await GetReadmeDetails();
+			popupXuZhi.value.open();
 		}
-		if (tabIndex.value == 1 && buyText.value == "立即购买") {
+		if (step == 2) {
 			$store.setBuyInfo({
 				combo_id: comboId.value,
 				person_id: personId.value,
@@ -181,6 +192,7 @@
 					status.value = 3;
 				}
 				if(groupInfo.value.items?.length){
+					contentInfo.value.push(groupInfo.value.items) 
 					groupInfo.value.itemscount=0;
 					let itemscount=0
 					groupInfo.value.items.forEach((v,i)=>{
@@ -192,8 +204,12 @@
 			}
 			losePrice.value = response.data.lose_price;
 			comboInfo.value = response.data.combo_info;
+			if(comboInfo.value.items?.length){
+				contentInfo.value.push(comboInfo.value.items)
+			}
 			itemsInfo.value = response.data.items_info;
 			if(itemsInfo.value.items?.length){
+				contentInfo.value.push(itemsInfo.value.items)
 				itemsInfo.value.itemscount=0;
 				let itemscount=0
 				itemsInfo.value.items.forEach((v,i)=>{
@@ -203,8 +219,10 @@
 				itemsInfo.value.itemscount=itemscount
 			}
 			totalPrice.value = response.data.true_price;
+			total_original_price.value=response.data.original_price
 			tabIndex.value = 0;
-			
+			contentInfo.value=contentInfo.value.flat()
+			 
 		});
 	};
 
@@ -274,55 +292,17 @@
 			<view :ref="configRef"></view>
 		</view>
 	</view>
-
+    <view v-if="[1,2].indexOf(status) !== -1">
+    	<!-- 1个检套餐 显示套餐信息 -->
+    	 <view  class="combo_name_row" >
+    	 	<text  v-if="status==2"> 项目自选 </text>
+    		<text  v-if="status==1">{{ comboInfo.combo_name }}</text> 
+    	 </view>
+    </view>
 	<view class="px-30rpx box-border comboInfo">
-		<view class="pt-35rpx rounded-15rpx px-10rpx bg-#fff pb-30rpx box-border b-0 b-t-1 b-solid b-#E1ECEE">
-			<view class="flex w-full" v-if="status == 1">
-				<!-- 1个检套餐 显示套餐信息 -->
-				<image v-if="comboInfo.img" :src="$image(comboInfo.img)" class="w-190rpx h-190rpx mr-37rpx" mode="widthFix" />
-				<view class="flex flex-col grow">
-					<text>{{ comboInfo.combo_name }}</text>
-					<view class="mt-13rpx mb-18rpx">
-						<uni-tag v-for="(val, i) in comboInfo.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 v-if="comboInfo.tags2?.length">
-						<text v-for="(val, i) in comboInfo.tags2" :key="i"
-							class="text-#8B8B8B text-20rpx line-height-[1] px-5rpx b-0 b-solid b-#8B8B8B"
-							:class="i == comboInfo.tags2?.length - 1 ? 'b-r-0' : 'b-r-2'">{{ 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">{{
-              comboInfo.price
-            }}</text>
-						<text class="text-18rpx text-#878787 line-through">{{
-              comboInfo.original_price
-            }}</text>
-						<text class="text-18rpx text-#878787 ml-auto mr-55rpx">已售{{ comboInfo.sale_count }}</text>
-					</view>
-				</view>
-			</view>
-			<view v-if="status == 1" class="mt-25rpx pt-25rpx b-0 b-t-1 b-solid b-#E1ECEE bettween flex-col text-24rpx">
-				<!-- 1个检套餐显示 -->
-				<view>
-					<text class="text-#8B8B8B">适用人群：</text>
-					<text class="text-#0E0E0E">{{ comboInfo.crowd_name }}</text>
-				</view>
-				<view>
-					<text class="text-#8B8B8B">适用院区：</text>
-					<text class="text-#0E0E0E">{{ comboInfo.hospital_name }}</text>
-				</view>
-			</view>
-			<view v-if="status != 1" class="px-15rpx pt-10rpx">
+		<view v-if="status != 1 && status!=2" class="pt-35rpx rounded-15rpx px-10rpx bg-#fff pb-30rpx box-border b-0 b-t-1 b-solid b-#E1ECEE">
+			
+			<view  class="px-15rpx pt-10rpx">
 				<!-- 2个检自选 和 3团检套餐 4团检自选 都要显示头像和名字 -->
 				<view class="flex items-center">
 					<image src="@/static/assets/userm.png" class="w-70rpx h-70rpx mr-35rpx" />
@@ -354,169 +334,119 @@
 				</view>
 			</view>
 		</view>
-		<view class="pb-300rpx">
-			<view class="flex items-center justify-around px-30rpx mt-30rpx">
-				<text v-if="status == 1 || status == 3" @click="tabIndex = 0" :class="tabIndex == 0 ? 'active' : ''"
-					class="text-30rpx text-#2E2E2E">套餐内容</text>
-				<text v-else @click="tabIndex = 0" :class="tabIndex == 0 ? 'active' : ''"
-					class="text-30rpx text-#2E2E2E">自选内容</text>
-				<text @click="GetReadmeDetails" :class="tabIndex == 1 ? 'active' : ''"
-					class="text-30rpx text-#2E2E2E">体检须知</text>
+		<view class="pb-150rpx">
+			<view class="flex items-center justify-around px-30rpx pl-150rpx pt-30rpx">
+				<view>
+					<text class="text-30rpx text-#2E2E2E">套餐项目</text>
+					<span v-if="status==1 && JSON.stringify(comboInfo) !== '{}'" class="combo_tag_wrapper" >{{ comboInfo?.tags[0]?.text }}</span> 
+					<span v-if="status==2"  class="combo_tag_wrapper">{{ itemsInfo?.itemscount }}</span> 
+				</view>
+				
 			</view>
-			<view v-if="tabIndex == 0" class="mt-20rpx bg-#fff py-40rpx px-14rpx box-border flex-col flex">
+			<view  class="mt--10rpx bg-#fff py-40rpx px-14rpx box-border flex-col flex">
 				<!-- 套餐内容 -->
-				<view v-if="comboInfo?.items?.length" class="mb-20rpx">
+				<view v-if="contentInfo.length>0" class="mb-20rpx">
 					<!-- 套餐项目 -->
-					<view class="text-#2E2E2E text-30rpx center mb-20rpx">套餐项目（{{ comboInfo?.tags[0]?.text }}）</view>
-					<view class="flex h-67rpx bg-#239ea3 text-#fff text-26rpx rounded-10rpx">
-						<view class="min-w-155rpx max-w-155rpx center b-0 b-r-4 b-solid b-#fff">检查项目</view>
-						<view class="grow center">检查指标意义</view>
+					 
+					<view class="flex h-58rpx bg-#239ea3 mb-26rpx text-#fff text-26rpx rounded-10rpx">
+						<view class="min-w-220rpx max-w-220rpx keshi_name_k">体检流程</view>
+						<view class="grow center">检查项目</view>
 					</view>
-					<view v-for="(val, index) in comboInfo?.items" :key="index">
+					<view v-for="(val, index) in contentInfo" :key="index">
 						<view v-if="val.keshi_name != '材料费'">
-							<view class="flex h-55rpx bg-#9f9f9f text-#fff text-24rpx rounded-10rpx mt-10rpx">
-								<view class="min-w-155rpx max-w-155rpx center b-0 b-r-4 b-solid b-#fff"></view>
-								<view class="grow center">{{ val.keshi_name }}（{{ val.children.length }}）</view>
+							<view class="flex h-58rpx bg-#E6F5F6 text-#333 text-27rpx rounded-10rpx mt-10rpx">
+								<view class="min-w-250rpx max-w-250rpx keshi_name_k ">{{index+1}}.{{ val.keshi_name }}</view>
+								<view class="grow center">{{ val.children.length }}个项目</view>
+								<view class="grow center xiangqingbutton" @click="opendDetail(index)">查看详情<span style="font-size: 12rpx;">>></span></view>
 							</view>
-							<view class="flex bg-#efefef text-#000 text-24rpx rounded-10rpx mt-10rpx" v-for="(v, i) in val.children"
-								:key="i">
-								<view
-									class="min-w-155rpx break-all max-w-155rpx center b-0 b-r-4 b-solid b-#fff p-10rpx box-border text-center">
-									{{ v.name }}
+							<view v-if="active_keshi.indexOf(index)!== -1">
+								<view class="xian mt-10rpx "></view>
+								<view class="  bg-#FBFBFB text-#000 text-24rpx rounded-10rpx p-20rpx little_item_k " v-for="(v, i) in val.children"
+									:key="i">
+									<view style="display: flex; align-items: center;">
+										<view class="break-all   box-border ">
+											{{ v.name }}
+										</view>
+										<view class="wenhao">?</view>
+									</view>
+									
+									<view class="grow text-20rpx text-#E95513 mt-10rpx   box-border">{{ v.desc || "-" }}</view>
 								</view>
-								<view class="grow center p-10rpx box-border">{{
-                  v.desc || "-"
-                }}</view>
 							</view>
+							
 						</view>
 					</view>
 				</view>
 
-				<!-- 团检内自带的项目 -->
-				<view v-if="groupInfo?.items?.length" class="mb-20rpx">
-					<!-- 套餐 -->
-					<view class="text-#2E2E2E text-30rpx center mb-20rpx">套餐项目（{{ groupInfo.itemscount }}项）</view>
-					<view class="flex h-67rpx bg-#239ea3 text-#fff text-26rpx rounded-10rpx">
-						<view class="min-w-155rpx max-w-155rpx center b-0 b-r-4 b-solid b-#fff">检查项目</view>
-						<view class="grow center">检查指标意义</view>
-					</view>
-					<view v-for="(val, index) in groupInfo?.items" :key="index">
-						<view v-if="val.keshi_name != '材料费'">
-							<view class="flex h-55rpx bg-#9f9f9f text-#fff text-24rpx rounded-10rpx mt-10rpx">
-								<view class="min-w-155rpx max-w-155rpx center b-0 b-r-4 b-solid b-#fff"></view>
-								<view class="grow center">{{ val.keshi_name }}（{{ val.children.length }}）</view>
+ 
+			</view>
+			<uni-popup ref="popupXuZhi">
+				<view class="tishi_main">
+					<!-- 体检须知 -->
+					 
+						<view class="text-#2E2E2E text-30rpx font-900 text-center">
+							体检须知
+						</view>
+						<view class="text-28rpx text-#2E2E2E">
+							<image class="w-5rpx h-26rpx" src="@/static/assets/slices/tjcol2x.png"></image>
+							体检须知
+						</view>
+				
+						<view class="flex flex-justify-around text-#111111 text-28rpx pt-24rpx pb-50rpx">
+							<view class="flex flex-col flex-items-center">
+								<image class="w-80rpx h-80rpx" src="@/static/assets/slices/xgtc.png"></image>
+								选购套餐
 							</view>
-							<view class="flex bg-#efefef text-#000 text-24rpx rounded-10rpx mt-10rpx" v-for="(v, i) in val.children"
-								:key="i">
-								<view
-									class="min-w-155rpx break-all max-w-155rpx center b-0 b-r-4 b-solid b-#fff p-10rpx box-border text-center">
-									{{ v.name }}
-								</view>
-								<view class="grow center p-10rpx box-border">{{
-                  v.desc || "-"
-                }}</view>
+							<view class="pt-25rpx">
+								<image class="w-30rpx h-30rpx" src="@/static/assets/slices/lt.png"></image>
 							</view>
-						</view>
-					</view>
-				</view>
-
-				<view v-if="itemsInfo.items?.length">
-					<!-- 自选 -->
-					<view class="text-#2E2E2E text-30rpx center mb-20rpx">自选项目（{{ itemsInfo.itemscount }}项）</view>
-					<view class="flex h-67rpx bg-#239ea3 text-#fff text-26rpx rounded-10rpx">
-						<view class="min-w-155rpx max-w-155rpx center b-0 b-r-4 b-solid b-#fff">检查项目</view>
-						<view class="grow center">检查指标意义</view>
-					</view>
-					<view v-for="(val, index) in itemsInfo.items" :key="index">
-						<view v-if="val.keshi_name != '材料费'">
-							<view class="flex h-55rpx bg-#9f9f9f text-#fff text-24rpx rounded-10rpx mt-10rpx">
-								<view class="min-w-155rpx max-w-155rpx center b-0 b-r-4 b-solid b-#fff"></view>
-								<view class="grow center">{{ val.keshi_name }}（{{ val.children.length }}）</view>
+							<view class="flex flex-col flex-items-center">
+								<image class="w-80rpx h-80rpx" src="@/static/assets/slices/yytj.png"></image>
+								预约体检
 							</view>
-							<view class="flex bg-#efefef text-#000 text-24rpx rounded-10rpx mt-10rpx" v-for="(v, i) in val.children"
-								:key="i">
-								<view
-									class="min-w-155rpx break-all max-w-155rpx center b-0 b-r-4 b-solid b-#fff p-10rpx box-border text-center">
-									{{ v.name }}
-								</view>
-								<view class="grow center p-10rpx box-border">{{ v.desc || "-" }}</view>
+							<view class="pt-25rpx">
+								<image class="w-30rpx h-30rpx" src="@/static/assets/slices/lt.png"></image>
+							</view>
+							<view class="flex flex-col flex-items-center">
+								<image class="w-80rpx h-80rpx" src="@/static/assets/slices/qwty.png"></image>
+								前往体检
+							</view>
+							<view class="pt-25rpx">
+								<image class="w-30rpx h-30rpx" src="@/static/assets/slices/lt.png"></image>
+							</view>
+							<view class="flex flex-col flex-items-center">
+								<image class="w-80rpx h-80rpx" src="@/static/assets/slices/lqbg.png"></image>
+								领取报告
 							</view>
 						</view>
-
-					</view>
-				</view>
-			</view>
-			<view v-if="tabIndex == 1">
-				<!-- 体检须知 -->
-				<view style="box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(0, 0, 0, 0.04)"
-					class="rounded-15rpx mt-20rpx bg-#fff py-40rpx px-30rpx box-border flex-col flex">
-					<view class="text-#2E2E2E text-30rpx font-500 text-center">
-						体检须知
-					</view>
-					<view class="text-30rpx text-#2E2E2E">
-						<image class="w-5rpx h-26rpx" src="@/static/assets/slices/tjcol2x.png"></image>
-						体检须知
-					</view>
-
-					<view class="flex flex-justify-around text-#111111 text-28rpx pt-24rpx pb-50rpx">
-						<view class="flex flex-col flex-items-center">
-							<image class="w-80rpx h-80rpx" src="@/static/assets/slices/xgtc.png"></image>
-							选购套餐
-						</view>
-						<view class="pt-25rpx">
-							<image class="w-30rpx h-30rpx" src="@/static/assets/slices/lt.png"></image>
-						</view>
-						<view class="flex flex-col flex-items-center">
-							<image class="w-80rpx h-80rpx" src="@/static/assets/slices/yytj.png"></image>
-							预约体检
-						</view>
-						<view class="pt-25rpx">
-							<image class="w-30rpx h-30rpx" src="@/static/assets/slices/lt.png"></image>
-						</view>
-						<view class="flex flex-col flex-items-center">
-							<image class="w-80rpx h-80rpx" src="@/static/assets/slices/qwty.png"></image>
-							前往体检
-						</view>
-						<view class="pt-25rpx">
-							<image class="w-30rpx h-30rpx" src="@/static/assets/slices/lt.png"></image>
-						</view>
-						<view class="flex flex-col flex-items-center">
-							<image class="w-80rpx h-80rpx" src="@/static/assets/slices/lqbg.png"></image>
-							领取报告
+						<view class="pb-20rpx text-28rpx text-#2E2E2E">
+							<image class="w-5rpx h-26rpx" src="@/static/assets/slices/tjcol2x.png"></image>
+							体检注意事项
 						</view>
-					</view>
-					<view class="pb-40rpx text-30rpx text-#2E2E2E">
-						<image class="w-5rpx h-26rpx" src="@/static/assets/slices/tjcol2x.png"></image>
-						体检注意事项
-					</view>
-					<view v-html="notice.content" class="text-28rpx" style="line-height: 50rpx;"></view>
+						<view v-html="notice.content" class="text-20rpx" style="line-height: 40rpx;"></view>
+					 
+					<view class="tishi_button" @click="buy(2)"  >我已知晓</view>
 				</view>
-			</view>
+			</uni-popup>
+			
 		</view>
-		<view class="fixed bottom-0 left-0 w-full bg-#fff p-30rpx box-border between">
+		<view class="fixed bottom-0 h-150rpx left-0 w-full bg-gradient-to-r from-#02b4bd to-#ABD7D7 p-30rpx box-border between">
 			<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 ml-56rpx">¥ {{ comboInfo.price }}</text>
-				</view>
-				<view class="flex items-end">
-					<text class="text-18rpx text-#878787">自选项目价格</text>
-					<text class="text-21rpx text-#ED6907 mx-20rpx">¥ {{ itemsInfo.price || 0 }}</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">{{
+				<view class="flex items-end" v-if="comboId != 0"> 
+					<text class="original_price_wrapper">¥ {{ total_original_price }}</text>
+				</view> 
+				<view class="flex items-end"> 
+					<text class="text-42rpx text-#ED6907 mr-20rpx font-bold">¥{{
             totalPrice
           }}</text>
 				</view>
 			</view>
 			<view class="flex">
-				<button @click="addCombo()" class="bg-#ED6907 text-30rpx text-#fff rounded-l-full px-34rpx w-200rpx h-full">
+				<button @click="addCombo()" class="button bgcolor_huang">
 					增加项目
 				</button>
-				<button @click="buy()" class="bg-#239EA3 text-30rpx text-#fff rounded-r-full px-34rpx w-200rpx h-full">
-					{{ buyText }}
+				<button @click="buy(1)" class="button">
+					立即支付
 				</button>
 			</view>
 		</view>
@@ -526,17 +456,9 @@
 	.comboInfo {
 		position: relative;
 		z-index: 1;
-
-		&::after {
-			content: "";
-			width: 100%;
-			height: 50rpx;
-			background-color: #239ea3;
-			position: absolute;
-			left: 0;
-			top: 0;
-			z-index: -1;
-		}
+		background-color: #fff;
+        min-height: calc(100vh - 200rpx);
+	 
 
 		.active {
 			color: #239ea3;
@@ -555,4 +477,91 @@
 			}
 		}
 	}
+</style>
+<style scoped>
+	.combo_name_row{
+		text-align: center;
+		background-color: #EEF7F7;
+		color: #009FA8;
+		font-size: 28rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+	}
+	.keshi_name_k{
+		line-height: 58rpx;
+		padding-left: 30rpx;
+	}
+	.xian{
+		height: 6rpx;
+		border-radius: 6rpx;
+		background-color: #B0E0E2;
+	}
+	.combo_tag_wrapper {
+		padding-left: 13rpx;
+		padding-right: 13rpx;
+		height: 28rpx;
+		line-height: 28rpx;
+		border-radius: 5rpx;
+		font-weight: 900;
+		font-size: 18rpx;
+		color: #47abd8;
+		margin: 10rpx 8rpx 10rpx 10rpx;
+		border: 3rpx solid #009FA8;
+	}
+	.little_item_k{
+		border-bottom: 1px solid #ccc;
+	}
+	.wenhao{
+		height: 18rpx;
+		width: 18rpx;
+		background-color: #009FA8;
+		line-height: 18rpx;
+		border-radius: 18rpx;
+		color: #fff;
+		text-align: center;
+		font-size: 14rpx;
+		margin-left: 10rpx;
+	}
+	.xiangqingbutton{
+		color:#009FA8;
+		font-size: 17rpx;
+	}
+	.button {
+		color: #00828e;
+		background-color: #fff;
+		height: 58rpx;
+		line-height: 58rpx;
+		text-align: center;
+		width: 174rpx;
+		border-radius: 58rpx;
+		margin-right: 20rpx;
+		font-size: 29rpx;
+	}
+	.bgcolor_huang{
+		background-color: #FF6D00;
+		color: #fff;
+	}
+	.original_price_wrapper {
+		font-weight: bolder;
+		font-size: 18rpx;
+		color: #333;
+		line-height: 1;
+		text-decoration-line: line-through; 
+	}
+	.tishi_main{
+		background-color: #fff;
+		padding: 40rpx 50rpx;
+		width:600rpx;
+		border-radius: 40rpx;
+	}
+	.tishi_button{
+		width: 365rpx;
+		background-color: #009da5;
+		color:#fff;
+		text-align: center;
+		padding-top: 10rpx;
+		padding-bottom: 10rpx;
+		border-radius: 40rpx;
+		margin: 20rpx auto 10rpx auto;
+	}
 </style>
\ No newline at end of file
diff --git a/h5/pages/main/tj/tjxq_new.vue b/h5/pages/main/tj/tjxq_new.vue
deleted file mode 100644
index 730a301..0000000
--- a/h5/pages/main/tj/tjxq_new.vue
+++ /dev/null
@@ -1,567 +0,0 @@
-<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";
-	const $store = useStore();
-
-	// groupId
-
-	let comboInfo = ref({}); // 套餐详情
-	let selectIds = ref([]); // 选中自选ID
-	let wj = ref(""); //
-	let itemsInfo = ref({}); // 自选项目详情
-	let comboId = ref(""); // 套餐id
-	let personId = ref(""); // 患者id
-	let groupId = ref(""); // 团检id
-	let tabIndex = ref(-1); // 标签索引
-	let total_original_price=ref(0);
-	let totalPrice = ref(0); // 总折扣价格
-	let groupInfo = ref({}); // 团检信息
-	let status = ref(0); // 1个检套餐 2个检自选 3团检套餐 4团检自选
-	let buyText = ref("立即购买"); // 购买按钮文字
-	let notice = ref({}); // 体检须知
-	let losePrice = ref(0); // 剩余金额
-	let popupTip = ref(null); // 剩余额度提示弹窗
-	let contentInfo=ref([])//详情信息
-	let active_keshi=ref([]);
-	let popupXuZhi=ref(null);
-
-	const GetReadmeDetails = async () => {
-		const response = await $api("GetReadme");
-		$response(response, () => {
-			notice.value = response.data || false;
-			if (tabIndex.value == 0) {
-				let num = 5;
-				buyText.value = "0" + num;
-				tabIndex.value = 1;
-				let timer = setInterval(() => {
-					num--;
-					buyText.value = "0" + num;
-					if (num == 0) {
-						buyText.value = "立即购买";
-						clearInterval(timer);
-					}
-				}, 1000);
-				return;
-			}
-			uni.hideLoading();
-		});
-	};
-
-	const $props = defineProps({
-		comboId: {
-			type: String,
-			default: "",
-		},
-		personId: {
-			type: String,
-			default: "",
-		},
-		groupId: {
-			type: String,
-			default: "",
-		},
-		itemIds: {
-			type: String,
-			default: "",
-		},
-		wj: {
-			type: String,
-			default: "",
-		},
-	});
-    const opendDetail=(index)=>{
-		if(active_keshi.value.indexOf(index)!== -1){
-			active_keshi.value.splice(active_keshi.value.indexOf(index), 1);
-		}else{
-			active_keshi.value.push(index)
-		}
-	}
-	const mountedAction = async () => {
-		selectIds.value = $props.itemIds ? $props.itemIds.split(",") : [];
-		wj.value = $props.wj || "";
-		comboId.value = $props.comboId || "";
-		personId.value = $store.getUser().person_id || "";
-		groupId.value = $props.groupId || "";
-		// 团检空项目 - 套餐列表 - 套餐详情 - 自选 - 弹剩余额度提醒 - 团检详情
-		//   ｜
-		//   自选   - 弹推荐套餐/剩余额度提醒 - 团检详情
-
-		// 团检有项目 - 团检详情 - 自选 - 团检详情
-
-		// comboId && person_id
-		// 个检 - 套餐列表 - 套餐详情 - 自选 - 个检详情
-		//  ｜
-		// 自选 - 弹推荐套餐 - 个检详情
-
-		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团检自选");
-		uni.showLoading({
-			title: "加载中",
-		});
-		getBuyInfo(); // 获取购买信息
-	};
-
-	const buy = async (step=0) => {
-		
-		if (step == 1) {
-			if (losePrice.value > 0 && groupId.value.length>0) {
-			  popupTip.value.open("center"); // 弹剩余额度提醒
-			  return;
-			}
-			await GetReadmeDetails();
-			popupXuZhi.value.open();
-		}
-		if (step == 2) {
-			$store.setBuyInfo({
-				combo_id: comboId.value,
-				person_id: personId.value,
-				group_id: groupId.value,
-				item_ids: selectIds.value,
-				hospital: $store.save_info.hospital,
-				duo_xuan_yi: $store.getDuoXuanYi(),
-				wj: wj.value,
-			});
-			if (!!$store.yytjInfo.doctor_name) {
-				$store.setYytjInfo({
-					doctor_name: $store.yytjInfo.doctor_name,
-					doctor_date: $store.yytjInfo.doctor_date,
-					doctor_id:$store.yytjInfo.doctor_id
-				});
-			} else {
-				$store.setYytjInfo({});
-			}
-			uni.setStorageSync("yytjInfoS", {});
-			uni.navigateTo({
-				url: "/pages/main/tjyy/tjyy",
-			});
-		}
-	};
-
-	const getBuyInfo = async () => {
-		// 获取购买信息
-		let obj = {
-			item_ids: selectIds.value,
-			combo_id: comboId.value,
-			hospital: $store.save_info.hospital,
-			person_id: personId.value,
-			group_id: groupId.value,
-			duo_xuan_yi: $store.getDuoXuanYi(),
-			wj: wj.value,
-		};
-		const response = await $api("BuyInfo", obj);
-		$response(response, () => {
-			uni.hideLoading();
-			if (groupId.value && response.data.group_info.length) {
-				// 团检
-				groupInfo.value = response.data.group_info[0];
-				if (response.data.group_info[0].items?.length) {
-					status.value = 3;
-				}
-				if(groupInfo.value.items?.length){
-					contentInfo.value.push(groupInfo.value.items) 
-					groupInfo.value.itemscount=0;
-					let itemscount=0
-					groupInfo.value.items.forEach((v,i)=>{
-						if(v.keshi_name!="材料费")
-						itemscount=itemscount+v.children.length
-					})
-					groupInfo.value.itemscount=itemscount
-				}
-			}
-			losePrice.value = response.data.lose_price;
-			comboInfo.value = response.data.combo_info;
-			if(comboInfo.value.items?.length){
-				contentInfo.value.push(comboInfo.value.items)
-			}
-			itemsInfo.value = response.data.items_info;
-			if(itemsInfo.value.items?.length){
-				contentInfo.value.push(itemsInfo.value.items)
-				itemsInfo.value.itemscount=0;
-				let itemscount=0
-				itemsInfo.value.items.forEach((v,i)=>{
-					if(v.keshi_name!="材料费")
-					itemscount=itemscount+v.children.length
-				})
-				itemsInfo.value.itemscount=itemscount
-			}
-			totalPrice.value = response.data.true_price;
-			total_original_price.value=response.data.original_price
-			tabIndex.value = 0;
-			contentInfo.value=contentInfo.value.flat()
-			 
-		});
-	};
-
-	const addCombo = () => {
-		// 增加项目
-		let itemIds = $props.itemIds ? $props.itemIds : "";
-		let query = "?comboId=" + comboId.value + "&itemIds=" + itemIds;
-		if (groupId.value) {
-			query += "&groupId=" + groupId.value;
-		}
-		if($props.wj){
-			query +="&wj="+$props.wj
-		}
-		uni.navigateTo({
-			url: "/pages/main/tj/tjzx?" + query,
-		});
-	};
-
-	const config_ref = ref(null);
-	const configRef = (e) => {
-		if (!config_ref.value) {
-			config_ref.value = e;
-			mountedAction();
-		}
-	};
-    const toreadme=()=>{
-		GetReadmeDetails();
-		 popupTip.value.close()
-	}
-	onShow(() => {
-		if (!!config_ref.value) {
-			mountedAction();
-		}
-	});
-</script>
-<template>
-	<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="toreadme()"
-	        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>
-	<DraggableButton />
-	<view>
-		<view v-if="!!$store.config">
-			<view :ref="configRef"></view>
-		</view>
-	</view>
-    <view class="  " v-if="[1,2].indexOf(status) !== -1">
-    	<!-- 1个检套餐 显示套餐信息 -->
-    	 <view  class="combo_name_row" >
-    	 	<text  v-if="status==2"> 项目自选 </text>
-    		<text  v-if="status==1">{{ comboInfo.combo_name }}</text> 
-    	 </view>
-    </view>
-	<view class="px-30rpx box-border comboInfo">
-		<view v-if="status != 1 && status!=2" class="pt-35rpx rounded-15rpx px-10rpx bg-#fff pb-30rpx box-border b-0 b-t-1 b-solid b-#E1ECEE">
-			
-			<view  class="px-15rpx pt-10rpx">
-				<!-- 2个检自选 和 3团检套餐 4团检自选 都要显示头像和名字 -->
-				<view class="flex items-center">
-					<image src="@/static/assets/userm.png" class="w-70rpx h-70rpx mr-35rpx" />
-					<view class="flex items-center grow">
-						<text class="text-#707070 text-24rpx">您好，</text>
-						<text class="text-#0E0E0E text-32rpx">{{
-              groupId ? groupInfo.name : $store.getUser().name
-            }}</text>
-					</view>
-				</view>
-				<view v-if="status != 2" class="text-24rpx mt-40rpx">
-					<!-- 3团检套餐 4团检自选 都要显示单位部门等信息 -->
-					<view class="pb-30rpx">
-						<text class="text-#8B8B8B">单位名称：</text>
-						<text>{{ groupInfo.group_name }}</text>
-					</view>
-					<view class="pb-30rpx">
-						<text class="text-#8B8B8B">部门名称：</text>
-						<text>{{ groupInfo.bumen_name }}</text>
-					</view>
-					<view class="pb-30rpx" v-if="groupInfo.combo_name || comboInfo?.combo_name">
-						<text class="text-#8B8B8B">套餐名称：</text>
-						<text>{{ groupInfo.combo_name || comboInfo?.combo_name }}</text>
-					</view>
-					<view>
-						<text class="text-#8B8B8B">体检额度：</text>
-						<text>{{ groupInfo.tongshou_xiane }}</text>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="pb-150rpx">
-			<view class="flex items-center justify-around px-30rpx pl-150rpx pt-30rpx">
-				<view>
-					<text class="text-30rpx text-#2E2E2E">套餐项目</text>
-					<span v-if="status==1 && JSON.stringify(comboInfo) !== '{}'" class="combo_tag_wrapper" >{{ comboInfo?.tags[0]?.text }}</span> 
-					<span v-if="status==2"  class="combo_tag_wrapper">{{ itemsInfo?.itemscount }}</span> 
-				</view>
-				
-			</view>
-			<view  class="mt--10rpx bg-#fff py-40rpx px-14rpx box-border flex-col flex">
-				<!-- 套餐内容 -->
-				<view v-if="contentInfo.length>0" class="mb-20rpx">
-					<!-- 套餐项目 -->
-					 
-					<view class="flex h-58rpx bg-#239ea3 mb-26rpx text-#fff text-26rpx rounded-10rpx">
-						<view class="min-w-220rpx max-w-220rpx keshi_name_k">体检流程</view>
-						<view class="grow center">检查项目</view>
-					</view>
-					<view v-for="(val, index) in contentInfo" :key="index">
-						<view v-if="val.keshi_name != '材料费'">
-							<view class="flex h-58rpx bg-#E6F5F6 text-#333 text-27rpx rounded-10rpx mt-10rpx">
-								<view class="min-w-250rpx max-w-250rpx keshi_name_k ">{{index+1}}.{{ val.keshi_name }}</view>
-								<view class="grow center">{{ val.children.length }}个项目</view>
-								<view class="grow center xiangqingbutton" @click="opendDetail(index)">查看详情<span style="font-size: 12rpx;">>></span></view>
-							</view>
-							<view v-if="active_keshi.indexOf(index)!== -1">
-								<view class="xian mt-10rpx "></view>
-								<view class="  bg-#FBFBFB text-#000 text-24rpx rounded-10rpx p-20rpx little_item_k " v-for="(v, i) in val.children"
-									:key="i">
-									<view style="display: flex; align-items: center;">
-										<view class="break-all   box-border ">
-											{{ v.name }}
-										</view>
-										<view class="wenhao">?</view>
-									</view>
-									
-									<view class="grow text-20rpx text-#E95513 mt-10rpx   box-border">{{ v.desc || "-" }}</view>
-								</view>
-							</view>
-							
-						</view>
-					</view>
-				</view>
-
- 
-			</view>
-			<uni-popup ref="popupXuZhi">
-				<view class="tishi_main">
-					<!-- 体检须知 -->
-					 
-						<view class="text-#2E2E2E text-30rpx font-900 text-center">
-							体检须知
-						</view>
-						<view class="text-28rpx text-#2E2E2E">
-							<image class="w-5rpx h-26rpx" src="@/static/assets/slices/tjcol2x.png"></image>
-							体检须知
-						</view>
-				
-						<view class="flex flex-justify-around text-#111111 text-28rpx pt-24rpx pb-50rpx">
-							<view class="flex flex-col flex-items-center">
-								<image class="w-80rpx h-80rpx" src="@/static/assets/slices/xgtc.png"></image>
-								选购套餐
-							</view>
-							<view class="pt-25rpx">
-								<image class="w-30rpx h-30rpx" src="@/static/assets/slices/lt.png"></image>
-							</view>
-							<view class="flex flex-col flex-items-center">
-								<image class="w-80rpx h-80rpx" src="@/static/assets/slices/yytj.png"></image>
-								预约体检
-							</view>
-							<view class="pt-25rpx">
-								<image class="w-30rpx h-30rpx" src="@/static/assets/slices/lt.png"></image>
-							</view>
-							<view class="flex flex-col flex-items-center">
-								<image class="w-80rpx h-80rpx" src="@/static/assets/slices/qwty.png"></image>
-								前往体检
-							</view>
-							<view class="pt-25rpx">
-								<image class="w-30rpx h-30rpx" src="@/static/assets/slices/lt.png"></image>
-							</view>
-							<view class="flex flex-col flex-items-center">
-								<image class="w-80rpx h-80rpx" src="@/static/assets/slices/lqbg.png"></image>
-								领取报告
-							</view>
-						</view>
-						<view class="pb-20rpx text-28rpx text-#2E2E2E">
-							<image class="w-5rpx h-26rpx" src="@/static/assets/slices/tjcol2x.png"></image>
-							体检注意事项
-						</view>
-						<view v-html="notice.content" class="text-20rpx" style="line-height: 40rpx;"></view>
-					 
-					<view class="tishi_button" @click="buy(2)"  >我已知晓</view>
-				</view>
-			</uni-popup>
-			
-		</view>
-		<view class="fixed bottom-0 h-150rpx left-0 w-full bg-gradient-to-r from-#02b4bd to-#ABD7D7 p-30rpx box-border between">
-			<view class="grow">
-				<view class="flex items-end" v-if="comboId != 0"> 
-					<text class="original_price_wrapper">¥ {{ total_original_price }}</text>
-				</view> 
-				<view class="flex items-end"> 
-					<text class="text-42rpx text-#ED6907 mr-20rpx font-bold">¥{{
-            totalPrice
-          }}</text>
-				</view>
-			</view>
-			<view class="flex">
-				<button @click="addCombo()" class="button bgcolor_huang">
-					增加项目
-				</button>
-				<button @click="buy(1)" class="button">
-					立即支付
-				</button>
-			</view>
-		</view>
-	</view>
-</template>
-<style scoped lang="scss">
-	.comboInfo {
-		position: relative;
-		z-index: 1;
-		background-color: #fff;
-        min-height: calc(100vh - 200rpx);
-	 
-
-		.active {
-			color: #239ea3;
-			font-weight: bold;
-			position: relative;
-
-			&::after {
-				content: "";
-				width: 26rpx;
-				height: 3rpx;
-				background-color: #239ea3;
-				position: absolute;
-				left: 50%;
-				bottom: -10rpx;
-				transform: translateX(-50%);
-			}
-		}
-	}
-</style>
-<style scoped>
-	.combo_name_row{
-		text-align: center;
-		background-color: #EEF7F7;
-		color: #009FA8;
-		font-size: 28rpx;
-		height: 80rpx;
-		line-height: 80rpx;
-	}
-	.keshi_name_k{
-		line-height: 58rpx;
-		padding-left: 30rpx;
-	}
-	.xian{
-		height: 6rpx;
-		border-radius: 6rpx;
-		background-color: #B0E0E2;
-	}
-	.combo_tag_wrapper {
-		padding-left: 13rpx;
-		padding-right: 13rpx;
-		height: 28rpx;
-		line-height: 28rpx;
-		border-radius: 5rpx;
-		font-weight: 900;
-		font-size: 18rpx;
-		color: #47abd8;
-		margin: 10rpx 8rpx 10rpx 10rpx;
-		border: 3rpx solid #009FA8;
-	}
-	.little_item_k{
-		border-bottom: 1px solid #ccc;
-	}
-	.wenhao{
-		height: 18rpx;
-		width: 18rpx;
-		background-color: #009FA8;
-		line-height: 18rpx;
-		border-radius: 18rpx;
-		color: #fff;
-		text-align: center;
-		font-size: 14rpx;
-		margin-left: 10rpx;
-	}
-	.xiangqingbutton{
-		color:#009FA8;
-		font-size: 17rpx;
-	}
-	.button {
-		color: #00828e;
-		background-color: #fff;
-		height: 58rpx;
-		line-height: 58rpx;
-		text-align: center;
-		width: 174rpx;
-		border-radius: 58rpx;
-		margin-right: 20rpx;
-		font-size: 29rpx;
-	}
-	.bgcolor_huang{
-		background-color: #FF6D00;
-		color: #fff;
-	}
-	.original_price_wrapper {
-		font-weight: bolder;
-		font-size: 18rpx;
-		color: #333;
-		line-height: 1;
-		text-decoration-line: line-through; 
-	}
-	.tishi_main{
-		background-color: #fff;
-		padding: 40rpx 50rpx;
-		width:600rpx;
-		border-radius: 40rpx;
-	}
-	.tishi_button{
-		width: 365rpx;
-		background-color: #009da5;
-		color:#fff;
-		text-align: center;
-		padding-top: 10rpx;
-		padding-bottom: 10rpx;
-		border-radius: 40rpx;
-		margin: 20rpx auto 10rpx auto;
-	}
-</style>
\ No newline at end of file
diff --git a/h5/pages/main/tjyy/tjyy_new.vue b/h5/pages/main/tjyy/tjyy(旧).vue
similarity index 71%
rename from h5/pages/main/tjyy/tjyy_new.vue
rename to h5/pages/main/tjyy/tjyy(旧).vue
index 9461037..eff1cf6 100644
--- a/h5/pages/main/tjyy/tjyy_new.vue
+++ b/h5/pages/main/tjyy/tjyy(旧).vue
@@ -509,53 +509,201 @@ const toRouter = (url, status, index) => {
       </view>
     </view>
   </uni-popup>
-  <view >
+  <view>
     <view v-if="!!$store.config">
       <view :ref="configRef"></view>
     </view>
-    <view class="px-30rpx box-border pb-200rpx comboInfo">
-     
+    <view class="px-20rpx box-border pb-200rpx comboInfo">
       <view
         style="box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(0, 0, 0, 0.04)"
-        class="p-20rpx pb-20rpx pt-30rpx rounded-15rpx bg-#fff my-16rpx"
+        class="p-16rpx pb-20rpx pt-30rpx rounded-15rpx bg-#fff"
+      >
+        <view
+          class="flex w-full b-0 b-solid b-#E1ECEE mb-7rpx"
+          :class="{
+            'b-b-1 pb-25rpx': itemsInfo?.items?.length,
+          }"
+          v-if="!buyInfo.group_id && comboInfo?.items?.length"
+        >
+          <!-- 1 个检套餐 显示套餐信息 -->
+          <image
+            v-if="comboInfo.img"
+            :src="$image(comboInfo.img)"
+            class="w-190rpx h-190rpx mr-37rpx"
+            mode="widthFix"
+          />
+          <view class="flex flex-col grow">
+            <text>{{ comboInfo.combo_name }}</text>
+            <view class="mt-13rpx mb-18rpx">
+              <uni-tag
+                v-for="(val, i) in comboInfo.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 v-if="comboInfo.tags2?.length">
+              <text
+                v-for="(val, i) in comboInfo.tags2"
+                :key="i"
+                class="text-#8B8B8B text-20rpx line-height-[1] px-5rpx b-0 b-solid b-#8B8B8B"
+                :class="i == comboInfo.tags2?.length - 1 ? 'b-r-0' : 'b-r-2'"
+                >{{ 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">{{
+                comboInfo.price
+              }}</text>
+              <text class="text-18rpx text-#878787 line-through">{{
+                comboInfo.original_price
+              }}</text>
+              <text class="text-18rpx text-#878787 ml-auto mr-55rpx"
+                >已售{{ comboInfo.sale_count }}</text
+              >
+            </view>
+          </view>
+        </view>
+        <view
+          v-if="buyInfo.group_id"
+          class="b-0 b-solid b-#E1ECEE pb-25rpx mb-7rpx"
+          :class="{
+            'b-b-1': itemsInfo?.items?.length,
+          }"
+        >
+          <!-- 3团检套餐 4团检自选 都要显示头像和名字 -->
+          <view class="flex items-center">
+            <image
+              src="@/static/assets/userm.png"
+              class="w-70rpx h-70rpx mr-35rpx"
+            />
+            <view class="flex items-center grow">
+              <text class="text-#707070 text-24rpx">您好，</text>
+              <text class="text-#0E0E0E text-32rpx">{{ groupInfo.name }}</text>
+            </view>
+          </view>
+          <view class="text-24rpx mt-40rpx">
+            <!-- 3团检套餐 4团检自选 都要显示单位部门等信息 -->
+            <view class="pb-30rpx">
+              <text class="text-#8B8B8B">单位名称：</text>
+              <text>{{ groupInfo.group_name }}</text>
+            </view>
+            <view class="pb-30rpx">
+              <text class="text-#8B8B8B">部门名称：</text>
+              <text>{{ groupInfo.bumen_name }}</text>
+            </view>
+            <view
+              class="pb-30rpx"
+              v-if="groupInfo.combo_name || comboInfo?.combo_name"
+            >
+              <text class="text-#8B8B8B">套餐名称：</text>
+              <text>{{ groupInfo?.combo_name || comboInfo?.combo_name }}</text>
+            </view>
+            <view>
+              <text class="text-#8B8B8B">体检额度：</text>
+              <text>{{ groupInfo.tongshou_xiane }}</text>
+            </view>
+          </view>
+        </view>
+        <view class="pt-15rpx" v-if="itemsInfo?.items?.length">
+          <view class="text-30rpx text-#0E0E0E pb-30rpx"> 自选项目 </view>
+          <view class="text-#8B8B8B text-24rpx">
+            <view
+              class="flex mb-20rpx"
+              v-for="(val, index) in itemsInfo?.items.length > 3
+                ? 3
+                : itemsInfo?.items"
+              :key="index"
+            >
+              <text class="whitespace-nowrap"
+                >{{ itemsInfo?.items[index]?.keshi_name }} -
+              </text>
+              <view class="line-clamp-2">
+                <text
+                  class="ml-10rpx text-#0E0E0E"
+                  v-for="(v, i) in itemsInfo?.items[index]?.children"
+                  :key="i"
+                  >{{ v.name }}</text
+                >
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+      <view
+        style="box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(0, 0, 0, 0.04)"
+        class="p-16rpx pb-20rpx pt-30rpx rounded-15rpx bg-#fff my-16rpx"
       >
         <view
           class="text-#0E0E0E text-30rpx b-0 b-solid b-b-1 b-#E1ECEE pb-20rpx mb-35rpx"
           >预约人信息</view
         >
-      
-			<view>
-				<view style="display: flex;justify-content: space-between;padding-right: 10rpx;">
-					<view>
-						<view class="text-28rpx text-#000  mb-20rpx" style="font-weight: bolder;">{{
-						  userInfo.name
-						}}</view>
-						<view class="text-24rpx text-#8B8B8B mb-30rpx between">
-						  <text>{{ userInfo.sex == 1 ? "男性" : "女性" }}</text>
-						  <text class="ml-20rpx">{{
-						    userInfo.married == 1
-						      ? "已婚"
-						      : userInfo.married == 2
-						      ? "未婚"
-						      : "未知"
-						  }}</text>
-						  <text class="ml-20rpx mr-auto">{{ userInfo.phone }}</text>
-						  <!-- <button
-						    v-if="!buyInfo.group_id"
-						    @click="toRouter('/pages/user/choose/choose')"
-						    class="text-24rpx text-#fff bg-#31AEB6 rounded-full px-26rpx h55rpx !m-0 center !ml-auto"
-						  >
-						    更改预约人
-						  </button> -->
-									
-						</view> 
-					</view>
-					<uni-icons @click="toRouter('/pages/user/choose/choose')" type="trash" color="#31AEB6" size="25"></uni-icons>
-			</view>
+        <view>
+          <view class="text-28rpx text-#000 bold mb-20rpx">{{
+            userInfo.name
+          }}</view>
+          <view class="text-24rpx text-#8B8B8B mb-30rpx between">
+            <text>{{ userInfo.sex == 1 ? "男性" : "女性" }}</text>
+            <text class="ml-20rpx">{{
+              userInfo.married == 1
+                ? "已婚"
+                : userInfo.married == 2
+                ? "未婚"
+                : "未知"
+            }}</text>
+            <text class="ml-20rpx mr-auto">{{ userInfo.phone }}</text>
+            <button
+              v-if="!buyInfo.group_id"
+              @click="toRouter('/pages/user/choose/choose')"
+              class="text-24rpx text-#fff bg-#31AEB6 rounded-full px-26rpx h55rpx !m-0 center !ml-auto"
+            >
+              更改预约人
+            </button>
+          </view>
+          <view class="text-24rpx text-#040404 mb-30rpx">
+            <view
+              class="mb-20rpx between"
+              v-for="(val, index) in yytjInfo?.nmr_list"
+              @click="toRouter('/pages/main/yytjsj/yytjsj', 1, index)"
+              :key="index"
+              v-if="yytjInfo?.nmr_list?.length"
+            >
+              <view class="flex-col flex">
+                <text v-for="(v, i) in val.name?.split('/')" :key="i">{{
+                  v
+                }}</text>
+              </view>
+              <text class="ml-20rpx mr-auto text-#239EA3">{{ val.time }}</text>
+              <text class="text-30rpx">{{
+                val.time ? "重新预约" : "预约时间"
+              }}</text>
+            </view>
+            <view
+              class="mb-20rpx between"
+              @click="toRouter('/pages/main/yytjsj/yytjsj', 1, -1)"
+            >
+              <text>体检医生</text>
+              <text class="text-30rpx">{{
+                yytjInfo?.doctor_name || "选择医生"
+              }}</text>
+            </view>
+          </view>
         </view>
       </view>
 
-      <view v-if="integral"
+      <view
         style="box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(0, 0, 0, 0.04)"
         class="p-38rpx pr-17rpx rounded-15rpx bg-#fff between text-24rpx line-height-[1] mb-15rpx"
         @click="selectDiscount(1)"
@@ -575,14 +723,14 @@ const toRouter = (url, status, index) => {
         <uni-icons type="right" size="12"></uni-icons>
       </view>
 
-      <view v-if="couponList.length"
+      <view
         style="box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(0, 0, 0, 0.04)"
         class="p-38rpx pr-17rpx rounded-15rpx bg-#fff between text-24rpx line-height-[1] mb-15rpx"
         @click="selectDiscount(2)"
       >
         <view>
           <text class="text-#050505">优惠券</text>
-          <text  class="text-#828383"
+          <text v-if="couponList.length" class="text-#828383"
             >（共{{ couponList.length }}个）</text
           >
         </view>
@@ -595,14 +743,14 @@ const toRouter = (url, status, index) => {
         <uni-icons type="right" size="12"></uni-icons>
       </view>
 
-      <view v-if="save_money"
+      <view
         style="box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(0, 0, 0, 0.04)"
         class="p-38rpx pr-17rpx rounded-15rpx bg-#fff between text-24rpx line-height-[1] mb-15rpx"
         @click="selectDiscount(3)"
       >
         <view>
           <text class="text-#050505">预存款</text>
-          <text  class="text-#828383"
+          <text v-if="save_money" class="text-#828383"
             >（剩余{{ save_money }}）</text
           >
         </view>
@@ -613,13 +761,13 @@ const toRouter = (url, status, index) => {
         <uni-icons type="right" size="12"></uni-icons>
       </view>
 
-      <view class="text-#E95513 text-20rpx mb-40rpx mt-40rpx pl-20rpx pr-20rpx">
-        <view class="flex items-center mt-20rpx mb-40rpx">
+      <view class="text-#FB4F1A text-20rpx mb-30rpx">
+        <view class="flex items-center mt-20rpx">
           <uni-icons
             type="info-filled"
             class="rotate-180"
-            color="#E95513"
-            size="18"
+            color="#FB4F1A"
+            size="22"
           ></uni-icons>
           <text>选择“预约人”和“体检时间”后，请点击提交按钮,完成预约。</text>
         </view>
@@ -627,8 +775,8 @@ const toRouter = (url, status, index) => {
           <uni-icons
             type="info-filled"
             class="rotate-180"
-            color="#E95513"
-            size="18"
+            color="#FB4F1A"
+            size="22"
           ></uni-icons>
           <text
             >购买后如需退款，未到预约体检日期者可在“我的订单”中点击申请退款，体检当日取消或逾期未检者须至健康管理中心服务台办理
@@ -683,14 +831,21 @@ const toRouter = (url, status, index) => {
             </view>
           </view>
         </view>
-      </view> 
+      </view>
+      <view
+        class="shadow-[0px_1px_1px_0px_rgba(0,0,0,0.08)] fixed bottom-0 left-0 w-full bg-#fff py-30rpx pl-55rpx pr-45rpx box-border between"
+      >
+        <view class="text-#ED6907 text-48rpx center items-end line-height-[1]">
+          <text class="text-24rpx">¥</text>
+          <text>{{ netReceiptsPrice }}</text>
+        </view>
         <button
           @click="comfrimyy"
-          class="w-210rpx h-42rpx center text-#fff text-30rpx rounded-full bg-#239EA3 !m-0 button"
+          class="w-276rpx h-76rpx center text-#fff text-30rpx rounded-full bg-#239EA3 !m-0"
         >
-          确认支付
+          提交预约
         </button>
-       
+      </view>
     </view>
   </view>
 </template>
@@ -707,9 +862,17 @@ const toRouter = (url, status, index) => {
 .comboInfo {
   position: relative;
   z-index: 1;
-  background-color: #D8EEF3;
-  padding-top: 20rpx;
-  min-height: calc(100vh - 80rpx);
+  &::after {
+    content: "";
+    width: 100%;
+    height: 50rpx;
+    background-color: #239ea3;
+    position: absolute;
+    left: 0;
+    top: 0;
+    z-index: -1;
+  }
+
   .active {
     color: #239ea3;
     font-weight: bold;
@@ -727,9 +890,4 @@ const toRouter = (url, status, index) => {
     }
   }
 }
-.button{
-	position: fixed;
-	bottom: 80rpx;
-	right: 40rpx;
-}
 </style>
diff --git a/h5/pages/main/tjyy/tjyy.vue b/h5/pages/main/tjyy/tjyy.vue
index eff1cf6..9461037 100644
--- a/h5/pages/main/tjyy/tjyy.vue
+++ b/h5/pages/main/tjyy/tjyy.vue
@@ -509,201 +509,53 @@ const toRouter = (url, status, index) => {
       </view>
     </view>
   </uni-popup>
-  <view>
+  <view >
     <view v-if="!!$store.config">
       <view :ref="configRef"></view>
     </view>
-    <view class="px-20rpx box-border pb-200rpx comboInfo">
+    <view class="px-30rpx box-border pb-200rpx comboInfo">
+     
       <view
         style="box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(0, 0, 0, 0.04)"
-        class="p-16rpx pb-20rpx pt-30rpx rounded-15rpx bg-#fff"
-      >
-        <view
-          class="flex w-full b-0 b-solid b-#E1ECEE mb-7rpx"
-          :class="{
-            'b-b-1 pb-25rpx': itemsInfo?.items?.length,
-          }"
-          v-if="!buyInfo.group_id && comboInfo?.items?.length"
-        >
-          <!-- 1 个检套餐 显示套餐信息 -->
-          <image
-            v-if="comboInfo.img"
-            :src="$image(comboInfo.img)"
-            class="w-190rpx h-190rpx mr-37rpx"
-            mode="widthFix"
-          />
-          <view class="flex flex-col grow">
-            <text>{{ comboInfo.combo_name }}</text>
-            <view class="mt-13rpx mb-18rpx">
-              <uni-tag
-                v-for="(val, i) in comboInfo.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 v-if="comboInfo.tags2?.length">
-              <text
-                v-for="(val, i) in comboInfo.tags2"
-                :key="i"
-                class="text-#8B8B8B text-20rpx line-height-[1] px-5rpx b-0 b-solid b-#8B8B8B"
-                :class="i == comboInfo.tags2?.length - 1 ? 'b-r-0' : 'b-r-2'"
-                >{{ 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">{{
-                comboInfo.price
-              }}</text>
-              <text class="text-18rpx text-#878787 line-through">{{
-                comboInfo.original_price
-              }}</text>
-              <text class="text-18rpx text-#878787 ml-auto mr-55rpx"
-                >已售{{ comboInfo.sale_count }}</text
-              >
-            </view>
-          </view>
-        </view>
-        <view
-          v-if="buyInfo.group_id"
-          class="b-0 b-solid b-#E1ECEE pb-25rpx mb-7rpx"
-          :class="{
-            'b-b-1': itemsInfo?.items?.length,
-          }"
-        >
-          <!-- 3团检套餐 4团检自选 都要显示头像和名字 -->
-          <view class="flex items-center">
-            <image
-              src="@/static/assets/userm.png"
-              class="w-70rpx h-70rpx mr-35rpx"
-            />
-            <view class="flex items-center grow">
-              <text class="text-#707070 text-24rpx">您好，</text>
-              <text class="text-#0E0E0E text-32rpx">{{ groupInfo.name }}</text>
-            </view>
-          </view>
-          <view class="text-24rpx mt-40rpx">
-            <!-- 3团检套餐 4团检自选 都要显示单位部门等信息 -->
-            <view class="pb-30rpx">
-              <text class="text-#8B8B8B">单位名称：</text>
-              <text>{{ groupInfo.group_name }}</text>
-            </view>
-            <view class="pb-30rpx">
-              <text class="text-#8B8B8B">部门名称：</text>
-              <text>{{ groupInfo.bumen_name }}</text>
-            </view>
-            <view
-              class="pb-30rpx"
-              v-if="groupInfo.combo_name || comboInfo?.combo_name"
-            >
-              <text class="text-#8B8B8B">套餐名称：</text>
-              <text>{{ groupInfo?.combo_name || comboInfo?.combo_name }}</text>
-            </view>
-            <view>
-              <text class="text-#8B8B8B">体检额度：</text>
-              <text>{{ groupInfo.tongshou_xiane }}</text>
-            </view>
-          </view>
-        </view>
-        <view class="pt-15rpx" v-if="itemsInfo?.items?.length">
-          <view class="text-30rpx text-#0E0E0E pb-30rpx"> 自选项目 </view>
-          <view class="text-#8B8B8B text-24rpx">
-            <view
-              class="flex mb-20rpx"
-              v-for="(val, index) in itemsInfo?.items.length > 3
-                ? 3
-                : itemsInfo?.items"
-              :key="index"
-            >
-              <text class="whitespace-nowrap"
-                >{{ itemsInfo?.items[index]?.keshi_name }} -
-              </text>
-              <view class="line-clamp-2">
-                <text
-                  class="ml-10rpx text-#0E0E0E"
-                  v-for="(v, i) in itemsInfo?.items[index]?.children"
-                  :key="i"
-                  >{{ v.name }}</text
-                >
-              </view>
-            </view>
-          </view>
-        </view>
-      </view>
-      <view
-        style="box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(0, 0, 0, 0.04)"
-        class="p-16rpx pb-20rpx pt-30rpx rounded-15rpx bg-#fff my-16rpx"
+        class="p-20rpx pb-20rpx pt-30rpx rounded-15rpx bg-#fff my-16rpx"
       >
         <view
           class="text-#0E0E0E text-30rpx b-0 b-solid b-b-1 b-#E1ECEE pb-20rpx mb-35rpx"
           >预约人信息</view
         >
-        <view>
-          <view class="text-28rpx text-#000 bold mb-20rpx">{{
-            userInfo.name
-          }}</view>
-          <view class="text-24rpx text-#8B8B8B mb-30rpx between">
-            <text>{{ userInfo.sex == 1 ? "男性" : "女性" }}</text>
-            <text class="ml-20rpx">{{
-              userInfo.married == 1
-                ? "已婚"
-                : userInfo.married == 2
-                ? "未婚"
-                : "未知"
-            }}</text>
-            <text class="ml-20rpx mr-auto">{{ userInfo.phone }}</text>
-            <button
-              v-if="!buyInfo.group_id"
-              @click="toRouter('/pages/user/choose/choose')"
-              class="text-24rpx text-#fff bg-#31AEB6 rounded-full px-26rpx h55rpx !m-0 center !ml-auto"
-            >
-              更改预约人
-            </button>
-          </view>
-          <view class="text-24rpx text-#040404 mb-30rpx">
-            <view
-              class="mb-20rpx between"
-              v-for="(val, index) in yytjInfo?.nmr_list"
-              @click="toRouter('/pages/main/yytjsj/yytjsj', 1, index)"
-              :key="index"
-              v-if="yytjInfo?.nmr_list?.length"
-            >
-              <view class="flex-col flex">
-                <text v-for="(v, i) in val.name?.split('/')" :key="i">{{
-                  v
-                }}</text>
-              </view>
-              <text class="ml-20rpx mr-auto text-#239EA3">{{ val.time }}</text>
-              <text class="text-30rpx">{{
-                val.time ? "重新预约" : "预约时间"
-              }}</text>
-            </view>
-            <view
-              class="mb-20rpx between"
-              @click="toRouter('/pages/main/yytjsj/yytjsj', 1, -1)"
-            >
-              <text>体检医生</text>
-              <text class="text-30rpx">{{
-                yytjInfo?.doctor_name || "选择医生"
-              }}</text>
-            </view>
-          </view>
+      
+			<view>
+				<view style="display: flex;justify-content: space-between;padding-right: 10rpx;">
+					<view>
+						<view class="text-28rpx text-#000  mb-20rpx" style="font-weight: bolder;">{{
+						  userInfo.name
+						}}</view>
+						<view class="text-24rpx text-#8B8B8B mb-30rpx between">
+						  <text>{{ userInfo.sex == 1 ? "男性" : "女性" }}</text>
+						  <text class="ml-20rpx">{{
+						    userInfo.married == 1
+						      ? "已婚"
+						      : userInfo.married == 2
+						      ? "未婚"
+						      : "未知"
+						  }}</text>
+						  <text class="ml-20rpx mr-auto">{{ userInfo.phone }}</text>
+						  <!-- <button
+						    v-if="!buyInfo.group_id"
+						    @click="toRouter('/pages/user/choose/choose')"
+						    class="text-24rpx text-#fff bg-#31AEB6 rounded-full px-26rpx h55rpx !m-0 center !ml-auto"
+						  >
+						    更改预约人
+						  </button> -->
+									
+						</view> 
+					</view>
+					<uni-icons @click="toRouter('/pages/user/choose/choose')" type="trash" color="#31AEB6" size="25"></uni-icons>
+			</view>
         </view>
       </view>
 
-      <view
+      <view v-if="integral"
         style="box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(0, 0, 0, 0.04)"
         class="p-38rpx pr-17rpx rounded-15rpx bg-#fff between text-24rpx line-height-[1] mb-15rpx"
         @click="selectDiscount(1)"
@@ -723,14 +575,14 @@ const toRouter = (url, status, index) => {
         <uni-icons type="right" size="12"></uni-icons>
       </view>
 
-      <view
+      <view v-if="couponList.length"
         style="box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(0, 0, 0, 0.04)"
         class="p-38rpx pr-17rpx rounded-15rpx bg-#fff between text-24rpx line-height-[1] mb-15rpx"
         @click="selectDiscount(2)"
       >
         <view>
           <text class="text-#050505">优惠券</text>
-          <text v-if="couponList.length" class="text-#828383"
+          <text  class="text-#828383"
             >（共{{ couponList.length }}个）</text
           >
         </view>
@@ -743,14 +595,14 @@ const toRouter = (url, status, index) => {
         <uni-icons type="right" size="12"></uni-icons>
       </view>
 
-      <view
+      <view v-if="save_money"
         style="box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(0, 0, 0, 0.04)"
         class="p-38rpx pr-17rpx rounded-15rpx bg-#fff between text-24rpx line-height-[1] mb-15rpx"
         @click="selectDiscount(3)"
       >
         <view>
           <text class="text-#050505">预存款</text>
-          <text v-if="save_money" class="text-#828383"
+          <text  class="text-#828383"
             >（剩余{{ save_money }}）</text
           >
         </view>
@@ -761,13 +613,13 @@ const toRouter = (url, status, index) => {
         <uni-icons type="right" size="12"></uni-icons>
       </view>
 
-      <view class="text-#FB4F1A text-20rpx mb-30rpx">
-        <view class="flex items-center mt-20rpx">
+      <view class="text-#E95513 text-20rpx mb-40rpx mt-40rpx pl-20rpx pr-20rpx">
+        <view class="flex items-center mt-20rpx mb-40rpx">
           <uni-icons
             type="info-filled"
             class="rotate-180"
-            color="#FB4F1A"
-            size="22"
+            color="#E95513"
+            size="18"
           ></uni-icons>
           <text>选择“预约人”和“体检时间”后，请点击提交按钮,完成预约。</text>
         </view>
@@ -775,8 +627,8 @@ const toRouter = (url, status, index) => {
           <uni-icons
             type="info-filled"
             class="rotate-180"
-            color="#FB4F1A"
-            size="22"
+            color="#E95513"
+            size="18"
           ></uni-icons>
           <text
             >购买后如需退款，未到预约体检日期者可在“我的订单”中点击申请退款，体检当日取消或逾期未检者须至健康管理中心服务台办理
@@ -831,21 +683,14 @@ const toRouter = (url, status, index) => {
             </view>
           </view>
         </view>
-      </view>
-      <view
-        class="shadow-[0px_1px_1px_0px_rgba(0,0,0,0.08)] fixed bottom-0 left-0 w-full bg-#fff py-30rpx pl-55rpx pr-45rpx box-border between"
-      >
-        <view class="text-#ED6907 text-48rpx center items-end line-height-[1]">
-          <text class="text-24rpx">¥</text>
-          <text>{{ netReceiptsPrice }}</text>
-        </view>
+      </view> 
         <button
           @click="comfrimyy"
-          class="w-276rpx h-76rpx center text-#fff text-30rpx rounded-full bg-#239EA3 !m-0"
+          class="w-210rpx h-42rpx center text-#fff text-30rpx rounded-full bg-#239EA3 !m-0 button"
         >
-          提交预约
+          确认支付
         </button>
-      </view>
+       
     </view>
   </view>
 </template>
@@ -862,17 +707,9 @@ const toRouter = (url, status, index) => {
 .comboInfo {
   position: relative;
   z-index: 1;
-  &::after {
-    content: "";
-    width: 100%;
-    height: 50rpx;
-    background-color: #239ea3;
-    position: absolute;
-    left: 0;
-    top: 0;
-    z-index: -1;
-  }
-
+  background-color: #D8EEF3;
+  padding-top: 20rpx;
+  min-height: calc(100vh - 80rpx);
   .active {
     color: #239ea3;
     font-weight: bold;
@@ -890,4 +727,9 @@ const toRouter = (url, status, index) => {
     }
   }
 }
+.button{
+	position: fixed;
+	bottom: 80rpx;
+	right: 40rpx;
+}
 </style>