From 301d10c88b03bc7993c64c3467b1bcb0b48104ea Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 17 Mar 2021 11:54:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-user.html | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-user.html b/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-user.html
index cc2ebb2..5ced92d 100644
--- a/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-user.html
+++ b/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-user.html
@@ -399,7 +399,7 @@
});
},
handleAvatarSuccess(res, file) {
- this.imageUrl = URL.createObjectURL(file.raw);
+ this.imageUrl = res.path;
},
beforeAvatarUpload(file) {
const isJPG = file.type === 'image/jpeg';
@@ -574,11 +574,11 @@
}
},
changePageSize(val) {
- this.table.pageSize = val;
+ this.fxyList.pageSize = val;
this.loadParamSetting();
},
changeCurrentPage(val) {
- this.table.currentPage = val;
+ this.fxyList.currentPage = val;
this.loadParamSetting();
},
//时间格式化
--
Gitblit v1.9.1