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

src/apps/AppResidentActivitie/Add.vue

@@ -184,7 +184,6 @@ export default {
               endTime: this.forms.endTime,
               address: this.forms.address,
               contactPerson: this.forms.contactPerson,
-
               contactPhone: this.forms.contactPhone,
               createUserName: this.user.name,
               createUserId: this.user.id,
@@ -193,7 +192,6 @@ export default {
             })
             .then((res) => {
               if (res.code == 0) {
-                this.flag = false
                 this.$u.toast('发布成功')
                 if (!this.indexDetail) {
                   uni.$emit('updateList')
@@ -206,6 +204,7 @@ export default {
               }
             })
             .catch(() => {
+              this.flag = false
               this.$u.toast('新增失败')
             })
         } else {

src/apps/AppResidentActivitie/AddPosts.vue

@@ -6,9 +6,9 @@
         <u-input v-model="form.content" type="textarea" :border="false" :height="140" :auto-height="true" placeholder="请输入内容（1000字以内）" placeholder-style="color:#999;font-size:16px;" maxLength="140" />
       </div>
     </div>
-    <div class="textarea-div pad-b208">
+    <div class="textarea-div pad-b176">
       <div class="title mar-b32"><span></span>图片（最多9张）</div>
-      <div class="pad-l20">
+      <div class="pad-b24">
         <AiUploader :def.sync="form.images" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader>
       </div>
     </div>
@@ -73,13 +73,16 @@ export default {
         .then((res) => {
           if (res.code == 0) {
             this.$u.toast('发布成功')
-            this.flag = false
             uni.$emit('refresh')
             setTimeout(() => {
               uni.navigateBack()
             }, 600)
           }
         })
+        .catch(() => {
+          this.flag = false
+          this.$u.toast('发布失败')
+        })
     },
   },
 }
@@ -114,12 +117,13 @@ export default {
 .mar-b16 {
   margin-bottom: 16px;
 }
-.pad-b208 {
+
-  padding-bottom: 208px;
+.pad-b176 {
+  padding-bottom: 176px;
 }
 .footer-btn {
   width: 100%;
-  padding: 116px 32px 32px;
+  padding: 0 32px 32px 32px;
   box-sizing: border-box;
   position: fixed;
   bottom: 0;