code-image-backup-public/lilishop-ui
1
0
Fork 0
mirror of https://gitee.com/beijing_hongye_huicheng/lilishop-ui.git synced 2026-08-06 02:47:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(manager): 解决 util.js 合并冲突标记导致的编译错误

Browse Source
This commit is contained in:
田香琪
2026-07-15 17:07:46 +08:00
parent 1df821aa0c
commit 192a9ca53f
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
manager/src/libs/util.js
View File

@@ -1,18 +1,13 @@
import lazyLoading from "./lazyLoading.js"; import lazyLoading from "./lazyLoading.js";
import { getRouter } from "./router-holder"; import { getRouter } from "./router-holder";
import Cookies from "js-cookie"; import Cookies from "js-cookie";
let util = {}; let util = {};
<<<<<<< HEAD /** 已弃用、前端未实现或已移除的菜单 frontRoute，注册路由时跳过 */
/** 已弃用、前端未实现的菜单 frontRoute，注册路由时跳过 */
const DEPRECATED_FRONT_ROUTES = new Set([
"distribution/distrbutionGrade",
=======
/** 已弃用、前端已移除的菜单 frontRoute，注册路由时跳过 */
const DEPRECATED_FRONT_ROUTES = new Set([ const DEPRECATED_FRONT_ROUTES = new Set([
"goods/goods-manage/spec", "goods/goods-manage/spec",
>>>>>>> vue3 "distribution/distrbutionGrade",
]); ]);
function isDeprecatedMenu(menu) { function isDeprecatedMenu(menu) {