Merge branch 'feature/zjx' into 'develop'

Feature/zjx

See merge request !122

src/views/appointDetails/index.vue

@@ -42,7 +42,7 @@
             >
               <img
                 class="navigation-img"
-                src="https://files.yunqueyi.com/image/png/common/20221220105602921.png"
+                src="https://files.yunqueyi.com/image/png/common/20230301160437750.png"
               >
               <div class="navigation-text">
                 导航
@@ -55,7 +55,7 @@
             alt=""
           >
           <div
-            v-if="detailInfo.hospitalRemarks !==''"
+            v-if="detailInfo.hospitalRemarks && detailInfo.hospitalRemarks !== ''"
             class="detail-top-hospitalInfo"
           >
             <img
@@ -79,7 +79,17 @@
             云鹊医温馨提示
             <div class="tip-org-right" />
           </div>
-          <div class="tip-grey">
+          <div
+            v-if="isUnderLine"
+            class="tip-grey"
+          >
+            <div class="tip-grey-dot" />
+            请在预约日前往现场领取产品；
+          </div>
+          <div
+            v-else
+            class="tip-grey"
+          >
             <div class="tip-grey-dot" />
             请在预约日期前往预约医院完成采样。无需空腹，采样前三天可适当清淡饮食；
           </div>
@@ -223,7 +233,8 @@ export default {
       yunOrderNo: '',
       projectEquityNo: '',
       expireFlag:false,
-      query:{},
+      query: {},
+      isUnderLine:false,
       // 状态 代码 说明
       // 0101 未填写问卷
       // 0102 已填写问卷
@@ -239,7 +250,7 @@ export default {
         '0101': '未填写问卷',
         '0102': '已填写问卷',
         '0201': '待预约',
-        '0202': '已预约',
+        '0202': '预约成功',
         '0203': '已取消待重新预约',
         '0301': '待采样',
         '0302': '已采样',
@@ -271,6 +282,7 @@ export default {
         console.log(res);
         this.detailInfo = res.data;
         this.expireFlag = res.data.expireFlag;
+        this.isUnderLine = res.data.detectionCategory == 2;
         this.$loading.hide();
       });
     },