From 7623b6e3f10ea92ce3bd06b72d7c9069a771b9d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Wed, 22 Dec 2021 18:27:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=9D=90=E6=A0=87=E8=BD=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppResidentFile/AppResidentFile.vue | 48 +++++++++++---------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/src/apps/AppResidentFile/AppResidentFile.vue b/src/apps/AppResidentFile/AppResidentFile.vue
index 5f5329d3..d737c6f1 100644
--- a/src/apps/AppResidentFile/AppResidentFile.vue
+++ b/src/apps/AppResidentFile/AppResidentFile.vue
@@ -283,39 +283,39 @@ export default {
     initEcharts1(data) {
       var option = {
         legend: {
-          borderColor: 'pink',
           data: ['群成员总数', '入群人数', '退群人数'],
+          y: 'bottom',
         },
+        color: ['#4A86FD', '#32C5FF', '#FFAA44'],
         tooltip: {
           trigger: 'axis',
         },
         grid: {
-          top: '12%',
+          top: '9%',
           left: '6%',
           right: '8%',
-          bottom: '6%',
+          bottom: '9%',
           containLabel: true,
         },
         xAxis: {
           type: 'category',
           data: Object.keys(data).map((e) => e.substring(e.length - 5, e.length)),
           axisLine: {
-            lineStyle: { color: '#157EFF' },
+            show: true,
+            lineStyle: { color: '#666' },
           },
           axisLabel: {
             show: true,
             interval: 0,
           },
           axisTick: {
-            interval: 'auto',
+            show: false,
           },
         },
         yAxis: {
           type: 'value',
           axisLine: {
-            lineStyle: {
-              color: '#666',
-            },
+            show: false,
           },
           splitLine: {
             show: true,
@@ -327,10 +327,13 @@ export default {
             show: true,
             interval: 0,
           },
+          axisTick: {
+            show: false,
+          },
         },
         series: [
           {
-            itemStyle: {
+            lineStyle: {
               normal: {
                 lineStyle: {
                   color: '#4A86FD',
@@ -344,7 +347,7 @@ export default {
             data: Object.values(data).map((e) => e.total),
           },
           {
-            itemStyle: {
+            lineStyle: {
               normal: {
                 lineStyle: {
                   color: '#32C5FF',
@@ -358,7 +361,7 @@ export default {
             data: Object.values(data).map((e) => e.increase),
           },
           {
-            itemStyle: {
+            lineStyle: {
               normal: {
                 lineStyle: {
                   color: '#FFAA44',
@@ -381,15 +384,17 @@ export default {
       var options = {
         legend: {
           data: ['居民总数', '新增居民数', '流失居民数'],
+          y: 'bottom',
         },
+        color: ['#4A86FD', '#32C5FF', '#FFAA44'],
         tooltip: {
           trigger: 'axis',
         },
         grid: {
-          top: '12%',
+          top: '9%',
           left: '6%',
           right: '8%',
-          bottom: '6%',
+          bottom: '9%',
           containLabel: true,
         },
         xAxis: {
@@ -403,15 +408,13 @@ export default {
             interval: 0,
           },
           axisTick: {
-            interval: 'auto',
+            show: false,
           },
         },
         yAxis: {
           type: 'value',
           axisLine: {
-            lineStyle: {
-              color: '#666',
-            },
+            show: false,
           },
           splitLine: {
             show: true,
@@ -423,10 +426,13 @@ export default {
             show: true,
             interval: 0,
           },
+          axisTick: {
+            show: false,
+          },
         },
         series: [
           {
-            itemStyle: {
+            lineStyle: {
               normal: {
                 lineStyle: {
                   color: '#4A86FD',
@@ -440,7 +446,7 @@ export default {
             data: Object.values(data).map((e) => e.total),
           },
           {
-            itemStyle: {
+            lineStyle: {
               normal: {
                 lineStyle: {
                   color: '#32C5FF',
@@ -454,7 +460,7 @@ export default {
             data: Object.values(data).map((e) => e.increase),
           },
           {
-            itemStyle: {
+            lineStyle: {
               normal: {
                 lineStyle: {
                   color: '#FFAA44',
@@ -605,7 +611,7 @@ uni-page-body {
 
       .echartes {
         margin-top: 64px;
-        padding-top: 20px;
+        padding-bottom: 20px;
         height: 616px;
         background: #fff;
         box-sizing: border-box;

From f926bf41c06850f402133102b6683192406f87cd Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 22 Dec 2021 18:41:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index cd2bd6b1..f8674b53 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dvcp-weapps",
-  "version": "0.1.0",
+  "version": "1.1.0",
   "private": false,
   "author": "Kubbo",
   "scripts": {