diff --git a/backend/core/open/helper.py b/backend/core/open/helper.py index aa576a27..8b9f3cf6 100644 --- a/backend/core/open/helper.py +++ b/backend/core/open/helper.py @@ -181,6 +181,7 @@ def trans_to_dcalc_set(detail, alter: AltersDep): 'job': job, 'equips': equips, 'avatars': avatar, + 'avatarLink': detail.get('avatarLink', ''), } # 处理装备 # 处理时装 diff --git a/backend/openapi b/backend/openapi index 8c08c859..0e790023 160000 --- a/backend/openapi +++ b/backend/openapi @@ -1 +1 @@ -Subproject commit 8c08c8599ae31718cae3c1578e37802b849ea0bb +Subproject commit 0e79002337c4e4e0ddea38c4beacdcc6e4870f0a diff --git a/frontend/src/components/dnf/Equipment/List/index.vue b/frontend/src/components/dnf/Equipment/List/index.vue index 57395f61..d98eba89 100644 --- a/frontend/src/components/dnf/Equipment/List/index.vue +++ b/frontend/src/components/dnf/Equipment/List/index.vue @@ -31,6 +31,12 @@ + Avatar @@ -60,6 +66,10 @@ const props = defineProps({ type: Boolean, default: false, }, + avatar: { + type: String, + default: '', + } }) const partModelValue = useVModel(props, 'part') const infoStore = useInfoStore() diff --git a/frontend/src/pages/Character/Config/import.vue b/frontend/src/pages/Character/Config/import.vue index a8766eb9..ba7166e4 100644 --- a/frontend/src/pages/Character/Config/import.vue +++ b/frontend/src/pages/Character/Config/import.vue @@ -16,6 +16,7 @@ export default defineComponent({ const res = await api.getConfigFromHelper(uid.value) configStore.config.equips = res.equips configStore.config.avatar = res.avatars + configStore.config.avatarLink = res.avatarLink const { alert } = useDialog() visible.value = false await alert({ diff --git a/frontend/src/pages/Character/Result/Index.vue b/frontend/src/pages/Character/Result/Index.vue index e4d27a11..afba9dcb 100644 --- a/frontend/src/pages/Character/Result/Index.vue +++ b/frontend/src/pages/Character/Result/Index.vue @@ -9,6 +9,7 @@ :suits="configStore.result.state.suits" :info="configStore.result.state.info" :equs="configStore.config.equips" + :avatar="configStore.config.avatarLink" >
@@ -85,6 +86,7 @@ const props = defineProps<{ info: IResultUserInfo[] suits: IResultSuit[] equs: Record + avatar: string }>() const partOrder = [ diff --git a/frontend/src/stores/config.ts b/frontend/src/stores/config.ts index a1d63e0c..53a329ad 100644 --- a/frontend/src/stores/config.ts +++ b/frontend/src/stores/config.ts @@ -58,6 +58,7 @@ export interface IConfig { /** 奶 */ BUFF: boolean options: Record + avatarLink: string } const defaultEqusConfig = { @@ -93,7 +94,8 @@ export const useConfigStore = defineStore('configStore', () => { bindAwake: 50, DSB: false, BUFF: false, - options:{} + options:{}, + avatarLink: '', }) const skillCountConfig = ref([]) @@ -122,7 +124,8 @@ export const useConfigStore = defineStore('configStore', () => { bindAwake: 50, DSB: false, BUFF: false, - options:{} + options:{}, + avatarLink: '', } if (!config.value?.equips) config.value.equips = {} if (!config.value?.skills) config.value.skills = {}