Merge branch 'release' of...

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

src/api/appoint.js

@@ -35,6 +35,7 @@ export const getDetailByYunOrderNo = async (yunOrderNo) => {
     method: 'get',
     url: `/tis/insurance/getDetailByYunOrderNo?yunOrderNo=${yunOrderNo}`,
     withCredentials: true,
+    hasLoading:false,
   });
 };
 export const getHospitalList = async(data) => {

src/api/detection.js

@@ -103,6 +103,9 @@ export const detectionRecordInfo = (data) => {
     method: 'get',
     url: `/trade/detection/record/record/infoV2?detectionRecordId=${data.detectionRecordId}&detectionKind=${data.detectionKind}`,
     withCredentials: true,
+    headers: {
+      hasLoading:false,
+    },
   });
 };
 

src/components/loading/loading.js

@@ -13,7 +13,6 @@ const loading = {
     document.body.appendChild(instance.$el);
 
     // 在Vue的原型链上注册方法，控制组件
-
     Vue.prototype.$loading = {
       show: (text) => {
         instance.show = true;

src/plugins/httpExtension.js

@@ -12,7 +12,7 @@ $http.setOptions({
     console.log('我重写了默认的loading1', opt);
     const globalLoading = document.getElementById('globalLoading');
     if (!globalLoading && !noLoading) {
-      vueApp.$loading.show();
+      // vueApp.$loading.show();
     }
   }
 });
@@ -22,7 +22,7 @@ $http.addBeforeHook(config => console.log('我是新增的前置钩子', config)
 
 // 新增后置钩子
 $http.addAfterHook(response => {
-  vueApp.$loading.hide();
+  // vueApp.$loading.hide();
   if (response.data.code !== '000000') {
     console.log('我是新增的后置钩子111', response);
     vueApp.$toast(response.data.message );

src/views/appoint-demo/index.vue

@@ -223,6 +223,7 @@ export default {
           console.log('--res', res);
           this.orgData = res.data;
         }
+        this.$loading.hide();
       });
     },
     selectTimes(times) {

src/views/appoint/index.vue

@@ -304,7 +304,6 @@ export default {
     },
   },
   mounted() {
-
     this.$loading.show();
     const { yunOrderNo, projectEquityNo } = this.$route.query;
     this.yunOrderNo = yunOrderNo;
@@ -518,7 +517,6 @@ export default {
           message: this.buttonText,
           confirmButtonColor:'#00bda5'
         });
-
       });
     },
     confirm(values) {

src/views/appointDetails/index.vue

@@ -258,7 +258,6 @@ export default {
     console.log('yunOrderNo', yunOrderNo);
     this.getDetailByYunOrderNo(yunOrderNo);
     this.getDetectionName(yunOrderNo);
-    this.$loading.hide();
     this.$sendBuriedData({
       action: 'ACTION_WEB_AFTER',
       component_tag: '7802855#0#0#预约详情',

src/views/insurance-Detection-detail-demo/index.vue

@@ -178,7 +178,6 @@
         >
           <div class="list-tips-item">
             1.请将带有阳性检测结果的试剂盒和包装盒上的条码一起拍照上传，确保两个元素在同一张照片里.
-            <!--            <span @click="showSample(2)">示例图</span>-->
           </div>
           <div
             class="list-tips-item"
@@ -317,6 +316,10 @@ export default {
       });
     },
     getJumpToWebapp() {
+      if(this.result == 2) {
+        this.$toast('参照选择的结果，您可暂不进行防癌早筛检测');
+        return false;
+      }
       this.saveOrder();
     },
     saveOrder() {

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

@@ -413,6 +413,7 @@ export default {
         prototypeId: this.pprotocolType,
         prototypeLogId: this.prototypeLogId,
       };
+      this.$loading.show();
       console.log('--obj--', obj);
       if(this.insuranceInfo.detectionKind == 1) {
         this.quickBindingCode(obj);
@@ -450,6 +451,7 @@ export default {
               }
             );
           }
+          this.$loading.hide();
           this.$toast('提交成功');
         }
       });
@@ -469,6 +471,7 @@ export default {
               },
             }
           );
+          this.$loading.hide();
           this.$toast('提交成功');
         }
       });

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

@@ -154,13 +154,15 @@ export default {
         component_tag: '7802847#0#0#查看我的检测',
         web_data:{yunOrderNo: this.yunOrderNo},
       });
