diff --git a/Laravel/app/Http/Controllers/API/ApiMapController.php b/Laravel/app/Http/Controllers/API/ApiMapController.php
index b5ff84c..6d3218b 100644
--- a/Laravel/app/Http/Controllers/API/ApiMapController.php
+++ b/Laravel/app/Http/Controllers/API/ApiMapController.php
@@ -83,7 +83,8 @@ class ApiMapController extends Controller
       'UserHunjian' => $base_url . '/api/H5/User/hunjian', // 婚检人员信息
       'hunjianBySFZ' => $base_url . '/api/H5/hunjianBySFZ', // 婚检人员信息
       'CheckedSignIn' => $base_url . '/api/H5/CheckedSignIn', // 检后签到
-
+      'SendMsgCode' => $base_url . '/api/H5/SendMsgCode', // 发送验证码
+      'CheckMsgCode' => $base_url . '/api/H5/CheckMsgCode', // 验证验证码
     ];
   }
 
diff --git a/Laravel/app/Http/Controllers/API/AspNetZhuanController.php b/Laravel/app/Http/Controllers/API/AspNetZhuanController.php
index bf4e341..8dda90b 100644
--- a/Laravel/app/Http/Controllers/API/AspNetZhuanController.php
+++ b/Laravel/app/Http/Controllers/API/AspNetZhuanController.php
@@ -71,7 +71,19 @@ class AspNetZhuanController extends Controller
    $content=$time." 健康体检。请提前10分钟凭身份证到".$yy_name.$keshi."签到。建议体检前3天清淡饮食、禁烟酒。体检当天需禁食禁水，空腹6小时以上";
     $url=self::$BaseUrl."/tuisong.aspx?yyid=".$yyid."&type=8&mobile=".$tel."&msg1=".urlencode($name)."&msg2=".urlencode($content);
     self::get($url,"短信发送");
-
+  }
+  //发送验证码
+  public static function SendYanZhengMaCode($r_yyid,$tel,$code){
+    if($r_yyid==1){
+      $yyid=6;
+      $yy_name="现代妇儿秀英院区";
+    }
+    if($r_yyid==4){
+      $yyid=2;
+      $yy_name="现代妇儿府城院区";
+    }
+    $url=self::$BaseUrl."/tuisong.aspx?yyid=".$yyid."&type=13&mobile=".$tel."&msg1=".urlencode($code);
+    self::get($url,"短信发送");
   }
 
   //获取优惠卷类型
