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

src/apps/AppWalkask/AppWalkask.vue

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

src/saas/AppBackUserList/AppBackUserList.vue

@@ -104,6 +104,9 @@ export default {
   },
   onLoad() {
     this.isGirdUser()
+    uni.$on('update').then(() => {
+      this.isGirdUser()
+    })
   },
   onShow() {
     document.title = '返乡登记'
@@ -170,7 +173,7 @@ export default {
         if (res.code == 0) {
           this.girdId = res.data[0].id
           this.girdName = res.data[0].girdName
-          this.getList()
+          this.getListInit()
           this.getTotal()
         }
       })

src/saas/AppWalkask/AppWalkask.vue

@@ -126,7 +126,6 @@ export default {
           params: {
             size: this.size,
             current: this.current,
-            areaId: this.areaId,
             createUserId: this.currentTabs == 1 ? this.user.id : '',
             title: this.keyword,
           },

src/saas/AppWalkask/add.vue

@@ -41,7 +41,7 @@
           <div class="line"></div>
 
           <u-form-item label="图片(最多9张)" prop="images" class="avatars" label-position="top" :border-bottom="false">
-            <AiUploader :def.sync="forms.images" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2" sourceType="camera"></AiUploader>
+            <AiUploader :def.sync="forms.images" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader>
           </u-form-item>
         </u-form>
       </div>