new ui

src/components/selectTime/index.vue

@@ -19,6 +19,7 @@
             :key="item"
             class="text"
             :class="selectTimes === item.appointmentDate ?'selected':''"
+            :style="item.amAppointmentFlag && item.pmAppointmentFlag?'color:#999999':''"
             @click="selectTime(item.appointmentDate,item)"
           >
             {{ item.appointmentDate }}
@@ -29,6 +30,7 @@
             v-show="currentItem.amTimeBegin !='' && currentItem.amTimeEnd !=''"
             class="text"
             :class="selectTimeBucket === currentItem.amTimeBegin ?'selected':''"
+            :style="currentItem.amAppointmentFlag?'':'color:#212121'"
             @click="selectTimeB('am')"
           >
             {{ currentItem.amTimeContent }}
@@ -37,6 +39,7 @@
             v-if="currentItem.pmTimeBegin !='' && currentItem.pmTimeEnd!=''"
             class="text"
             :class="selectTimeBucket === currentItem.pmTimeBegin ?'selected':''"
+            :style="currentItem.pmAppointmentFlag?'':'color:#212121'"
             @click="selectTimeB('pm')"
           >
             {{ currentItem.pmTimeContent }}
@@ -117,6 +120,7 @@ export default {
       });
     },
     selectItem() {
+
       if (this.selectTimes === '') {
         // this.$toast('请选择日期');
         return;
@@ -228,11 +232,15 @@ export default {
       font-size: 16px;
       font-family: PingFangSC-Regular, PingFang SC;
       font-weight: 400;
-      color: #666666;
+      color: #999999;
       line-height: 41px;
     }
   }
 }
