Merge branch 'feature/zjx' into 'develop'

Feature/zjx

See merge request !136

src/components/selectTime/index.vue

@@ -159,9 +159,6 @@ 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;

src/views/appoint/index.vue

@@ -175,7 +175,7 @@
       </van-button>
       <div class="appoint-tel">
         客服电话：<a
-          style="font-weight:550"
+          style="font-weight:600"
           href="tel:400-006-5252"
         >400-006-5252</a>
       </div>
@@ -652,13 +652,13 @@ export default {
     }
   }
   .appoint-form-items{
-    font-weight: 550px;
+    font-weight: 600;
 
     /deep/ .van-field__label{
       color: #999999;
     }
     /deep/ .van-field__control{
-      font-weight: 550;
+      font-weight: 600;
     }
     /deep/ .van-field__control::placeholder{
       font-weight: 450;
@@ -669,7 +669,7 @@ export default {
 
   }
   .appoint-form-value{
-      font-weight: 550;
+      font-weight: 600;
     }
   .appoint-form-placeholder{
     color: #999999;
@@ -811,13 +811,14 @@ export default {
   .appoint-form-submit{
     margin-top: 30px;
     height: 40px;
-    font-weight: 550;
+    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

@@ -494,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;
@@ -504,6 +505,9 @@ export default {
       align-items: center;
 
       img{
+        position: absolute;
+        left: 12px;
+        top: 3px;
         width: 12px;
         height: 14px;
         margin-right: 5px;