From f264888b15e844ba338a4d76d63dc785ee8de68a 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: Fri, 24 Dec 2021 16:18:52 +0800
Subject: [PATCH 1/3] 25892

---
 src/apps/AppUniMsg/Add.vue | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/apps/AppUniMsg/Add.vue b/src/apps/AppUniMsg/Add.vue
index e3320832..bf6c06c0 100644
--- a/src/apps/AppUniMsg/Add.vue
+++ b/src/apps/AppUniMsg/Add.vue
@@ -10,7 +10,7 @@
           <u-input v-model="forms.publishUnitName" placeholder="请输入发布单位" maxlength="16" />
         </u-form-item>
 
-        <u-form-item label="正文" prop="content" required :border-bottom="false" label-position="top" class="contents">
+        <u-form-item label="正文" prop="content" :border-bottom="false" label-position="top" class="contents">
           <u-input v-model="forms.content" placeholder="请输入正文" type="textarea" auto-height height="100" maxlength="500" />
         </u-form-item>
 
@@ -81,8 +81,13 @@ export default {
             return this.$u.toast('请输入发布组织')
           }
 
-          if (!this.forms.content) {
-            return this.$u.toast('请输入正文')
+          var isContent = false
+          if (this.forms.content || this.forms.images.length > 0) {
+            isContent = true
+          }
+
+          if (!isContent) {
+            return this.$u.toast('请输入正文或图片')
           }
 
           const imgs = []
@@ -105,9 +110,9 @@ export default {
               if (res.code == 0) {
                 this.flag = false
                 this.$u.toast('提交成功')
-                  uni.$emit('updateList')
-                  setTimeout(() => {
-                    uni.navigateBack()
+                uni.$emit('updateList')
+                setTimeout(() => {
+                  uni.navigateBack()
                 }, 600)
               }
             })

From 4d6ff0db6f74efe899fda05bf0072ac4ff536474 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 24 Dec 2021 16:19:53 +0800
Subject: [PATCH 2/3] BUG 25965

---
 src/apps/AppBuilding/components/searchMap.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/apps/AppBuilding/components/searchMap.vue b/src/apps/AppBuilding/components/searchMap.vue
index 90e8eef7..f2cb6fad 100644
--- a/src/apps/AppBuilding/components/searchMap.vue
+++ b/src/apps/AppBuilding/components/searchMap.vue
@@ -48,11 +48,11 @@
         </div>
         <div class="info-flex">
           <span class="label">所属网格</span>
-          <span class="value">{{detailInfo.community.girdName || ''}}</span>
+          <span class="value">{{ detailInfo.community.girdName || '' }}</span>
         </div>
         <div class="info-flex">
           <span class="label">网格管理员</span>
-          <span class="value">{{detailInfo.build.girdMemberNames || ''}}</span>
+          <span class="value">{{ detailInfo.build.girdMemberNames || '' }}</span>
         </div>
         <div class="info-flex">
           <span class="label">楼栋长</span>
@@ -85,11 +85,11 @@
         </div>
         <div class="info-flex">
           <span class="label">所属网格</span>
-          <span class="value" v-text="building.girdName||''"/>
+          <span class="value" v-text="building.appGirdInfo.girdName||''"/>
         </div>
         <div class="info-flex">
           <span class="label">网格管理员</span>
-          <span class="value" v-text="building.girdMemberNames||''"/>
+          <span class="value" v-text="building.appGirdInfo.girdMemberNames||''"/>
         </div>
         <div class="info-flex">
           <span class="label">楼栋长</span>
@@ -139,7 +139,7 @@ export default {
     this.getCenterLatLng().then(points => {
       this.getMarkerCluster(points)
     })
-     document.title =  '以房找人'
+    document.title = '以房找人'
   },
   created() {
     this.$dict.load("communityBuildingType")

From 6345212ffb9e32dbcb85b6201fe5991e30bd31fd Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 24 Dec 2021 16:22:58 +0800
Subject: [PATCH 3/3] BUG 25965

---
 src/apps/AppBuilding/components/searchMap.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/apps/AppBuilding/components/searchMap.vue b/src/apps/AppBuilding/components/searchMap.vue
index 34d3cccb..1c7dc1de 100644
--- a/src/apps/AppBuilding/components/searchMap.vue
+++ b/src/apps/AppBuilding/components/searchMap.vue
@@ -85,11 +85,11 @@
         </div>
         <div class="info-flex">
           <span class="label">所属网格</span>
-          <span class="value" v-text="building.appGirdInfo.girdName||''"/>
+          <span class="value" v-text="building.girdName||''"/>
         </div>
         <div class="info-flex">
           <span class="label">网格管理员</span>
-          <span class="value" v-text="building.appGirdInfo.girdMemberNames||''"/>
+          <span class="value" v-text="building.girdMemberNames||''"/>
         </div>
         <div class="info-flex">
           <span class="label">楼栋长</span>