+.canselect{
+  color: #02120F;
+
+}
 .selected{
   color: #00BDA5 !important;
   background: #FFFFFF

src/views/appoint/index.vue

@@ -16,6 +16,7 @@
         <van-form
           ref="dectionForm"
           validate-first
+          @submit="onSubmit"
         >
           <van-field
             name="checkboxGroup"
@@ -23,7 +24,7 @@
             required
           >
             <template #input>
-              {{ dectionForm.detectName }}
+              <span style="font-weight:600">{{ dectionForm.detectName }}</span>
             </template>
           </van-field>
           <van-field
@@ -173,7 +174,10 @@
         提交
       </van-button>
       <div class="appoint-tel">
-        客服电话：<a href="tel:400-006-5252">400-006-5252</a>
+        客服电话：<a
+          style="font-weight:600"
+          href="tel:400-006-5252"
+        >400-006-5252</a>
       </div>
     </div>
     <SelectHospital
@@ -588,8 +592,8 @@ export default {
   }
   .appoint-form-title{
     font-size: 14px;
-    font-family: PingFangSC-Medium, PingFang SC;
-    font-weight: 500;
+    font-family:  PingFang SC;
+    font-weight: 400;
     color: #212121;
     padding-top:22px ;
     padding-bottom: 0;
@@ -648,11 +652,25 @@ export default {
     }
   }
   .appoint-form-items{
+    // font-weight: 600;
+
     /deep/ .van-field__label{
       color: #999999;
     }
+    /deep/ .van-field__control{
+      font-weight: 600;
+    }
+    /deep/ .van-field__control::placeholder{
+      font-weight: 450;
+    }
+    .appoint-form-placeholder{
+      font-weight: 450;
+    }
 
   }
+  .appoint-form-value{
+      font-weight: 600;
+    }
   .appoint-form-placeholder{
     color: #999999;
   }
@@ -793,12 +811,14 @@ export default {
   .appoint-form-submit{
     margin-top: 30px;
     height: 40px;
+    font-weight: 600;
     background: #D9D9D9;
     border-radius: 20px;
     border: 1px solid #D9D9D9;
   }
   .appoint-form-submit-active{
     background: #00BDA5;
+    border: 1px solid #00BDA5;
   }
   .appoint-tel{
     margin-top: 25px;

src/views/appointDetails/index.vue

@@ -22,7 +22,7 @@
       </div>
       <div class="detail-top insurance-detection">
         <div class="detection-title">
-          您的领取时间
+          您的{{ isUnderLine ? '领取' : '检测' }}时间
         </div>
         <div class="detection-time">
           {{ detailInfo.appointmentTimeStr }}
@@ -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">
                 导航
@@ -54,7 +54,10 @@
             src="https://files.yunqueyi.com/image/png/common/20230228180052259.png"
             alt=""
           >
-          <div class="detail-top-hospitalInfo">
+          <div
+            v-if="detailInfo.hospitalRemarks && detailInfo.hospitalRemarks !== ''"
+            class="detail-top-hospitalInfo"
+          >
             <img
               src="https://files.yunqueyi.com/image/png/common/20230228181040335.png"
               alt=""
@@ -76,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>
@@ -142,7 +155,10 @@
         </div>
       </div>
       <div class="appoint-detail-tel">
-        客服电话：<a href="tel:400-006-5252">400-006-5252</a>
+        客服电话：<a
+          style="font-weight:600"
+          href="tel:400-006-5252"
+        >400-006-5252</a>
       </div>
       <!-- <div
       class="detail-btn"
@@ -159,7 +175,7 @@
           class="detail-btn-bottom-tips"
         >
           <van-icon name="warning-o" />
-          请在预约日前往预约地完成采样，并点击按钮绑定采样码
+          请在预约日前往预约地{{ isUnderLine ? '领取产品' : '完成采样' }}，并点击按钮绑定采样码
         </div>
         <div
           class="detail-btn btn-empty reAppoint"
@@ -220,7 +236,8 @@ export default {
       yunOrderNo: '',
       projectEquityNo: '',
       expireFlag:false,
-      query:{},
+      query: {},
+      isUnderLine:false,
       // 状态 代码 说明
       // 0101 未填写问卷
       // 0102 已填写问卷
@@ -236,7 +253,7 @@ export default {
         '0101': '未填写问卷',
         '0102': '已填写问卷',
         '0201': '待预约',
-        '0202': '已预约',
+        '0202': '预约成功',
         '0203': '已取消待重新预约',
         '0301': '待采样',
         '0302': '已采样',
@@ -268,6 +285,7 @@ export default {
         console.log(res);
         this.detailInfo = res.data;
         this.expireFlag = res.data.expireFlag;
+        this.isUnderLine = res.data.detectionCategory == 2;
         this.$loading.hide();
       });
     },
@@ -476,8 +494,9 @@ export default {
       margin-bottom: 10px;
     }
     .detail-top-hospitalInfo{
+      position: relative;
       display: flex;
-      padding-left: 15px;
+      padding-left: 27px;
       font-size: 13px;
       font-family: PingFangSC-Regular, PingFang SC;
       font-weight: 400;
@@ -486,6 +505,9 @@ export default {
       align-items: center;
 
       img{
+        position: absolute;
+        left: 12px;
+        top: 1px;
         width: 12px;
         height: 14px;
         margin-right: 5px;
@@ -518,7 +540,7 @@ export default {
   }
   .detail-top-address {
     position: relative;
-    padding: 15px 52px 18px 12px;
+    padding: 15px 52px 6px 12px;
     .detail-top-address-name {
       height:21px;
       width: 257px;
@@ -605,7 +627,7 @@ export default {
     .tips {
       font-size: 14px;
       border-radius: 11px;
-      padding: 20px 0 10px 0;
+      padding: 5px 0 10px 0;
       .tip-org {
         text-align: center;
         height: 21px;
@@ -747,7 +769,7 @@ export default {
     left: 0;
     width: calc(100vw - 24px);
     bottom: 0;
-    padding:5px 12px 26px 12px ;
+    padding:5px 12px 5px 12px ;
     display: flex;
     .detail-btn-bottom-tips{
       position: absolute;

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

@@ -116,11 +116,7 @@
       <div
         class="l-right"
       >
-<!--        <img-->
-<!--          class="l-right-img"-->
-<!--          src="https://files.yunqueyi.com/image/png/common/20230207134347503.png"-->
-<!--        />-->
-        <a href="tel:400-006-5252">400-006-5252</a>
+        <a class="fw600" href="tel:400-006-5252">400-006-5252</a>
       </div>
     </div>
     <van-popup
@@ -567,7 +563,7 @@ export default {
       display: flex;
       align-items: center;
       justify-content: center;
-      font-weight: 500;
+      font-weight: 600;
       color: #FFFFFF;
       margin: 0 auto;
     }
@@ -634,13 +630,13 @@ export default {
       overflow-y: scroll;
       -webkit-overflow-scrolling: touch;
       line-height: 2;
-      padding-bottom: 60px;
       &>p{
         -webkit-overflow-scrolling: touch;
         min-height: 1000px;
       }
     }
     .btn{
+      border: none;
       background-color: #00BDA5;
       color: #ffffff;
       width: 300px;
@@ -758,6 +754,9 @@ export default {
       color:#00BDA5;
       display: flex;
       align-items: center;
+      .fw600{
+        font-weight: 600;
+      }
     }
     .l-right-img{
       width: 12px;

src/views/insurance-bindCode-success/index.scss

@@ -24,7 +24,7 @@
         width: 120px;
         height: 20px;
         font-size: 20px;
-        font-weight: 500;
+        font-weight: 600;
         color: #ffffff;
         line-height: 20px;
       }

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

@@ -33,6 +33,7 @@
           <img
             src="https://files.yunqueyi.com/image/gif/common/20230228173135233.gif"
             class="info-btn"
+            @click="toAppoint"
           >
 
           <div class="info-tips">
@@ -132,7 +133,7 @@ export default {
       };
       return m[status];
     },
-     // 目前是配置一个检测信息，可能会拓展，所以返回的是一个list
+     // 目前是配置一个检测信息，可能会拓展，所以返回的是一个list  ces
      getDetectionName(yunOrderNo) {
       getDetectionName(yunOrderNo).then(res => {
         if (res.code === '000000' && res.data) {
@@ -347,7 +348,7 @@ background: #F3FCFF;
   }
 }
 .tips-fixed{
-  position: fixed;
+  margin-top: 53px;
   width: 100%;
   bottom: 70px;
   height: 21px;