Merge branch 'feature/zl2' into 'develop'

Feature/zl2

See merge request !42

src/views/insurance-bind-code/insurance-bind-code.vue

@@ -224,6 +224,7 @@ export default {
       },
       insuranceInfo: {},
       pprotocolType: '',
+      yunOrderNo: ''
     };
   },
   computed: {
@@ -234,6 +235,7 @@ export default {
     if(pprotocolType && detectionRecordId && yunOrderNo) {
       this.pprotocolType = pprotocolType;
       this.detectionRecordId = detectionRecordId;
+      this.yunOrderNo = yunOrderNo;
       this.getProtocolName();
       this.getRecordInfo(detectionRecordId);
       this.getDetectionName(yunOrderNo);
@@ -392,7 +394,7 @@ export default {
         {
           path:  '/insuranceBindCodeSuccess',
           query: {
-            projectId: this.projectId,
+            yunOrderNo: this.yunOrderNo,
             detectionRecordId: this.detectionRecordId
           },
         }

src/views/insurance-bindCode-success/insurance-bindCode-success.vue

@@ -99,12 +99,14 @@ export default {
         background: '',
       },
       dataDetail: {},
-      detectionRecordId: ''
+      detectionRecordId: '',
+      yunOrderNo: ''
     };
   },
   created() {
-    const {detectionRecordId} = this.$route.query;
+    const {detectionRecordId, yunOrderNo} = this.$route.query;
     this.detectionRecordId = detectionRecordId;
+    this.yunOrderNo = yunOrderNo;
     this.init();
   },
   mounted() {
@@ -125,6 +127,7 @@ export default {
         path: '/insuranceDetectionDetail',
         query: {
           detectionRecordId: this.detectionRecordId,
+          yunOrderNo: this.yunOrderNo
         },
       });
     },

src/views/insurance-detection-detail/insurance-detection-detail.vue

@@ -241,11 +241,14 @@ export default {
         path:'pagesInsurance/all-entrance/index', // 打开页面
         extraData: JSON.stringify({})
       },
-      openWebAppBtnName: '报告解读'
+      openWebAppBtnName: '报告解读',
+      yunOrderNo: ''
     };
   },
   created() {
-    this.detectionRecordId = this.$route.query.detectionRecordId;
+    const {detectionRecordId, yunOrderNo} = this.$route.query;
+    this.detectionRecordId = detectionRecordId;
+    this.yunOrderNo = yunOrderNo;
     this.init();
   },
   mounted() {
@@ -256,8 +259,7 @@ export default {
       const ed = {
         channelSource: 'insurance_channel',
         targetPath: 'pagesInsurance/all-entrance/index',
-        query: {detectionRecordId:this.detectionRecordId, status: this.dataDetail.status},
-        fromOriginPage:'insuranceDetectionDetail',
+        query: {detectionRecordId:this.detectionRecordId, status: this.dataDetail.status, yunOrderNo: this.yunOrderNo},
       };
       getDetectionDetail(this.detectionRecordId).then((res) => {
         if (res.code === '000000') {
@@ -322,7 +324,7 @@ export default {
       if(this.picaWechat == 'wechat') {
         return false;
       }
-      const p = {params:{path:'pagesInsurance/all-entrance/index', query:{channelSource:'insurance_channel', detectionRecordId:this.detectionRecordId, status: this.dataDetail.status }}, type: 2};
+      const p = {params:{path:'pagesInsurance/all-entrance/index', query:`yunOrderNo=${this.yunOrderNo}&channelSource=insurance_channel`}, type: 2};
       getJumpToWebapp(p).then(res => {
         console.log('--res', res);
         if(res.data) {