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

src/apps/AppResidentActivitie/Detail.vue

@@ -27,10 +27,7 @@
         <div class="cards">
           <div class="cards-left">活动人数</div>
           <div class="cards-right" @click="toSignUser()">
-            <span style="color: #1c6bdf">
+            <span style="color: #1c6bdf">{{ detail.realNum }}</span>
-              <span v-if="detail.realNum != 0">{{ detail.realNum }}</span>
-              <span v-else>不限</span>
-            </span>
             <u-icon name="arrow-right" color="#DDDDDD" size="28" style="margin-left: 8px"></u-icon>
           </div>
         </div>

src/apps/AppResidentFile/components/info.vue

@@ -190,13 +190,13 @@ export default {
       ])
     },
   },
-  onLoad() { 
+  created() {
     this.$dict.load('wxCustomerAddWay', 'wxCustomerLogType')
     this.getCustomLog(this.top.custom)
     this.injectJWeixin('openUserProfile')
   },
   onShow() {
-    document.title =  '居民详情' 
+    document.title =  '居民详情'
   }
 }
 </script>

src/apps/AppResourcesManage/addPlay.vue

@@ -106,8 +106,8 @@ export default {
             delta: 1
           })
         }
-      }).catch(res => {
+      }).catch(err => {
-        this.$u.toast(res)
+        this.$u.toast('添加失败')
         uni.hideLoading()
       })
     }

src/apps/AppSpecialPeople/add.vue

@@ -278,6 +278,7 @@ export default {
             })
 
             this.$forceUpdate()
+            console.log(this.formData)
             this.pageShow = true
           }
         }
@@ -303,7 +304,7 @@ export default {
           })
         })
         this.$forceUpdate()
-
+        console.log(this.formData)
         this.pageShow = true
       })
     },