diff --git a/Laravel/app/Http/Controllers/API/H5/UserController.php b/Laravel/app/Http/Controllers/API/H5/UserController.php
index 6c4a0cb..1a37e70 100644
--- a/Laravel/app/Http/Controllers/API/H5/UserController.php
+++ b/Laravel/app/Http/Controllers/API/H5/UserController.php
@@ -212,7 +212,9 @@ class UserController extends Controller
     if(!!$hunjianLog){
 
       $person_info=json_decode($hunjianLog->content,true);
-
+      unset($person_info['详细地址省市区']);
+      unset($person_info['详细地址']);
+      unset($person_info['邮政编码']);
 
     }
     return \Yz::Return(true, '获取成功', [
diff --git a/Laravel/app/Http/Controllers/API/SendMsgCodeController.php b/Laravel/app/Http/Controllers/API/SendMsgCodeController.php
new file mode 100644
index 0000000..a0b540b
--- /dev/null
+++ b/Laravel/app/Http/Controllers/API/SendMsgCodeController.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Http\Controllers\API;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class SendMsgCodeController extends Controller
+{
+  //创建验证码
+    public function SendMsgCode(Request $request)
+    {
+      $mobile = request('mobile');
+      //查找相同手机号1分钟内是否发送过
+      $code = DB::table('send_code')->where('mobile', $mobile)->where('created_at', '>=', date('Y-m-d H:i:s', time() - 60))->first();
+      if ($code) {
+        return \Yz::echoError1("操作太频繁，请稍后再试");
+      }
+      $code = rand(100000, 999999);
+      //获取当前时间5分钟后的日期时间
+      $end_time = date('Y-m-d H:i:s', time() + 300);
+      $i=DB::table('send_code')->insert([
+        'mobile' => $mobile,
+        'code' => $code,
+        'created_at' => date('Y-m-d H:i:s'),
+        'end_time' => $end_time
+      ]);
+      if ($i) {
+        $aspnet=new AspNetZhuanController();
+        $aspnet::SendYanZhengMaCode(1,$mobile,$code);
+        return \Yz::Return(true,"发送成功",[]);
+      } else {
+        return \Yz::echoError1("发送失败");
+      }
+
+    }
+    //验证验证码
+  public function CheckMsgCode(){
+      $mobile = request('mobile');
+      $code = request('code');
+      $u = DB::table('send_code')
+        ->where('mobile', $mobile)
+        ->where('code', $code)
+        ->where('end_time', '>=', date('Y-m-d H:i:s'))
+        ->where(['status' => 1])
+        ->update(['status' => 2]);
+      if($u){
+        return \Yz::Return(true,"验证成功",['data'=>$code]);
+      }else{
+        return \Yz::echoError1("验证码无效");
+      }
+  }
+}
diff --git a/Laravel/app/Http/Controllers/TestController.php b/Laravel/app/Http/Controllers/TestController.php
index 10d0740..4dcac6f 100644
--- a/Laravel/app/Http/Controllers/TestController.php
+++ b/Laravel/app/Http/Controllers/TestController.php
@@ -57,43 +57,9 @@ class TestController extends Controller
       //--------------
 
       $aspnet=new AspNetZhuanController();
-      //医生排班
-      $res = $aspnet->GetDoctorDateList([
-        "yyid" => 6,
-        "data" => ["2024-12-24",
-          "2024-12-25",
-          "2024-12-26",
-          "2024-12-27",
-          "2024-12-28",
-          "2024-12-29",
-          "2024-12-30",
-          "2024-12-31",
-          "2025-01-01",
-          "2025-01-02",
-          "2025-01-03",
-          "2025-01-04",
-          "2025-01-05",
-          "2025-01-06",
-          "2025-01-07",
-          "2025-01-08",
-          "2025-01-09",
-          "2025-01-10",
-          "2025-01-11",
-          "2025-01-12",
-          "2025-01-13",
-          "2025-01-14",
-          "2025-01-15",
-          "2025-01-16",
-          "2025-01-17",
-          "2025-01-18",
-          "2025-01-19",
-          "2025-01-20",
-          "2025-01-21",
-          "2025-01-22",
-          "2025-01-23"],
-        "action" => "1"
-      ]);
-      dd($res);
+     // $res=$aspnet::SendYanZhengMaCode(1,"19933509886");
+
+     // dd($res);
 //优惠券-----------------
 //      $data=[
 //        'action'=>4,
diff --git a/Laravel/routes/web.php b/Laravel/routes/web.php
index cd5ee8e..248564f 100644
--- a/Laravel/routes/web.php
+++ b/Laravel/routes/web.php
@@ -29,6 +29,8 @@ Route::get('/wxLogin/{env}', function ($env) {
 Route::get('/wxGetCode', 'App\Http\Controllers\API\mH5\LoginController@wxGetCode');
 Route::get('/test', 'App\Http\Controllers\TestController@DBtest');
 
+
+
 Route::any('/payNotify', 'App\Http\Controllers\API\H5\PayController@Notify')->middleware('log');//支付回调
 Route::group(['middleware' => ['log'],'prefix' => 'api/H5'], function () {
   Route::post('/CheckUpTypeGetList', 'App\Http\Controllers\API\H5\CheckUpTypeController@GetList');//获取体检类型分类
@@ -72,6 +74,8 @@ Route::group(['middleware' => ['log'],'prefix' => 'api/H5'], function () {
   Route::post('/HunQianQuestionSubmit', 'App\Http\Controllers\API\H5\QuestionController@HunQianQuestionSubmit');//婚前问卷提交
   Route::post('/hunjianBySFZ', 'App\Http\Controllers\API\H5\UserController@hunjianBySFZ');//根据身份证查询建档信息
   Route::post('/CheckedSignIn', 'App\Http\Controllers\API\H5\OrderController@CheckedSignIn');//检后签到
+  Route::post('/SendMsgCode', 'App\Http\Controllers\API\SendMsgCodeController@SendMsgCode');//发送验证码
+  Route::post('/CheckMsgCode', 'App\Http\Controllers\API\SendMsgCodeController@CheckMsgCode');//验证验证码
 
 
 
diff --git a/bot/workerman/composer.json b/bot/workerman/composer.json
index fdd4808..98601fd 100755
--- a/bot/workerman/composer.json
+++ b/bot/workerman/composer.json
@@ -24,7 +24,7 @@
         "source": "https://github.com/walkor/workerman"
     },
     "require": {
-        "php": ">=5.3"
+        "php": ">=5.5"
     },
     "suggest": {
         "ext-event": "For better performance. "
diff --git a/h5/common/PriceRange.vue b/h5/common/PriceRange.vue
new file mode 100644
index 0000000..5f57210
--- /dev/null
+++ b/h5/common/PriceRange.vue
@@ -0,0 +1,131 @@
+<template>
+	<view>
+		<view>
+			 
+			<view class="chart_wrapper" id="line">折线图</view>
+			<view class="huakuai_k">
+				<view class="huakuai_value">
+					<view>￥{{rang0}}</view>
+					<view>￥{{rang1}}</view>
+				</view>
+				<view>
+					<slider @changing="huakuai0_change" activeColor="#5ab6b8" block-color="#5ab6b8" block-size="18" backgroundColor="#5ab6b8" class="huakuai0"  max="99999" :value="rang0" >
+			 
+					</slider>
+				</view>
+				<view class="huakuai1"><slider @changing="huakuai1_change" block-size="18"  block-color="#5ab6b8" activeColor="#5ab6b8" backgroundColor="#5ab6b8" max="99999" :value="rang1"  /></view>
+				
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted
+	} from 'vue'
+	import * as echarts from 'echarts';
+	let rang0=ref(0);
+	let rang1=ref(99999);
+	onMounted(() => {
+		drawChart()
+	})
+	const huakuai0_change=(e)=>{
+		 rang0.value=e.detail.value
+		 if(rang0.value>rang1.value){
+			 let temp=0
+			 temp=rang0.value
+			 rang0.value=rang1.value
+			 rang1.value=temp
+		 }
+	}
+	const huakuai1_change=(e)=>{
+		 rang1.value=e.detail.value
+		 if(rang0.value>rang1.value){
+		 	let temp=0
+		 	temp=rang0.value
+		 	rang0.value=rang1.value
+		 	rang1.value=temp
+		 }
+	}
+	const drawChart = () => {
+		let chartDom = document.getElementById('line');
+		let myChart = echarts.init(chartDom);
+	 let option = {
+	   xAxis: {
+	     type: 'category',
+	     boundaryGap: false,
+	     data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+		  axisLine: { show: false }, // 隐藏X轴线
+		     axisTick: { show: false }, // 隐藏X轴刻度
+		     axisLabel: { show: false } // 隐藏X轴标签
+	   },
+	   yAxis: {
+	     type: 'value',
+		  axisLine: { show: false }, // 隐藏Y轴线
+		     axisTick: { show: false }, // 隐藏Y轴刻度
+		     axisLabel: { show: false } ,// 隐藏Y轴标签
+			  splitLine: { show: false } // 隐藏Y轴的分割线
+	   },
+	   series: [
+	     {
+	       data: [0,8, 12,7 ,33, 5,5],
+	       type: 'line',
+		   lineStyle: {
+		         width: 0 ,// 隐藏线条，设置线条宽度为0
+				 },
+		    smooth: true, // 这里设置线条平滑
+		 	symbol: 'none', // 隐藏所有数据点的标记符号
+	       areaStyle: {
+			    color: {
+					colorStops: [{
+					            offset: 0, color: '#e5f5f6' // 区域顶部颜色，半透明红色
+					        }, {
+					            offset: 1, color: '#e5f5f6' // 区域底部颜色，更浅的半透明红色
+					        }]
+				}
+			   
+		   }
+	     }
+	   ]
+	 };
+		option && myChart.setOption(option);
+	}
+</script>
+
+<style scoped>
+	.chart_wrapper{
+		height: 200rpx;
+		width: 100% !important;
+	}
+	.huakuai_k{
+	   position: relative;
+	   width: 100%;
+	   top:-120rpx;
+	}
+	.huakuai0{
+		position: relative;
+	 
+	}
+	.huakuai1{
+		position: relative;
+		width: 100%;
+		top:-54rpx;
+	}
+	.huakuai_value{
+		position: absolute;
+		display: flex;
+		width: calc(100% - 40rpx);
+		justify-content: space-between;
+		top: -40rpx;
+		padding: 0rpx 20rpx 0rpx 20rpx;
+		font-size:26rpx;
+		color:#5ab6b8;
+	}
+ 
+	 
+</style>
+<style>
+	 
+</style>
\ No newline at end of file
diff --git a/h5/pages.json b/h5/pages.json
index a6b2273..09493a3 100644
--- a/h5/pages.json
+++ b/h5/pages.json
@@ -14,6 +14,14 @@
 				"navigationBarTextStyle": "white"
 			}
 		},
+		{
+			"path": "pages/main/combo/combo_new",
+			"style": {
+				"navigationBarTitleText": "套餐",
+				"navigationBarBackgroundColor": "#239EA3",
+				"navigationBarTextStyle": "white"
+			}
+		},
 		{
 			"path": "pages/main/combo/tcdb",
 			"style": {
@@ -276,6 +284,14 @@
 			"style": {
 				"navigationBarTitleText": "预约医生"
 			}
+		},
+		{
+			"path" : "pages/test/test",
+			"style" : 
+			{
+				"navigationBarTitleText" : "",
+				"enablePullDownRefresh" : false
+			}
 		}
 
 	],
diff --git a/h5/pages/main/combo/combo_new.vue b/h5/pages/main/combo/combo_new.vue
new file mode 100644
index 0000000..e78503b
--- /dev/null
+++ b/h5/pages/main/combo/combo_new.vue
@@ -0,0 +1,1103 @@
+<script setup>
+import DraggableButton from "@/pages/components/goHome.vue";
+import PriceRange from "@/common/PriceRange.vue";
+/**
+ * name：
+ * user：sa0ChunLuyu
+ * date：2024年8月7日 20:05:05
+ */
+import { ref, computed, nextTick } from "vue";
+import { $image, $api, $response } from "@/api";
+import { onShow,onLoad } from "@dcloudio/uni-app";
+import { useStore } from "@/store";
+const $store = useStore();
+
+const $props = defineProps({
+  groupId: {
+    type: String,
+    default: "",
+  },
+});
+
+const combo_active = ref("");
+const person_active = ref("");
+let popup = ref(null);
+let popup_new=ref(null);
+let selectKey = ref(""); // 整个选择的key
+let sortIndex = ref(0); // 排序的索引
+let comboIndex = ref(null); // 套餐类型索引
+let crowdIndex = ref(null); // 适用人群索引
+let priceIndex = ref(null); // 套餐价格索引
+let projectIds = ref([]); // 项目id集合
+let screenObj = ref({}); // 筛选条件
+let combo_select = ref({}); // 套餐筛选条件
+let comboIds = ref([]); // 套餐对比列表
+let popupMultiple = ref(false); // 多选弹窗
+let multipleList = ref([]); // 多选列表
+let multipleIndex = ref(0); // 多选索引
+let itemIds = ref([]); // 项目id集合
+let itemId = ref(""); // 项目id
+let comboId = ref(""); // 套餐id
+
+const selectItemClick = async (index, key) => {
+  // 选择套餐条件
+  let data = combo_select.value;
+  if (selectKey.value == "sort_list") {
+	  	 combo_list.value.list=[]
+    if (sortIndex.value == index) {
+      sortIndex.value = 0;
+    } else {
+      sortIndex.value = index;
+    }
+    screenObj.value.combo_sort = data[selectKey.value][index]?.id;
+  } else if (selectKey.value == "combo_type") {
+    if (comboIndex.value == index) {
+      comboIndex.value = null;
+      delete screenObj.value.combo_type;
+    } else {
+      comboIndex.value = index;
+      screenObj.value.combo_type = data[selectKey.value][index]?.id;
+    }
+  } else if (selectKey.value == "combo_crowd") {
+    if (crowdIndex.value == index) {
+      crowdIndex.value = null;
+      delete screenObj.value.combo_crowd;
+    } else {
+      crowdIndex.value = index;
+      screenObj.value.combo_crowd = data[selectKey.value][index]?.id;
+    }
+  } else {
+    if (key == "combo_price") {
+      if (priceIndex.value == index) {
+        priceIndex.value = null;
+        return;
+      }
+      priceIndex.value = index;
+    } else {
+      if (projectIds.value?.includes(index)) {
+        projectIds.value.splice(projectIds.value.indexOf(index), 1);
+      } else {
+        projectIds.value.push(index);
+      }
+    }
+    return;
+  }
+  await getComboList();
+  popup.value.close();
+};
+const selectDone = async () => {
+  if (priceIndex.value === null) {
+    delete screenObj.value.combo_price;
+  } else {
+    screenObj.value.combo_price =
+      combo_select.value["combo_price"][priceIndex.value]?.id;
+  }
+  if (projectIds.value.length) {
+    screenObj.value.combo_item = projectIds.value;
+  } else {
+    delete screenObj.value.combo_item;
+  }
+  await getComboList();
+  popup_new.value.close();
+};
+
+const remake = () => {
+  // 重置筛选
+  delete screenObj.value.combo_price;
+  delete screenObj.value.combo_item;
+  priceIndex.value = null;
+  projectIds.value = [];
+};
+const getComboSelect = async () => {
+  uni.showLoading();
+  const response = await $api("GetComboSort");
+  uni.hideLoading();
+  $response(response, async () => {
+    combo_select.value = response.data;
+    if ("sort_list" in combo_select.value) {
+      selectKey.value = "sort_list";
+      sortIndex.value = 0;
+    }
+    await getComboList();
+  });
+};
+
+const combo_list = ref({
+  list: [],
+  hospital: {
+    id: 1,
+  },
+  doctor: {
+    id: 0,
+  },
+  info: {
+    name: "",
+  },
+});
+
+const combo_list_computed = computed(() => {
+  let list = [];
+  for (let i in combo_list.value.list) {
+    let push = false;
+    if (!combo_active.value) {
+      push = true;
+    } else {
+      if (combo_list.value.list[i].combo_type === combo_active.value) {
+        push = true;
+      }
+    }
+    if (!!push) {
+      if (!person_active.value) {
+        push = true;
+      } else {
+        if (combo_list.value.list[i].person_type === person_active.value) {
+          push = true;
+        } else {
+          push = false;
+        }
+      }
+    }
+    if (!!push) {
+      list.push(combo_list.value.list[i]);
+    }
+  }
+  return list;
+});
+let combo_list_k=ref(null)
+const getComboList = async (e) => {
+  uni.showLoading();
+  let obj = {
+    doctor: $store.save.doctor,
+    hospital: hospital_active.value,
+    search: e?.value,
+	keshi_name:keshi_name.value
+  };
+  if ($store.getCheckupTypeId()) {
+    let b = $store.getCheckupTypeId();
+    console.log();
+    if (Object.keys(b).length != 0) {
+      screenObj.value.checkup_type_id = b.id;
+    }
+  }
+  if (screenObj.value) {
+    obj = Object.assign(obj, screenObj.value);
+  }
+
+  const response = await $api("ComboList", obj);
+  uni.hideLoading();
+  $response(response, () => {
+ 
+		combo_list.value = response.data;
+ 
+
+  });
+};
+
+const contrastClick = async (item) => {
+  if (comboIds.value.includes(item.combo_id)) {
+    comboIds.value.splice(comboIds.value.indexOf(item.combo_id), 1);
+  } else {
+    if (comboIds.value.length < 3) {
+      comboIds.value.push(item.combo_id);
+    } else {
+      uni.showToast({
+        title: "最多对比3个套餐",
+        icon: "none",
+      });
+    }
+  }
+  $store.setComboContrast(comboIds.value);
+};
+
+const hospital_active = ref(0);
+const checkHospital = () => {
+  let hospital_id = $store.save.hospital;
+  comboIds.value = $store.getComboContrast() || [];
+  if (!hospital_id) {
+    hospital_id = $store.config.hospital[0].id;
+  }
+  hospital_active.value = hospital_id;
+  $store.saveInfo({
+    hospital: hospital_id,
+  });
+  getComboSelect();
+};
+
+const tabPatients = () => {
+  uni.navigateTo({
+    url: "/pages/user/choose/choose",
+  });
+};
+
+const open = (key) => {
+  if (key) {
+    // 点击三个筛选条件
+    selectKey.value = key;
+    popup.value.close();
+	popup_new.value.close();
+    let time = setTimeout(() => {
+      popup.value.open("top");
+      clearTimeout(time);
+    }, 400);
+  } else {
+    // 点击筛选
+    popup.value.close();
+	popup_new.value.close();
+    selectKey.value = "screen";
+    let time = setTimeout(() => {
+      popup_new.value.open("top");
+      clearTimeout(time);
+    }, 400);
+
+    // if (screenObj.value.combo_price) {
+    //   priceIndex.value = combo_select.value["combo_price"].findIndex(
+    //     (item) => item.id == screenObj.value.combo_price
+    //   );
+    // } else {
+    //   priceIndex.value = null;
+    // }
+
+    // if (screenObj.value.combo_item?.length) {
+    //   projectIds.value = [...screenObj.value.combo_item];
+    // } else {
+    //   projectIds.value = [];
+    // }
+  }
+};
+
+
+
+const config_ref = ref(null);
+const configRef = (e) => {
+  if (!config_ref.value) {
+    config_ref.value = e;
+    checkHospital();
+  }
+};
+
+const select_drawer_ref = ref(null);
+const selectDrawerRef = (e) => {
+  select_drawer_ref.value = e;
+};
+
+onShow(() => {
+	$store.setDuoXuanYi({});
+	 itemIds.value = [];
+  if (!!config_ref.value) {
+    checkHospital();
+  }
+});
+let keshi_name=ref(null);
+onLoad((e)=>{
+	keshi_name.value=e.keshi_name
+})
+
+const buyClick = async (item) => {
+  let checkup_type_id=$store.getCheckupTypeId();
+  console.log("----",checkup_type_id.id);
+  if(checkup_type_id.id=="" || checkup_type_id.id==undefined){
+	  $store.setCheckupTypeId({
+	  	id: item.checkup_type_id
+	  });
+  }
+  comboId.value = item.combo_id;
+  if (item.duo_xuan_yi.length > 0) {
+    popupMultiple.value.open("center");
+    multipleIndex.value = 0;
+    itemIds.value = [];
+    $store.setDuoXuanYi([]);
+    itemId.value = "";
+    multipleList.value = item.duo_xuan_yi;
+    return;
+  }
+  toDetail();
+};
+
+const nextItemClick = () => {
+  if (!itemId.value) {
+    uni.$lu.toast("请选择项目");
+    return;
+  }
+  itemIds.value.push({
+    item_id: itemId.value,
+    zu_name: multipleList.value[multipleIndex.value]["0"]["zu_name"],
+  });
+  if (multipleIndex.value == multipleList.value.length - 1) {
+    toDetail();
+    return;
+  }
+  itemId.value = "";
+  multipleIndex.value = multipleIndex.value + 1;
+};
+ 
+const toDetail = () => {
+  // 跳转到套餐详情
+  let query = "?comboId=" + comboId.value;
+  if ($props.groupId) {
+    // 团检把团检ID加上
+    query += "&groupId=" + $props.groupId;
+  }
+  $store.setDuoXuanYi(itemIds.value);
+  // 个检只要套餐ID
+  // 预约 跳转到个检/团检套餐详情
+  popupMultiple.value.close();
+  uni.navigateTo({
+    url: "/pages/main/tj/tjxq" + query,
+  });
+};
+
+const toRouter = () => {
+  if (!comboIds.value.length) {
+    uni.showToast({
+      title: "请先选择套餐",
+      icon: "none",
+    });
+    return;
+  }
+  uni.navigateTo({
+    url: "/pages/main/combo/tcdb",
+  });
+};
+</script>
+<template>
+  <DraggableButton />
+  <view style="background-color: #d8eef3;">
+    <view v-if="!!$store.config">
+      <view :ref="configRef"></view>
+    </view>
+
+    <view class="header_wrapper">
+      <view
+        @click="toRouter"
+        class="center fixed pt-10rpx box-border left-40rpx bottom-5% rounded-full w-110rpx h-110rpx bg-#239EA3 flex-col"
+      >
+        <uni-badge :text="comboIds.length" absolute="rightTop" size="small">
+          <image
+            src="@/static/assets/slices/duibi.png"
+            mode="widthFix"
+            class="w-42rpx"
+          />
+        </uni-badge>
+        <text class="text-22rpx text-#fff -mt-5rpx">对比</text>
+      </view>
+
+      <view v-if="!!combo_list.hospital.id" class="hospital_wrapper">
+        <view class="hospital_icon_wrapper">
+          <image src="@/static/assets/dingwei@2x.png"></image>
+        </view>
+        <view class="hospital_name_wrapper">{{
+          combo_list.hospital.name
+        }}</view>
+        <view class="hospital_select_wrapper">
+          <image src="@/static/assets/gengduo@2x.png"></image>
+        </view>
+      </view>
+      <view
+        v-if="!!combo_list.info.name"
+        class="user_wrapper"
+        @click="tabPatients()"
+      >
+        <view class="user_title_wrapper">体检人：</view>
+        <view class="user_name_wrapper">{{ combo_list.info.name }}</view>
+        <view v-if="combo_list.info.count > 1" class="user_choose_wrapper">
+          <image src="@/static/assets/qiehuan@2x.png"></image>
+        </view>
+      </view>
+    </view>
+ 
+    <view class="bg-#d8edf2" style="margin-top: -10rpx;">
+      <uni-search-bar
+        class="search"
+        radius="100" 
+        placeholder="请输入关键字搜索"
+        @clear="getComboList()"
+        @cancel="getComboList()"
+        @confirm="getComboList"
+      />
+    </view>
+	<view class="top_button_row">
+		<view class="top_button top_button_active">选择套餐</view>
+		<view class="top_button">专家定制</view>
+		<view class="top_button">项目自选</view>
+	</view>
+    <view class="select_wrapper flex" v-if="selectKey">
+      <template v-for="(value, key, index) in combo_select" :key="index">
+        <view
+          @click="open(key)"
+          class="flex-1 center text-#2f2f2f text-26rpx line-height-[1]"
+          v-if="key != 'combo_price' && key != 'combo_item'"
+          :class="{
+            '!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 style="display: flex;">
+			<view class="combo_info_wrapper">
+			  <view class="combo_content_wrapper">
+			    <view class="combo_name_wrapper">{{ i.name }}</view>
+			    <view class="combo_tags_wrapper">
+			      <view class="combo_tag_wrapper" v-for="(ii, kk) in i.tag" :key="kk" :style="{  color: ii.text_color, background: '#fff',}">
+			        {{ ii.text }} 
+			      </view>
+			    </view>
+			    <view class="combo_desc_wrapper">
+			      {{ i.tags2?.join(" | ") }} 
+			    </view>
+			    <view class="combo_price_wrapper">
+			      <view class="combo_price_box_wrapper">
+			        <view class="combo_true_price_wrapper">
+			          <text class="combo_true_price_icon_wrapper">¥</text>
+			          <text class="combo_true_price_number_wrapper">{{ i.price }}</text>
+			        </view>
+			        <view class="combo_original_price_wrapper">¥{{ i.original_price }}</view>
+			      </view>
+			      <!-- <view class="combo_count_wrapper">已售{{ i.count }}</view> -->
+			    </view>
+			  </view>
+			</view>
+			<view class="combo_button_wrapper">
+			  <view @click="contrastClick(i)" class="combo_pick_button_wrapper">
+			     {{comboIds.includes(i.combo_id) ? "已加入" : "对比"}}
+			  </view>
+			  <view class="combo_buy_button_wrapper" @click="buyClick(i)">预约</view>
+			</view>
+		</view>
+        <view class="combo_line_wrapper"></view>
+      </view>
+    </view>
+    <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 == '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>
+	<uni-popup ref="popup_new" mask-background-color="transparent" :animation="false" :mask-click="false">
+	  <view class="pt-292rpx w-full h-100vh"  >
+	    <view class="bg-[rgba(0,0,0,0.3)] h-100%">
+	      <view class="popup_new_main">
+			  <PriceRange></PriceRange>
+			  <view class="around">
+			    <view
+			      class="w-40% text-26rpx h-60rpx center rounded-full bg-#239EA3 text-#fff"
+			      @click="remake()"
+			      >重置</view
+			    >
+			    <view
+			      class="w-40% text-26rpx h-60rpx center rounded-full bg-#239EA3 text-#fff"
+			      @click="selectDone()"
+			      >确定</view
+			    >
+			  </view>
+		  </view>
+	    </view>
+	  </view>
+	</uni-popup>
+  </view>
+</template>
+<style scoped>
+.select_done_wrapper {
+  color: #ffffff;
+  background: #239ea3;
+  width: calc(100% - 60rpx);
+  margin: 50rpx auto 0;
+  height: 50rpx;
+  line-height: 50rpx;
+  text-align: center;
+  border-radius: 6rpx;
+}
+
+.select_group_item_wrapper {
+  padding: 10rpx 20rpx;
+  border: 1rpx solid #239ea3;
+  font-size: 22rpx;
+  margin: 20rpx 20rpx 0 0;
+  border-radius: 6rpx;
+  color: #239ea3;
+}
+
+.select_group_item_wrapper.active {
+  color: #ffffff;
+  background: #239ea3;
+}
+
+.select_group_line_wrapper {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+}
+
+.select_group_wrapper {
+  margin: 20rpx;
+}
+
+.list_wrapper {
+  padding-top: 30rpx;
+  height: calc(100vh - 100rpx - 10rpx - 70rpx - 80rpx - 30rpx - 30rpx);
+  width: 750rpx;
+  overflow-y: auto;
+  padding-bottom: 30rpx;
+  margin: 0 auto;
+  overflow-x: hidden;
+  -ms-overflow-style: none;
+  scrollbar-width: none;
+  overflow: -moz-scrollbars-none;
+  overflow-y: scroll;
+  background-color: #fff;
+}
+
+.list_wrapper::-webkit-scrollbar {
+  display: none;
+}
+
+.combo_line_wrapper {
+  width: 710rpx;
+  height: 1rpx;
+  background: #e1ecee;
+  margin: 26rpx 0rpx 0rpx 0;
+}
+
+.combo_pick_button_wrapper {
+  width: 160rpx;
+  height: 60rpx;
+  background: #e1ecee;
+  border-radius: 30rpx;
+  font-weight: 400;
+  font-size: 28rpx;
+  color: #239ea3;
+  text-align: center;
+  line-height: 60rpx;
+}
+
+.combo_buy_button_wrapper {
+  width: 160rpx;
+  height: 60rpx;
+  background: #239ea3;
+  border-radius: 30rpx;
+  font-weight: 400;
+  font-size: 28rpx;
+  color: #ffffff;
+  text-align: center;
+  line-height: 60rpx; 
+}
+
+.combo_button_wrapper {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: space-around;
+ 
+}
+
+.combo_count_wrapper {
+  font-weight: 500;
+  font-size: 18rpx;
+  color: #8b8b8b;
+  line-height: 1;
+}
+
+.combo_original_price_wrapper {
+  font-weight: 500;
+  font-size: 18rpx;
+  color: #8b8b8b;
+  line-height: 1;
+  text-decoration-line: line-through;
+  margin-left: 10rpx;
+}
+
+.combo_true_price_wrapper {
+  font-weight: 500;
+  font-size: 18rpx;
+  color: #ec3d15;
+  line-height: 1;
+}
+
+.combo_true_price_number_wrapper {
+  font-size: 38rpx;
+}
+
+.combo_price_wrapper {
+  display: flex;
+  align-items: end;
+  justify-content: space-between;
+  margin-top: 21rpx;
+}
+
+.combo_price_box_wrapper {
+  display: flex;
+  align-items: end;
+}
+
+.combo_wrapper {
+  /* height: 196rpx; */
+  width:calc(750rpx - 80rpx) ;
+  margin: 0 auto;
+  background-color: #fff;
+  padding: 0rpx 40rpx 30rpx 40rpx;
+}
+
+.combo_tags_wrapper {
+  display: flex;
+  align-items: center;
+  margin-top: 13rpx;
+}
+
+.combo_desc_wrapper {
+  font-weight: 500;
+  font-size: 20rpx;
+  color: #8b8b8b;
+  line-height: 1;
+  margin-top: 18rpx;
+}
+
+.combo_tag_wrapper {
+  padding-left: 13rpx;
+  padding-right: 13rpx;
+  height: 30rpx;
+  line-height: 30rpx;
+  border-radius: 5rpx;
+  font-weight: 400;
+  font-size: 18rpx;
+  color: #47abd8;
+  margin:10rpx  8rpx 10rpx 0rpx;
+  border: 1rpx solid #009da5;
+}
+
+.combo_name_wrapper {
+  font-weight: 400;
+  font-size: 32rpx;
+  color: #0e0e0e;
+  line-height: 1;
+}
+
+.combo_content_wrapper { 
+  margin-left: 30rpx;
+  width: calc(750rpx - 190rpx - 30rpx - 20rpx - 55rpx);
+}
+
+.combo_info_wrapper {
+  display: flex;
+  align-items: center;
+  width: 750rpx;
+  margin: 0 auto;
+}
+
+.combo_cover_wrapper {
+  width: 190rpx;
+  height: 190rpx;
+  margin-left: 20rpx;
+}
+
+.combo_cover_wrapper image {
+  width: 190rpx;
+  height: 190rpx;
+  display: block;
+  object-fit: contain;
+}
+
+.select_item_line_wrapper {
+  position: absolute;
+  width: 95rpx;
+  height: 10rpx;
+  background: linear-gradient(to bottom, #ffffff00, #1b9a9f);
+  border-radius: 5rpx;
+  bottom: 0;
+  left: 50%;
+  transform: translateX(calc(-50% - 8px));
+  opacity: 0;
+}
+
+.select_wrapper {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 750rpx;
+  height: 80rpx;
+  background: #eef7f7;
+  box-shadow: 0rpx -1rpx 1rpx 0rpx rgba(0, 0, 0, 0.1);
+  margin: 0 auto;
+  position: relative;
+  z-index: 999;
+}
+
+.select_item_icon_wrapper {
+  width: 18rpx;
+  height: 9rpx;
+  margin-left: 9rpx;
+  filter: grayscale(100%);
+}
+
+.select_item_icon_wrapper image {
+  width: 18rpx;
+  height: 9rpx;
+  display: block;
+  object-fit: contain;
+}
+
+.select_item_icon2_wrapper {
+  width: 26rpx;
+  height: 23rpx;
+  margin-left: 7rpx;
+}
+
+.select_item_icon2_wrapper image {
+  width: 26rpx;
+  height: 23rpx;
+  display: block;
+  object-fit: contain;
+}
+
+.select_item_name_wrapper {
+  font-weight: 400;
+  font-size: 26rpx;
+  color: #2f2f2f;
+  line-height: 1;
+}
+
+.select_item_wrapper {
+  width: 25%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  position: relative;
+  height: 80rpx;
+}
+
+.select_item_wrapper.active .select_item_name_wrapper {
+  color: #239ea3;
+  font-weight: bold;
+}
+
+.select_item_wrapper.active .select_item_icon_wrapper {
+  filter: grayscale(0%);
+}
+
+.select_item_wrapper.active .select_item_line_wrapper {
+  opacity: 1;
+}
+
+.doctor_name_wrapper {
+  font-weight: 400;
+  font-size: 24rpx;
+  line-height: 1;
+  color: #ffffff;
+  border-bottom: 1rpx solid #ffffff;
+}
+
+.doctor_tip_wrapper {
+  font-weight: 400;
+  font-size: 22rpx;
+  line-height: 1;
+  color: #ffffff;
+}
+
+.doctor_wrapper {
+  display: flex;
+  align-items: center;
+  width: 710rpx;
+  height: 70rpx;
+  background: #239ea3;
+  border-radius: 15rpx 15rpx 0rpx 0rpx;
+  padding-left: 24rpx;
+}
+
+.user_choose_wrapper {
+  width: 50rpx;
+  height: 50rpx;
+  margin-left: 30rpx;
+}
+
+.user_choose_wrapper image {
+  width: 50rpx;
+  height: 50rpx;
+  display: block;
+  object-fit: contain;
+}
+
+.user_title_wrapper {
+  font-weight: 400;
+  font-size: 28rpx;
+  color: #239ea3;
+  line-height: 1;
+}
+
+.user_name_wrapper {
+  font-weight: 400;
+  font-size: 28rpx;
+  color: #0d0d0d;
+  line-height: 1;
+}
+
+.user_wrapper {
+  height: 80rpx;
+  padding-left: 40rpx;
+  padding-right: 20rpx;
+  background: #ffffff;
+  border-radius: 40rpx 0 0 40rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.header_wrapper {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 750rpx;
+  height: 100rpx;
+  background: #d8edf2;
+  margin: 0 auto;
+  position: relative;
+  z-index: 999;
+}
+
+.hospital_wrapper {
+  display: flex;
+  align-items: center;
+  width: 50%;
+}
+
+.hospital_icon_wrapper {
+  width: 48rpx;
+  height: 48rpx;
+  margin-left: 20rpx;
+}
+
+.hospital_icon_wrapper image {
+  width: 48rpx;
+  height: 48rpx;
+  display: block;
+  object-fit: contain;
+}
+
+.hospital_name_wrapper {
+  font-weight: 400;
+  font-size: 28rpx;
+  color: #484747;
+  margin-left: 9rpx;
+  line-height: 1;
+}
+
+.hospital_select_wrapper {
+  width: 24rpx;
+  height: 14rpx;
+  margin-left: 19rpx;
+}
+
+.hospital_select_wrapper image {
+  width: 24rpx;
+  height: 14rpx;
+  display: block;
+  object-fit: contain;
+}
+.popup_new_main{
+	background-color: #fff;
+	border-radius:  0rpx 0rpx 20rpx 20rpx;
+	padding: 20rpx;
+}
+.top_button_row{
+	display: flex;
+    justify-content: space-between;
+	padding-left: 20rpx;
+	padding-right: 20rpx;
+}
+.top_button{
+	color:#666;
+	background-color: #fff;
+	padding: 6rpx 40rpx;
+	border-radius: 15rpx;
+	margin-top: -6rpx;
+	margin-bottom: 8rpx;
+	font-size: 28rpx;
+	width: 140rpx;
+	text-align: center;
+}
+.top_button_active{
+	background-color: #009ea7;
+	color:#fff;
+}
+.search{
+	 
+}
+</style>
diff --git a/h5/pages/main/index/index.vue b/h5/pages/main/index/index.vue
index 3ae2919..4e50284 100644
--- a/h5/pages/main/index/index.vue
+++ b/h5/pages/main/index/index.vue
@@ -203,6 +203,11 @@
 			url: '/pages/other/entry/index?path=/pages/physical-examination/location/index'+p
 		})
 	};
+	const gotoo=()=>{
+		uni.navigateTo({
+			url: "/pages/test/test"
+		})
+	}
 
 	onShow(() => {
 		 
@@ -231,6 +236,7 @@
 		getUserInfo()
 		$store.setCheckupTypeId({});
 		$store.setDuoXuanYi({});
+		$store.setPeiOuUser({});
 	})
 </script>
 <template>
@@ -283,7 +289,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="botm_blank_wrapper" style="font-size: 18rpx;color: #ccc;">12250922</view>
+			<view class="botm_blank_wrapper" style="font-size: 18rpx;color: #ccc;">01031940</view>
 		</view>
 	</view>
 </template>
diff --git a/h5/pages/main/question/question/question.vue b/h5/pages/main/question/question/question.vue
index 4e2c239..cd0960c 100644
--- a/h5/pages/main/question/question/question.vue
+++ b/h5/pages/main/question/question/question.vue
@@ -309,7 +309,7 @@
 	}
 </script>
 <template>
-	<view>
+	<view style="background-color:#d8eef3 ;">
 		<view v-if="!!$store.config">
 			<view :ref="configRef"></view>
 		</view>
@@ -317,8 +317,13 @@
 			<view>
 				<view v-if="question_info.type === '检前评估'" class="banner_wrapper">
 					<view @click="getQuestionLogPush()" class="push_log_wrapper">带入上次答题记录</view>
-					<image src="@/static/assets/question/banner.png"></image>
+					<image src="@/static/assets/question/banner3.png"></image>
+					
 				</view>
+				<!-- <view v-if="question_info.type === '检前评估'" class="chuchu">
+					<uni-icons type="search" color="#fff" size="18"></uni-icons>
+					<view style="margin-left: 10rpx;">问卷出处:《健康体检基本项目专家共识》 </view>
+				</view> -->
 				<view v-else>
 					<view class="q2_banner_wrapper">
 						<view class="q2_banner_text_wrapper">健康问卷</view>
@@ -623,6 +628,7 @@
 		width: 750rpx;
 		height: 226rpx;
 		overflow: hidden;
+		 
 	}
 
 	.q2_banner_wrapper image {
@@ -654,6 +660,9 @@
 		height: 434rpx;
 		margin: 0 auto;
 		position: relative;
+		padding-top: 20rpx;
+		padding-left: 20rpx;
+		padding-right: 20rpx;
 	}
 
 	.push_log_wrapper {
@@ -661,22 +670,37 @@
 		z-index: 9;
 		width: 250rpx;
 		height: 50rpx;
-		background: #38C6BC;
-		right: 30rpx;
+		/* background: #DAD3C9; */
+		/* color: #7E6F5C; */
+		color: #fff;
+		background: #259ea3;
+		right: 36rpx;
 		top: -15rpx;
 		border-radius: 6rpx;
 		margin: 40rpx auto 0;
 		font-weight: 500;
 		font-size: 22rpx;
-		color: #FFFFFF;
+		
 		line-height: 50rpx;
 		text-align: center;
 	}
 
 	.banner_wrapper image {
-		width: 724rpx;
+		width: 714rpx;
 		height: 434rpx;
 		display: block;
 		object-fit: contain;
 	}
+	.chuchu{
+		background-color: #259ea3;
+		border-radius: 10rpx;
+		margin: 20rpx;
+		padding: 10rpx 30rpx;
+		color: #fff;
+		font-size: 24rpx;
+		display: flex;
+		justify-items: center;
+		align-items: center;    /* 垂直居中 */
+		height: 30rpx;          /* 设置父容器的高度 */
+	}
 </style>
\ No newline at end of file
diff --git a/h5/pages/main/tjyy/tjyy.vue b/h5/pages/main/tjyy/tjyy.vue
index 9ea0d96..b3dc6ea 100755
--- a/h5/pages/main/tjyy/tjyy.vue
+++ b/h5/pages/main/tjyy/tjyy.vue
@@ -307,6 +307,7 @@ const comfrimyy = async () => {
 	coupon_id:yytjInfo.value?.couponId || null,
     wj: buyInfo.value.wj,
 	erxian_info:erxianInfo.value,
+	peiou_info:$store.getPeiOuUser()//配偶信息
   };
   console.log(obj);
   const response = await $api("OrderCreate", obj);
diff --git a/h5/pages/premarital/form/form.vue b/h5/pages/premarital/form/form.vue
index 63773c6..9eae39b 100644
--- a/h5/pages/premarital/form/form.vue
+++ b/h5/pages/premarital/form/form.vue
@@ -93,6 +93,7 @@
 			mountedAction()
 		}
 	}
