Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev

src/pages/login.vue

@@ -60,7 +60,7 @@ export default {
             module = 'wangge'
           }
           this.setModule(module)
-          this.getToken({...this.form, module, corpId: 'wpytYEDgAAcpXjmlYkYwKO60JDGDWrXg'}).then(token => {
+          this.getToken({...this.form, module, corpId}).then(token => {
             if (token) {
               this.login(token)
               if (module != 'AppCountryAlbum') {

src/project/police/AppPeopleList/AppPeopleList.vue

@@ -8,7 +8,7 @@
         <!-- @select="areaSelect" -->
         <u-form label-width="auto">
           <u-form-item label="区域选择" right-icon="arrow-right" class="areaIds">
-            <AiAreaPicker v-model="areaId" :areaId="user.areaId" @input="seachObj" :name.sync="areaName" selectRoot/>
+            <AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="changeArea" :name.sync="areaName" selectRoot/>
           </u-form-item>
         </u-form>
       </div>
@@ -101,8 +101,7 @@ export default {
   methods: {
     getList() {
       var residentType = ['', 0, 1][this.currentTabs]
-      this.$http
-      .post('/app/appresident/list', null, {
+      this.$http.post('/app/appresident/list', null, {
         params: {
           size: 20,
           current: this.current,
@@ -111,8 +110,7 @@ export default {
           residentType: residentType,
           auditStatus: 1
         },
-      })
-      .then((res) => {
+      }).then((res) => {
         if (res.code == 0) {
           this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records
 
@@ -132,7 +130,7 @@ export default {
       uni.navigateTo({url: `./DetailCard?id=${item.id}`})
     },
 
-    seachObj(e) {
+    changeArea(e) {
       this.areaId = e
       this.current = 1
       this.getList()