Merge remote-tracking branch 'origin/dev' into dev

src/apps/AppResidentFile/AppResidentFile.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="AppResidentFile">
-    <u-tabbar v-model="currentTabBar" :list="lists" @change="changeTab" style="height: 0"></u-tabbar>
+    <u-tabbar v-model="currentTabBar" :list="lists" @change="changeTab" active-color="#3267F0" inactive-color="#C4CAD4" style="height: 0" class="u-tabbar"></u-tabbar>
 
     <div class="currentTabBar0" v-if="currentTabBar == 0">
       <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" bg-color="#3975C6" inactive-color="#fff" active-color="#fff" @change="change"></u-tabs>
@@ -126,21 +126,21 @@ export default {
     return {
       lists: [
         {
-          iconPath: 'home',
+          iconPath: 'http://respub.sinoecare.net/20211227/1n-20211227162529.png',
-          selectedIconPath: 'home-fill',
+          selectedIconPath: 'http://respub.sinoecare.net/20211227/1h-20211227164832.png',
           text: '统计分析',
           customIcon: false,
         },
         {
-          iconPath: 'photo',
+          iconPath: 'http://respub.sinoecare.net/20211227/2n-20211227164853.png',
-          selectedIconPath: 'photo-fill',
+          selectedIconPath: 'http://respub.sinoecare.net/20211227/2h-20211227164906.png',
           text: '居民列表',
           customIcon: false,
         },
 
         {
-          iconPath: 'play-right',
+          iconPath: 'http://respub.sinoecare.net/20211227/3n-20211227164927.png',
-          selectedIconPath: 'play-right-fill',
+          selectedIconPath: 'http://respub.sinoecare.net/20211227/3h-20211227165003.png',
           text: '居民群列表',
           customIcon: false,
         },
@@ -203,12 +203,14 @@ export default {
           }
         })
     },
+
     reachBottom() {
       if (this.page.total > this.list.length) {
         this.page.current++
         this.getList()
       }
     },
+
     showResident({ id }) {
       id &&
         uni.navigateTo({
@@ -271,7 +273,6 @@ export default {
     },
 
     initEcharts1(data) {
-      console.log(Object.values(data).map((e) => e.decrease))
       var option = {
         legend: {
           data: ['群成员总数', '入群人数', '退群人数'],
@@ -522,6 +523,7 @@ uni-page-body {
 }
 .AppResidentFile {
   height: 100%;
+
   .currentTabBar0 {
     .peopleGroup,
     .people {