Merge branch 'develop' of...

Merge branch 'develop' of http://192.168.110.53/com.pica.cloud.frontend/pica-insurance into feature/zjx

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

@@ -174,7 +174,7 @@
           :extra-data="openWebAppConfig.extraData"
         >
           <script type="text/wxtag-template">
-            <style>.btn {position:absolute; top: 0; color: #ffffff;text-align: center;line-height: 40px; left: 0; width:100%; height: 100%;}</style> <div class="btn">{{ mapStatus(dataDetail.inquiryStatus)}}</div>
+            <style>.btn {position:absolute; top: 0; color: #ffffff;text-align: center;line-height: 40px; left: 0; width:100%; height: 100%;}</style> <div class="btn">{{ openWebAppBtnName}}</div>
           </script>
         </wx-open-launch-weapp>
       </div>
@@ -183,7 +183,7 @@
         class="submit-button"
         @click="getJumpToWebapp"
       >
-        {{ mapStatus(dataDetail.inquiryStatus) }}
+        {{ openWebAppBtnName }}
       </div>
     </div>
   </div>
@@ -260,6 +260,7 @@ export default {
         targetPath: 'pagesInsurance/all-entrance/index',
         query: {yunOrderNo: this.yunOrderNo},
       };
+      that.openWebAppConfig.path = `pagesInsurance/all-entrance/index?yunOrderNo=${this.yunOrderNo}&channelSource=channelSource`;
       getDetectionDetail(this.detectionRecordId).then((res) => {
         if (res.code === '000000') {
           this.dataDetail = res.data;
@@ -323,7 +324,8 @@ export default {
       if(this.picaWechat == 'wechat') {
         return false;
       }
-      const p = {params:{path:'pagesInsurance/all-entrance/index', query:`yunOrderNo=${this.yunOrderNo}&channelSource=insurance_channel`}, type: 2};
+      const query = `channelSource=insurance_channel&yunOrderNo=${this.yunOrderNo}`;
+      const p = {params:{path:'pagesInsurance/all-entrance/index', query:query}, type: 2};
       getJumpToWebapp(p).then(res => {
         console.log('--res', res);
         if(res.data) {
@@ -335,14 +337,17 @@ export default {
       });
     },
     mapStatus(inquiryStatus) {
+      console.log('--mapStatus', inquiryStatus);
+      const s = String(inquiryStatus);
       let m = '报告解读';
-      if(inquiryStatus == 0) {
+      if(s == '0') {
         m = '报告解读';
-      }else if([4, 6].includes(inquiryStatus)) {
+      }else if(['4', '6'].includes(s)) {
         m = '查看专家建议';
       }else{
         m = '已预约待咨询';
       }
+      console.log('--mapStatus', m);
       return m;
     }
   },