diff --git a/src/store.js b/src/store.js index 14a645d..9b82921 100644 --- a/src/store.js +++ b/src/store.js @@ -51,8 +51,12 @@ export default defineStore("store", { updateRank(data = {}) { this.rankData = { rank: data.rank || [], ringRank: data.ringRank || [] }; }, - updateUser(user = {}) { + async updateUser(user = {}) { this.user = { ...defaultUser, ...user }; + if (user.avatar) { + const avatarInfo = await uni.getImageInfo({ src: user.avatar }); + this.user.avatar = avatarInfo.path; + } const rankInfos = this.config.randInfos || []; let lvlName = ""; if (this.user.scores) { diff --git a/src/util.js b/src/util.js index 2e92c8c..7126c18 100644 --- a/src/util.js +++ b/src/util.js @@ -183,15 +183,8 @@ export async function generateCanvasImage(canvasId, type, user, data) { var ctx = uni.createCanvasContext(canvasId); const width = 300; const height = 534; - try { - // 先下载完再一起渲染 - const avatarInfo = await uni.getImageInfo({ src: user.avatar }); - ctx.drawImage("../static/share-bg.png", 0, 0, width, height); - drawRoundImage(ctx, avatarInfo.path, 17, 20, 32, 32, 20); - } catch (err) { - console.log("下载头像错误:", err); - } - // drawRoundImage(ctx, user.avatar, 17, 20, 32, 32, 20); + ctx.drawImage("../static/share-bg.png", 0, 0, width, height); + drawRoundImage(ctx, user.avatar, 17, 20, 32, 32, 20); ctx.drawImage("../static/avatar-frame.png", 12, 15, 42, 42); renderText(ctx, user.nickName, 13, "#fff", 58, 34); renderRankTitle(ctx, user.lvlName);