Merge branch 'feature/zjx' into 'develop'

Feature/zjx

See merge request !24

src/plugins/httpExtension.js

@@ -17,7 +17,8 @@ $http.addBeforeHook(config => console.log('我是新增的前置钩子', config)
 
 // 新增后置钩子
 $http.addAfterHook(response => {
-  if (response.data.code !== '000000') {
+
+  if (response.code !== '000000' ) {
     Toast(response.data.message);
   }
   console.log('我是新增的后置钩子', response);

src/router/index.js

@@ -3,7 +3,6 @@ import insuranceBindCode from '@/views/insurance-bind-code/insurance-bind-code';
 import insuranceDetectionDetail from '@/views/insurance-detection-detail/insurance-detection-detail';
 import insuranceBindCodeSuccess from '@/views/insurance-bindCode-success/insurance-bindCode-success';
 import handleAllRouter from '../public_uat';
-
 const routerConfig = [
   {
     path: '/insuranceBindCode',
@@ -56,9 +55,24 @@ const routerConfig = [
     component: () => import('@/views/pdf-preview/index.vue'),
   },
 ];
-
+// 无问卷-0001 有问卷未填写-0101 已填写问卷未出结果-0102 已出结果无需领用-0401 已出结果未预约-0201 已预约未采样-0301 已预约已采样-0302
+const routerMap = {
+  '0001': null,
+  '0101': null,
+  '0102': null,
+  '0401': null,
+  '0201': '/appoint',
+  '0301': null,
+  '0302': null,
+};
 router.beforeEach(async (to, from, next) => {
+  console.log(to, from, next);
+  if (to.name === 'home') {
+    console.log(to.name, routerMap);
+  } else {
   next();
+
+  }
 });
 
 router.addRoutes(routerConfig);

src/views/appoint/index.vue

@@ -187,6 +187,7 @@
 </template>
 
 <script>
+import store from 'storejs';
 import {getDetectionName, getOrderInfo, appointment, getHospitalList} from '@/api/appoint';
 import SelectHospital from '@/components/selectHospital/index.vue';
 import SelectTime from '@/components/selectTime/index.vue';
@@ -322,6 +323,9 @@ export default {
           });
           geolocation.getCurrentPosition((status, result) => {
             console.log('geolocation,', status, result);
+            if (geolocation.result) {
+              store.set('geolocation', geolocation.result.position);
+            }
             that.position.latitude = result.position.lat || '';
             that.position.longitude = result.position.lng || '';
             const data = {
@@ -360,6 +364,7 @@ export default {
           this.dectionData = dectionData;
           this.dectionForm.detectName = dectionData.detectionName;
           this.dectionForm.goodsId = dectionData.goodsId;
+          this.$store.dispatch('setInsuranceInfo', dectionData);
         }
 
       });

src/views/appointDetails/index.vue

@@ -138,6 +138,7 @@
 <script>
 import {getDetailByYunOrderNo} from '@/api/appoint';
 import { mapActions, mapGetters } from 'vuex';
+import store from 'storejs';
 export default {
   data() {
     return {
@@ -149,7 +150,7 @@ export default {
         style: 'backgroundColor:#ffffff;zIndex:100;',
         background: '',
       },
-      actions: [{ name: '高德地图', value:1 }, { name: '腾讯地图', value:1 }, { name: '百度地图', value:1}],
+      actions: [{ name: '高德地图', value:1 }, { name: '腾讯地图', value:2 }, { name: '百度地图', value:3}],
       detailInfo: {},
       showSsheet:false,
       yunOrderNo: '',
@@ -193,10 +194,41 @@ export default {
 
     },
     selectItem(item) {
-      console.log(item);
-      const address = '上海市浦东新区兰花路333';
-      const url = 'https://uri.amap.com/marker?&name=' + address + '&callnative=1';
+      const geolocation = store.get('geolocation');
+      const hospitalName = '上海市浦东新区兰花路333';
+
+      let url = '';
+      // lat<纬度>,lng<经度>
+      const latitude = '31.234527';
+      const longitude = '121.287689';
+
+      if (geolocation && geolocation.lat && geolocation.lng) {
+        // https://uri.amap.com/navigation
+      } else {
+        console.log(item);
+        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:
+            // https://lbsyun.baidu.com/index.php?title=uri/api/web api地址
+
+            url = 'http://api.map.baidu.com/marker?location=' + latitude + ',' + longitude + '&title=' + hospitalName + '&output=html&src=webapp.baidu.openAPIdemo';
+            break;
+          default:
+            url = 'https://uri.amap.com/marker?&name=' + hospitalName + '&position=' + longitude + ',' + latitude + '&callnative=1';
+            break;
+        }
+      }
+      console.log('geolocation', url);
       window.open(url);
+
     },
     bindingCode() {
       this.$router.push({

src/views/home/index.vue

+<template>
+  <div>111</div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+
+    };
+  },
+};
+</script>
+
+<style>
+
+</style>