Merge branch 'feature/zl' into 'release'

quick detect

See merge request !143

src/views/appointDetails/index.vue

@@ -174,7 +174,7 @@
           class="detail-btn-bottom-tips"
         >
           <van-icon name="warning-o" />
-          请在预约日前往预约地{{ isUnderLine ? '领取产品' : '完成采样' }}，并点击按钮绑定采样码
+          请在预约日前往预约地{{ isUnderLine ? '领取产品' : '完成采样' }}，并点击按钮绑定{{insuranceInfo && insuranceInfo.detectionKind == 0 ? '采样码' : '条形码'}}
         </div>
         <div
           class="detail-btn btn-empty reAppoint"
@@ -186,7 +186,7 @@
           class="detail-btn"
           @click="bindingCode"
         >
-          绑定采样码
+          绑定{{insuranceInfo && insuranceInfo.detectionKind == 0 ? '采样码' : '条形码'}}
         </div>
       </div>
       <div
@@ -206,7 +206,6 @@
         :actions="actions"
         cancel-text="取消"
         close-on-click-action
-        @cancel="onCancel"
         @select="selectItem"
       />
     </div>

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

@@ -119,6 +119,7 @@ export default {
     this.query = query;
     this.needDetect = !(query.needDetect == '1');
     console.log('query', this.needDetect);
+    this.yunOrderNo = query.yunOrderNo;
     this.getButtonStatus(query.yunOrderNo);
     this.getDetectionName(query.yunOrderNo);
     this.$loading.hide();
@@ -156,6 +157,8 @@ export default {
           path: '/appoint',
           query: {projectEquityNo, externalOrderNo, yunOrderNo},
         });
+      }else{
+        this.getButtonStatus(this.yunOrderNo);
       }
     },
     // 获取按钮状态
@@ -165,6 +168,10 @@ export default {
         this.buttonStatus = res.data.buttonStatus;
         this.buttonText = res.data.statusDesc;
         this.$loading.hide();
+        !this.buttonStatus && this.$dialog.alert({
+          message: this.buttonText,
+          confirmButtonColor:'#00bda5'
+        });
       });
     }
   },