From bdf03bf8edb0928117888a8e221722d19218ad3a Mon Sep 17 00:00:00 2001 From: awesomefamine Date: Wed, 16 Jun 2021 19:28:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=B4=E5=83=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/lang/en.js | 5 +++-- src/i18n/lang/zh.js | 5 +++-- src/view/user/CutPortrait.vue | 23 +++++++++++++---------- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/i18n/lang/en.js b/src/i18n/lang/en.js index 7c83900..0192613 100644 --- a/src/i18n/lang/en.js +++ b/src/i18n/lang/en.js @@ -96,8 +96,8 @@ export default { like: 'Like and star', starred: 'Starred', postForSearch: 'Post', - user:'User', - tag:'Tag', + user: 'User', + tag: 'Tag', }, user: { score: 'Score', @@ -131,6 +131,7 @@ export default { errInfo: 'please enter the correct user infomation.', errPassword: 'The length should be 6-20 characters.', errAlias: 'The length should be less than 15 characters.', + errAvatar: 'The picture type must be one of jpeg, jpg, png, bmp', checkPassword: 'Failed to change password, please check it.', sameEmail: 'Failed to change email, same as old email.', }, diff --git a/src/i18n/lang/zh.js b/src/i18n/lang/zh.js index 66d5cbd..7a9f5b1 100644 --- a/src/i18n/lang/zh.js +++ b/src/i18n/lang/zh.js @@ -96,8 +96,8 @@ export default { like: '点赞并收藏', starred: '已收藏', postForSearch: '帖子', - user:'用户', - tag:'标签', + user: '用户', + tag: '标签', }, user: { score: '积分', @@ -131,6 +131,7 @@ export default { errInfo: '请输入正确的用户信息', errPassword: '密码长度在6到20个字符。', errAlias: '昵称长度要小于等于15个字符', + errAvatar: '图片类型必须是,jpeg,jpg,png,bmp中的一种', checkPassword: '修改密码失败,请检查旧密码。', sameEmail: '修改邮箱失败,新邮箱与旧邮箱相同。', }, diff --git a/src/view/user/CutPortrait.vue b/src/view/user/CutPortrait.vue index 7ce4610..7a94c7b 100644 --- a/src/view/user/CutPortrait.vue +++ b/src/view/user/CutPortrait.vue @@ -63,7 +63,6 @@ :to="{ path: `/member/${this.username}/setting`, }" - @click.native="refresh" style="margin-left: 1em" > this.imageMaxSize) { - this.$message.error($t("user.selectAvatarTip", [imageMaxSize])); + if (this.file.size / 1024 / 1024 > this.imageMaxSize) { + this.$message.error(this.$t("user.selectAvatarTip", [imageMaxSize])); return false; } //fileReader 接口,用于异步读取文件数据 let reader = new FileReader(); - reader.readAsDataURL(file); //重要 以dataURL形式读取文件 + reader.readAsDataURL(this.file); //重要 以dataURL形式读取文件 reader.onload = (e) => { // this.options.img = window.URL.createObjectURL(new Blob([e.target.result])) 转化为blob格式 this.options.img = e.target.result; -- Gitee