From c5388f01a75bca7c1bc9cb23a4de7c422c6c0eef Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 10 Jan 2023 13:43:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/userManage/customerManage.vue | 11 ++++++-----
 src/views/userManage/registerManage.vue |  7 ++++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/views/userManage/customerManage.vue b/src/views/userManage/customerManage.vue
index fc2c45a..0339517 100644
--- a/src/views/userManage/customerManage.vue
+++ b/src/views/userManage/customerManage.vue
@@ -119,8 +119,8 @@
                     </el-button
                     >
 
-                   
-                    
+
+
                 </template>
             </el-table-column>
         </el-table>
@@ -317,6 +317,7 @@
             @current-change="handleCurrentChange"
             layout="prev, pager, next"
             :total="total"
+            :current-page="filterQuery.page"
         ></el-pagination>
     </div>
 </template>
@@ -418,6 +419,7 @@ export default {
                 limit: 20,
             };
             this.getList();
+                this.filterQuery.page=null;
         },
         formSubmit() {
             this.formData.roleId = 1;
@@ -441,13 +443,11 @@ export default {
                 });
         },
         onSubmit() {
+            this.filterQuery.checkType=null;
             this.getList();
         },
         getList() {
             this.loading = true;
-            if (this.filterQuery.companyName != null && this.filterQuery.companyName != '') {
-                this.filterQuery.page = 1;
-            }
             getCustomers(this.filterQuery)
                 .then((response) => {
                     this.loading = false;
@@ -485,6 +485,7 @@ export default {
         handleCurrentChange(val) {
             this.filterQuery.page = val;
             this.getList();
+            this.filterQuery.page = 1;
         },
         handleCheckedChange(val) {
         },
diff --git a/src/views/userManage/registerManage.vue b/src/views/userManage/registerManage.vue
index bef7c7b..5a15ea4 100644
--- a/src/views/userManage/registerManage.vue
+++ b/src/views/userManage/registerManage.vue
@@ -335,7 +335,7 @@
             return {
                 filterQuery: {
                     companyName: "",
-                    checkType: "0",
+                    checkType: "",
                     page: 1,
                     limit: 20,
                 },
@@ -451,6 +451,7 @@
             handleCurrentChange(val) {
                 this.filterQuery.page = val;
                 this.getList();
+                this.filterQuery.page = 1;
             },
             findMethod(query) {
                 this.fromOptions = [];
@@ -500,11 +501,11 @@
 
             passRegister() {
                 this.checkQuery.roles = this.check;
-                
+
                 if (this.$isBlank(this.rowData.companyName)) {
                     return this.$message.warning("请输入企业名称");
                 }
-              
+
                 this.checkRegister();
                 this.centerDialogVisible = false;
             },