Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue

src/views/inspection/inspection/PartnerManagement/index.vue

@@ -131,7 +131,7 @@
     <el-dialog title="选择店主" :visible.sync="dialogTableVisible">
      <div style="display: flex;align-items: center; margin: 15px auto;">
        <div style="width: 70%;margin-right: 10px">
-         <el-input v-model="queryParamsx.phonenumber" placeholder="请输入手机号搜索" ></el-input>
+         <el-input v-model="queryParamsx.mobile" placeholder="请输入手机号搜索" ></el-input>
        </div>
 
        <el-button type="primary" icon="el-icon-search"  @click="getUserList()">搜索</el-button>
@@ -361,7 +361,7 @@
           pageNum: 1,
           pageSize: 10,
           userName: undefined,
-          phonenumber: undefined,
+          mobile: undefined,
           status: undefined,
           deptId: undefined
         },
@@ -423,6 +423,7 @@
         let data = {
           partnerId : this.partnerId,
           pageNum: this.plfye.pageNum,//第几页
+          pageNo: this.plfye.pageNum,//第几页
           pageSize: this.plfye.pageSize,//一页多少张
         }
         this.dialogTableVisibles = true
@@ -437,6 +438,7 @@
         let data = {
           partnerId : this.partnerId,
           pageNum: this.plfye.pageNum,//第几页
+          pageNo: this.plfye.pageNum,//第几页
           pageSize: this.plfye.pageSize,//一页多少张
         }
         this.dialogTableVisibles = true
@@ -451,11 +453,12 @@
         let data = {
           partnerId : this.partnerId,
           pageNum: this.queryParams.pageNum,//第几页
+          pageNo: this.queryParams.pageNum,//第几页
           pageSize: this.queryParams.pageSize,//一页多少张
         }
         listUser(data).then(response => {
-          this.userList = response.rows;
-          this.total = response.total
+          this.userList = response.data.list;
+          this.total = response.data.total
         } );
 
       },
@@ -481,7 +484,7 @@
         listUser(addDateRange(this.queryParamsx, this.dateRange)).then(response => {
           this.userList = response.data.list;
           this.total = response.data.total
-          this.queryParamsx.phonenumber = undefined
+          this.queryParamsx.mobile = undefined
           // console.log('userlist',response.rows)
         } );
       },