From 7bd7b56e5a7901683c8b183f1c57317311c0a811 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: Tue, 4 Jan 2022 09:13:10 +0800
Subject: [PATCH 01/18] 26297

---
 src/apps/AppMarryAndDie/AppMarryAndDie.vue | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/apps/AppMarryAndDie/AppMarryAndDie.vue b/src/apps/AppMarryAndDie/AppMarryAndDie.vue
index de0a7248..f096ee8f 100644
--- a/src/apps/AppMarryAndDie/AppMarryAndDie.vue
+++ b/src/apps/AppMarryAndDie/AppMarryAndDie.vue
@@ -331,6 +331,7 @@ uni-page-body {
 
   .msg {
     background: #fff;
+    height: 100%;
 
     .box {
       display: flex;
@@ -396,11 +397,12 @@ uni-page-body {
   }
 
   .myReport {
-    background: #f3f6f9;
-    padding-bottom: 112px;
+    background: #f5f5f5 !important;
+    height: 100%;
 
     ::v-deep .AiCard {
       background: #f3f6f9;
+      padding: 0 24px 24px 24px;
 
       .start {
         display: flex;
@@ -477,8 +479,12 @@ uni-page-body {
       }
     }
 
+    ::v-deep .AiCard:first-child {
+      padding-top: 24px;
+    }
+
     .emptyWrap {
-      background: #f3f6f9;
+      background: #f5f5f5 !important;
     }
 
     .u-load-more-wrap {

From c728f1f7bf9904bb7f5246e1b3c2b517efee2646 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: Tue, 4 Jan 2022 09:14:55 +0800
Subject: [PATCH 02/18] 26298

---
 src/apps/AppUniMsg/AppUniMsg.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/AppUniMsg/AppUniMsg.vue b/src/apps/AppUniMsg/AppUniMsg.vue
index f27cbe6e..41e63e1f 100644
--- a/src/apps/AppUniMsg/AppUniMsg.vue
+++ b/src/apps/AppUniMsg/AppUniMsg.vue
@@ -85,7 +85,7 @@ export default {
     })
   },
   onShow() {
-    document.title = '通知公告'
+    document.title = '小程序公告'
   },
   methods: {
     getList() {

From 83daa77e589cf47d22095749a67c8dd2556e0633 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: Tue, 4 Jan 2022 09:22:20 +0800
Subject: [PATCH 03/18] 26300

---
 src/apps/AppResidentActivitie/AppResidentActivities.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/apps/AppResidentActivitie/AppResidentActivities.vue b/src/apps/AppResidentActivitie/AppResidentActivities.vue
index 4f12ffff..e1a1505c 100644
--- a/src/apps/AppResidentActivitie/AppResidentActivities.vue
+++ b/src/apps/AppResidentActivitie/AppResidentActivities.vue
@@ -39,6 +39,8 @@
       </AiCard>
     </template>
 
+    <AiEmpty description="暂无数据" v-else></AiEmpty>
+
     <AiFixedBtn>
       <div class="addBtn iconfont iconfont-iconfangda" @tap.stop="toAdd()" />
     </AiFixedBtn>

From 325986c1e40aa81b1bbec7bb428f87208adbce3f Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Tue, 4 Jan 2022 10:11:22 +0800
Subject: [PATCH 04/18] =?UTF-8?q?=E4=BE=BF=E6=B0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppMailList/AppMailList.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/apps/AppMailList/AppMailList.vue b/src/apps/AppMailList/AppMailList.vue
index 00aca805..ad870474 100644
--- a/src/apps/AppMailList/AppMailList.vue
+++ b/src/apps/AppMailList/AppMailList.vue
@@ -46,7 +46,10 @@ export default {
   },
   computed: { ...mapState(['user']) },
   mounted() {
-    // this.getList()
+    this.getList()
+    uni.$on('updateList', () => {
+      this.getList()
+    })
   },
   onShow() {
     document.title = "便民通讯录"

From 0768fa63aed410f10d2d4695c6ae76f801d03dc0 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Tue, 4 Jan 2022 10:13:23 +0800
Subject: [PATCH 05/18] 26309

---
 src/apps/AppMailList/add.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/apps/AppMailList/add.vue b/src/apps/AppMailList/add.vue
index 71cc0ecf..c058353c 100644
--- a/src/apps/AppMailList/add.vue
+++ b/src/apps/AppMailList/add.vue
@@ -30,7 +30,7 @@
       <div class="item">
         <span class="label"><span class="tips">*</span>地区</span>
         <div class="value">
-          <AiAreaPicker :areaId="user.areaId" v-model="userInfo.areaId" @select="areaSelect">
+          <AiAreaPicker :areaId="user.areaId" v-model="userInfo.areaId" :name.sync="userInfo.areaName" @select="areaSelect">
             <span class="label" v-if="userInfo.areaName">{{ userInfo.areaName }}</span>
             <span v-else class="color-999">请选择</span>
             <u-icon name="arrow-right" color="#cccccc" size="14"></u-icon>
@@ -85,8 +85,7 @@ export default {
 
   methods: {
     areaSelect(e) {
-      this.userInfo.areaId = e.id
-      this.userInfo.areaName = e.name
+      this.userInfo.areaId = e
     },
     confirmSelect(e) {
       this.userInfo.isPublic = e[0].value

From 433d099fb6589b05294dc9f360e690f5010d2587 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Tue, 4 Jan 2022 11:01:18 +0800
Subject: [PATCH 06/18] 26313

---
 src/apps/AppServicePublic/Add.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/AppServicePublic/Add.vue b/src/apps/AppServicePublic/Add.vue
index d390e367..bf14654c 100644
--- a/src/apps/AppServicePublic/Add.vue
+++ b/src/apps/AppServicePublic/Add.vue
@@ -217,7 +217,7 @@ export default {
     font-size: 32px;
     font-weight: 500;
     color: #ffffff;
-    z-index: 999999;
+    z-index: 9999;
   }
 
   .right {

From 626f547a8b015438dd361b27a3aba2725bf7d546 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: Tue, 4 Jan 2022 11:23:02 +0800
Subject: [PATCH 07/18] 26317

---
 src/apps/AppResidentActivitie/Add.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/AppResidentActivitie/Add.vue b/src/apps/AppResidentActivitie/Add.vue
index 0c8302cf..3634a618 100644
--- a/src/apps/AppResidentActivitie/Add.vue
+++ b/src/apps/AppResidentActivitie/Add.vue
@@ -330,7 +330,7 @@ export default {
     font-size: 32px;
     font-weight: 500;
     color: #ffffff;
-    z-index: 999999;
+    z-index: 99;
   }
 }
 </style>

From 4a746e09dcd5ae599775215dbd7b2a836d9863c3 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: Tue, 4 Jan 2022 11:35:41 +0800
Subject: [PATCH 08/18] 26315

---
 src/apps/AppWalkask/detail.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/apps/AppWalkask/detail.vue b/src/apps/AppWalkask/detail.vue
index d943ba0c..1922f234 100644
--- a/src/apps/AppWalkask/detail.vue
+++ b/src/apps/AppWalkask/detail.vue
@@ -28,7 +28,7 @@
       <div class="hint-con" v-if="data.description">{{ data.description }}</div>
 
       <div class="imgs">
-        <img :src="item.url" alt="" v-for="(item, index) in data.images" :key="index" />
+        <img :src="item.url" alt="" v-for="(item, index) in data.images" :key="index" @click.stop="previewImage(data.images, item.url)" />
       </div>
     </div>
   </div>
@@ -69,6 +69,13 @@ export default {
         }
       })
     },
+
+    previewImage(images, img) {
+      uni.previewImage({
+        urls: images.map((v) => v.url),
+        current: img,
+      })
+    },
   },
 }
 </script>

From 8db4033ad84acdc429ad0a39735bf4e87e6ec96c 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: Tue, 4 Jan 2022 11:36:42 +0800
Subject: [PATCH 09/18] 26314

---
 src/apps/AppWalkask/detail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/AppWalkask/detail.vue b/src/apps/AppWalkask/detail.vue
index 1922f234..ce5cd59f 100644
--- a/src/apps/AppWalkask/detail.vue
+++ b/src/apps/AppWalkask/detail.vue
@@ -5,7 +5,7 @@
 
       <div class="walk-item">
         <span>走访对象：</span>
-        <span>{{ data.createUserName }}</span>
+        <span>{{ data.name }}</span>
       </div>
 
       <div class="walk-item" v-if="data.reality">

From 269881aa0bb30455f584b908baf3c2653b5318ba 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: Tue, 4 Jan 2022 13:43:45 +0800
Subject: [PATCH 10/18] 26298

---
 src/apps/AppUniMsg/Add.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/AppUniMsg/Add.vue b/src/apps/AppUniMsg/Add.vue
index 80725c26..a82d8c55 100644
--- a/src/apps/AppUniMsg/Add.vue
+++ b/src/apps/AppUniMsg/Add.vue
@@ -51,7 +51,7 @@ export default {
     this.getDetail()
   },
   onShow() {
-    document.title = '新增通知公告'
+    document.title = '新增小程序公告'
   },
 
   mounted() {

From e41bd505f4880e662c7db9e5203d132a181744b8 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: Tue, 4 Jan 2022 13:49:42 +0800
Subject: [PATCH 11/18] 26319

---
 src/apps/AppUniMsg/AppUniMsg.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/AppUniMsg/AppUniMsg.vue b/src/apps/AppUniMsg/AppUniMsg.vue
index 41e63e1f..fa93cf94 100644
--- a/src/apps/AppUniMsg/AppUniMsg.vue
+++ b/src/apps/AppUniMsg/AppUniMsg.vue
@@ -24,7 +24,7 @@
           </div>
         </template>
 
-        <template #menu>
+        <template #menu v-if="item.createUserId == user.id">
           <div class="menu" @tap.stop="toAdd(item, 2)">编辑</div>
           <div class="menu" @tap.stop="toDetele(item)">删除</div>
         </template>

From 6e77943d762fc6440cdf8fb345399369b7a342a3 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: Tue, 4 Jan 2022 14:33:53 +0800
Subject: [PATCH 12/18] bug

---
 src/apps/AppResidentDocument/DetailPeople.vue    | 4 ++--
 src/apps/AppResidentFile/components/document.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/apps/AppResidentDocument/DetailPeople.vue b/src/apps/AppResidentDocument/DetailPeople.vue
index 9a95965e..98e5c3c2 100644
--- a/src/apps/AppResidentDocument/DetailPeople.vue
+++ b/src/apps/AppResidentDocument/DetailPeople.vue
@@ -9,7 +9,7 @@
       <div class="right">
         <div class="rightTop">
           <span class="names">{{ data.resident && data.resident.name }}</span>
-          <span class="householdNames" v-if="data.resident.householdName == 1">户主</span>
+          <span class="householdNames" v-if="data.resident && data.resident.householdName == 1">户主</span>
           <span class="householdNames" v-else>
             {{ $dict.getLabel('householdRelation', data.resident && data.resident.householdRelation) }}
           </span>
@@ -127,7 +127,7 @@ export default {
     })
   },
   onShow() {
-    document.title =  '家庭成员信息'
+    document.title = '家庭成员信息'
   },
   methods: {
     getDetail() {
diff --git a/src/apps/AppResidentFile/components/document.vue b/src/apps/AppResidentFile/components/document.vue
index a5be6da5..417913e8 100644
--- a/src/apps/AppResidentFile/components/document.vue
+++ b/src/apps/AppResidentFile/components/document.vue
@@ -83,7 +83,7 @@ export default {
     }
   },
   onShow() {
-    document.title =  '居民详情' 
+    document.title = '居民详情'
     this.$dict.load('sex', 'nation', 'education', 'job', 'faithType', 'politicsStatus', 'militaryStatus', 'householdRelation', 'householdName')
   },
 }

From 7f8d24356829c96cd0fc473089886d596bcb92d9 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Tue, 4 Jan 2022 14:57:11 +0800
Subject: [PATCH 13/18] bug

---
 src/apps/AppServicePublic/Add.vue              | 1 -
 src/apps/AppServicePublic/AppServicePublic.vue | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/AppServicePublic/Add.vue b/src/apps/AppServicePublic/Add.vue
index bf14654c..11cdf874 100644
--- a/src/apps/AppServicePublic/Add.vue
+++ b/src/apps/AppServicePublic/Add.vue
@@ -149,7 +149,6 @@ export default {
         contentType: 0
       })
       .then((res) => {
-        console.log(333)
         if (res.code == 0) {
           uni.$emit('update')
           this.$u.toast('发布成功')
diff --git a/src/apps/AppServicePublic/AppServicePublic.vue b/src/apps/AppServicePublic/AppServicePublic.vue
index b796b130..9f56d026 100644
--- a/src/apps/AppServicePublic/AppServicePublic.vue
+++ b/src/apps/AppServicePublic/AppServicePublic.vue
@@ -105,6 +105,7 @@ export default {
     this.getType()
     this.getList()
     uni.$on('update', () => {
+      this.current = 1
       this.getList()
     })
 

From 58a7bab9a03fd4f98d9818ac04b11a4f725420b3 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: Tue, 4 Jan 2022 15:14:02 +0800
Subject: [PATCH 14/18] log

---
 src/apps/AppResidentFile/components/document.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/apps/AppResidentFile/components/document.vue b/src/apps/AppResidentFile/components/document.vue
index 417913e8..f39fa1be 100644
--- a/src/apps/AppResidentFile/components/document.vue
+++ b/src/apps/AppResidentFile/components/document.vue
@@ -82,6 +82,11 @@ export default {
       familyList: [],
     }
   },
+  created() {
+    console.log('居民档案性别(无字典)', this.resident.sex)
+    console.log('居民档案性别(有字典)', this.$dict.getLabel('sex', this.resident.sex))
+    console.log('居民档案字典值', this.$dict.getDict('sex'))
+  },
   onShow() {
     document.title = '居民详情'
     this.$dict.load('sex', 'nation', 'education', 'job', 'faithType', 'politicsStatus', 'militaryStatus', 'householdRelation', 'householdName')

From 1526ba13ecc615b824e7fc689ae3fd6f1cd8cdda Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Tue, 4 Jan 2022 15:28:49 +0800
Subject: [PATCH 15/18] bug

---
 src/apps/AppServicePublic/Add.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/AppServicePublic/Add.vue b/src/apps/AppServicePublic/Add.vue
index 11cdf874..86e94145 100644
--- a/src/apps/AppServicePublic/Add.vue
+++ b/src/apps/AppServicePublic/Add.vue
@@ -161,7 +161,7 @@ export default {
     },
 
     areaSelect(e) {
-      this.forms.areaId = e.id
+      this.forms.areaId = e
     },
 
     selectStatus(e) {

From 2ca1feb92b73d007e8a6d0ffcff852d91c9c21d9 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: Tue, 4 Jan 2022 16:05:21 +0800
Subject: [PATCH 16/18] 26329

---
 src/apps/AppUniMsg/AppUniMsg.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/apps/AppUniMsg/AppUniMsg.vue b/src/apps/AppUniMsg/AppUniMsg.vue
index fa93cf94..7c81d6e7 100644
--- a/src/apps/AppUniMsg/AppUniMsg.vue
+++ b/src/apps/AppUniMsg/AppUniMsg.vue
@@ -145,6 +145,7 @@ export default {
     },
 
     change(index) {
+      this.datas = []
       this.currentTabs = index
       this.getList()
     },

From c1505c6dd16e4647f23ccb4a4b924899da61956f 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: Tue, 4 Jan 2022 16:06:12 +0800
Subject: [PATCH 17/18] 26298

---
 src/apps/AppUniMsg/Detail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/AppUniMsg/Detail.vue b/src/apps/AppUniMsg/Detail.vue
index 1ea29dac..794796e7 100644
--- a/src/apps/AppUniMsg/Detail.vue
+++ b/src/apps/AppUniMsg/Detail.vue
@@ -33,7 +33,7 @@ export default {
   computed: {},
   watch: {},
   onLoad(o) {
-    document.title = '公告详情' 
+    document.title = '小程序公告详情'
     this.id = o.id
     this.getDetail()
   },

From eb9fc9fa5cbb0e2c974df09178338e1d2f66cc39 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: Tue, 4 Jan 2022 16:20:46 +0800
Subject: [PATCH 18/18] 26331

---
 src/apps/AppWorkonline/Opinion.vue | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/apps/AppWorkonline/Opinion.vue b/src/apps/AppWorkonline/Opinion.vue
index 2a35034e..3eb40c8d 100644
--- a/src/apps/AppWorkonline/Opinion.vue
+++ b/src/apps/AppWorkonline/Opinion.vue
@@ -65,8 +65,8 @@
       <div class="reply_img">
         <text class="img">图片资料</text>
         <text class="img_text">(最多9张)</text>
-        <div class="upload">
-          <div class="info">
+        <div class="uploads">
+          <div class="infos">
             <AiUploader multiple @list="(v) => (picture = v)" :limit="9" action="/admin/file/add2" preview />
           </div>
         </div>
@@ -324,7 +324,11 @@ export default {
         ::v-deep .info > span {
           width: 380px;
           text-align: left;
-          //  word-break: break-all;
+          word-break: break-all;
+
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
         }
 
         ::v-deep .ai-uploader .fileList .default {
@@ -352,13 +356,13 @@ export default {
         margin-left: 10px;
       }
 
-      .upload {
+      .uploads {
         width: 100%;
         margin-top: 10px;
         padding: 12px 12px 12px 0;
         box-sizing: border-box;
 
-        .info {
+        .infos {
           width: 100%;
           text-align: center;
         }