Merge branch 'chronic-master' of…

Merge branch 'chronic-master' of http://gitlab.yiboshi.com/nightkis1995/frontend-h5 into chronic-master

 Conflicts:
	src/doctor/Doctor.vue

src/assets/css/base.less

@@ -34,10 +34,10 @@ body {
 // van组件样式调整
 // 表单
 .screen-form {
-    input::placeholder {
-        color: #999999;
-        float: right;
-    }
+    // input::placeholder {
+    //     color: #999999;
+    //     float: right;
+    // }
     .van-cell:after {
         transform: scaleY(1);
     }
@@ -57,9 +57,9 @@ body {
     // 在table表格中的控件
     .table-field {
         padding: 0;
-        input::placeholder {
-            float: none;
-        }
+        // input::placeholder {
+        //     float: none;
+        // }
         &:after {
             display: none;
         }

src/resident/screening/first/form/BaseInfo.vue

@@ -5,6 +5,7 @@
             <div class="text-12">请准确填写您的证件信息，标*内容为必填</div>
         </div>
         <van-form label-width="5em" ref="form" class="screen-form"
+            input-align="right"
             error-message-align="right">
             <van-field v-model="form.residentName"
                 required

src/resident/screening/first/form/IdCheck.vue

@@ -6,6 +6,7 @@
         </div>
         <van-form label-width="5em" ref="form"
             error-message-align="right"
+            input-align="right"
             class="screen-form">
             <van-field required
                 v-model="form.certificateTypeTrans"

src/resident/screening/first/form/ScreenInfo.vue

@@ -6,6 +6,7 @@
         </div>
 
         <van-form label-width="10em" ref="form" class="screen-form"
+            input-align="right"
             error-message-align="right">
             <van-field v-model="form.currentAge"
                 name="currentAge" 
@@ -163,6 +164,7 @@
                                 maxlength="10"
                                 :rules="rules.pressureDbp"
                                 error-message-align="left"
+                                input-align="left"
                                 class="table-field"
                             />
                             <span class="divide">/</span>
@@ -176,6 +178,7 @@
                                 maxlength="10"
                                 :rules="rules.pressureSbp"
                                 error-message-align="left"
+                                input-align="left"
                                 class="table-field"
                             />
                         </td>
@@ -193,6 +196,7 @@
                                 maxlength="10"
                                 :rules="rules.pressureDbp"
                                 error-message-align="left"
+                                input-align="left"
                                 class="table-field"
                             />
                             <span class="divide">/</span>
@@ -207,6 +211,7 @@
                                     maxlength="10"
                                     :rules="rules.pressureSbp"
                                     error-message-align="left"
+                                    input-align="left"
                                     class="table-field"
                                 />
                             </div>