Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_cp/dv_cp_wechat_app into dev

src/apps/AppBuilding/components/searchMap.vue

@@ -53,7 +53,7 @@
         </div>
         <div class="info-flex">
           <span class="label">网格管理员</span>
-          <span class="value">林珊珊</span>
+          <span class="value">{{detailInfo.build.girdMemberNames}}</span>
         </div>
         <div class="info-flex">
           <span class="label">楼栋长</span>

src/apps/AppServicePublic/Add.vue

@@ -125,34 +125,37 @@ export default {
             return this.$u.toast('请选择类别')
           }
 
-          const imgs = []
+          var imgs = []
           if (this.forms.fileIds) {
             this.forms.fileIds.map((e) => {
               imgs.push({ url: e.url, id: e.id })
             })
           }
 
-          this.flag = true
+          console.log(222)
           this.$http.post(`/app/appcontentinfo/addOrUpdate`, {
-              title: this.forms.title,
+            title: this.forms.title,
-              areaId: this.forms.areaId,
+            areaId: this.forms.areaId,
-              content: this.forms.content,
+            content: this.forms.content,
-              files: imgs || [],
+            files: imgs || [],
-              id: this.id,
+            id: this.id,
-              moduleId: this.moduleId,
+            moduleId: this.moduleId,
-              categoryId: this.selectList[this.forms.selectIndex].id,
+            categoryId: this.selectList[this.forms.selectIndex].id,
-	            categoryName: this.selectList[this.forms.selectIndex].categoryName,
+            categoryName: this.selectList[this.forms.selectIndex].categoryName,
-            })
+          })
-            .then((res) => {
+          .then((res) => {
-              if (res.code == 0) {
+            console.log(333)
-                uni.$emit('update')
+            if (res.code == 0) {
-                this.$u.toast('发布成功')
+              uni.$emit('update')
-                this.flag = false
+              this.$u.toast('发布成功')
-                setTimeout(() => {
+              this.flag = true
-                  uni.navigateBack()
+              setTimeout(() => {
-                }, 600)
+                uni.navigateBack()
-              }
+              }, 600)
-            })
+            }
+          }).catch((err) => {
+            console.log(err)
+          })
         } else {
           this.$u.toast('失败')
         }

src/apps/AppServicePublic/AppServicePublic.vue

@@ -10,7 +10,7 @@
       <AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="areaSelect"></AiAreaPicker>
     </div>
 
-    <u-search class="serach_content" placeholder="请输入公开标题" :show-action="false" v-model="keyword" @clear="clearSearch" @search="search"></u-search>
+    <u-search class="serach_content" placeholder="请输入标题" :show-action="false" v-model="keyword" @clear="clearSearch" @search="search"></u-search>
 
     <template v-if="datas.length > 0">
       <AiCard v-for="(item, i) in datas" :key="i" @click.native="toAdd(item, 1)">

src/apps/AppSpecialPeople/add.vue

@@ -388,10 +388,9 @@ export default {
       }).then((res) => {
         if (res.code == 0) {
           this.$u.toast('提交成功')
+          uni.$emit('specialPeopleList')
           setTimeout(() => {
-            this.$emit('change', {
+            uni.navigateBack()
-              type: 'Detail',
-            })
           }, 600)
         }
       })

src/apps/AppSpecialPeople/detail.vue

@@ -95,6 +95,11 @@ export default {
     this.getStatisticMon()
     this.getUserList()
     uni.setNavigationBarTitle({title: '特殊人群管理'})
+    uni.$on('specialPeopleList', () => {
+      this.getStatistic()
+      this.getStatisticMon()
+      this.getUserList()
+    })
   },
 
   methods: {

src/apps/AppUniMsg/Add.vue

@@ -6,7 +6,7 @@
           <u-input v-model="forms.title" placeholder="请输入标题" maxlength="30" />
         </u-form-item>
 
-        <u-form-item label="发布单位" prop="publishUnitName" required :border-bottom="false" class="phones">
+        <u-form-item label="发布组织" prop="publishUnitName" required :border-bottom="false" class="phones">
           <u-input v-model="forms.publishUnitName" placeholder="请输入发布单位" maxlength="16" />
         </u-form-item>
 
@@ -79,7 +79,7 @@ export default {
             return this.$u.toast('请输入标题')
           }
           if (!this.forms.publishUnitName) {
-            return this.$u.toast('请输入发布单位')
+            return this.$u.toast('请输入发布组织')
           }
 
           const imgs = []