Merge branch 'chronic-master' of…

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

src/assets/css/base.less

@@ -34,10 +34,9 @@ body {
 // van组件样式调整
 // 表单
 .screen-form {
-    // input::placeholder {
-    //     color: #999999;
-    //     float: right;
-    // }
+    input::placeholder {
+        color: #999999;
+    }
     .van-cell:after {
         transform: scaleY(1);
     }

src/resident/Resident.vue

@@ -20,10 +20,16 @@ export default {
             visible: false,
             themeVars: {
                 primaryColor: '#54CCBD',
+                // 按键
                 buttonPrimaryBackground: '#54CCBD',
                 buttonPrimaryBorderColor: '#54CCBD',
                 buttonDefaultBorderColor: '#BFBFBF',
                 buttonNormalFontSize: '.16rem',
+                pickerConfirmActionColor: '#54CCBD',
+                // tab
+                tabsBottomBarColor: '#54CCBD',
+                // 级联选项
+                cascaderActiveColor: '#54CCBD',
                 // 表单相关
                 cellVerticalPadding: '.15rem',
                 cellTextColor: '#262626',

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

@@ -97,7 +97,8 @@
                 :rules="rules.presentCode"
                 @click="showPresent = true"
             />
-            <van-popup v-model:show="showPresent" :close-on-click-overlay="false" position="bottom">
+            <van-popup v-model:show="showPresent" :close-on-click-overlay="false" position="bottom"
+                :lazy-render="false">
                 <DocAddress v-model:value="form.presentCode" @close="showPresent = false"
                     :viewData="addressRecord.presentCode"
                     @change="presentChange"/>
@@ -126,7 +127,8 @@
                 :rules="rules.registeredCode"
                 @click="showRegistered = true"
             />
-            <van-popup v-model:show="showRegistered" :close-on-click-overlay="false" position="bottom">
+            <van-popup v-model:show="showRegistered" :close-on-click-overlay="false" position="bottom"
+                :lazy-render="false">
                 <DocAddress v-model:value="form.registeredCode" @close="showRegistered = false"
                     :viewData="addressRecord.registeredCode"
                     @change="registeredChange"/>

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

@@ -14,8 +14,7 @@
                 readonly
                 name="certificateType"
                 label="证件类型"
-                placeholder="请选择"
-                disabled/>
+                placeholder="请选择" />
             <van-field v-model="form.idCard"
                 required
                 clearable

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

@@ -428,7 +428,7 @@ export default {
             return height && weight ? (weight / (height / 100 * height / 100)).toFixed(2) : undefined
         }
     },
-    inject: ['recordForm'],
+    inject: ['recordForm', 'checkInfo'],
     created() {
         this.init()
     },
@@ -455,7 +455,8 @@ export default {
                 const query = {
                     ...this.form,
                     screenDoctorId: this.recordForm.doctorId,
-                    residentsRecord: this.recordForm.base
+                    residentsRecord: this.recordForm.base,
+                    idCard: this.checkInfo.idCard
                 }
                 // 提交表单
                 savefirstScreen(fetchDataHandle(query, {