Skip to content

Commit 9d44101

Browse files
committed
feat: 更新依赖版本,优化组件Nav_v5的显示逻辑,添加forceShow属性,调整多个视图以集成新导航组件
1 parent 1659089 commit 9d44101

9 files changed

Lines changed: 29 additions & 19 deletions

File tree

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
},
3131
"dependencies": {
3232
"@element-plus/icons-vue": "^2.3.2",
33-
"@jx3box/jx3box-common": "^9.1.6",
33+
"@jx3box/jx3box-common": "^9.1.7",
3434
"@jx3box/jx3box-data": "^3.9.4",
3535
"@jx3box/jx3box-editor": "^3.0.9",
3636
"@jx3box/jx3box-emotion": "^1.3.0",
37-
"@jx3box/jx3box-facedat": "^2.7.1",
37+
"@jx3box/jx3box-facedat": "^2.7.3",
3838
"@jx3box/jx3box-map": "^1.0.0",
39-
"@jx3box/jx3box-ui": "^2.0.26",
39+
"@jx3box/jx3box-ui": "^2.0.39",
4040
"@tinymce/tinymce-vue": "^5.1.1",
4141
"@vueuse/core": "^9.13.0",
4242
"@vueuse/head": "^0.7.6",

src/components/Nav_v5.vue

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<aside class="m-pvx-aside" :class="navStatusClass" v-show="active !== 'pvx'">
2+
<aside class="m-pvx-aside" :class="navStatusClass" v-show="active !== 'pvx' || forceShow">
33
<div :class="`m-pvx-box ${navStatus ? 'open' : 'close'}`" @mouseleave="toLeft">
44
<template v-if="navStatus">
55
<div class="u-home-wrap" :class="active === 'pvx' && 'is-active'">
@@ -56,7 +56,12 @@ import { compact } from "lodash";
5656
import menus from "@/assets/data/menus.json";
5757
export default {
5858
name: "Nav_V5",
59-
props: [],
59+
props: {
60+
forceShow: {
61+
type: Boolean,
62+
default: false,
63+
},
64+
},
6065
components: {},
6166
data: function () {
6267
return {

src/components/adventure/tabs.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<CommonToolbar search color="#d16400" :active="active" :types="body_types" @update="updateToolbar">
33
<template #append>
4-
<a class="u-jump" href="/adventure/treasure">奇遇珍卷</a>
4+
<a class="u-jump" href="/pvx/codex/adventure">奇遇珍卷</a>
55
</template>
66
</CommonToolbar>
77
</template>

src/components/common/face-body/tabs.vue

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
<div class="m-face-filter m-common-filter">
77
<div class="u-filter-item">
88
<el-radio-group v-model="is_new_face" v-if="client === 'std'">
9-
<el-radio-button class="u-filter" :label="-1">全部</el-radio-button>
10-
<el-radio-button class="u-filter" :label="1">写实</el-radio-button>
11-
<el-radio-button class="u-filter" :label="0">写意</el-radio-button>
9+
<el-radio-button class="u-filter" :value="-1">全部</el-radio-button>
10+
<el-radio-button class="u-filter" :value="1">写实</el-radio-button>
11+
<el-radio-button class="u-filter" :value="0">写意</el-radio-button>
1212
</el-radio-group>
1313
</div>
1414

@@ -22,14 +22,14 @@
2222
</div>
2323
<div class="u-filter-item">
2424
<el-radio-group v-model="filter_empty_images">
25-
<el-radio-button class="u-filter" :label="0">全部</el-radio-button>
26-
<el-radio-button class="u-filter" :label="1">有图</el-radio-button>
25+
<el-radio-button class="u-filter" :value="0">全部</el-radio-button>
26+
<el-radio-button class="u-filter" :value="1">有图</el-radio-button>
2727
</el-radio-group>
2828
</div>
2929
<div class="u-filter-item">
3030
<el-radio-group v-model="code_mode">
31-
<el-radio-button class="u-filter" label="">全部</el-radio-button>
32-
<el-radio-button class="u-filter" :label="1">捏脸码</el-radio-button>
31+
<el-radio-button class="u-filter" value="">全部</el-radio-button>
32+
<el-radio-button class="u-filter" :value="1">捏脸码</el-radio-button>
3333
</el-radio-group>
3434
</div>
3535
</div>

src/views/adventure/landscape.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<template>
2+
<CommonNav :force-show="true"></CommonNav>
23
<div class="m-body">
3-
<a class="u-go_back" href="/adventure">返回主页</a>
4+
<!-- <a class="u-go_back" href="/adventure">返回主页</a> -->
45
<template v-if="!isLogin">
56
<div class="u-bind_role">
67
<el-empty description="您还没有登录" :image="__imgPath + `/img/common/empty.png`" :image-size="200">
@@ -91,11 +92,13 @@ import User from "@jx3box/jx3box-common/js/user";
9192
import html2canvas from "html2canvas";
9293
import { __Links, __cdn, __Root } from "@/utils/config";
9394
import landscapeContent from "./landscapeContent.vue";
95+
import CommonNav from "@/components/Nav_v5.vue";
9496
export default {
9597
name: "landscape",
9698
inject: ["__imgRoot", "__imgPath"],
9799
components: {
98100
landscapeContent,
101+
CommonNav,
99102
},
100103
data: () => ({
101104
addClass: false,

src/views/face/List.vue

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<template v-if="active === -1">
77
<div v-for="(item, index) in list" :key="'l' + index" class="m-face-box"
88
:class="{ none: !item.list.length }">
9-
<CardBannerList :class="{ search: tabsData.name }" :count="count" :minw="190"
9+
<CardBannerList :class="{ search: tabsData.title }" :count="count" :minw="190"
1010
:data="{ ...itemData, type: item.value }" :items="item.list" @update:load="handleLoad">
1111
<template v-slot:title>
1212
<div>{{ item.label + "脸型" }}</div>
@@ -110,7 +110,7 @@ export default {
110110
return tab && tab.pages > 1 && this.page < tab.pages;
111111
},
112112
alertTitle: function () {
113-
if (this.title) return "没找到对应的捏脸,请重新选择条件或关键词搜索";
113+
if (this.tabsData.title) return "没找到对应的捏脸,请重新选择条件或关键词搜索";
114114
return "没有找到相关的捏脸";
115115
},
116116
subList() {
@@ -233,6 +233,8 @@ export default {
233233
handleFaceTabChange: function (data) {
234234
this.page = 1;
235235
this.tabsData = data;
236+
// 重置 Tab 切换标志,确保筛选条件变化时能正常触发加载
237+
this.isTabSwitching = false;
236238
},
237239
// 页面宽度变化时重新计算每页显示数量(带防抖,避免频繁触发)
238240
showCount: debounce(function () {

src/views/wiki/index.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<router-view></router-view>
55
</div>
66
<div v-else>
7+
<CommonNav :forceShow="true"></CommonNav>
78
<CommonHeader></CommonHeader>
89
<div class="m-achievement-main" :class="{ is_mobile: mobile }">
910
<SideBar v-if="!is_fold" />
@@ -20,9 +21,10 @@
2021
import CommonHeader from "@jx3box/jx3box-ui/src/CommonHeader.vue";
2122
import { isMiniProgram, isApp } from "@jx3box/jx3box-common/js/utils";
2223
import SideBar from "@/components/wiki/sidebar.vue";
24+
import CommonNav from "@/components/Nav_v5.vue"
2325
export default {
2426
name: "WikiAchievementIndex",
25-
components: { SideBar, CommonHeader },
27+
components: { SideBar, CommonHeader, CommonNav },
2628
data() {
2729
return {
2830
is_fold: false,

src/views/wiki/leap/detail.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@ export default {
146146
currentRole: {
147147
deep: true,
148148
handler(val, old) {
149-
console.log(val, old);
150149
this.getSchemaDetail();
151150
},
152151
},

src/views/wiki/overview.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,6 @@ export default {
333333
localStorage.setItem("wiki_last_sync", val.jx3id || 0);
334334
this.$store.commit("SET_STATE", { key: "role", value: val });
335335
const { jx3id } = val;
336-
console.log(jx3id);
337336
if (jx3id) {
338337
this.$store.commit("SET_STATE", { key: "achievementsVirtual", value: [] });
339338
this.loadRoleAchievements(jx3id);

0 commit comments

Comments
 (0)