refactor: 活动订单id显示变更嘉联
Some checks failed
continuous-integration/drone/push Build is failing

This commit is contained in:
2025-10-31 14:36:56 +08:00
parent d5751d305c
commit 07e3e15be8
5 changed files with 3463 additions and 6064 deletions

View File

@@ -33,45 +33,45 @@
},
"dependencies": {
"@unocss/eslint-config": "^0.55.7",
"@vueuse/core": "^10.11.0",
"@vueuse/core": "^10.11.1",
"@wangeditor/editor": "^5.1.23",
"@wangeditor/editor-for-vue": "^5.1.12",
"axios": "^1.7.2",
"dayjs": "^1.11.11",
"echarts": "^5.5.1",
"axios": "^1.13.0",
"dayjs": "^1.11.18",
"echarts": "^5.6.0",
"file-saver": "^2.0.5",
"jszip": "^3.10.1",
"lodash-es": "^4.17.21",
"md-editor-v3": "^4.17.3",
"md-editor-v3": "^4.21.3",
"mockjs": "^1.1.0",
"pinia": "^2.1.7",
"vite": "^4.5.3",
"pinia": "^2.3.1",
"vite": "^4.5.14",
"vue": "3.3.4",
"vue-echarts": "^6.7.3",
"vue-router": "^4.2.5",
"vue-router": "^4.6.3",
"xlsx": "^0.18.5"
},
"devDependencies": {
"@commitlint/cli": "^17.8.1",
"@commitlint/config-conventional": "^17.8.1",
"@iconify/json": "^2.2.228",
"@iconify/vue": "^4.1.2",
"@iconify/json": "^2.2.401",
"@iconify/vue": "^4.3.0",
"@unocss/preset-rem-to-px": "^0.55.7",
"@vitejs/plugin-vue": "^4.6.2",
"@vue/compiler-sfc": "^3.4.32",
"@vue/compiler-sfc": "^3.5.22",
"@zclzone/eslint-config": "^0.0.4",
"chalk": "^5.3.0",
"commitizen": "^4.3.0",
"chalk": "^5.6.2",
"commitizen": "^4.3.1",
"cz-conventional-changelog": "^3.3.0",
"cz-customizable": "^7.1.0",
"dotenv": "^16.4.5",
"cz-customizable": "^7.5.1",
"dotenv": "^16.6.1",
"esno": "^0.17.0",
"fs-extra": "^11.2.0",
"fs-extra": "^11.3.2",
"husky": "^8.0.3",
"lint-staged": "^13.3.0",
"naive-ui": "^2.39.0",
"rollup-plugin-visualizer": "^5.12.0",
"sass": "^1.77.8",
"naive-ui": "^2.43.1",
"rollup-plugin-visualizer": "^5.14.0",
"sass": "^1.93.2",
"unocss": "0.55.0",
"unplugin-auto-import": "^0.16.7",
"unplugin-icons": "^0.16.6",

8277
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@@ -45,27 +45,29 @@ export async function addDynamicRoutes() {
router.addRoute(NOT_FOUND_ROUTE)
// 确保根路径重定向到工作台
if (!router.hasRoute('Dashboard')) {
const workbenchRoute = {
name: 'Dashboard',
path: '/',
component: () => import('@/layout/index.vue'),
redirect: '/workbench',
children: [
{
name: 'Workbench',
path: 'workbench',
component: () => import('@/views/workbench/index.vue'),
meta: {
title: '工作台',
icon: 'mdi:index',
order: 0,
},
},
],
}
router.addRoute(workbenchRoute)
}
// if (!router.hasRoute('workbench')) {
// const workbenchRoute = {
// name: 'workbench',
// path: '/',
// component: () => import('@/views/workbench/index.vue'),
// redirect: '/workbench',
// // children: [
// // {
// // name: 'Workbench',
// // path: 'workbench',
// // component: () => import('@/views/workbench/index.vue'),
// // meta: {
// // title: '工作台',
// // icon: 'mdi:index',
// // order: 0,
// // },
// // },
// // ],
// }
// router.addRoute(workbenchRoute)
// }
// console.log(router)
} catch (error) {
console.error(error)
throw error

View File

@@ -58,7 +58,7 @@ function filterAsyncRoutes(routes = [], firstRoute = true) {
const curRoute = {
path: route.route,
name: route.name,
name: route.route,
isHidden,
meta,
children: [],

View File

@@ -191,7 +191,7 @@ const columns = ref([
{
title: '订单号',
align: 'center',
key: 'oid',
key: 'jl_oid',
width: 200,
fixed: 'left',
},