a

src/views/flow/components/combo.vue

 <template>
   <div class="combo">
-    <div class="title"><span class="point"></span>请选择套餐</div>
+    <div class="title"><span class="point" v-if="reservedInfo"></span>{{reservedInfo.chooseName}}</div>
    <!-- v-if="combos.type === '1'" -->
     <a-radio-group
       class="items-radios"
@@ -8,10 +8,18 @@
       @change="onChange"
     >
       <ul class="items">
-        <li class="item" v-for="item in reservedInfo.chooseList" :key="item.id">
-          <a-radio :value="item.id">
-            {{ item.servicecententName }}
+        <li class="item" v-for="item in chooseList" :key="item.id"
+			@click.stop="item.show=!item.show">
+          <a-radio :value="item.id" @focus="item.show=!item.show">
+            <span>{{ item.servicecententName }}</span>
           </a-radio>
+		  <div class="desc-div" v-if="item.articleList&&item.show">
+			  <div class="flex li" v-for="(ite,i) in item.articleList" :key='ite.id'>
+				  <div class="title">{{i+1}}. 标题：{{ite.title}}</div>
+				  <div class="content">内容：{{ite.content}}</div>
+			  </div>
+		  </div>
+		  
         </li>
       </ul>
     </a-radio-group>
@@ -42,6 +50,7 @@ export default {
   data() {
     return {
       chooseId: '',
+	  chooseList: [],
       // chkvalue: [],
       // combos: {
       //   type: "2",
@@ -91,8 +100,15 @@ export default {
   created(){
     //获取产品信息-可选体检套餐
     this.reservedInfo = JSON.parse(window.localStorage.getItem('reservedInfo'))
-    this.chooseId = JSON.parse(window.localStorage.getItem('chooseList'))[0].id
-    console.log('1111chooseId==',this.chooseId)
+	let chooseList = JSON.parse(window.localStorage.getItem('chooseList'));
+    this.chooseId = chooseList.id
+	this.chooseList = this.reservedInfo.chooseList.map((item)=>{
+		return {
+			...item,
+			show: false
+		}
+	})
+    console.log(this.chooseList)
   },
   methods: {
     onChange(checkedValues) {
@@ -111,6 +127,13 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.desc-div{
+	box-sizing: border-box;
+	padding: 10px;
+	border-radius: 6px;
+	background: #f8f8f8;
+	
+}
 .combo {
   .items-radios {
     margin-top: 20px;
@@ -121,7 +144,6 @@ export default {
       background: #fafafa;
       border-radius: 2px;
       margin-top: 20px;
-      height: 36px;
       line-height: 36px;
       font-size: 14px !important;
       padding-left: 10px;

src/views/flow/components/selectInstitution.vue

 <template>
   <div class="institution">
-    <!-- 请选择体检地区 -->
+    <!-- 请选择服务地区 -->
     <div class="area">
       <div class="title">
-        <div class="type"><span class="point"></span> 请选择体检地区</div>
+        <div class="type"><span class="point"></span> 请选择服务地区</div>
       </div>
       <ul class="area_box">
         <li>
           <label>省：</label>
-          <a-select style="width: 120px" @change="handleSelectProvince">
+          <a-select style="width: 120px" @change="handleSelectProvince" allowClear>
             <a-select-option
               v-for="item in provinceList"
               :key="item.id"
@@ -41,10 +41,10 @@
         </li>
       </ul>
     </div>
-    <!-- 请选择体检机构 -->
+    <!-- 请选择服务机构 -->
     <div class="mechanism">
       <div class="title">
-        <div class="type"><span class="point"></span> 请选择体检机构</div>
+        <div class="type"><span class="point"></span> 请选择服务机构</div>
       </div>
       <div class="mechanism_box">
         <span
@@ -57,10 +57,10 @@
         <!-- -{{ item.id }} -->
       </div>
     </div>
-    <!-- 请选择体检地区 -->
+    <!-- 请选择服务地区 -->
     <div class="hospital">
       <div class="title">
-        <div class="type"><span class="point"></span> 请选择体检中心</div>
+        <div class="type"><span class="point"></span> 请选择服务中心</div>
       </div>
       <ul class="hospital_box" v-if="isShowHospitalList">
         <li v-for="(item, index) in hospitalList" :key="index">
@@ -72,7 +72,7 @@
             :class="item.isDisabled ? 'btn disabled' : 'btn'"
             @click="openDatePicker(item)"
           >
-            选择体检日期
+            选择服务日期
           </button>
           <!-- -{{ item.supplierId }}-{{ item.id }} -->
         </li>
@@ -118,21 +118,21 @@ export default {
       provinceCode: '', //选择省
       cityCode: '', //选择市
       areaCode: '', //选择区
-      mechanismList: [], //体检机构列表
-      hospitalList: [], //体检机构对应下的体检中心列表
-      isShowHospitalList: true, //是否显示体检中心列表
-      supplierIds: '', //体检中心ids,默认显示全部
+      mechanismList: [], //服务机构列表
+      hospitalList: [], //服务机构对应下的服务中心列表
+      isShowHospitalList: true, //是否显示服务中心列表
+      supplierIds: '', //服务中心ids,默认显示全部
       servicepackageId: '', //产品id
       serviceDate: '', //预约的时间
       hospitalId: '', //医院id
-      supplierId: '', //选择体检中id
+      supplierId: '', //选择服务中id
     }
   },
   created() {
     const { servicepackageId } = this.$route.query
     this.servicepackageId = servicepackageId ? servicepackageId : ''
     this.getProvinceList() //获取省
-    this.getSupplierList() //获取体检机构
+    this.getSupplierList() //获取服务机构
     // 获取门店排期
   },
 
@@ -188,24 +188,30 @@ export default {
     // 选择省
     handleSelectProvince(value) {
       console.log(`选择省provinceCode= ${value}`)
-      this.provinceCode = value
+      this.provinceCode = value||''
+	  this.cityCode = ''
+	  this.areaCode = ''
       this.getCityListByProvinceCode() // 根据省-获取市
+	  this.getSupplierList();
     },
 
     // 选择市
     handleSelectCity(value) {
       console.log(`选择市CityCode= ${value}`)
       this.cityCode = value
+	  this.areaCode = ''
       this.getDistrictListByCityCode() // 根据市-获取区
+	  this.getSupplierList();
     },
 
     // 选择区
     handleSelectDistrict(value) {
       this.areaCode = value
       console.log(`选择区DistrictCode= ${value}`)
+	  this.getSupplierList();
     },
 
-    // 获取体检机构
+    // 获取服务机构
     async getSupplierList() {
       // 测试id1043
       api
@@ -214,7 +220,7 @@ export default {
           if (res.returnCode == '0000') {
             const data = res.content
 
-            // 提取所有的体检机构ids,并用逗号隔开,比如:1004,1007
+            // 提取所有的服务机构ids,并用逗号隔开,比如:1004,1007
             this.supplierIds = data
               .map(function (e, i) {
                 return e.id
@@ -230,33 +236,33 @@ export default {
               ...res.content,
             ]
             console.log('this.supplierIds===', this.supplierIds)
-            this.getShopByDistrictCode() //根据体检结构-显示可选择的体检中心,默认显示全部
+            this.getShopByDistrictCode() //根据服务结构-显示可选择的服务中心,默认显示全部
           } else {
             this.$message.error(res.returnMsg)
           }
         })
     },
 
-    // 选择体检机构
+    // 选择服务机构
     clickTab(index, id) {
       this.selectIndex = index
-      console.log('选择体检机构id', index, id)
+      console.log('选择服务机构id', index, id)
       this.supplierIds = id
-      // 点击选择体检机构,显示该机构下的体检中心
+      // 点击选择服务机构,显示该机构下的服务中心
       this.getShopByDistrictCode()
     },
 
-    // 根据体检机构-获取体检中心列表
+    // 根据服务机构-获取服务中心列表
     getShopByDistrictCode() {
       const params = {
         // customerSex: 'M', //性别
         // customerMaritalStatus: '02', //婚姻状况
         chooseList: JSON.parse(window.localStorage.getItem('chooseList')),
         payList: [],
-        provinceCode: '', //省编号
-        cityCode: '', //市编号
-        areaCode: '', //区号
-        supplierIds: this.supplierIds, //体检机构d
+        provinceCode: this.provinceCode, //省编号
+        cityCode: this.cityCode, //市编号
+        areaCode: this.areaCode, //区号
+        supplierIds: this.supplierIds, //服务机构d
         location: ',', //经纬度
         servicepackageId: this.servicepackageId, //产品id
       }
@@ -264,7 +270,7 @@ export default {
         if (res.returnCode === '0000') {
           this.isShowHospitalList = true
           this.hospitalList = res.content
-          console.log('根据体检机构-获取体检中心列表=', this.hospitalList)
+          console.log('根据服务机构-获取服务中心列表=', this.hospitalList)
         } else {
           this.isShowHospitalList = false
           // this.$message.error(res.returnMsg)
@@ -324,7 +330,9 @@ export default {
       // 弹窗-"你预约的日期为:xxxxxx"
       this.$confirm({
         title: '预约时间确认',
-        content: `你预约的日期为:${this.serviceDate}`,
+        content: `您预约的日期为： ${this.serviceDate}`,
+		okText: '确认',
+		cancelText: '取消',
         onOk() {
           // return new Promise((resolve, reject) => {
           //   setTimeout(Math.random() > 0.5 ? resolve : reject, 1000)
@@ -467,4 +475,7 @@ export default {
     padding: 20px;
   }
 }
+.ant-btn.ant-btn-primary{
+	background: #3F7FFB;
+}
 </style>

src/views/flow/detail.vue

@@ -31,6 +31,9 @@
             <span class="label">出生日期：</span>
             <a-input :value="customerInfo.birthDate" disabled />
           </div>
+		  <div class="item tip">
+		    【温馨提醒：女士请注意婚姻状况的选择，未婚代表不做妇科项目，需要做妇科项目检测请选择已婚，谢谢理解！】
+		  </div>
         </div>
       </div>
 
@@ -136,10 +139,8 @@ export default {
   },
 }
 </script>
+
 <style lang="less" scoped>
-/deep/ .footbar_{
-	position: initial;
-}
 .flow {
   background: #fafafa;
   min-height: calc(100vh - 360px);
@@ -179,6 +180,10 @@ export default {
         .item {
           display: flex;
           margin-top: 14px;
+		  &.tip{
+			  font-size: 12px;
+			  color: #999;
+		  }
           .label {
             display: inline-block;
             width: 120px;

src/views/flow/index.vue

@@ -31,6 +31,9 @@
             <span class="label">出生日期：</span>
             <a-input :value="customerInfo.birthDate" disabled />
           </div>
+		  <div class="item tip">
+		    【温馨提醒：女士请注意婚姻状况的选择，未婚代表不做妇科项目，需要做妇科项目检测请选择已婚，谢谢理解！】
+		  </div>
         </div>
         <div class="reset">
           <a-button type="primary" @click="onSubmit">点击修改</a-button>
@@ -143,10 +146,16 @@ export default {
 }
 </script>
 
+<style lang="less">
+.footbar_{
+	position: initial !important;
+}	
+</style>
 <style lang="less" scoped>
 .flow {
   background: #fafafa;
   min-height: calc(100vh - 300px);
+  margin-bottom: 20px;
   .btn {
     text-align: center;
     position: relative;
@@ -168,7 +177,6 @@ export default {
     display: flex;
     justify-content: center;
     .left {
-      max-height: 480px;
       .reset {
         text-align: center;
         margin-top: 25px;
@@ -183,6 +191,10 @@ export default {
         .item {
           display: flex;
           margin-top: 14px;
+		  &.tip{
+			  font-size: 12px;
+			  color: #999;
+		  }
           .label {
             display: inline-block;
             width: 120px;