Merge branch 'chronic-master' of…

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

src/assets/css/atomic.less

@@ -80,6 +80,7 @@
 .text-16 { font-size: 16px; }
 .text-12 { font-size: 12px; }
 .text-center { text-align: center; }
+.text-end { text-align: end; }
 .text-black { color: #000; }
 .text-red { color: #FF4D4F; }
 .text-primary { color: var(--van-primary-color); }

src/assets/css/base.less

@@ -80,6 +80,7 @@ body {
             display: none;
         }
     }
+
 }
 
 // 按键形式的单选框

src/doctor/resident/Visit.vue

@@ -212,7 +212,7 @@ export default {
             }).then(() => {
                 // on confirm
                 // console.log(item.id)
-                deleteVisit(item.id).then(res => {
+                deleteVisit({ id: item.id }).then(res => {
                     this.load()
                 })
             })

src/resident/screening/first/detail/Detail.vue

@@ -15,7 +15,7 @@
             <div v-for="item in columnsBase" :key="item.key"
                 class="flex justify-between py-4 border-bottom item">
                 <span class="shrink-0 mr-2 label">{{ item.title }}</span>
-                <span>{{ residentInfo[item.key] || '-' }}</span>
+                <span class="text-end">{{ residentInfo[item.key] || '-' }}</span>
             </div>
         </div>
 

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

@@ -96,7 +96,11 @@
                 placeholder="请选择所在地区"
                 :rules="rules.presentCode"
                 @click="showPresent = true"
-            />
+            >
+                <template #input>
+                    <span class="text-end">{{ form.presentCodeName }}</span>
+                </template>
+            </van-field>
             <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"
@@ -126,7 +130,11 @@
                 placeholder="请选择所在地区"
                 :rules="rules.registeredCode"
                 @click="showRegistered = true"
-            />
+            >
+                <template #input>
+                    <span class="text-end">{{ form.registeredCodeName }}</span>
+                </template>
+            </van-field>
             <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"

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

 <template>
-    <div class="h-full pb-5 flex flex-col ">
+    <div class="pb-5 flex flex-col" style="height: 100vh;">
         <div class="p-3 text-16 text-black text-center shrink-0 top-bar">
             <span class="back-bt" v-if="step >= 2">
                 <span @click="onClose" v-if="[5].includes(step)">
@@ -12,6 +12,7 @@
             <span>居民慢病筛查</span>
         </div>
         <div class="grow overflow-y-auto">
+            <div ref="top"></div>
             <IdCheck v-show="step === 1"/>
             <CheckTip v-if="step === 2"/>
             <!-- 居民基础信息 -->
@@ -80,6 +81,9 @@ export default {
             }
             this.step = step ? step : this.step + 1
             this.setpHistory.push(this.step)
+            const dom = this.$refs.top
+            console.log(dom)
+            dom && dom.scrollIntoView()
         },
         onBack() {
             if (this.step === 1) return

src/utils/commonReg.js

@@ -56,7 +56,7 @@ export const addressValidator = { validator: (value) => {
     if (!array.length || array.length === 5) {
         return
     }
-    if (value.length < 5) {
+    if (array.length < 5) {
         return '请选择至第五级地址'
     }
     return