Merge branch 'feature/zjx' into 'develop'

Feature/zjx

See merge request !133

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,7 +30,7 @@
             v-show="currentItem.amTimeBegin !='' && currentItem.amTimeEnd !=''"
             class="text"
             :class="selectTimeBucket === currentItem.amTimeBegin ?'selected':''"
-            :style="currentItem.amAppointmentFlag?'':'color:#02120F'"
+            :style="currentItem.amAppointmentFlag?'':'color:#212121'"
             @click="selectTimeB('am')"
           >
             {{ currentItem.amTimeContent }}
@@ -38,7 +39,7 @@
             v-if="currentItem.pmTimeBegin !='' && currentItem.pmTimeEnd!=''"
             class="text"
             :class="selectTimeBucket === currentItem.pmTimeBegin ?'selected':''"
-            :style="currentItem.amAppointmentFlag?'':'color:#02120F'"
+            :style="currentItem.pmAppointmentFlag?'':'color:#212121'"
             @click="selectTimeB('pm')"
           >
             {{ currentItem.pmTimeContent }}
@@ -119,6 +120,7 @@ export default {
       });
     },
     selectItem() {
+
       if (this.selectTimes === '') {
         // this.$toast('请选择日期');
         return;
@@ -157,6 +159,9 @@ export default {
       return num > 9 ? num + '' : '0' + num;
     },
     selectTime(selectTimes, item) {
+      if (item.amAppointmentFlag && item.pmAppointmentFlag) {
+        return;
+      }
       console.log(item);
       this.selectTimes = selectTimes;
       this.currentItem = item;
@@ -230,7 +235,7 @@ export default {
       font-size: 16px;
       font-family: PingFangSC-Regular, PingFang SC;
       font-weight: 400;
-      color: #666666;
+      color: #999999;
       line-height: 41px;
     }
   }

src/views/appoint/index.vue

@@ -811,6 +811,7 @@ export default {
   .appoint-form-submit{
     margin-top: 30px;
     height: 40px;
+    font-weight: 550;
     background: #D9D9D9;
     border-radius: 20px;
     border: 1px solid #D9D9D9;

src/views/appointDetails/index.vue

@@ -623,7 +623,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;
@@ -765,7 +765,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;