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

src/apps/AppPeopleList/PeopleList.vue

@@ -90,6 +90,7 @@ export default {
     this.areaId = this.user.areaId
     this.areaName = this.user.areaName
     uni.$on('reload',()=>{
+      this.current = 1
       this.getList()
     })
     this.getList()

src/apps/AppWalkask/add.vue

@@ -41,14 +41,13 @@
 
           <u-form-item label="入户走访内容" prop="description" label-position="top" :border-bottom="false">
             <u-input v-model="forms.description" placeholder="请输入入户走访事项(500字以内)" type="textarea" auto-height height="60" :maxlength="500" />
-            <!-- <div>{{ forms.description.length }}/500</div> -->
           </u-form-item>
           <div class="hint">{{ forms.description.length }}/500</div>
 
           <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"></AiUploader>
+            <AiUploader :def.sync="forms.images" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2" sourceType="camera"></AiUploader>
           </u-form-item>
         </u-form>
       </div>

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"></AiUploader>
+            <AiUploader :def.sync="forms.images" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2" sourceType="camera"></AiUploader>
           </u-form-item>
         </u-form>
       </div>