fix

src/components/selectHospital/index.vue

@@ -92,6 +92,10 @@ export default {
     projectEquityNo: {
       type: String,
       default:() => ''
+    },
+    externalData: {
+      type: Object,
+      default:() => null
     }
   },
   data() {
@@ -105,6 +109,15 @@ export default {
       searchValue: '',
     };
   },
+  watch: {
+    externalData: {
+      handler(nv) {
+        console.log('externalData', nv);
+        this.getHospitalList(false);
+      },
+      deep:true
+    }
+  },
   mounted() {
 
     this.getHospitalList(false);
@@ -120,9 +133,9 @@ export default {
       this.pageNum = isLoad ? this.pageNum + 1 : 1;
 
       const data = {
-        cityId: '',
-        countyId: '',
-        provinceId:'',
+        cityId: this.externalData.cityId,
+        countyId: this.externalData.countyId,
+        provinceId:this.externalData.provinceId,
         projectEquityNo:this.projectEquityNo,
         // pageNum: this.pageNum,
         // pageSize: this.pageSize,
@@ -130,17 +143,21 @@ export default {
       };
       console.log(data);
       getHospitalList(data).then(res => {
-        console.log(res.data.list);
+        console.log('getHospitalList', res);
         if (isLoad) {
-          this.list = [...this.list, ...res.data.list];
+          this.list = [...this.list, ...res.data.data];
         } else {
-          this.list = res.data.list;
+          this.list = res.data.data;
         }
-        if (res.data.list.length < this.pageSize) {
+        if (res.data.data.length < this.pageSize) {
           this.finished = true;
         }
         this.loading = false;
-
+        const hospitalIdIndex = this.list.findIndex(ele => ele.hospitalId === this.hospitalId);
+        console.log('hospitalIdIndex', hospitalIdIndex);
+        if (this.externalData.cityId && this.externalData.countyId && this.externalData.provinceId && hospitalIdIndex == -1) {
+          this.$emit('clean');
+        }
       });
     },
     selectItem(item) {

src/views/appoint/index.vue

 <template>
   <div class="insurance-detection-appoint">
+    <page-model
+      v-if="picaWechat != 'wechat'"
+      ref="PageModel"
+      :header-info="headerInfo"
+    />
     <div class="wrap">
       <div class="title-1">
         检测预约
@@ -153,11 +158,13 @@
       </van-button>
     </div>
     <SelectHospital
+      :external-data="externalData"
       :project-equity-no="projectEquityNo"
       :show="showselectHospital"
       :hospital-id="hospitalId"
       @change="selectHospital"
       @close="closePopup"
+      @clean="cleanHospitalId"
     />
     <SelectTime
       :hospital-id="hospitalId"
@@ -193,6 +200,14 @@ export default {
   },
   data() {
     return {
+      picaWechat:window._picaWechat,
+      headerInfo: {
+        title: '检测服务',
+        isBlack: true,
+        backMethod: 'web',
+        style: 'backgroundColor:#ffffff;zIndex:100;',
+        background: '',
+      },
       dectionData:{},
       dectionForm: {
         detectName: '',
@@ -235,7 +250,8 @@ export default {
       locationAreaCode: [],
       hospitalId: '12746',
       projectEquityNo: '',
-      yunOrderNo:''
+      yunOrderNo: '',
+      externalData:{}
     };
   },
   computed: {
@@ -328,6 +344,10 @@ export default {
         this.locationAreaCode = [provinceId, cityId, countyId];
         this.dectionForm.hospitalName = hospitalName;
         this.hospitalId = hospitalId;
+        this.externalData = {
+          ...this.position,
+          provinceId, countyId, cityId
+        };
       });
     },
     // 目前是配置一个检测信息，可能会拓展，所以返回的是一个list
@@ -407,15 +427,25 @@ export default {
     confirm(values) {
       console.log('confirm', values);
       this.showAreaLabel = values.map(ele => ele.name).join('');
+      this.externalData.provinceId = values[0].id;
+      this.externalData.countyId = values[2].id;
+      this.externalData.cityId = values[1].id;
+
       this.showArea = false;
     },
     selectHospital({hospitalId, hospitalName}) {
       this.hospitalId = hospitalId;
       this.dectionForm.hospitalName = hospitalName;
       this.showselectHospital = false;
+
     },
     showAreaFn() {
       this.showArea = true;
+    },
+    cleanHospitalId() {
+      console.log('cleanHospitalId');
+      this.hospitalId = '';
+      this.dectionForm.hospitalName = '';
     }
   },
 };
@@ -428,9 +458,6 @@ export default {
   overflow: auto;
   box-sizing: border-box;
   color: #ffffff;
-  background: url('https://files.yunqueyi.com/image/png/common/20221213160647748.png')
-  no-repeat top left;
-  background-size: 100% 281px;
 
   .bg-img {
     width: 100%;
@@ -441,6 +468,10 @@ export default {
   }
   .wrap {
     padding: 0 12px;
+    overflow: auto;
+    background: url('https://files.yunqueyi.com/image/png/common/20221213160647748.png')
+  no-repeat top left;
+  background-size: 100% 281px;
   }
   .title-1 {
     font-size: 20px;

src/views/appointDetails/index.vue

 <template>
   <div class="insurance-reseach-detail">
+    <page-model
+      v-if="picaWechat != 'wechat'"
+      ref="PageModel"
+      :header-info="headerInfo"
+    />
     <div class="detail-top">
       <div
         class="detail-top-info"
@@ -126,8 +131,17 @@ import { mapActions, mapGetters } from 'vuex';
 export default {
   data() {
     return {
+      picaWechat:window._picaWechat,
+      headerInfo: {
+        title: '检测服务',
+        isBlack: true,
+        backMethod: 'web',
+        style: 'backgroundColor:#ffffff;zIndex:100;',
+        background: '',
+      },
       detailInfo: {},
-      yunOrderNo:'',
+      yunOrderNo: '',
+      query:{},
       // 状态 0=待预约，1=已预约 ，2=已出报告 4=已取消 5=已过期
       statusMap: {
         0: '待预约',

src/views/insurance-question-back/index.vue

 <template>
+  <div>
+    <page-model
+      v-if="picaWechat != 'wechat'"
+      ref="PageModel"
+      :header-info="headerInfo"
+    />
     <div class="insuranceQuestionBack">
       <div class="icon-item">
         <img
@@ -24,6 +30,7 @@
         :is-need-wx-config="false"
       />
     </div>
+  </div>
 </template>
 
 <script>
@@ -32,6 +39,14 @@ const { VUE_APP_ENV } = process.env;
 export default {
   data() {
     return {
+      picaWechat:window._picaWechat,
+      headerInfo: {
+        title: '检测服务',
+        isBlack: true,
+        backMethod: 'web',
+        style: 'backgroundColor:#ffffff;zIndex:100;',
+        background: '',
+      },
       openWebAppConfig: {
         content:
           '<script' +
@@ -85,10 +100,9 @@ export default {
 <style lang="scss" scoped>
 .insuranceQuestionBack {
   width: 100%;
-  height: 100vh;
   background: #ffffff;
   box-sizing: border-box;
-  padding: 20px 16px;
+  padding: 0 16px;
   color: #676869;
   text-align: center;
   .icon-item {

src/views/insurance-question-result/insuranceQuestionResult.vue

 <template>
+  <div class="insuranceQuestionResult-box">
+    <page-model
+      v-if="picaWechat != 'wechat'"
+      ref="PageModel"
+      :header-info="headerInfo"
+    />
     <div class="insuranceQuestionResult">
       <div class="icon-item">
         <img
@@ -53,6 +59,7 @@
         注：该问卷评估结果仅供填写人自行参考。
       </div>
     </div>
+  </div>
 </template>
 
 <script>
@@ -60,6 +67,14 @@ import {getButtonStatus, getJumpPageStatus} from '@/api/question';
 export default {
   data() {
     return {
+      picaWechat:window._picaWechat,
+      headerInfo: {
+        title: '检测服务',
+        isBlack: true,
+        backMethod: 'web',
+        style: 'backgroundColor:#ffffff;zIndex:100;',
+        background: '',
+      },
       needDetect: false,
       result: {},
       detailInfo: {},
@@ -137,18 +152,21 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.insuranceQuestionResult-box{
+background: #fff;
+}
 .insuranceQuestionResult {
   width: 100%;
-  height: 100vh;
   box-sizing: border-box;
-  padding: 20px 16px;
+  padding: 0 16px;
   color: #676869;
+  overflow: auto;
   text-align: center;
   .icon-item {
     width: 50px;
     height: 60px;
     margin: 0 auto;
-    margin-top: 45px;
+    margin-top: 30px;
     img {
       width: 100%;
       height: 100%;
@@ -176,7 +194,7 @@ export default {
     border: 1px solid #fbe0ce;
     padding: 15px;
     text-align: center;
-    margin: 10 auto;
+    margin: 16px auto;
   }
   .fs {
     font-size: 12px;
@@ -200,7 +218,7 @@ export default {
     //position: absolute;
     //bottom: 120px;
     margin: 0 auto;
-    margin-top: 150px;
+    margin-top: 70px;
   }
   .tips {
     font-size: 13px;