-      this.$router.push({
-        path: url,
-        query: {
-          detectionRecordId: this.detectionRecordId,
-          yunOrderNo: this.yunOrderNo
-        },
-      });
+      const u = window.location.origin + '/pica-insurance' + url + `?detectionRecordId=${this.detectionRecordId}&yunOrderNo=${this.yunOrderNo}`;
+      window.location.href = u;
+      // this.$router.push({
+      //   path: url,
+      //   query: {
+      //     detectionRecordId: this.detectionRecordId,
+      //     yunOrderNo: this.yunOrderNo
+      //   },
+      // });
     },
     copyText(item) {
       const input = document.createElement('input');

src/views/insurance-detection-detail/index.scss

@@ -274,7 +274,6 @@
     position: relative;
     height: 40px;
     border-radius: 20px;
-    font-weight: 700;
     color: #ffffff;
     font-size: 16px;
     display: flex;
@@ -296,6 +295,19 @@
     padding: 0px 20px;
     min-width: 60px;
   }
+  .submit-button2{
+    position: relative;
+    height: 40px;
+    border-radius: 20px;
+    color: #ffffff;
+    font-size: 16px;
+    display: flex;
+    align-items: center;
+    background: #00bda5;
+    justify-content: center;
+    padding: 0px 20px;
+    min-width: 80%;
+  }
   .btn-label{
     width: 62px;
     height: 14px;

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

@@ -170,6 +170,7 @@
           :username="openWebAppConfig.username"
           :path="openWebAppConfig.path"
           :extra-data="openWebAppConfig.extraData"
+          :env-version="envVersion"
         >
           <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">{{ openWebAppBtnName }}</div>
@@ -198,9 +199,10 @@
           style="position: absolute; top: 0; left: 0; width: 100%; height: 100%"
           :username="openWebAppConfigPositive.username"
           :path="openWebAppConfigPositive.path"
+          :env-version="envVersion"
         >
           <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">{{ openWebAppBtnName }}</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>
@@ -218,10 +220,21 @@
         阳性报销
       </div>
     </div>
+    <div v-else class="submit-container multi-sub-wrap">
+      <div
+        class="submit-button2"
+        @click="getReport()"
+      >
+        获取报告
+      </div>
+    </div>
   </div>
 </template>
 <script>
 import { getDetectionDetailProces, getJumpToWebapp, detectionRecordInfo } from '@/api/detection';
+const { VUE_APP_ENV } = process.env;
+import axios from 'axios';
+import {getDetailByYunOrderNo} from '@/api/appoint';
 // 0待完善信息、1待采样、2已采样、21已送检、22快递已签收、 25实验室已收样、 27已上机、 3已完成、5样本失效、 6待支付
 export default {
   filters: {
@@ -255,6 +268,7 @@ export default {
   },
   data() {
     return {
+      envVersion: VUE_APP_ENV == 'production' ? 'release' : 'trial',
       picaWechat:window._picaWechat,
       status: '',
       headerInfo: {
@@ -289,6 +303,7 @@ export default {
     this.init();
   },
   mounted() {
+    console.log('--VUE_APP_ENV', VUE_APP_ENV);
     this.$sendBuriedData({
       action: 'ACTION_WEB_AFTER',
       component_tag: '7802848#0#0#检测详情页面',
@@ -333,11 +348,12 @@ export default {
           that.openWebAppConfig.extraData = JSON.stringify(ed);
           that.openWebAppBtnName = n;
           that.openWebAppConfig.path = jump_path;
-          // this.openWebAppConfigPositive = `pagesInsurance/all-entrance/index?detectionKind=${this.dataDetail.id}&tradeDetectionServiceRecordId=${this.dataDetail.detectType}`;
+          this.openWebAppConfigPositive.path = `pagesInsurance/all-entrance/index?detectionKind=0&tradeDetectionServiceRecordId=${this.dataDetail.detectionRecordId}`;
           console.log('-that.openWebAppConfig.', that.openWebAppConfig, that.openWebAppConfigPositive, that.openWebAppBtnName);
         } else {
           that.$toast(res.message);
         }
+        this.$loading.hide();
       });
     },
     copyText(val) {
@@ -410,7 +426,7 @@ export default {
       if(this.picaWechat == 'wechat') {
         return false;
       }
-      const query = `detectionKind=${this.dataDetail.id}&tradeDetectionServiceRecordId=${this.dataDetail.detectType}`;
+      const query = `detectionKind=0&tradeDetectionServiceRecordId=${this.dataDetail.detectionRecordId}`;
       const p = {params:{path:'pagesInsurance/all-entrance/index', query:query}, type: 2};
       getJumpToWebapp(p).then(res => {
         console.log('--res', res);
@@ -446,6 +462,36 @@ export default {
       }
       return t;
     },
+    getReport() {
+      this.$loading.show('报告生成中,请稍等...');
+      getDetailByYunOrderNo(this.yunOrderNo).then(res => {
+        console.log(res);
+        const {showFlagForReport} = res.data;
+        if(showFlagForReport == 1) {
+          const p = {
+            env: VUE_APP_ENV == 'production' ? 'prod' : 'test1',
+            sample_code: this.dataDetail.sampleCode,
+            res_type: 1
+          };
+          //
+          axios.post('https://project.picahealth.com/auto_set_detection_report', p)
+            .then(res => {
+              console.error('请求menu接口失败error', res);
+              const {errorMessage} = res.data.data;
+              this.$toast(errorMessage);
+              this.init();
+            }).catch(error => {
+            console.error('请求menu接口失败error', error);
+            const {errorMessage} = error.data.data;
+            this.$toast(errorMessage);
+            this.init();
+          });
+        }else {
+          this.$loading.hide();
+        }
+        console.log('--showFlagForReport', showFlagForReport);
+      });
+    },
   },
 };
 </script>

src/views/insurance-question-result-pay/insuranceQuestionResult.vue

@@ -27,9 +27,9 @@
                 <div class="tips-item-dot" />
                 早期检出、早期干预、实现可逆
               </div>
-              <div class="tips-item">
+              <div v-if="insuranceInfo.positiveReimburse == 0 && insuranceInfo.reimburseMax > 0" class="tips-item">
                 <div class="tips-item-dot" />
-                检测报告阳性，最高可报销300元复查费用
+                检测报告阳性，最高可报销{{ (insuranceInfo.reimburseMax / 100).toFixed(0) }}元复查费用
               </div>
             </div>
             <div
@@ -118,7 +118,6 @@ export default {
   },
   mounted() {
     const { query } = this.$route;
-    this.$loading.show();
     this.query = query;
     this.yunOrderNo = query.yunOrderNo;
     this.getDetectionName(query.yunOrderNo);
@@ -127,7 +126,6 @@ export default {
       component_tag: '7802850#0#0#问卷结果页面',
       web_data:{yunOrderNo: this.yunOrderNo},
     });
-    this.$loading.hide();
   },
   methods: {
     statusMap(status) {

src/views/insurance-question-result/insuranceQuestionResult.vue

@@ -27,9 +27,9 @@
                 <div class="tips-item-dot" />
                 早期检出、早期干预、实现可逆
               </div>
-              <div class="tips-item">
+              <div v-if="detectionDetail.positiveReimburse == 0 && detectionDetail.reimburseMax > 0" class="tips-item">
                 <div class="tips-item-dot" />
-                检测报告阳性，最高可报销300元复查费用
+                检测报告阳性，最高可报销{{ (detectionDetail.reimburseMax / 100).toFixed(0) }}元复查费用
               </div>
             </div>
             <div
@@ -115,6 +115,7 @@ export default {
       query: {},
       buttonStatus: false,
       buttonText:'',
+      detectionDetail:{}
     };
   },
   computed: {
@@ -152,10 +153,11 @@ export default {
      getDetectionName(yunOrderNo) {
       getDetectionName(yunOrderNo).then(res => {
         if (res.code === '000000' && res.data) {
-          const dectionData = res.data[0] || {};
-          console.log('dectionData.detectionName', this.insuranceInfo, dectionData);
-          this.detectionName = dectionData.detectionName;
-          this.$store.dispatch('home/setInsuranceInfo', dectionData);
+          const d = res.data[0] || {};
+          this.detectionDetail = d || {};
+          console.log('dectionData.detectionName', this.insuranceInfo, d);
+          this.detectionName = d.detectionName;
+          this.$store.dispatch('home/setInsuranceInfo', d);
           this.$loading.hide();
         }
       });

src/views/insurance-quickDetection-detail/index.vue

@@ -132,7 +132,7 @@
           style="position: absolute; top: 0; left: 0; width: 100%; height: 100%"
           :username="openWebAppConfig.username"
           :path="openWebAppConfig.path"
-          env-version="trial"
+          :env-version="envVersion"
           :extra-data="openWebAppConfig.extraData"
         >
           <script type="text/wxtag-template">
@@ -151,6 +151,7 @@
   </div>
 </template>
 <script>
+const { VUE_APP_ENV } = process.env;
 import { getQuickDetectionDetailProces, getJumpToWebapp, detectionRecordInfo } from '@/api/detection';
 // 0待完善信息、1待采样、2已采样、21已送检、22快递已签收、 25实验室已收样、 27已上机、 3已完成、5样本失效、 6待支付
 export default {
@@ -177,6 +178,7 @@ export default {
   },
   data() {
     return {
+      envVersion: VUE_APP_ENV == 'production' ? 'release' : 'trial',
       picaWechat:window._picaWechat,
       status: '',
       headerInfo: {