mirror of
https://gitee.com/beijing_hongye_huicheng/lilishop-ui.git
synced 2026-08-06 10:57:26 +08:00
fix(manager): 解决 util.js 合并冲突标记导致的编译错误
This commit is contained in:
@@ -1,18 +1,13 @@
|
||||
import lazyLoading from "./lazyLoading.js";
|
||||
import lazyLoading from "./lazyLoading.js";
|
||||
import { getRouter } from "./router-holder";
|
||||
import Cookies from "js-cookie";
|
||||
|
||||
let util = {};
|
||||
|
||||
<<<<<<< HEAD
|
||||
/** 已弃用、前端未实现的菜单 frontRoute,注册路由时跳过 */
|
||||
const DEPRECATED_FRONT_ROUTES = new Set([
|
||||
"distribution/distrbutionGrade",
|
||||
=======
|
||||
/** 已弃用、前端已移除的菜单 frontRoute,注册路由时跳过 */
|
||||
/** 已弃用、前端未实现或已移除的菜单 frontRoute,注册路由时跳过 */
|
||||
const DEPRECATED_FRONT_ROUTES = new Set([
|
||||
"goods/goods-manage/spec",
|
||||
>>>>>>> vue3
|
||||
"distribution/distrbutionGrade",
|
||||
]);
|
||||
|
||||
function isDeprecatedMenu(menu) {
|
||||
|
||||
Reference in New Issue
Block a user