update guide app

src/plugins/httpExtension.js

 import $http from 'mn-template/plugins/http';
-import { Toast } from 'vant';
+// import { Toast } from 'vant';
 // 设置axios默认属性
 $http.setDefaults({
   headers: {}
@@ -19,7 +19,7 @@ $http.addBeforeHook(config => console.log('我是新增的前置钩子', config)
 $http.addAfterHook(response => {
 
   if (response.code !== '000000' ) {
-    Toast(response.data.message);
+    // Toast(response.data.message);
   }
   console.log('我是新增的后置钩子', response);
 }, 0);

src/views/appoint/index.vue

@@ -399,7 +399,6 @@ export default {
         this.dectionForm.beneficiaryPhone = res.data.beneficiaryPhone;
         this.dectionForm.beneficiaryIdNum = res.data.beneficiaryIdNum;
         this.$store.dispatch('home/setOrderInfo', res.data);
-
       });
     },
     selectTimes(times) {
@@ -447,14 +446,7 @@ export default {
         yunOrderNo:this.yunOrderNo,
       };
       appointment(data).then(res => {
-        if (res.code === '000000') {
-          this.$router.push({
-            path: '/appoint-details',
-            query: {
-              yunOrderNo:this.yunOrderNo
-            }
-          });
-        }
+        console.log('confirm', res);
       });
     },
 

src/views/home/index.vue

@@ -4,6 +4,7 @@
 
 <script>
 import { getJumpPageStatus} from '@/api/question';
+import {getOrderInfo} from '@/api/appoint';
 export default {
   data() {
     return {
@@ -26,6 +27,7 @@ export default {
         if (res.code == '000000') {
           this.yunOrderNo = res.data.yunOrderNo;
           this.query.yunOrderNo = res.data.yunOrderNo;
+          this.getOrderInfo(res.data.yunOrderNo);
           this.status = res.data.status;
           switch (res.data.status) {
             case '0001':
@@ -63,7 +65,14 @@ export default {
       this.$router.push({
         path, query
       });
-    }
+    },
+    getOrderInfo(yunOrderNo) {
+      getOrderInfo(yunOrderNo).then(res => {
+        if (res.code == '000000') {
+          this.$store.dispatch('home/setOrderInfo', res.data);
+        }
+      });
+    },
   }
 };
 </script>

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

@@ -18,14 +18,6 @@
             >
               {{ insuranceInfo.checkName || '' }}
             </div>
-            <div class="code-input-item-r">
-              <div
-                class="scan-qr-img-container"
-                @click="triggerEditModal"
-              >
-                修改
-              </div>
-            </div>
           </div>
         </div>
       </div>
@@ -101,7 +93,8 @@
         <span
           class="notification-text2"
           @click="goProtocol"
-        >《{{ protocolName }}》</span>
+        >
+          《{{ protocolName }}》</span>
       </div>
     </div>
     <div class="submit-button-top">
@@ -196,6 +189,7 @@
 <script>
 import { mapGetters } from 'vuex';
 import { signDetection, getProtocolContent, getProtocolName, sampleCodeValidate, detectionRecordInfo, bindingSampleCode} from '@/api/detection.js';
+import {getDetectionName} from '@/api/appoint';
 export default {
   data() {
     return {
@@ -225,10 +219,12 @@ export default {
         date: '',
         checkName: ''
       },
+      insuranceInfo: {},
+      pprotocolType: ''
     };
   },
   computed: {
-    ...mapGetters(['insuranceInfo', 'orderInfo']),
+    ...mapGetters(['orderInfo']),
   },
   created() {
     console.log('--window._picaWechat', window._picaWechat);
@@ -248,9 +244,12 @@ export default {
       validateIdNo: 0,
     };
     this.insuranceInfo = mock;
-    const { pprotocolType, detectionRecordId } = this.$route.query;
-    this.getProtocolName(pprotocolType || 31);
+    const { pprotocolType, detectionRecordId, yunOrderNo } = this.$route.query;
+    this.pprotocolType = pprotocolType || 31;
+    this.detectionRecordId = detectionRecordId;
+    this.getProtocolName();
     this.getRecordInfo(detectionRecordId || 11077);
+    this.getDetectionName(yunOrderNo);
   },
   methods: {
     clearCode() {
@@ -258,7 +257,6 @@ export default {
     },
     scanCode() {
       const that = this;
-      console.log('--$rocNative', this.$rocNative);
       const p = {
         needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
         scanType: ['barCode'], // 可以指定扫二维码还是一维码，默认二者都有
@@ -274,7 +272,7 @@ export default {
       });
     },
     toggleBindingInfo() {
-      if(!this.isCheck && this.insuranceInfo.pprotocolType) {
+      if(!this.isCheck && this.pprotocolType) {
         this.goProtocol();
       }else{
         if(this.isCheck && this.barCode) {
@@ -299,9 +297,10 @@ export default {
       }
     },
     setSignDetection() {
+      // const {beneficiaryPatientId } = this.orderInfo;
       const obj = {
-        protocolType: this.insuranceInfo.pprotocolType,
-        patientId: this.orderInfo.beneficiaryPatientId || 212773027
+        protocolType: this.pprotocolType,
+        patientId: 212773027
       };
       signDetection(obj).then(res => {
           if (res.code !== '000000') {
@@ -311,9 +310,18 @@ export default {
         this.isCheck = !this.isCheck;
       });
     },
+    getDetectionName(yunOrderNo) {
+      getDetectionName(yunOrderNo).then(res => {
+        if (res.code === '000000' && res.data) {
+          const dectionData = res.data[0] || {};
+          this.insuranceInfo = dectionData;
+        }
+
+      });
+    },
     goProtocol() {
       const obj = {
-        id: this.insuranceInfo.pprotocolType,
+        id: this.pprotocolType,
       };
       getProtocolContent(obj).then(res => {
         if (res.code !== '000000') {
@@ -325,19 +333,21 @@ export default {
     },
     getProtocolName() {
       const d = {
-        id: this.insuranceInfo.pprotocolType
+        id: this.pprotocolType
       };
       getProtocolName(d).then( res => {
         if (res.code !== '000000') {
           return this.$toast(res.message);
         }
+        console.log('--res', res.data);
         this.protocolName = res.data;
       });
     },
     subProtocol() {
+      // const {beneficiaryPatientId } = this.orderInfo;
       const obj = {
-        protocolType: this.insuranceInfo.pprotocolType,
-        patientId: this.orderInfo.beneficiaryPatientId || 212773027
+        protocolType: this.pprotocolType,
+        patientId: 212773027
       };
       signDetection(obj).then(res => {
         if (res.code !== '000000') {
@@ -352,14 +362,11 @@ export default {
     getRecordInfo(id) {
       const i = id || 11074;
       detectionRecordInfo(i).then(res => {
-        console.log('--res', res);
         if (res.code === '000000') {
           this.recordInfo.name = res.data.patientName;
           this.recordInfo.sex = res.data.sex === 1 ? '男' : '女';
           this.recordInfo.date = res.data.birthday;
           this.recordInfo.checkName = res.data.checkName;
-          // this.status = res.data.data.status;
-          // this.goodsId = res.data.data.goodsId;
         }
       });
 
@@ -369,7 +376,7 @@ export default {
       const obj = {
         barCode: this.barCode,
         id: this.recordID,
-        prototypeId: this.insuranceInfo.pprotocolType ? this.insuranceInfo.pprotocolType : 0,
+        prototypeId: this.pprotocolType ? this.pprotocolType : 0,
         prototypeLogId: this.prototypeLogId ? this.prototypeLogId : 0,
       };
       bindingSampleCode(obj).then(res => {
@@ -385,7 +392,8 @@ export default {
         {
           path:  '/insuranceBindCodeSuccess',
           query: {
-            id: this.projectId,
+            projectId: this.projectId || 9,
+            detectionRecordId: this.detectionRecordId
           },
         }
       );

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

@@ -98,19 +98,20 @@ export default {
         style: 'backgroundColor:#ffffff;zIndex:100;',
         background: '',
       },
-      id: '',
       dataDetail: {},
+      detectionRecordId: ''
     };
   },
   created() {
-    this.id = this.$route.query.id || 11073;
+    const {detectionRecordId} = this.$route.query;
+    this.detectionRecordId = detectionRecordId;
     this.init();
   },
   mounted() {
   },
   methods: {
     init() {
-      getDetectionDetail(this.id).then((res) => {
+      getDetectionDetail(this.detectionRecordId).then((res) => {
         if (res.code === '000000') {
           this.dataDetail = res.data;
         } else {
@@ -123,7 +124,7 @@ export default {
       this.$router.push({
         path: '/insuranceDetectionDetail',
         query: {
-          id: 11073,
+          detectionRecordId: this.detectionRecordId,
         },
       });
     },

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

@@ -21,11 +21,10 @@
         <div>{{ dataDetail.status | statusFilter }}</div>
       </div>
       <div
-        v-if="dataDetail.status != 0 && dataDetail.status != 1"
         class="content"
       >
         <div
-          v-if="![1,3,5].includes(dataDetail.status)"
+          v-if="![0,1,3,5].includes(dataDetail.status)"
           class="p30"
         >
           <div
@@ -96,7 +95,7 @@
                 <div
                   class="step-time"
                 >
-                  {{ item.nodeTime || '未开始' }}
+                  {{ item.nodeTime ? item.nodeTime : item.completed ? '暂无数据' : '未开始' }}
                 </div>
               </div>
             </div>
@@ -161,7 +160,7 @@
         :class="[3].includes(dataDetail.status) && 'multi-sub-wrap'"
         @click="bottomBtnFun(dataDetail.reportUrl)"
       >
-       查看报告
+        查看报告
       </div>
       <!--      v-if="[3].includes(dataDetail.status)"-->
       <div
@@ -176,12 +175,16 @@
           :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.status | showBtnTextFilter}}</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">{{ dataDetail.status | showBtnTextFilter }}</div>
           </script>
         </wx-open-launch-weapp>
       </div>
-      <div v-else class="submit-button" @click="getJumpToWebapp">
-        {{dataDetail.status | showBtnTextFilter}}
+      <div
+        v-else
+        class="submit-button"
+        @click="getJumpToWebapp"
+      >
+        {{ mapStatus(dataDetail.inquiryStatus) }}
       </div>
     </div>
   </div>
@@ -230,7 +233,7 @@ export default {
         style: 'backgroundColor:#ffffff;zIndex:100;',
         background: '',
       },
-      id: '',
+      detectionRecordId: '',
       dataDetail: {},
       dataList: [],
       openWebAppConfig:{
@@ -242,7 +245,7 @@ export default {
     };
   },
   created() {
-    this.id = this.$route.query.id || 11073;
+    this.detectionRecordId = this.$route.query.detectionRecordId;
     this.init();
   },
   mounted() {
@@ -253,10 +256,10 @@ export default {
       const ed = {
         channelSource: 'insurance_channel',
         targetPath: 'pagesInsurance/all-entrance/index',
-        query: {detectionRecordId:this.id, status: this.dataDetail.status},
+        query: {detectionRecordId:this.detectionRecordId, status: this.dataDetail.status},
         fromOriginPage:'insuranceDetectionDetail',
       };
-      getDetectionDetail(this.id).then((res) => {
+      getDetectionDetail(this.detectionRecordId).then((res) => {
         if (res.code === '000000') {
           this.dataDetail = res.data;
           this.getDetailProces();
@@ -274,7 +277,6 @@ export default {
           }
           that.openWebAppConfig.extraData = JSON.stringify(ed);
           that.openWebAppBtnName = n;
-          console.log(res, 'eeeeeeeeeee', this.dataDetail);
         } else {
           that.$toast(res.message);
         }
@@ -293,39 +295,25 @@ export default {
     },
     // 检测详情
     getDetailProces() {
-      getDetectionDetailProces({id:this.id, channel: 4} ).then((res) => {
+      getDetectionDetailProces({id:this.detectionRecordId, channel: 4} ).then((res) => {
         if (res.code === '000000') {
-          var flag = false;
-          const data = res.data || [];
-          console.log(this.dataDetail);
-          data.forEach((item) => {
-            if (item.status == this.dataDetail.status) {
-              item.complate = false;
-              flag = true;
-            } else {
-              console.log(flag, 'flag');
-              if (!flag) {
-                item.complate = true;
-              } else {
-                item.complate = false;
-              }
-            }
-          });
-          this.dataList = data;
-          console.log(this.dataList, 'res111111');
+          this.dataList = res.data || [];
         } else {
           this.$toast(res.message);
         }
       });
     },
     bottomBtnFun(u) {
-      // const p = s == 1 ? '/insuranceBindCode' : '/pdf-preview';
+      if(!u) {
+        this.$toast('reportUrl--为空', u);
+        return false;
+      }
       const p = '/pdf-preview';
       this.$router.push(
         {
           path:  p,
           query: {
-            url: u || 'https://file.yunqueyi.com/bioHope/reports/202302/20230215165058_2axd021dy0.pdf?response-content-type=application/pdf&1676514088161',
+            url: u,
           },
         }
       );
@@ -334,11 +322,27 @@ export default {
       if(this.picaWechat == 'wechat') {
         return false;
       }
-      const p = {params:{path:'pagesInsurance/all-entrance/index', query:{channelSource:'insurance_channel', detectionRecordId:this.id }}, type: 2};
+      const p = {params:{path:'pagesInsurance/all-entrance/index', query:{channelSource:'insurance_channel', detectionRecordId:this.detectionRecordId, status: this.dataDetail.status }}, type: 2};
       getJumpToWebapp(p).then(res => {
         console.log('--res', res);
-        window.location.href = res.data;
+        if(res.data) {
+          window.location.href = res.data;
+        }else{
+          this.$toast(res.message);
+        }
+
       });
+    },
+    mapStatus(inquiryStatus) {
+      let m = '报告解读';
+      if(inquiryStatus == 0) {
+        m = '报告解读';
+      }else if([4, 6].includes(inquiryStatus)) {
+        m = '查看专家建议';
+      }else{
+        m = '已预约待咨询';
+      }
+      return m;
     }
   },
 };