居民端小程序 初筛bug修复 筛查、随访 样式重新优化

src/residentWX/ResidentWX.vue

@@ -42,7 +42,7 @@ export default {
                 fieldLabelColor: '#262626',
                 cellBorderColor: '#d9d9d9',
                 // 进度条
-                sliderActiveBackground: '#54CCBD'
+                sliderActiveBackground: '#54CCBD',
             }
         }
     },

src/residentWX/screening/detail/FirstDetail.vue

@@ -8,14 +8,12 @@
         </div>
         <div class="px-4 py-3 flex shrink-0 base-info">
             <div class="flex w-full">
-                <img src="@/assets/image/residentWX/avatar.png" alt="" class="shrink-0"
-                    style="width: .56rem">
-                <div class="grow flex flex-col justify-between pl-3">
+                <div class="grow flex flex-col justify-between">
                     <div class="flex justify-between">
                         <span class="name">{{ userInfo.residentName }}</span>
-                        <span>筛查日期：{{ info.screenDate || '-' }}</span>
                     </div>
-                    <div>
+                    <div class='lh-22'>
+                        <div class='mt-3'>筛查日期：{{ info.screenDate || '-' }}</div>
                         <span>慢病高危评估结果：</span>
                         <span :class="{'text-red': info.screenResult !== 1 }">{{ info.screenResultName }}</span>
                     </div>
@@ -167,9 +165,10 @@ export default {
     },
     methods: {
         init() {
-            this.collapseList[0].info = this.userInfo
+
             firstScreenDetail({ id: this.id }).then(res => {
                 this.info = res.data || {}
+                this.collapseList[0].info = this.info?.residentsRecord
                 this.collapseList[1].info = this.info
                 this.collapseList[2].info = this.info
             })
@@ -256,4 +255,8 @@ table {
         min-width: 5em;
     }
 }
+
+.lh-22 {
+    line-height: 22px;
+}
 </style>

src/residentWX/screening/detail/SecondDetail.vue

@@ -8,14 +8,15 @@
         </div>
         <div class='px-4 py-3 flex shrink-0 base-info'>
             <div class='flex w-full'>
-                <img src='@/assets/image/residentWX/avatar.png' alt='' class='shrink-0'
-                     style='width: .56rem;height: .56rem'>
-                <div class='grow flex flex-col justify-between pl-3'>
+                <div class='grow flex flex-col justify-between'>
                     <div class='flex justify-between'>
                         <span class='name'>{{ residentInfo.residentName }}</span>
-                        <span class='top-label'>报告日期：<span class='color-b'>{{ info.screenDate || '-' }}</span></span>
+
                     </div>
                     <div class='top-label mt-3'>
+                        <span >报告日期：<span class='color-b'>{{ info.screenDate || '-' }}</span></span>
+                    </div>
+                    <div class='top-label'>
                         <span>慢病高危评估结果：</span>
                     </div>
                     <div class='top-label color-b'>
@@ -26,7 +27,7 @@
                     <div v-if='info.specialScreenResult && info.specialScreenResult !=9'
                          class='flex items-center flex-wrap gap-x-2.5 gap-y-1'>
                         <div v-for='(item, index) in highRiskList' :key='index' class='tag tag-red'>
-                            <span>{{ item.name }}</span><span>{{ item.num || 0 }}</span>项
+                            <span>{{ item.name }}：</span><span class='color-red'>{{ item.num || 0 }}项</span>
                         </div>
                     </div>
                 </div>
@@ -846,12 +847,13 @@ export default {
         border-radius: 2px;
         padding: 3px 8px;
         font-size: 12px;
+        line-height: 18px;
     }
 
     .tag-red {
-        border: 1px solid #FFA39E;
-        color: #F5222D;
-        background-color: #FFF1F0;
+        border: 1px solid #EFF2F7;
+        color: #262626;
+        background-color: #EFF2F7;
     }
 }
 

src/residentWX/utils/common.less

@@ -33,7 +33,7 @@
     }
     .van-cell {
         padding: .1rem 0;
-        color: #595959;
+        color: #8C8C8C;
         background: transparent;
         &::after {
             display: none;
@@ -46,6 +46,7 @@
     .van-collapse-item {
         .van-collapse-item__content {
             padding: 0;
+            color: #262626;
         }
         &::after {
             display: none;

src/residentWX/visit/detail/GeneralFUDetail.vue

@@ -9,9 +9,7 @@
         </div>
         <div class='px-4 py-3 flex shrink-0 base-info'>
             <div class='flex w-full'>
-                <img src='@/assets/image/residentWX/avatar.png' alt='' class='shrink-0'
-                     style='width: .56rem;height: .56rem'>
-                <div class='grow flex flex-col justify-between pl-3'>
+                <div class='grow flex flex-col justify-between'>
                     <div class='flex justify-between'>
                         <span class='name'>{{ residentInfo.residentName }}</span>
                     </div>

src/residentWX/visit/detail/SeparateFUDetail.vue

@@ -8,8 +8,7 @@
         </div>
         <div class="px-4 py-3 flex shrink-0 base-info">
             <div class="flex w-full">
-                <img src="@/assets/image/residentWX/avatar.png" alt="" class="shrink-0" style="width: .56rem; height: .56rem">
-                <div class="grow flex flex-col justify-between pl-3">
+                <div class="grow flex flex-col justify-between">
                     <div class="flex justify-between">
                         <span class="name">{{ residentInfo.residentName }}</span>
                     </div>