Merge remote-tracking branch 'origin/dev' into dev

src/apps/AppResidentActivitie/Add.vue

@@ -20,8 +20,7 @@
         <div class="line"></div>
 
         <u-form-item label="发布地区" prop="areaId" required :border-bottom="false" right-icon="arrow-right" class="addresss">
-          <AiAreaPicker v-model="forms.areaId" :areaId="user.areaId" @select="areaSelect" style="color: #333">
+          <AiAreaPicker v-model="forms.areaId" :areaId="user.areaId" @select="areaSelect" style="color: #333"> </AiAreaPicker>
-          </AiAreaPicker>
         </u-form-item>
 
         <div class="line"></div>
@@ -94,7 +93,7 @@ export default {
         second: false,
         timestamp: true,
       },
-      isShow: false
+      isShow: false,
     }
   },
   computed: { ...mapState(['user']) },
@@ -107,7 +106,7 @@ export default {
 
       this.getDetail()
     })
-    if(!o.id) {
+    if (!o.id) {
       this.isShow = true
     }
     if (!this.indexDetail) {
@@ -196,7 +195,11 @@ export default {
               if (res.code == 0) {
                 this.flag = false
                 this.$u.toast('发布成功')
-                uni.$emit('updateList')
+                if (!this.indexDetail) {
+                  uni.$emit('updateList')
+                } else {
+                  uni.$emit('updateGetDetail')
+                }
                 setTimeout(() => {
                   uni.navigateBack()
                 }, 600)
@@ -257,7 +260,7 @@ export default {
       height: 112px;
       line-height: 112px;
       overflow: hidden;
-      text-overflow:ellipsis;
+      text-overflow: ellipsis;
       white-space: nowrap;
       color: #303133 !important;
       font-size: 30px;

src/apps/AppResidentActivitie/AddPosts.vue

@@ -9,7 +9,7 @@
     <div class="textarea-div pad-b208">
       <div class="title mar-b32"><span></span>图片（最多9张）</div>
       <div class="pad-l20">
-        <AiUploader :def.sync="form.images" multiple placeholder="上传图片" :limit="9"></AiUploader>
+        <AiUploader :def.sync="form.images" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader>
       </div>
     </div>
     <div class="footer-btn">

src/apps/AppResidentActivitie/AppResidentActivities.vue

@@ -98,6 +98,7 @@ export default {
             size: this.size,
             current: this.current,
             createUserId: this.currentTabs == 1 ? this.user.id : '',
+            areaId: this.user.areaId,
           },
         })
         .then((res) => {

src/apps/AppResidentActivitie/Detail.vue

@@ -71,7 +71,7 @@
               </div>
 
               <div class="card-img">
-                <img :src="e.url" v-for="(e, i) in imgList[index]" :key="i" alt="" @click.stop="previewImage(imgList[index], e.url)" />
+                <img :src="e.url" v-for="(e, i) in imgList[index]" :key="i" alt="" @click.stop="previewImage(imgList[index], e.url)" v-if="i < 3" />
               </div>
 
               <!-- <div class="card-icon">
@@ -143,13 +143,16 @@ export default {
     this.$dict.load(['villageActivityStatus']).then(() => {
       this.getDetail()
     })
-
-    uni.$on('refresh', () => {
-      this.getListInit()
-    })
   },
   onShow() {
     document.title = '活动详情'
+    uni.$on('refresh', () => {
+      this.getListInit()
+    })
+
+    uni.$on('updateGetDetail', () => {
+      this.getDetail()
+    })
   },
   methods: {
     getDetail() {
@@ -407,7 +410,7 @@ export default {
                 height: 224px;
                 margin-right: 8px;
               }
-              img:last-child {
+              img:nth-child(3n + 0) {
                 margin-right: 0;
               }
             }

src/apps/AppVillagersCircle/commentList.vue

@@ -2,7 +2,7 @@
   <div class="commentList">
     <!-- tab栏 -->
     <div style="position: fixed; top: 0; left: 0;width: 100%;">
-      <div style="display:flex;justify-content:space-between; padding: 0 18px;height: 40px; line-height: 40px;background: #FFFF;">
+      <div class="area">
         <div>区域选择</div>
         <div>
           <AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="changeArea" :name.sync="areaName">
@@ -132,7 +132,14 @@ export default {
 
 <style lang="scss" scoped>
 .commentList {
-
+  .area {
+    display:flex;
+    justify-content:space-between; 
+    padding: 0 30px;
+    height: 80px; 
+    line-height: 80px;
+    background: #FFFF;
+  }
   .tab-select {
     width: 100%;
     height: 96px;

src/apps/AppVillagersCircle/infoList.vue

@@ -2,7 +2,7 @@
   <div class="infoList">
     <!-- tab栏 -->
     <div style="position: fixed; top: 0; left: 0;width: 100%;">
-      <div style="display:flex;justify-content:space-between; padding: 0 18px;height: 40px; line-height: 40px;background: #FFFF;">
+      <div class="area">
         <div>区域选择</div>
         <div>
           <AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="changeArea" :name.sync="areaName">
@@ -131,7 +131,14 @@ export default {
 
 <style lang="scss" scoped>
 .infoList {
-
+  .area {
+    display:flex;
+    justify-content:space-between; 
+    padding: 0 30px;
+    height: 80px; 
+    line-height: 80px;
+    background: #FFFF;
+  }
   .tab-select {
     width: 100%;
     height: 96px;

src/apps/AppWorkonline/Opinion.vue

@@ -22,7 +22,7 @@
         <div v-if="type == 1">
           <div class="textarea_msgfont">
             <span class="msgfont">
-              <span> 同意意见:</span>
+              <span>审批意见:</span>
             </span>
             <textarea :maxlength="150" placeholder="请输入" v-model="opinion" class="textarea" clearable="false"> </textarea>
             <div class="clearns" @click="opinion = ''">清空内容</div>