Merge branch 'feature/zjx' into 'develop'

Feature/zjx

See merge request !22

src/api/appoint.js

@@ -38,3 +38,11 @@ export const getDetailByYunOrderNo = (yunOrderNo) => {
     withCredentials: true,
   });
 };
+export const getHospitalList = (data) => {
+  return request({
+    method: 'post',
+    data,
+    url: '/tis/insurance/hospitalList',
+    withCredentials: true,
+  });
+};

src/components/pickArea/index.vue

@@ -70,6 +70,7 @@ export default {
     locationAreaCode:{
       async handler(nv, ov) {
         console.log('locationAreaCode', nv, ov);
+        if (nv) {
           this.provinceList = await this.getProvinceList();
           this.cityList = await this.getCityList(nv[0]);
           this.countyList = await this.getCountyList(nv[1]);
@@ -77,7 +78,12 @@ export default {
           const cityIndex = this.cityList.findIndex(ele => ele.id === nv[1]);
           const countyIndex = this.countyList.findIndex(ele => ele.id === nv[2]);
           this.columns = [{ values: this.provinceList, defaultIndex:provinceIndex}, { values: this.cityList, defaultIndex:cityIndex}, { values: this.countyList, defaultIndex:countyIndex }];
-        console.log('locationAreaCode', this.$refs.picker);
+          console.log('locationAreaCode', this.provinceList, provinceIndex);
+          const data = [this.provinceList[provinceIndex], this.cityList[cityIndex], this.countyList[countyIndex]];
+          this.$emit('confirm', data);
+        }else{
+          this.initData();
+        }
 
       },
       immediate:true
@@ -85,7 +91,7 @@ export default {
 
   },
   created() {
-
+    this.initData();
   },
   methods: {
     // 初始化 省市县信息
@@ -94,6 +100,8 @@ export default {
       this.cityList = await this.getCityList(this.provinceList[0].id);
       this.countyList = await this.getCountyList(this.cityList[0].id);
       this.columns = [{ values: this.provinceList }, { values: this.cityList }, { values: this.countyList }];
+      const data = [this.provinceList[0], this.cityList[0], this.countyList[0]];
+      this.$emit('confirm', data);
     },
     // 获取省列表
     getProvinceList() {

src/components/selectHospital/api.js

 //
 import request from 'mn-template/plugins/http';
-export const getHospitalList = (params) => {
+export const getHospitalList = (data) => {
   return request({
-    method: 'GET',
-    params,
+    method: 'post',
+    data,
     url: '/tis/insurance/hospitalList',
     withCredentials: true,
   });

src/components/selectHospital/index.vue

@@ -30,7 +30,7 @@
       </div>
       <div class="select-hospital-list">
         <van-list
-          v-if="list.length >0"
+          v-if="list && list.length >0"
           v-model="loading"
           :finished="finished"
           finished-text="没有更多了"
@@ -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/components/selectTime/index.vue

@@ -82,11 +82,18 @@ export default {
     };
   },
   watch: {
+    projectEquityNo: {
+      handler(nv) {
+        if (nv) {
+          this.getScheduling();
 
+        }
+      },
+      immediate:true
+    }
   },
   mounted() {
     // this.getTimes();d
-    this.getScheduling();
   },
   methods: {
     // 获取机构列表

src/router/index.js

@@ -23,7 +23,7 @@ const routerConfig = [
   {
     path: '/insuranceQuestionResult',
     name: 'insuranceQuestionResult',
-    component: () => import('@/views/insurance-question-result/index.vue'),
+    component: () => import('@/views/insurance-question-result/insuranceQuestionResult.vue'),
   },
   {
     path: '/insuranceQuestionBack',

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">
         检测预约
@@ -62,6 +67,7 @@
           <van-field
             label="检测地点"
             required
+            disabled
             class="appoint-form-title"
           />
           <van-field
@@ -143,20 +149,22 @@
         round
         block
         type="info"
-        :disabled="!checkValue"
+        :disabled="!canSubmit"
         class="appoint-form-submit "
-        :class="checkValue ? 'appoint-form-submit-active':''"
+        :class="canSubmit ? 'appoint-form-submit-active':''"
         @click="appointment"
       >
         提交
       </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"
@@ -179,7 +187,7 @@
 </template>
 
 <script>
-import {getDetectionName, getOrderInfo, appointment} from '@/api/appoint';
+import {getDetectionName, getOrderInfo, appointment, getHospitalList} from '@/api/appoint';
 import SelectHospital from '@/components/selectHospital/index.vue';
 import SelectTime from '@/components/selectTime/index.vue';
 import PickArea from '@/components/pickArea/index.vue';
@@ -192,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: '',
@@ -227,24 +243,46 @@ export default {
       showSelectTime:false,
       isSelf: false,
       spEquityCode: '',
-
-      locationAreaCode: [330, 330400000000, 330424000000],
+      position: {
+        latitude: '',
+        longitude:''
+      },
+      locationAreaCode: [],
       hospitalId: '12746',
-      projectEquityNo: 'CX202302091000154321',
-      yunOrderNo:''
+      projectEquityNo: '',
+      yunOrderNo: '',
+      externalData:{}
     };
   },
   computed: {
-    checkValue() {
-      return true;
+    canSubmit() {
+      // appointmentTime: this.dectionForm.appointmentTime,
+      //   goodsId: this.dectionForm.goodsId,
+      //   hospitalId: this.hospitalId,
+      //   hospitalName: this.dectionForm.hospitalName,
+      //   patientIdNo: this.dectionForm.beneficiaryIdNum,
+      //   patientMobile: this.dectionForm.beneficiaryPhone,
+      //   patientName: this.dectionForm.beneficiaryName,
+      //   yunOrderNo:this.yunOrderNo,
+
+      return (
+        this.dectionForm.appointmentTime &&
+        this.dectionForm.goodsId &&
+        this.dectionForm.hospitalName &&
+        this.hospitalId &&
+        this.dectionForm.beneficiaryIdNum &&
+        this.dectionForm.beneficiaryName &&
+        this.dectionForm.beneficiaryPhone &&
+        this.yunOrderNo
+
+      );
     },
   },
   mounted() {
-    setTimeout(() => {
-      this.locationAreaCode = [330, 330400000000, 330424000000];
-    }, 3000);
-    const { yunOrderNo } = this.$route.query;
+
+    const { yunOrderNo, projectEquityNo } = this.$route.query;
     this.yunOrderNo = yunOrderNo;
+    this.projectEquityNo = projectEquityNo;
     console.log('yunOrderNo', yunOrderNo);
     this.getDetectionName(yunOrderNo);
     this.getOrderInfo(yunOrderNo);
@@ -252,8 +290,18 @@ export default {
   },
   methods: {
     choose() {},
-    submit() {},
+    submit() { },
+    //  高德地图导航只有在线上环境才能使用
     initMap() {
+      var that = this;
+       // latitude: 70
+      // longitude: 50.2
+      const data = {
+        projectEquityNo: that.projectEquityNo,
+        latitude: 70,
+        longitude: 50.2,
+      };
+      that.getHospitalList(data);
       AMapLoader.load({
         key:'d22c1f112c97cb93b8d343b18420b98d', // 申请好的Web端开发者Key，首次调用 load 时必填
         version:'2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
@@ -274,10 +322,33 @@ export default {
           });
           geolocation.getCurrentPosition((status, result) => {
             console.log('geolocation,', status, result);
+            that.position.latitude = result.position.lat || '';
+            that.position.longitude = result.position.lng || '';
+            const data = {
+              projectEquityNo: that.projectEquityNo,
+              latitude: that.position.latitude,
+              longitude:that.position.longitude,
+            };
+            that.getHospitalList(data);
           });
 
         });
       });
+
+    },
+    //  根据坐标获取最近的机构id
+    getHospitalList(data) {
+      getHospitalList(data).then(res => {
+        console.log('getHospitalList', res);
+        const {provinceId, countyId, cityId, hospitalName, hospitalId} = res.data.data[0];
+        this.locationAreaCode = [provinceId, cityId, countyId];
+        this.dectionForm.hospitalName = hospitalName;
+        this.hospitalId = hospitalId;
+        this.externalData = {
+          ...this.position,
+          provinceId, countyId, cityId
+        };
+      });
     },
     // 目前是配置一个检测信息，可能会拓展，所以返回的是一个list
     getDetectionName(yunOrderNo) {
@@ -340,8 +411,8 @@ export default {
       const data = {
         appointmentTime: this.dectionForm.appointmentTime,
         goodsId: this.dectionForm.goodsId,
-        hospitalId: '12746',
-        hospitalName: '1111',
+        hospitalId: this.hospitalId,
+        hospitalName: this.dectionForm.hospitalName,
         patientIdNo: this.dectionForm.beneficiaryIdNum,
         patientMobile: this.dectionForm.beneficiaryPhone,
         patientName: this.dectionForm.beneficiaryName,
@@ -356,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 = '';
     }
   },
 };
@@ -377,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%;
@@ -390,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>
+    <page-model
+      v-if="picaWechat != 'wechat'"
+      ref="PageModel"
+      :header-info="headerInfo"
+    />
     <div class="insurance-reseach-detail">
       <div class="detail-top">
         <div
@@ -117,6 +123,15 @@
       >
         重新预约
       </div>
+      <van-action-sheet
+        v-model="showSsheet"
+        :actions="actions"
+        cancel-text="取消"
+        close-on-click-action
+        @cancel="onCancel"
+        @select="selectItem"
+      />
+    </div>
   </div>
 </template>
 
@@ -126,8 +141,19 @@ import { mapActions, mapGetters } from 'vuex';
 export default {
   data() {
     return {
+      picaWechat:window._picaWechat,
+      headerInfo: {
+        title: '预约详情',
+        isBlack: true,
+        backMethod: 'web',
+        style: 'backgroundColor:#ffffff;zIndex:100;',
+        background: '',
+      },
+      actions: [{ name: '高德地图', value:1 }, { name: '腾讯地图', value:1 }, { name: '百度地图', value:1}],
       detailInfo: {},
-      yunOrderNo:'',
+      showSsheet:false,
+      yunOrderNo: '',
+      query:{},
       // 状态 0=待预约，1=已预约 ，2=已出报告 4=已取消 5=已过期
       statusMap: {
         0: '待预约',
@@ -165,8 +191,20 @@ export default {
     },
     reAppoint() {
 
+    },
+    selectItem(item) {
+      console.log(item);
+      const address = '上海市浦东新区兰花路333';
+      const url = 'https://uri.amap.com/marker?&name=' + address + '&callnative=1';
+      window.open(url);
     },
     bindingCode() {
+      this.$router.push({
+        path:'/insuranceBindCode'
+      });
+    },
+    navigation() {
+      this.showSsheet = true;
 
     },
     // 复制快递单号
@@ -184,9 +222,8 @@ export default {
 .insurance-reseach-detail {
   position: relative;
   width: 100%;
-  min-height: 100vh;
   box-sizing: border-box;
-  padding: 13px 12px;
+  padding: 10px 12px;
   background: #f5f6f8;
   padding-bottom: 120px;
   .detail-top {

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
@@ -44,6 +50,7 @@
       <div
         v-if="!needDetect"
         class="custom-style"
+
         @click="toAppoint"
       >
         {{ statusMap(detailInfo.status) || '免费预约检测' }}
@@ -52,21 +59,50 @@
         注：该问卷评估结果仅供填写人自行参考。
       </div>
     </div>
+  </div>
 </template>
 
 <script>
+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: {},
       isLoading: true,
+      projectEquityNo: '',
+      orderNo: '',
+      yunOrderNo:'',
+       // 无问卷-0001 有问卷未填写-0101 已填写问卷未出结果-0102 已出结果无需领用-0401 已出结果未预约-0201 已预约未采样-0301 已预约已采样-0302
+      routerMap: {
+        '0001': null,
+        '0101': null,
+        '0102': null,
+        '0401': null,
+        '0201': '/appoint',
+        '0301': null,
+        '0302': null,
+      },
+      status:null,
+      query: {},
+      buttonStatus:false
     };
   },
 
   mounted() {
     console.log(11223);
+    const { query } = this.$route;
+    this.query = query;
+    this.getJumpPageStatus();
   },
   methods: {
     statusMap(status) {
@@ -80,23 +116,57 @@ export default {
       };
       return m[status];
     },
+    // 获取跳转状态
+    getJumpPageStatus() {
+      getJumpPageStatus(this.orderNo, this.projectEquityNo).then(res => {
+        // console.log('res', getJumpPageStatus);
+        if (res.code == '000000') {
+          this.yunOrderNo = res.data.yunOrderNo;
+          this.query.yunOrderNo = res.data.yunOrderNo;
+          this.status = res.data.status;
+          this.needDetect = this.status === '0401';
+
+          this.getButtonStatus(res.data.yunOrderNo);
+        }
+      });
+    },
+    // 去预约
+    toAppoint() {
+      if (this.buttonStatus) {
+        const {projectEquityNo, orderNo, yunOrderNo} = this;
+        this.$router.push({
+          path: this.routerMap[this.status],
+          query: {projectEquityNo, orderNo, yunOrderNo},
+        });
+      }
+    },
+    // 获取按钮状态
+    getButtonStatus(yunOrderNo) {
+      getButtonStatus(yunOrderNo).then(res => {
+        console.log(res);
+        this.buttonStatus = res.data.buttonStatus;
+      });
+    }
   },
 };
 </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%;
@@ -124,7 +194,7 @@ export default {
     border: 1px solid #fbe0ce;
     padding: 15px;
     text-align: center;
-    margin: 10 auto;
+    margin: 16px auto;
   }
   .fs {
     font-size: 12px;
@@ -148,7 +218,7 @@ export default {
     //position: absolute;
     //bottom: 120px;
     margin: 0 auto;
-    margin-top: 150px;
+    margin-top: 70px;
   }
   .tips {
     font-size: 13px;