From 3b8aa43ec635b6dfb46a923b6b24f489e874f4be Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Thu, 23 Dec 2021 20:02:26 +0800
Subject: [PATCH] bug

---
 src/apps/AppBuilding/components/searchMap.vue | 19 +++++++++++--------
 src/apps/AppCountryAlbum/detail.vue           |  8 +++++++-
 src/apps/AppServicePublic/Add.vue             | 15 ++++-----------
 .../AppServicePublic/AppServicePublic.vue     |  4 +++-
 src/apps/AppServicePublic/Detail.vue          |  4 +++-
 5 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/src/apps/AppBuilding/components/searchMap.vue b/src/apps/AppBuilding/components/searchMap.vue
index 1012103e..c1b37c59 100644
--- a/src/apps/AppBuilding/components/searchMap.vue
+++ b/src/apps/AppBuilding/components/searchMap.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="searchMap">
     <div class="grid-input">
-      <img src="./img/search-icon.png" alt="" class="search-icon">
-      <!-- <img src="./img/back-icon.png" alt="" class="back-icon"> -->
+      
+      <img src="./img/back-icon.png" alt="" class="back-icon" v-if="name && show" @click="show=false">
+      <img src="./img/search-icon.png" alt="" class="search-icon" v-else>
       <input type="text" class="input" placeholder="请输入姓名、房屋信息" v-model="name" maxlength="10" confirm-type="search"
              @confirm="search"/>
       <div class="clear-btn">
@@ -11,11 +12,11 @@
 
       <span class="search-btn" @click="search">搜索</span>
     </div>
-    <div class="search-list" v-if="show" @click="show=false">
+    <div class="search-list" v-if="show">
       <div class="title border">
         <img src="./img/search-icon.png" alt="" class="search-icon">{{ name }}
       </div>
-      <div class="item border" v-for="(item, index) in buildList" :key="index" @click.stop="getBuildingInfo(item)">
+      <div class="item border" v-for="(item, index) in buildList" :key="index" @click="getBuildingInfo(item)">
         <img src="./img/user-icon.png" alt="" class="search-icon user-icon">
         <div class="item-content">
           <h3>{{ item.residentName }}</h3>
@@ -125,7 +126,8 @@ export default {
       buildList: [],
       detailInfo: {
         house: {},
-        build: {}
+        build: {},
+        community: {}
       },
       showPop: false,
       retryMapCount: 0,
@@ -429,9 +431,7 @@ export default {
     overflow-y: scroll;
     top: 128px;
     left: 0;
-    padding: 0 44px;
     box-sizing: border-box;
-    background-color: #fff;
     z-index: 99999;
 
     .search-icon {
@@ -447,10 +447,13 @@ export default {
       font-size: 26px;
       font-family: MicrosoftYaHeiSemibold;
       color: #1365DD;
+      padding-left: 44px;
+      background-color: #fff;
     }
 
     .item {
-      padding: 22px 0 24px 0;
+      padding: 22px 44px 24px 44px;
+      background-color: #fff;
     }
 
     .item-content {
diff --git a/src/apps/AppCountryAlbum/detail.vue b/src/apps/AppCountryAlbum/detail.vue
index 0bd8941a..9a620c46 100644
--- a/src/apps/AppCountryAlbum/detail.vue
+++ b/src/apps/AppCountryAlbum/detail.vue
@@ -31,7 +31,7 @@
         <div class="img-list">
           <div class="img-item" v-for="(e, indexs) in item.list" :key="indexs">
             <p>{{e.createUserName}} 上传</p>
-            <img :src="e.url" alt="">
+            <img :src="e.url" alt="" @click.stop="previewImage(item.list, e.url)">
           </div>
         </div>
       </div>
@@ -64,6 +64,12 @@ export default {
   },
 
   methods: {
+    previewImage(images, img) {
+      uni.previewImage({
+        urls: images.map(v => v.url),
+        current: img
+      })
+    },
     getList() {
       this.$http.post(`/app/appvillagepicturealbum/queryAlbum`, null, {
         params: {
diff --git a/src/apps/AppServicePublic/Add.vue b/src/apps/AppServicePublic/Add.vue
index d70994a1..f5d74e2b 100644
--- a/src/apps/AppServicePublic/Add.vue
+++ b/src/apps/AppServicePublic/Add.vue
@@ -26,8 +26,8 @@
           <u-input v-model="forms.content" placeholder="请输入活动详情(30字以内)" type="textarea" auto-height height="60" maxlength="500" />
         </u-form-item>
 
-        <u-form-item label="图片(最多9张)" prop="fileIds" class="avatars" label-position="top">
-          <AiUploader :def.sync="forms.fileIds" multiple placeholder="上传图片" :limit="9"></AiUploader>
+        <u-form-item label="图片(最多9张)" prop="files" class="avatars" label-position="top">
+          <AiUploader :def.sync="forms.files" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader>
         </u-form-item>
       </u-form>
     </div>
@@ -52,9 +52,9 @@ export default {
       forms: {
         title: '',
         content: '',
-        fileIds: [],
         areaId: '',
         selectIndex: '',
+        files: []
       },
       showStstus: false,
       flag: false,
@@ -125,13 +125,6 @@ export default {
         return this.$u.toast('请选择类别')
       }
 
-      var imgs = []
-      if (this.forms.fileIds.length) {
-        this.forms.fileIds.map((e) => {
-          imgs.push({ url: e.url, id: e.id })
-        })
-      }
-
       var categoryId = '', categoryName = ''
 
       if(this.selectList.length) {
@@ -142,7 +135,7 @@ export default {
         title: this.forms.title,
         areaId: this.forms.areaId,
         content: this.forms.content,
-        files: imgs || [],
+        files: this.forms.files,
         id: this.id,
         moduleId: this.moduleId,
         categoryId: categoryId,
diff --git a/src/apps/AppServicePublic/AppServicePublic.vue b/src/apps/AppServicePublic/AppServicePublic.vue
index 27564bcb..862f34ce 100644
--- a/src/apps/AppServicePublic/AppServicePublic.vue
+++ b/src/apps/AppServicePublic/AppServicePublic.vue
@@ -15,7 +15,9 @@
       <AiCard v-for="(item, i) in datas" :ref="item.id" :key="i" @click.native="toAdd(item, 1)">
         <template #custom>
           <div class="titles">{{ item.title }}</div>
-          <p class="item-content">{{item.content}}</p>
+          <p class="item-content">
+            <u-parse :html="item.content"></u-parse>
+          </p>
           <div class="img-list" v-if="item.files.length">
              <img :src="item.accessUrl" alt="" v-for="(item, index) in item.files" :key="index" v-if="index < 3" />
           </div>
diff --git a/src/apps/AppServicePublic/Detail.vue b/src/apps/AppServicePublic/Detail.vue
index 99a64958..ceefbeb7 100644
--- a/src/apps/AppServicePublic/Detail.vue
+++ b/src/apps/AppServicePublic/Detail.vue
@@ -16,7 +16,9 @@
     </div>
 
     <div class="header-middle">
-      <span class="contsnts">{{data.content}}</span>
+      <div class="contsnts">
+        <u-parse :html="data.content"></u-parse>
+      </div>
       
       
     </div>