Merge branch 'chronic-master' of…

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

src/residentWX/guide/List.vue

@@ -164,7 +164,7 @@ export default {
         position: relative;
         display: flex;
         margin-bottom: 8px;
-        &:last-child {
+        &:last-of-type {
             margin-bottom: 0;
         }
     }

src/residentWX/screening/List.vue

@@ -163,11 +163,10 @@ export default {
     background-color: #fff;
     border-radius: 12px;
     >div {
-        position: relative;
         display: flex;
         margin-bottom: 8px;
-        &:last-child {
-            margin-bottom: 0;
+        &:last-of-type {
+            margin-bottom: 0!important;
         }
     }
     .label {

src/residentWX/screening/detail/FirstDetail.vue

@@ -13,9 +13,9 @@
                         <span class="name">{{ userInfo.residentName }}</span>
                     </div>
                     <div class='lh-22'>
-                        <div class='mt-3'>筛查日期：{{ info.screenDate || '-' }}</div>
+                        <div class='mt-3'>筛查日期：<span class='color-26'>{{ info.screenDate || '-' }}</span></div>
                         <span>慢病高危评估结果：</span>
-                        <span :class="{'text-red': info.screenResult !== 1 }">{{ info.screenResultName }}</span>
+                        <span :class="{'text-red': info.screenResult !== 1, 'color-26': info.screenResult === 1 }">{{ info.screenResultName }}</span>
                     </div>
                 </div>
             </div>
@@ -260,4 +260,7 @@ table {
 .lh-22 {
     line-height: 22px;
 }
+.color-26 {
+     color: #262626;
+}
 </style>

src/residentWX/screening/detail/SecondDetail.vue

@@ -25,7 +25,7 @@
                         <span v-if='info.specialScreenResult ==9'>您并未存在高危风险。</span>
                     </div>
                     <div v-if='info.specialScreenResult && info.specialScreenResult !=9'
-                         class='flex items-center flex-wrap gap-x-2.5 gap-y-1'>
+                         class='flex items-center flex-wrap gap-x-2.5 gap-y-1 mt-2'>
                         <div v-for='(item, index) in highRiskList' :key='index' class='tag tag-red'>
                             <span>{{ item.name }}：</span><span class='color-red'>{{ item.num || 0 }}项</span>
                         </div>

src/residentWX/visit/List.vue

@@ -193,12 +193,12 @@ export default {
         position: relative;
         display: flex;
         margin-bottom: 8px;
-        &:last-child {
+        &:last-of-type {
             margin-bottom: 0;
         }
     }
     .label {
-        min-width: 6em;
+        min-width: 7em;
         color: #8C8C8C;
     }
 }