Merge branch 'feature/zjx' into 'develop'

add

See merge request !68

src/api/question.js

@@ -9,10 +9,10 @@ export const getButtonStatus = (id) => {
 };
 // 根据订单号获取跳转页状态/
 // /tis/insurance/jumpPageStatus?orderNo=1&projectEquityNo=1
-export const getJumpPageStatus = ({externalOrderNo, projectEquityNo}) => {
+export const getJumpPageStatus = ({externalOrderNo, yunOrderNo, projectEquityNo}) => {
   return request({
     method: 'get',
-    url: `/tis/insurance/jumpPageStatus?externalOrderNo=${externalOrderNo}&projectEquityNo=${projectEquityNo}`,
+    url: `/tis/insurance/jumpPageStatus?externalOrderNo=${externalOrderNo}&projectEquityNo=${projectEquityNo}&yunOrderNo=${yunOrderNo}`,
     withCredentials: true,
   });
 };

src/views/home/index.vue

@@ -37,16 +37,38 @@ export default {
       dectionData: {},
       projectEquityNo: '',
       externalOrderNo: '',
-      query:{}
+      query: {},
+      yunOrderNo:'',
 
     };
   },
   mounted() {
-    const { projectEquityNo, externalOrderNo } = this.$route.query;
-    this.query = this.$route.query;
-    this.projectEquityNo = projectEquityNo;
-    this.externalOrderNo = externalOrderNo;
     this.$loading.show();
+    this.query = this.$route.query;
+    if (this.query.projectEquityNo && this.query.externalOrderNo) {
+      const { projectEquityNo, externalOrderNo } = this.$route.query;
+      this.projectEquityNo = projectEquityNo;
+      this.externalOrderNo = externalOrderNo;
+      const data = {
+        yunOrderNo:'',
+        projectEquityNo,
+        externalOrderNo
+      };
+      this.initMap(data);
+
+    }
+    if (this.query.referer) {
+      const url = this.query.referer;
+      const yunOrderNo = url.split('@@')[1];
+      console.log('this.query.referer', yunOrderNo);
+      const data = {
+        yunOrderNo,
+        projectEquityNo:'',
+        externalOrderNo:'',
+      };
+      this.initMap(data);
+    }
+
     // get geolocation
     // var that = this;
     // var geolocation = new qq.maps.Geolocation();
@@ -58,11 +80,11 @@ export default {
     //   console.log('err', result);
     //   that.getJumpPageStatus();
     // });
-    this.initMap();
+
   },
   methods: {
      //  高德地图导航只有在线上环境才能使用
-     initMap() {
+     initMap(data) {
        // latitude: 70
       // longitude: 50.2
       // const data = {
@@ -72,6 +94,7 @@ export default {
       // };
       // that.getHospitalList(data);
       var that = this;
+
       AMapLoader.load({
         key:'009dd02e4fe0a1b5f895cd7b86b9e216', // 申请好的Web端开发者Key，首次调用 load 时必填
         plugins:[''], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
@@ -95,7 +118,7 @@ export default {
               const position = { ...result.position, addr: result.formattedAddress };
               storejs.set('geolocation', position);
             }
-            that.getJumpPageStatus();
+            that.getJumpPageStatus(data);
 
           });
 
@@ -118,11 +141,8 @@ export default {
       });
     },
     // 获取跳转状态
-    getJumpPageStatus() {
-      const data = {
-        externalOrderNo: this.externalOrderNo,
-        projectEquityNo: this.projectEquityNo
-      };
+    getJumpPageStatus(data) {
+
       getJumpPageStatus(data).then(res => {
         console.log('getJumpPageStatus', res);
         if (res.code == '000000') {