Merge branch 'feature/zl2' into 'develop'

update guide app

See merge request !26

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

@@ -9,12 +9,7 @@
     <div class="detail-box">
       <div class="status">
         <img
-          v-if="waitIcon.indexOf(dataDetail.status) != -1"
-          src="https://files.yunqueyi.com/image/png/common/20220816135321860.png"
-          alt="wait"
-        >
-        <img
-          v-else-if="dataDetail.status == 5"
+          v-if="dataDetail.status == 5"
           src="https://files.yunqueyi.com/image/png/common/20220817141150961.png"
           alt="success"
         >
@@ -29,7 +24,10 @@
         v-if="dataDetail.status != 0 && dataDetail.status != 1"
         class="content"
       >
-        <div class="p30">
+        <div
+          v-if="![1,3,5].includes(dataDetail.status)"
+          class="p30"
+        >
           <div
             v-if="[2, 21, 22, 25].includes(Number(dataDetail.status|| 0))"
             class="flex-wrap"
@@ -154,21 +152,19 @@
         </div>
       </div>
     </div>
-    <!-- howBtn == 0 针对诺辉的走单独送检流程 不显示去送检按钮 -->
-    <!--    v-if="[1, 3].includes(dataDetail.status)"-->
+<!--    v-if="[1, 3].includes(dataDetail.status)"-->
     <div
       class="submit-container multi-sub-wrap"
     >
-      <!--      :class="[3].includes(dataDetail.status) && 'multi-sub-wrap'"-->
       <div
         class="submit-button"
+        :class="[3].includes(dataDetail.status) && 'multi-sub-wrap'"
         @click="bottomBtnFun(dataDetail.status)"
       >
         {{ dataDetail.status | showBtnTextFilter }}
       </div>
       <!--      v-if="[3].includes(dataDetail.status)"-->
       <div
-        v-if="dataDetail.checkName"
         class="submit-button"
       >
         <wx-open-launch-weapp
@@ -179,7 +175,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">{{ dataDetail.checkName }}</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">{{ }}</div>
           </script>
         </wx-open-launch-weapp>
       </div>
@@ -187,20 +183,8 @@
   </div>
 </template>
 <script>
-
-// const { VUE_APP_ENV } = process.env;
 import { getDetectionDetail, getDetectionDetailProces, getJumpToWebapp } from '@/api/detection';
-//  UNCOMMITTED(0,"待完善信息"),
-//   UNDER_DETECTION(1,"待采样"),
-//   UNPAID(6, "待支付"),
-//   DETECTING(2,"已采样"),
-//   COMPLETED(3,"已完成"),
-//   ARRIVED(21,"已送检"),
-//   ACCEPT(22,"已签收"),
-//   CHECK_ACCEPT(25,"已接收"),
-//   TESTING(27, "已上机"),
-//   CANCEL(4, "取消"),
-//   INVALID(5, "样本失效")
+// 0待完善信息、1待采样、2已采样、21已送检、22快递已签收、 25实验室已收样、 27已上机、 3已完成、5样本失效、 6待支付
 export default {
   filters: {
     sexFilter(val) {
@@ -244,42 +228,50 @@ export default {
       },
       id: '',
       dataDetail: {},
-      canClick: true,
-      needPaybackOrderid: '',
-      needPaybackGoodId: '',
-      payAmountData: [],
-      payLogId: '', // 预支付记录ID
       dataList: [],
-      waitIcon: [0, 1, 6], // icon 显示等待状态
-      noShowBottomBtn: [0, 21, 22, 5, 1, 6, 2, 25, 27], // 这几种状态不显示底部操作按钮
       openWebAppConfig:{
-        content:'', // 标签内容
         username:'gh_e92f58174364', // 小程序唯一username  1.gh_80d54796f2d5 云鹊助手 2. gh_e92f58174364 云鹊健康
         path:'pagesInsurance/all-entrance/index', // 打开页面
         extraData: JSON.stringify({})
       },
+      openWebAppBtnName: '报告解读'
     };
   },
   created() {
     this.id = this.$route.query.id || 11073;
-    this.openWebAppConfig.extraData = JSON.stringify({
-      channelSource: 'insurance_channel',
-      path: 'pagesInsurance/all-entrance/index',
-      query: {id:this.id}
-    });
     this.init();
   },
   mounted() {
   },
   methods: {
     init() {
+      const that = this;
+      const ed = {
+        channelSource: 'insurance_channel',
+        targetPath: 'pagesInsurance/all-entrance/index',
+        query: {id:this.id},
+        fromOriginPage:'insuranceDetectionDetail',
+      };
       getDetectionDetail(this.id).then((res) => {
         if (res.code === '000000') {
           this.dataDetail = res.data;
           this.getDetailProces();
+          const {inquiryStatus} = res.data;
+          let n = '';
+          if(inquiryStatus == 0) {
+            ed.targetPath = '/pages/consultation-info/consultation/index';
+            n = '报告解读';
+          }else if([4, 6].includes(inquiryStatus)) {
+            n = '查看专家建议';
+            ed.targetPath = '/pages/health/detection-detail/index';
+          }else {
+            n = '已预约待咨询';
+            ed.targetPath = '/pages/consultation-im/index?initTRTC=false';
+          }
+          that.openWebAppBtnName = n;
           console.log(res, 'eeeeeeeeeee', this.dataDetail);
         } else {
-          this.$toast(res.message);
+          that.$toast(res.message);
         }
       });
     },
@@ -320,7 +312,6 @@ export default {
           this.$toast(res.message);
         }
       });
-      console.log('999000999');
     },
     //  查看报告
     seeReport() {