Merge branch 'feature/qiao' into 'release'

Feature/qiao

See merge request !276

src/views/appointDetails/index.vue

@@ -12,12 +12,12 @@
             v-if="expireFlag"
             src="https://files.yunqueyi.com/image/png/common/20230804161425552.png"
             alt=""
-          >
+          />
           <img
             v-else
             src="https://files.yunqueyi.com/image/png/common/20230804161508175.png"
             alt=""
-          >
+          />
 
           {{ !expireFlag ? statusMap(detailInfo.status) : '已过期' }}
         </div>
@@ -41,9 +41,7 @@
             <div class="detail-top-address-name">
               {{ detailInfo.hospitalName || '--' }}
             </div>
-            <div class="detail-top-address-info">
-              检验科/检验室/采血室
-            </div>
+            <div class="detail-top-address-info">检验科/检验室/采血室</div>
             <div class="detail-top-address-info">
               {{ detailInfo.hospitalAddress || '--' }}
             </div>
@@ -55,7 +53,7 @@
               <img
                 class="navigation-img"
                 src="https://files.yunqueyi.com/image/png/common/2023080416441238.png"
-              >
+              />
               <!-- <div class="navigation-text">
                 导航
               </div> -->
@@ -68,7 +66,7 @@
             <img
               src="https://files.yunqueyi.com/image/png/common/20230228181040335.png"
               alt=""
-            >
+            />
             提示备注信息提示备注信息提示备注信息提示{{
               detailInfo.hospitalRemarks
             }}
@@ -76,9 +74,7 @@
         </div>
       </div>
       <div class="detail-qrcode-content">
-        <div class="tips">
-          请截图保存图片<br>检测时出示给检测人员
-        </div>
+        <div class="tips">请截图保存图片<br />检测时出示给检测人员</div>
         <van-image
           width="189px"
           height="189px"
@@ -113,29 +109,21 @@
         </div>
       </div>
       <div class="detail-bottom">
-        <div class="detail-bottom-title">
-          预约信息
-        </div>
+        <div class="detail-bottom-title">预约信息</div>
         <div class="detail-bottom-item">
-          <div class="title">
-            参保人:
-          </div>
+          <div class="title">参保人:</div>
           <div class="value">
             {{ detailInfo.patientName || '--' }}
           </div>
         </div>
         <div class="detail-bottom-item">
-          <div class="title">
-            检测名称:
-          </div>
+          <div class="title">检测名称:</div>
           <div class="value">
             {{ detailInfo.detectName || '--' }}
           </div>
         </div>
         <div class="detail-bottom-item">
-          <div class="title">
-            检测编号:
-          </div>
+          <div class="title">检测编号:</div>
           <div class="value">
             {{ detailInfo.recordNo || '--' }}
             <img
@@ -143,7 +131,7 @@
               src="https://files.yunqueyi.com/image/png/common/20230301110919111.png"
               alt=""
               @click="copyNum()"
-            >
+            />
             <!-- <text
               class="value-copy"
               @click="copyNum()"
@@ -156,47 +144,34 @@
           v-if="detailInfo.helpDetectionFlag == 1"
           class="detail-bottom-item"
         >
-          <div class="title">
-            采集方式:
-          </div>
-          <div class="value">
-            现场检测
-          </div>
+          <div class="title">采集方式:</div>
+          <div class="value">现场检测</div>
         </div>
       </div>
       <div class="appoint-detail-tel">
         客服电话：<a
           style="font-weight: 600"
           href="tel:400-021-8282"
-        >400-021-8282</a>
-        <div class="serve-time">
-          在线时间: 周一至周日9:00~21:00
-        </div>
+        >
+          400-021-8282
+        </a>
+        <div class="serve-time">在线时间: 周一至周日9:00~21:00</div>
       </div>
       <div
         v-if="!expireFlag"
         class="detail-btn-bottom"
       >
-        <div class="detail-btn-bottom-tips">
-          <van-icon name="warning-o" />
-          请按时前往预约地点，并绑定{{
-            insuranceInfo && insuranceInfo.detectionKind == 0
-              ? '采样码'
-              : '条形码'
-          }}
-        </div>
         <div
           class="detail-btn btn-empty reAppoint"
-          :class="{ 'detail-btn-all': bindFlag == 0}"
+          :class="{ 'detail-btn-all': bindFlag == 0 }"
           @click="reAppoint"
         >
           重新预约
         </div>
         <div
-          v-if="bindFlag>0"
+          v-if="bindFlag > 0"
           class="detail-btn"
           @click="bindingCode"
-
         >
           绑定{{
             insuranceInfo && insuranceInfo.detectionKind == 0
@@ -266,7 +241,7 @@ export default {
       intervalId: null,
       status: '',
       allowChangeTimes: 0,
-      bindFlag:1, // 是否显示绑定条形码的按钮
+      bindFlag: 1, // 是否显示绑定条形码的按钮
     };
   },
   computed: {
@@ -279,9 +254,10 @@ export default {
     },
     canReappoint() {
       return (
-        this.detailInfo.detectionKind == 1 && this.detailInfo.allowChangeTimes > 0
+        this.detailInfo.detectionKind == 1 &&
+        this.detailInfo.allowChangeTimes > 0
       );
-    }
+    },
   },
 
   created() {
@@ -421,7 +397,9 @@ export default {
         web_data: { yunOrderNo: this.yunOrderNo },
       });
       if (window._miniprogram) {
-        const u = this.canReappoint ? '/pagesInsurance/sz-insurance/appoint' : '/pagesInsurance/sz-insurance/screeningAppoint';
+        const u = this.canReappoint
+          ? '/pagesInsurance/sz-insurance/appoint'
+          : '/pagesInsurance/sz-insurance/screeningAppoint';
         this.clear();
         this.$rocNative.WXInstance.miniProgram.navigateTo({
           url: `${u}?allowChangeFlagType=offline&yunOrderNo=${that.yunOrderNo}&projectEquityNo=${this.projectEquityNo}`,
@@ -1010,7 +988,7 @@ export default {
     border: 1px solid #c0c0c0;
     color: #212121;
   }
-  .detail-btn-all{
+  .detail-btn-all {
     width: 500px;
     height: 40px;
     background: #00bda5;

src/views/sz-public-new/date-picker.vue

@@ -8,11 +8,7 @@
       class="appoint-form-items"
       @click="handleOpenPopup"
     />
-    <van-popup
-      v-model="visible"
-      position="bottom"
-      :transition-appear="false"
-    >
+    <van-popup v-model="visible" position="bottom" :transition-appear="false">
       <van-datetime-picker
         type="date"
         title="选择年月日"