diff --git a/frontend/index.html b/frontend/index.html index 1d5cb807..c2191165 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -12,7 +12,6 @@ DNF计算器 diff --git a/frontend/src/components/calc/button/index.vue b/frontend/src/components/calc/button/index.vue index 4a0bae9b..bcd242a1 100644 --- a/frontend/src/components/calc/button/index.vue +++ b/frontend/src/components/calc/button/index.vue @@ -19,6 +19,10 @@ export default defineComponent({ }, icon: { type: String + }, + type: { + type: String, + default: "primary" } }, setup(props, { slots }) { diff --git a/frontend/src/components/calc/cascader/index.vue b/frontend/src/components/calc/cascader/index.vue index ad9744d5..a14910ee 100644 --- a/frontend/src/components/calc/cascader/index.vue +++ b/frontend/src/components/calc/cascader/index.vue @@ -1,5 +1,5 @@ diff --git a/frontend/src/pages/Character/Equipment/Stone.vue b/frontend/src/pages/Character/Equipment/components/Stone.vue similarity index 100% rename from frontend/src/pages/Character/Equipment/Stone.vue rename to frontend/src/pages/Character/Equipment/components/Stone.vue diff --git a/frontend/src/pages/Character/Equipment/Suit.vue b/frontend/src/pages/Character/Equipment/components/Suit.vue similarity index 100% rename from frontend/src/pages/Character/Equipment/Suit.vue rename to frontend/src/pages/Character/Equipment/components/Suit.vue diff --git a/frontend/src/pages/Character/Equipment/Universal.vue b/frontend/src/pages/Character/Equipment/components/Universal.vue similarity index 100% rename from frontend/src/pages/Character/Equipment/Universal.vue rename to frontend/src/pages/Character/Equipment/components/Universal.vue diff --git a/frontend/src/pages/Character/Equipment/Weapon.vue b/frontend/src/pages/Character/Equipment/components/Weapon.vue similarity index 100% rename from frontend/src/pages/Character/Equipment/Weapon.vue rename to frontend/src/pages/Character/Equipment/components/Weapon.vue diff --git a/frontend/src/pages/Character/Index.vue b/frontend/src/pages/Character/Index.vue index 75e3f7d3..0bab2df4 100644 --- a/frontend/src/pages/Character/Index.vue +++ b/frontend/src/pages/Character/Index.vue @@ -1,27 +1,19 @@ diff --git a/frontend/src/pages/Home/Index.vue b/frontend/src/pages/Home/Index.vue index 7acc17e1..e98607e6 100644 --- a/frontend/src/pages/Home/Index.vue +++ b/frontend/src/pages/Home/Index.vue @@ -36,7 +36,7 @@ export default defineComponent(async () => { return } else{ - return window.open("/character/" + (child.class || child.name),"_self") + return window.open("/character/" + (child.class || child.name),"_blank") } } } diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts index b124b5e0..31d641fe 100644 --- a/frontend/src/router/index.ts +++ b/frontend/src/router/index.ts @@ -1,9 +1,9 @@ import { createRouter, createWebHistory, type RouteRecordRaw } from 'vue-router' const routes: RouteRecordRaw[] = [ - { - path: '/:pathMatch(.*)', - redirect: '/', - }, + // { + // path: '/:pathMatch(.*)', + // redirect: '/', + // }, { path: '/', name: 'home', @@ -11,9 +11,25 @@ const routes: RouteRecordRaw[] = [ }, { path:'/character/:alter', - name:'character', + redirect: (to) => { + return { path: `/character/equipment/${to.params.alter}` } + }, props: true, + name:'character', component: defineAsyncComponent(() => import('@/pages/Character/Index.vue')), + children: [ + { + path: '/character/equipment/:alter', + name: 'equipment', + props: true, + component: defineAsyncComponent(() => import('@/pages/Character/Equipment/Index.vue')), + },{ + path: '/character/skill/:alter', + name: 'skill', + props: true, + component: defineAsyncComponent(() => import('@/pages/Character/Skill/index.vue')), + } + ] } ]