@@ -23,11 +23,13 @@
diff --git a/src/renderer/components/TaskList/index.vue b/src/renderer/components/TaskList/index.vue
index fcaf7fa..9f61eb8 100644
--- a/src/renderer/components/TaskList/index.vue
+++ b/src/renderer/components/TaskList/index.vue
@@ -1,9 +1,59 @@
-
+
+
+
\ No newline at end of file
diff --git a/src/renderer/constant/menus.ts b/src/renderer/constant/menus.ts
index f6e7698..144e74d 100644
--- a/src/renderer/constant/menus.ts
+++ b/src/renderer/constant/menus.ts
@@ -65,6 +65,6 @@ export const menus: MenuItem[] = [
icon: RiSettingsLine,
color: '#525866',
activeColor: '#2B7FFF',
- url: '/settings',
+ url: '/setting',
},
]
\ No newline at end of file
diff --git a/src/renderer/layout/index.vue b/src/renderer/layout/index.vue
index c2ca3b0..0d29669 100644
--- a/src/renderer/layout/index.vue
+++ b/src/renderer/layout/index.vue
@@ -2,11 +2,16 @@
-
+
+
+
+
+
+
+
-
-
-
+
+
diff --git a/src/renderer/main.ts b/src/renderer/main.ts
index 6b3b183..a7e7fab 100644
--- a/src/renderer/main.ts
+++ b/src/renderer/main.ts
@@ -3,7 +3,6 @@ import { createApp } from "vue";
import { createPinia } from "pinia";
import router from "./router";
import App from "./App.vue";
-import Layout from "./layout/index.vue";
import ElementPlus from 'element-plus'
import 'element-plus/dist/index.css'
import locale from 'element-plus/es/locale/lang/zh-cn'
@@ -14,8 +13,6 @@ const app = createApp(App);
// 使用 Pinia 状态管理
app.use(createPinia());
-// 注册 Layout 组件
-app.component('Layout', Layout);
// 使用 Vue Router
app.use(router);
diff --git a/src/renderer/router/index.ts b/src/renderer/router/index.ts
index 3bfecd1..9b5e6fa 100644
--- a/src/renderer/router/index.ts
+++ b/src/renderer/router/index.ts
@@ -1,4 +1,5 @@
import { createRouter, createWebHistory } from "vue-router";
+import Layout from '@/layout/index.vue'
const routes = [
{
@@ -13,16 +14,52 @@ const routes = [
meta: { requiresAuth: true },
},
{
- path: "/home",
- name: "Home",
- component: () => import("@/views/home/index.vue"),
- meta: { requiresAuth: true },
- },
- {
- path: "/rate",
- name: "Rate",
- component: () => import("@/views/rate/index.vue"),
- meta: { requiresAuth: true },
+ path: "/",
+ component: Layout,
+ children: [
+ {
+ path: "home",
+ component: () => import("@/views/home/index.vue"),
+ name: "Home",
+ meta: { requiresAuth: true },
+ },
+ {
+ path: "stock",
+ name: "Stock",
+ component: () => import("@/views/stock/index.vue"),
+ meta: { requiresAuth: true },
+ },
+ {
+ path: "rate",
+ name: "Rate",
+ component: () => import("@/views/rate/index.vue"),
+ meta: { requiresAuth: true },
+ },
+ {
+ path: "order",
+ name: "Order",
+ component: () => import("@/views/order/index.vue"),
+ meta: { requiresAuth: true },
+ },
+ {
+ path: "more",
+ name: "More",
+ component: () => import("@/views/more/index.vue"),
+ meta: { requiresAuth: true },
+ },
+ {
+ path: "setting",
+ name: "Setting",
+ component: () => import("@/views/setting/index.vue"),
+ meta: { requiresAuth: true },
+ },
+ {
+ path: "/dashboard",
+ name: "Dashboard",
+ component: () => import("@/views/dashboard/index.vue"),
+ meta: { requiresAuth: true },
+ },
+ ]
},
{
path: "/about",
@@ -34,6 +71,13 @@ const routes = [
const router = createRouter({
history: createWebHistory(),
routes,
+ scrollBehavior(to: any, from: any, savedPosition: any) {
+ if (savedPosition) {
+ return savedPosition
+ }
+
+ return { top: 0 }
+ },
});
router.beforeEach((to: any, from: any, next: any) => {
diff --git a/src/renderer/views/dashboard/index.vue b/src/renderer/views/dashboard/index.vue
index 71ed926..d440836 100644
--- a/src/renderer/views/dashboard/index.vue
+++ b/src/renderer/views/dashboard/index.vue
@@ -1,18 +1,7 @@
-
-
-
-
-
+ 看板
diff --git a/src/renderer/views/home/index.vue b/src/renderer/views/home/index.vue
index 71ed926..8075179 100644
--- a/src/renderer/views/home/index.vue
+++ b/src/renderer/views/home/index.vue
@@ -1,18 +1,9 @@
-
-
-
-
-
+
+ 首页
+
diff --git a/src/renderer/views/login/index.vue b/src/renderer/views/login/index.vue
index d2a784c..a77cf23 100644
--- a/src/renderer/views/login/index.vue
+++ b/src/renderer/views/login/index.vue
@@ -1,13 +1,12 @@
-
+

-
+
没有账号?
-
+
@@ -18,39 +17,24 @@
账号
-
-
-
-
-
{{ errors.account }}
+
+
+
+
+
{{ errors.account }}
密码
-
+
{{ errors.password }}
验证码
{{ errors.code }}
@@ -58,31 +42,21 @@
-