diff --git a/apps/character/profile-stat.js b/apps/character/profile-stat.js index 15638f4f..68d61b33 100644 --- a/apps/character/profile-stat.js +++ b/apps/character/profile-stat.js @@ -45,7 +45,7 @@ export async function profileStat (e) { avatarRet.push(avatar) if (profiles[id]) { let profile = profiles[id] - if(profile.hasData) { + if (profile.hasData) { let mark = profiles[id].getArtisMark(false) avatar.artisMark = Data.getData(mark, 'mark,markClass,names') } diff --git a/models/ProfileArtis.js b/models/ProfileArtis.js index 214452ab..acb5a29d 100644 --- a/models/ProfileArtis.js +++ b/models/ProfileArtis.js @@ -70,11 +70,11 @@ export default class ProfileArtis extends Base { } get sets () { - return this.getSetData().sets + return this.getSetData().sets || {} } get names () { - return this.getSetData().names + return this.getSetData().names || [] } mainAttr (idx = '') { diff --git a/resources/common/tpl/avatar-card.html b/resources/common/tpl/avatar-card.html index 6a8e9d3f..eb0fc54c 100644 --- a/resources/common/tpl/avatar-card.html +++ b/resources/common/tpl/avatar-card.html @@ -30,9 +30,9 @@ {{weapon.affix}} -
+
- {{each avatar.names name}} + {{each avatar?.names name}} {{/each}}