for-all

gitPush.sh

 #!/bin/bash
 hasGit=`which git` # 判断是否存在git
 msg=${1:-'auto commit'} # 获取终端输入的第一个参数，若为空则为auto commit
-originBranch='origin/develop'
+originBranch='origin/release'
 if [ ! $hasGit ];then
   echo 'Please download git first!';
   exit 1;

src/views/appointDetails/index.vue

@@ -186,17 +186,15 @@
           }}
         </div>
         <div
+          v-if="!canReappoint"
           class="detail-btn btn-empty reAppoint"
-          :class="{ 'detail-btn-all': bindFlag == 0}"
           @click="reAppoint"
         >
           重新预约
         </div>
         <div
-          v-if="bindFlag>0"
           class="detail-btn"
           @click="bindingCode"
-         
         >
           绑定{{
             insuranceInfo && insuranceInfo.detectionKind == 0
@@ -210,6 +208,7 @@
         class="detail-btn-bottom"
       >
         <div
+          v-if="!canReappoint"
           class="detail-btn"
           @click="reAppoint"
         >
@@ -265,7 +264,7 @@ export default {
       verificationCode: '',
       intervalId: null,
       status: '',
-      bindFlag:1, // 是否显示绑定条形码的按钮
+      allowChangeTimes: 0
     };
   },
   computed: {
@@ -276,6 +275,12 @@ export default {
         this.detailInfo.hospitalRemarks !== ''
       );
     },
+    canReappoint() {
+      return (
+        this.detailInfo.allowChangeTimes <= 0 &&
+        this.detailInfo.detectionKind == 1
+      );
+    }
   },
 
   created() {
@@ -338,14 +343,14 @@ export default {
             sampleCode,
             externalOrderNo,
             projectEquityNo,
-            bindFlag,
+            allowChangeTimes,
           } = res.data;
           this.detailInfo = res.data;
           this.expireFlag = expireFlag || '';
           this.isUnderLine = res.data.detectionCategory == 2;
           this.qrcodeUrl = qrCodeUrl;
           this.verificationCode = verificationCode;
-          this.bindFlag = bindFlag; // 是否展示绑定条形码功能
+          this.allowChangeTimes = allowChangeTimes;
           if (window._miniprogram) {
             if (status != '0202') {
               let url;
@@ -413,10 +418,14 @@ export default {
         web_data: { yunOrderNo: this.yunOrderNo },
       });
       const { detectionKind } = this.insuranceInfo;
-      console.log('detectionKind--', detectionKind);
       if (window._miniprogram) {
+        const u = detectionKind == 1 ? '/pagesInsurance/sz-insurance/appoint' : '/pagesInsurance/sz-insurance/screeningAppoint';
+        if(this.canReappoint) {
+          return false;
+        }
+        this.clear();
         this.$rocNative.WXInstance.miniProgram.navigateTo({
-          url: `/pagesInsurance/sz-insurance/screeningAppoint?yunOrderNo=${that.yunOrderNo}&projectEquityNo=${this.projectEquityNo}`,
+          url: `${u}?allowChangeFlagType=offline&yunOrderNo=${that.yunOrderNo}&projectEquityNo=${this.projectEquityNo}`,
         });
       } else {
         this.$router.push({
@@ -534,6 +543,7 @@ export default {
       });
       if (window._miniprogram) {
         const { detectionKind } = this.insuranceInfo;
+        this.clear();
         this.$rocNative.WXInstance.miniProgram.navigateTo({
           url: `/pages/health/binding-code/index?yunOrderNo=${this.yunOrderNo}&projectEquityNo=${this.projectEquityNo}&detectionRecordId=${detectionServiceRecordId}&pprotocolType=${pprotocolType}&channelSource=insurance_channel&detectionKind=${detectionKind}`,
         });
@@ -916,7 +926,6 @@ export default {
     left: 16px;
     right: 16px;
   }
- 
 }
 .insurance-detection {
   background: #ffffff;
@@ -1002,17 +1011,5 @@ export default {
     border: 1px solid #c0c0c0;
     color: #212121;
   }
-  .detail-btn-all{
-    width: 500px;
-    height: 40px;
-    background: #00bda5;
-    border-radius: 25px;
-    margin: 0 auto;
-    font-size: 16px;
-    font-weight: 800;
-    color: #ffffff;
-    text-align: center;
-    line-height: 40px;
-  }
 }
 </style>