diff --git a/src/assets/images/password.png b/src/assets/images/password.png
index 1e939425..1a319029 100644
Binary files a/src/assets/images/password.png and b/src/assets/images/password.png differ
diff --git a/src/assets/images/userNameIcon.png b/src/assets/images/userNameIcon.png
index aa42eeb7..a0871627 100644
Binary files a/src/assets/images/userNameIcon.png and b/src/assets/images/userNameIcon.png differ
diff --git a/src/components/header.vue b/src/components/header.vue
index 3b6f89fe..30e498e5 100644
--- a/src/components/header.vue
+++ b/src/components/header.vue
@@ -210,6 +210,7 @@ export default {
isLoop: true,
timer: null,
jumpToken: "",
+ showQrCode: false
};
},
components: {
diff --git a/src/views/companyAdmin/companyDiagram.vue b/src/views/companyAdmin/companyDiagram.vue
index 77f17055..ba8bcb08 100644
--- a/src/views/companyAdmin/companyDiagram.vue
+++ b/src/views/companyAdmin/companyDiagram.vue
@@ -2248,7 +2248,6 @@ export default {
}
},
getListData(){
- this.pagInfo.pageNo = 1;
if(this.tabActiveName == 'first'){
this.getAccountList();
} else if(this.tabActiveName == 'two'){
@@ -2261,6 +2260,7 @@ export default {
},
handleTabClick(tab, event) {
if(!this.treeSelectData.name) return;
+ this.pagInfo.pageNo = 1;
this.getListData();
},
handleNodeClick(data) {
@@ -3675,6 +3675,7 @@ export default {
this.getListData();
},
CurrentChange(val) {
+ console.log(val)
this.pagInfo.pageNo = val
this.getListData();
},
diff --git a/src/views/home/login_v2.vue b/src/views/home/login_v2.vue
index e9d7de67..cb85c608 100644
--- a/src/views/home/login_v2.vue
+++ b/src/views/home/login_v2.vue
@@ -98,6 +98,7 @@
@@ -114,6 +115,7 @@
@@ -235,6 +237,7 @@
@@ -251,6 +254,7 @@
@@ -269,6 +273,7 @@
@@ -283,6 +288,7 @@
@@ -1246,10 +1252,10 @@ export default {
.info_content {
margin-top: 25px;
- img {
- width: 16.8px;
- height: 24px;
- }
+ // img {
+ // width: 16.8px;
+ // height: 24px;
+ // }
}
.operate-btn {
display: flex;
diff --git a/src/views/supplierAdmin/qualificationApply/components/apply-info.vue b/src/views/supplierAdmin/qualificationApply/components/apply-info.vue
index f8616c5b..0fb5aefd 100644
--- a/src/views/supplierAdmin/qualificationApply/components/apply-info.vue
+++ b/src/views/supplierAdmin/qualificationApply/components/apply-info.vue
@@ -675,7 +675,7 @@ export default {
// 获取表格数据
getTableList() {
let requestData = {
- userId: this.$store.state.userInfo.userId,
+ applyUserId: this.$store.state.userInfo.userId,
pageNo: this.page,
pageSize: this.pageSize,
applyStatus: this.tableParameter.applyStatus,