Feature/zjx

src/api/question.js

@@ -26,3 +26,12 @@ export const createOrder = (data) => {
     withCredentials: true,
   });
 };
+
+// tis/insurance/makeAppointmentStatus?yunOrderNo=PCX2023021608340000000709043
+export const getAppointmentStatus = (yunOrderNo) => {
+  return request({
+    method: 'get',
+    url: `/tis/insurance/makeAppointmentStatus?yunOrderNo=${yunOrderNo}`,
+    withCredentials: true,
+  });
+};

src/components/selectTime/index.vue

@@ -28,16 +28,16 @@
           <div
             v-show="currentItem.amTimeBegin !='' && currentItem.amTimeEnd !=''"
             class="text"
-            :class="selectTimeBucket === 'amTimeBegin' ?'selected':''"
-            @click="selectTimeB('amTimeBegin')"
+            :class="selectTimeBucket === 'am' ?'selected':''"
+            @click="selectTimeB('am')"
           >
             {{ currentItem.amTimeContent }}
           </div>
           <div
             v-if="currentItem.pmTimeBegin !='' && currentItem.pmTimeEnd!=''"
             class="text"
-            :class="selectTimeBucket === 'pmTimeBegin' ?'selected':''"
-            @click="selectTimeB('pmTimeBegin')"
+            :class="selectTimeBucket === 'pm' ?'selected':''"
+            @click="selectTimeB('pm')"
           >
             {{ currentItem.pmTimeContent }}
           </div>
@@ -154,10 +154,10 @@ export default {
     },
     selectTimeB(item) {
       // 约满禁止预约
-      if (!this.currentItem[item]) {
+      if (this.currentItem[item + 'AppointmentFlag' ]) {
         return;
       }
-      this.selectTimeBucket = item === 'amTimeBegin' ? this.currentItem['amTimeBegin'] : this.currentItem['pmTimeBegin'];
+      this.selectTimeBucket = item === 'am' ? this.currentItem['amTimeBegin'] : this.currentItem['pmTimeBegin'];
       this.selectItem();
     }
   }

src/views/appoint/index.vue

@@ -40,7 +40,7 @@
                      },
                      {
                        pattern: /^.{2,20}$/,
-                       message: '收货人姓名请填写2-20位',
+                       message: '受检人姓名请填写2-20位',
                      },]"
           />
           <van-field

src/views/appointDetails/index.vue

@@ -230,6 +230,25 @@ export default {
 
       if (geolocation && geolocation.lat && geolocation.lng) {
         // https://uri.amap.com/navigation
+        switch (item.value) {
+          case 1:
+          // https://lbs.amap.com/api/uri-api/guide/mobile-web/point api地址
+            url = 'https://uri.amap.com/marker?&name=' + hospitalName + '&position=' + longitude + ',' + latitude + '&callnative=1';
+            break;
+          case 2:
+            // https://lbs.qq.com/webApi/uriV1/uriGuide/uriWebMarker  api地址
+            url = 'https://apis.map.qq.com/uri/v1/geocoder?coord=' + latitude + ',' + longitude + '&referer=PICA';
+            break;
+          case 3:
+          // http://api.map.baidu.com/direction?origin=latlng:34.264642646862,108.95108518068|name:我家&destination=大雁塔&mode=driving&region=西安&output=html&src=webapp.baidu.openAPIdemo
+
+            // https://lbsyun.baidu.com/index.php?title=uri/api/web api地址
+            url = 'http://api.map.baidu.com/direction?origin=latlng:' + latitude + ',' + longitude + '&destination=' + geolocation.lat + ',' + geolocation.lng + + '&output=html&src=webapp.baidu.openAPIdemo&coord_type=bd09ll';
+            break;
+          default:
+            url = 'https://uri.amap.com/marker?&name=' + hospitalName + '&position=' + longitude + ',' + latitude + '&callnative=1';
+            break;
+        }
       } else {
         console.log(item);
         switch (item.value) {

src/views/home/index.vue

@@ -81,8 +81,9 @@ export default {
       this.yunOrderNo = res.data.yunOrderNo;
       this.query.yunOrderNo = res.data.yunOrderNo;
       this.status = res.data.status;
+      this.status = '0102';
       this.getDetectionName(this.yunOrderNo);
-      switch (res.data.status) {
+      switch (this.status) {
           case '0101':
           window.location.href = res.data.questionnaireUrl;
           break;

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

@@ -105,6 +105,7 @@ export default {
   padding: 0 16px;
   color: #676869;
   text-align: center;
+  overflow: auto;
   .icon-item {
     width: 57px;
     height: 65px;

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

@@ -53,7 +53,7 @@
 
         @click="toAppoint"
       >
-        {{ statusMap(detailInfo.status) || '免费预约检测' }}
+        {{ buttonText || '免费预约检测' }}
       </div>
       <div class="tips">
         注：该问卷评估结果仅供填写人自行参考。
@@ -84,7 +84,8 @@ export default {
       yunOrderNo:'',
       status:null,
       query: {},
-      buttonStatus:false
+      buttonStatus: false,
+      buttonText:''
     };
   },
 
@@ -123,6 +124,7 @@ export default {
       getButtonStatus(yunOrderNo).then(res => {
         console.log(res);
         this.buttonStatus = res.data.buttonStatus;
+        this.buttonText = res.data.statusDesc;
       });
     }
   },