diff --git a/src/locales/en.json b/src/locales/en.json index c1c8948..6215fd3 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -459,7 +459,7 @@ "active_game_reward_frame": "Customized Frames * 365 Days", "active_game_reward_ride": "Customized Vehicles * 60 Days", "active_game_reward_banner": "Customized Banners * 15 Days", - "rule": "rule", + "rule": "RULE", "history": "history", "CollectCards to Win Prizes": "CollectCards to Win Prizes", "Personal Rank": "Personal Rank", diff --git a/src/views/Activities/GulbenFestival/index.vue b/src/views/Activities/GulbenFestival/index.vue index f423107..f849ded 100644 --- a/src/views/Activities/GulbenFestival/index.vue +++ b/src/views/Activities/GulbenFestival/index.vue @@ -2140,8 +2140,10 @@ const visibleChildTabs = computed(() => { return children.tabs.items .map((item, index) => { - const section = children.sections?.[index] const value = typeof item === 'string' ? item : item.value + const section = + children.sections?.find((childSection) => childSection?.name === value) || + children.sections?.[index] return { value, label: typeof item === 'string' ? item : item.label || item.labelKey || value, diff --git a/src/views/Activities/GulbenFestival/page.config.js b/src/views/Activities/GulbenFestival/page.config.js index 26d4cc5..023fecb 100644 --- a/src/views/Activities/GulbenFestival/page.config.js +++ b/src/views/Activities/GulbenFestival/page.config.js @@ -132,8 +132,8 @@ export const pageConfig = { children: { tabs: { enabled: true, - defaultValue: 'Reward', - items: ['Reward', 'Ranking'], + defaultValue: 'Ranking', + items: ['Ranking', 'Reward'], }, sections: [ { @@ -170,8 +170,8 @@ export const pageConfig = { children: { tabs: { enabled: true, - defaultValue: 'Reward', - items: ['Reward', 'Ranking'], + defaultValue: 'Ranking', + items: ['Ranking', 'Reward'], }, sections: [ { diff --git a/src/views/Activities/GulbenFestival/页面创建信息.md b/src/views/Activities/GulbenFestival/页面创建信息.md index 0936cec..4687952 100644 --- a/src/views/Activities/GulbenFestival/页面创建信息.md +++ b/src/views/Activities/GulbenFestival/页面创建信息.md @@ -202,10 +202,10 @@ "children": { "tabs": { "enabled": true, - "defaultValue": "Reward", + "defaultValue": "Ranking", "items": [ - "Reward", - "Ranking" + "Ranking", + "Reward" ] }, "sections": [ @@ -246,10 +246,10 @@ "children": { "tabs": { "enabled": true, - "defaultValue": "Reward", + "defaultValue": "Ranking", "items": [ - "Reward", - "Ranking" + "Ranking", + "Reward" ] }, "sections": [ @@ -1073,6 +1073,12 @@ - `activeLotteryIndex` 默认值保持 `0`,页面初始时第一个奖品位置展示 `lotteryPrizeActiveBg`。 - 切换 `lotteryBg` 的 R/SR/SSR 奖池后,也将 `activeLotteryIndex` 重置为 `0`,默认展示当前奖池第一个位置的 active 图。 + +## 本次同步:Personal Rank / Room Rank 二级标签顺序 + +- `Personal Rank` 和 `Room Rank` 下的二级标签顺序调整为 `Ranking`、`Reward`。 +- 两个一级标签进入时默认打开 `Ranking` 小标签页。 +- Vue 渲染二级标签时按 section `name` 匹配内容区,不再依赖 `items` 和 `sections` 的数组下标,避免后续只调整按钮顺序时内容错位。 - 点击抽奖后动画从当前 `activeLotteryIndex` 位置继续向后滚动,最终停留在接口返回中奖奖品对应的位置;下一次抽奖继续从上一次停留位置开始模拟转圈。 ## 本次同步:抽奖 active 图唯一渲染