Merge branch 'chronic-master' of…

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

src/doctor/followUp/List.vue

@@ -22,7 +22,7 @@
                 <div class='mt-10 white-back p-16' v-for='item in activeData' :key="item.id">
                     <div class='flex items-center'>
                         <div class='base-title'>{{ item.residentName }}</div>
-                        <div class='second-title plr-8'>{{ item.age }}岁</div>
+                        <div class='second-title plr-8'>{{ getInfoByIdCard(item.idCard).age }}岁</div>
                         <div class='second-title plr-6'>{{ item.genderName }}</div>
                     </div>
                     <div class='mt-3 flex items-center'>
@@ -80,7 +80,7 @@
 import dayjs from 'dayjs'
 import { getVisitAll } from '@/api/doctor/generalFU.js'
 import ChronicTag from '@/doctor/components/chronicTag/ChronicTag.vue'
-import { backHome } from '@/utils/common'
+import { backHome, getInfoByIdCard } from '@/utils/common'
 
 export default {
     name: 'List',
@@ -125,6 +125,7 @@ export default {
         })
     },
     methods: {
+        getInfoByIdCard,
         init() {
             this.load()
         },

src/doctor/resident/Visit.vue

 <template>
     <div class="h-full flex flex-col visit">
         <van-tabs v-model:active='activeTab' class="shrink-0" v-if="tabList.length"
-            @change="tabChange">
+            @change="tabChange"
+            shrink>
             <van-tab  v-for='item in tabList' :key="item.name"
                 :title='item.title' :name='item.name'></van-tab>
         </van-tabs>