+	let msgCode=ref('');
 	const number_type_array = [{
 			value: 1,
 			label: '身份证'
@@ -191,7 +192,7 @@
 		'职业': "",
 		'出生地': "",
 		'配偶姓名': "",
-		'配偶证件类型': 0,
+		'配偶证件类型':0,
 		'配偶证件号': "",
 		'血缘关系': "无",
 	//	'邮政编码': "",
@@ -217,10 +218,10 @@
 	}
 	const editDoneClick = async() => {
 		let post_data = JSON.parse(JSON.stringify(input_data.value))
-		post_data['证件类型'] = number_type_array[input_data.value['证件类型']].value
-		post_data['配偶证件类型'] = number_type_array[input_data.value['配偶证件类型']].value
+		post_data['证件类型'] = input_data.value['证件类型']
+		post_data['配偶证件类型'] = input_data.value['配偶证件类型']
 		for (let i in post_data) {
-			if (!post_data[i]) {
+			if (!post_data[i] && post_data[i]!==0) {
 				return uni.$lu.toast(`请填写${i}`)
 			}
 		}
@@ -230,10 +231,21 @@
 			sfz: input_data.value['配偶证件号'],
 		})
 		 
-		$response(response, () => {
+		$response(response, async () => {
 			if(response.status){
 				if(response.data.info.code ==200){
-					HunQianQuestionSubmit(post_data)
+					let peiou_info=$store.getPeiOuUser()
+					peiou_info={
+						name:input_data.value['配偶姓名'],
+						sfz:input_data.value['配偶证件号']
+					}
+					$store.setPeiOuUser(peiou_info);
+					let checkcode=false;
+					checkcode=await CheckMsgCode()
+					if(checkcode===true){
+						HunQianQuestionSubmit(post_data)
+					}
+					
 				}else{
 					uni.$lu.toast("配偶未建档，请先建档")
 				}
@@ -243,6 +255,43 @@
 		})
 		
 		
+	}
+	const GetMsgCode=async ()=>{
+		if(input_data.value['手机号码']==''){
+			uni.$lu.toast("验证码不能为空")
+			return false
+		}
+		uni.showLoading({
+			title: "加载中",
+		});
+		const response = await $api('SendMsgCode', {
+			mobile:input_data.value['手机号码'] 
+		})
+		uni.hideLoading();
+		$response(response, () => {
+			 if(response.status){
+				 uni.$lu.toast("发送成功")
+			 }
+		})
+	}
+	const CheckMsgCode= async ()=>{
+		if(msgCode.value==''){
+			uni.$lu.toast("验证码不能为空")
+			return false
+		}
+		uni.showLoading({
+			title: "加载中",
+		});
+		const response = await $api('CheckMsgCode', {
+			mobile:input_data.value['手机号码'],
+			code:msgCode.value
+		})
+		uni.hideLoading();
+		let status=false;
+		$response(response, () => {
+			 status=response.status
+		})
+		return status
 	}
 	const HunQianQuestionSubmit = async (post_data) => {
 		const response = await $api('HunQianQuestionSubmit', {
@@ -292,13 +341,13 @@
 						<template v-else-if="k === '文化程度'">
 							<picker class="select_picker_wrapper" @change="(e)=>{bindWenHuaPickerChange(e, k)}"  :value="WenHuaIndex"
 								:range="wenhua_array"  >
-								<view>{{WenHuaIndex==""?"请选择文化程度":wenhua_array[WenHuaIndex]}}</view>
+								<view :class="WenHuaIndex==''?'huizi':''">{{WenHuaIndex==""?"请选择文化程度":wenhua_array[WenHuaIndex]}}</view>
 							</picker>
 						</template>
 						<template v-else-if="k === '职业'">
 							<picker class="select_picker_wrapper" @change="(e)=>{bindZhiYePickerChange(e, k)}"  :value="ZhiYeIndex"
 								:range="zhiye_array"  >
-								<view>{{ZhiYeIndex==""?"请选择职业":zhiye_array[ZhiYeIndex]}}</view>
+								<view :class="ZhiYeIndex==''?'huizi':''">{{ZhiYeIndex==""?"请选择职业":zhiye_array[ZhiYeIndex]}}</view>
 							</picker>
 						</template>
 						<template v-else-if="k === '生日'">
@@ -323,11 +372,22 @@
 								</radio-group>
 							</view>
 						</template>
+						<template v-else-if="k === '手机号码'">
+							<view style="display: flex;align-items: center;">
+							 <input style="font-size: 26rpx;" v-model="input_data[k]" :placeholder="`请输入${k}`" />
+							 <view style="border: 1px solid #ccc;padding: 8rpx;border-radius: 10rpx;" @click="GetMsgCode()">获取验证码</view>
+							</view>
+						</template>
 						<template v-else>
 							<input style="font-size: 26rpx;" v-model="input_data[k]" :placeholder="`请输入${k}`" />
 						</template>
 					</view>
 				</view>
+				<view style="margin-top: 20rpx;display: flex;">
+					<view class="form_title_wrapper">验证码</view>
+						<input style="font-size: 26rpx;margin-left: 40rpx;" v-model="msgCode" placeholder="请输入验证码" />
+				</view>
+				
 			</view>
 			<view @click="editDoneClick()" class="button_wrapper">提交</view>
 			<view style="height: 100rpx;"></view>
@@ -400,6 +460,7 @@
 
 	.form_title_wrapper {
 		width: 140rpx;
+		 font-size: 26rpx;
 	}
 
 	.form_item_wrapper {
@@ -427,4 +488,7 @@
 		width: calc(100% - 50rpx);
 		margin: 0 auto;
 	}
+	.huizi{
+		color: #888888;
+	}
 </style>
\ No newline at end of file
diff --git a/h5/pages/test/test.vue b/h5/pages/test/test.vue
new file mode 100644
index 0000000..69dd757
--- /dev/null
+++ b/h5/pages/test/test.vue
@@ -0,0 +1,41 @@
+<template>
+	<view>
+		<uni-file-picker 
+			v-model="imageValue" 
+			fileMediatype="image" 
+			mode="grid" 
+			ref="files" :auto-upload="false"
+			@select="select" 
+			@progress="progress" 
+			 
+		/>
+		<button @click="upload">上传文件</button>
+		<view v-if="fileInfo">
+			{{fileInfo}}
+		</view>
+	</view>
+</template>
+
+<script setup>
+	 import {
+	 	ref
+	 } from 'vue'
+	 let files=ref(null);
+	 let imageValue=ref(null);
+	 const upload=()=>{
+		  
+	 }
+	 const progress=(e)=>{
+		 console.log(e)
+	 }
+	 let fileInfo=ref(null);
+	 const select=(e)=>{
+		 console.log('-------',e)
+		 fileInfo.value=e
+		 fileInfo.value= JSON.stringify(fileInfo.value)
+	 }
+</script>
+
+<style>
+
+</style>
diff --git a/h5/static/assets/question/banner3.png b/h5/static/assets/question/banner3.png
new file mode 100644
index 0000000..32c4127
Binary files /dev/null and b/h5/static/assets/question/banner3.png differ
diff --git a/h5/store/index.js b/h5/store/index.js
index d71664d..666bce1 100644
--- a/h5/store/index.js
+++ b/h5/store/index.js
@@ -77,6 +77,15 @@ export const useStore = defineStore('counter', {
 		getUser() {
 			return JSON.parse(uni.getStorageSync('USER') || '{}') || this.user;
 		},
+		//配偶信息
+		setPeiOuUser(user) {
+			this.user = user;
+			uni.setStorageSync('PEIOU', JSON.stringify(user));
+		},
+		//获取配偶信息
+		getPeiOuUser() {
+			return JSON.parse(uni.getStorageSync('PEIOU') || '{}') || this.user;
+		},
 		setGroupInfo(info) {
 			this.groupInfo = info;
 			uni.setStorageSync('GROUP_INFO', JSON.stringify(info));