From 13a60da2424da8cd50e52e35e0126e23e34ea6f3 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期日, 16 三月 2025 15:58:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/router/index.js | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index a9811bb..9d4db52 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -46,6 +46,18 @@
component: () => import("@/views/login"),
hidden: true,
},
+ // 绗笁鏂圭櫥褰曢〉
+ {
+ path: "/thirdpartylogin",
+ component: () => import("@/views/thirdpartylogin"),
+ hidden: true,
+ },
+ // 绗笁鏂圭櫥褰曢〉涓浆
+ {
+ path: "/logindemo",
+ component: () => import("@/views/logindemo"),
+ hidden: true,
+ },
{
path: "/register",
component: () => import("@/views/register"),
@@ -133,7 +145,7 @@
component: () =>
import("@/views/business/productOrder/components/add.vue"),
name: "Add",
- meta: { title: "鎴愬搧涓嬪崟璇︽儏", activeMenu: "/business/materialOrder",keepAlive: true },
+ meta: { title: "鎴愬搧涓嬪崟璇︽儏", activeMenu: "/business/productOrder",keepAlive: true },
},
],
},
@@ -204,20 +216,6 @@
component: Layout,
hidden: true,
permissions: ["customer:edit"],
- },
- {
- path: "/monitor/job-log",
- component: Layout,
- hidden: true,
- permissions: ["monitor:job:list"],
- children: [
- {
- path: "index/:jobId(\\d+)",
- component: () => import("@/views/monitor/job/log"),
- name: "JobLog",
- meta: { title: "璋冨害鏃ュ織", activeMenu: "/monitor/job" },
- },
- ],
},
];
--
Gitblit v1.9.3