diff --git a/seller/src/libs/routerJson.js b/seller/src/libs/routerJson.js index 6a4e6b24..f01c1975 100644 --- a/seller/src/libs/routerJson.js +++ b/seller/src/libs/routerJson.js @@ -1,511 +1,313 @@ -export const result = [ - { +export const result = [{ name: "lili", - level: 0, type: -1, title: "商品", path: "", component: "", - icon: "md-home", - isMenu: true, - url: "", - description: "", - permTypes: [], - children: [ - { - name: "goods-list", - - level: 1, - type: 0, - title: "商品管理", - path: "", - component: "Main", - icon: "md-person", - isMenu: true, - url: "", - permTypes: [], - children: [ - { - name: "goods-operation", - - level: 2, - type: 0, - title: "商品发布", - path: "goods-operation", - component: "goods-operation", - icon: "md-person", - isMenu: true, - url: "", - children: null, - permTypes: [] + children: [{ + name: "goods-list", + level: 1, + type: 0, + title: "商品管理", + path: "", + component: "Main", + children: [{ + name: "goods-operation", + level: 2, + type: 0, + title: "商品发布", + path: "goods-operation", + component: "goods-operation", + children: null, + }, + { + name: "goods", + level: 2, + type: 0, + title: "商品列表", + path: "goods", + component: "goods/goods-seller/goods", + children: null, + }, + { + path: "template-goods", + props: { + type: "TEMPLATE" }, - { - name: "goods", - - level: 2, - type: 0, - title: "商品列表", - path: "goods", - component: "goods/goods-seller/goods", - icon: "md-person", - isMenu: true, - url: "", - children: null, - permTypes: [] - }, - // { - // name: "daft-goods", - // - // level: 2, - // type: 0, - // title: "草稿商品", - // path: "daft-goods", - // component: "goods/goods-seller/draftGoods", - // icon: "md-person", - // isMenu: true, - // url: "", - // children: null, - // permTypes: [] - // }, - - { - path: "template-goods", - props: {type: "TEMPLATE"}, - - level: 2, - type: 0, - title: "商品模版", - component: "goods/goods-seller/draftGoods", - icon: "md-person", - isMenu: true, - url: "", - name: "template-goods", - children: null, - permTypes: [] - }, - { - name: "category", - - level: 2, - type: 0, - title: "店铺分类", - path: "category", - component: "goods/goods-manage/category", - icon: "md-person", - isMenu: true, - url: "", - children: null, - permTypes: [] - } - ] - } - ] + level: 2, + type: 0, + title: "商品模版", + component: "goods/goods-seller/draftGoods", + name: "template-goods", + children: null, + }, + { + name: "category", + level: 2, + type: 0, + title: "店铺分类", + path: "category", + component: "goods/goods-manage/category", + children: null, + } + ] + }] }, - { name: "order", - level: 0, type: -1, title: "订单", path: "", component: "", - icon: "md-home", - isMenu: true, - url: "", description: "", - permTypes: [], - children: [ - { + children: [{ name: "order", - level: 1, type: 0, title: "订单管理", path: "/order", component: "Main", - icon: "md-person", - isMenu: true, - url: "", - permTypes: [], - children: [ - { + children: [{ name: "orderList", - level: 2, type: 0, + keepAlive: true, title: "商品订单", path: "orderList", component: "order/order/orderList", - icon: "md-person", - isMenu: true, - url: "", children: null, - permTypes: [] }, { name: "virtualOrderList", - level: 2, type: 0, + keepAlive: true, title: "虚拟订单", path: "virtualOrderList", component: "order/order/virtualOrderList", - icon: "md-person", - isMenu: true, - url: "", - children: null, - permTypes: [] + children: null } ] }, { name: "memberComment", - level: 1, type: 0, title: "评价管理", path: "/order", component: "Main", - icon: "md-person", - isMenu: true, - url: "", - permTypes: [], - children: [ - { - name: "memberComment", - - level: 2, - type: 0, - title: "评价管理", - path: "memberComment", - component: "member/memberComment", - icon: "md-person", - isMenu: true, - url: "", - children: null, - permTypes: [] - } - ] + children: [{ + name: "memberComment", + level: 2, + type: 0, + title: "评价管理", + path: "memberComment", + component: "member/memberComment", + children: null, + }] }, { name: "order", - level: 1, type: 0, title: "售后管理", path: "/order", component: "Main", - icon: "md-person", - isMenu: true, - url: "", - permTypes: [], - children: [ - { + children: [{ name: "returnGoodsOrder", - level: 2, type: 0, + keepAlive: true, title: "退货管理", path: "returnGoodsOrder", component: "order/after-order/returnGoodsOrder", - icon: "md-person", - isMenu: true, - url: "", - permTypes: [], children: null }, { name: "returnMoneyOrder", - level: 2, type: 0, + keepAlive: true, title: "退款管理", path: "returnMoneyOrder", component: "order/after-order/returnMoneyOrder", - icon: "md-person", - isMenu: true, - url: "", - permTypes: [], children: null }, { name: "orderComplaint", - level: 2, type: 0, + keepAlive: true, title: "投诉管理", path: "orderComplaint", component: "order/after-order/orderComplaint", - icon: "md-person", - isMenu: true, - url: "", - permTypes: [], children: null } ] } ] }, - { name: "bill", - level: 0, type: -1, title: "财务", path: "", component: "", - icon: "md-home", - isMenu: true, - url: "", - description: "", - permTypes: [], - children: [ - { + children: [{ name: "bill", - level: 1, type: 0, title: "财务管理", path: "/bill", component: "Main", - icon: "md-person", - isMenu: true, - url: "", - permTypes: [], - children: [ - { + children: [{ name: "accountStatementBill", - level: 2, type: 0, + keepAlive: true, title: "财务对账", path: "accountStatementBill", component: "shop/bill/accountStatementBill", - icon: "md-person", - isMenu: true, - url: "", - permTypes: [], children: null }, { name: "storeBill", - level: 2, type: 0, + keepAlive: true, title: "店铺结算", path: "storeBill", component: "shop/bill/storeBill", - icon: "md-person", - isMenu: true, - url: "", - permTypes: [], children: null } ] }, - { name: "receiptManager", - level: 1, type: 0, title: "发票管理", path: "/bill", component: "Main", - icon: "md-person", - isMenu: true, - url: "", - permTypes: [], - children: [ - { - name: "receipt", - - level: 2, - type: 0, - title: "发票管理", - path: "receipt", - component: "order/receiptManager/receipt", - icon: "md-person", - isMenu: true, - url: "", - children: null, - permTypes: [] - } - ] + children: [{ + name: "receipt", + level: 2, + type: 0, + title: "发票管理", + path: "receipt", + component: "order/receiptManager/receipt", + children: null + }] } ] }, { name: "promotion", - level: 0, type: -1, title: "营销", path: "", component: "", - icon: "md-home", - isMenu: true, - url: "", - description: "", - permTypes: [], - children: [ - { + children: [{ name: "promotion", - level: 1, type: 0, title: "平台活动", path: "/promotion", component: "Main", - icon: "md-person", - isMenu: true, - url: "", - permTypes: [], - children: [ - { + children: [{ name: "pintuan", - level: 2, type: 0, + keepAlive: true, title: "拼团活动", path: "pintuan", component: "promotion/pintuan/pintuan", - icon: "md-person", - isMenu: true, - url: "", - permTypes: [], children: null }, { name: "seckill", - level: 2, type: 0, + keepAlive: true, title: "秒杀活动", path: "seckill", component: "promotion/seckill/seckill", - icon: "md-person", - isMenu: true, - url: "", - permTypes: [], children: null } ] }, { name: "lives", - level: 1, type: 0, title: "直播活动", path: "/promotion", component: "Main", - icon: "md-person", - isMenu: true, - url: "", - permTypes: [], - children: [ - { + children: [{ name: "live", - level: 2, type: 0, title: "直播管理", path: "live", component: "promotion/live/live", - icon: "md-person", - isMenu: true, - url: "", - permTypes: [], children: null }, { name: "liveGoods", - level: 2, type: 0, title: "直播商品", path: "liveGoods", component: "promotion/live/liveGoods", - icon: "md-person", - isMenu: true, - url: "", - permTypes: [], children: null } ] }, { name: "storePromotion", - level: 1, type: 0, title: "商家活动", path: "/storePromotion", component: "Main", - icon: "md-person", - isMenu: true, - url: "", - permTypes: [], - children: [ - { + children: [{ name: "full-cut", - level: 2, type: 0, title: "满额活动", path: "full-cut", component: "promotion/fullCut/fullCut", - icon: "md-person", - isMenu: true, - url: "", - permTypes: [], children: null }, { name: "coupon", - level: 2, type: 0, title: "优惠券", path: "coupon", component: "promotion/coupon/coupon", - icon: "md-person", - isMenu: true, - url: "", - permTypes: [], children: null }, - ] }, { name: "distribution", - level: 1, type: 0, title: "分销管理", path: "/distribution", component: "Main", - icon: "md-person", - isMenu: true, - url: "", - permTypes: [], - children: [ - { + children: [{ name: "distributionGoods", level: 2, type: 0, title: "分销商品", path: "distributionGoods", component: "distribution/distributionGoods", - icon: "md-person", - isMenu: true, - url: "", - permTypes: [], children: null }, { @@ -515,17 +317,12 @@ export const result = [ title: "分销订单", path: "distributionOrder", component: "distribution/distributionOrder", - icon: "md-person", - isMenu: true, - url: "", - permTypes: [], children: null } ] } ] }, - { name: "statistics", level: 0, @@ -533,68 +330,43 @@ export const result = [ title: "统计", path: "", component: "", - icon: "md-home", - isMenu: true, - url: "", - description: "", - permTypes: [], - children: [ - { - name: "statistics", - level: 1, - type: 0, - title: "统计管理", - path: "/statistics", - component: "Main", - icon: "md-person", - isMenu: true, - url: "", - permTypes: [], - children: [ - { - name: "goodsStatistics", - level: 2, - type: 0, - title: "商品统计", - path: "goodsStatistics", - component: "statistics/goods", - icon: "md-person", - isMenu: true, - url: "", - permTypes: [], - children: null - }, - { - name: "orderStatistics", - level: 2, - type: 0, - title: "订单统计", - path: "orderStatistics", - component: "statistics/order", - icon: "md-person", - isMenu: true, - url: "", - permTypes: [], - children: null - }, - { - name: "trafficStatistics", - level: 2, - type: 0, - title: "流量统计", - path: "trafficStatistics", - component: "statistics/traffic", - icon: "md-person", - isMenu: true, - url: "", - permTypes: [], - children: null - }, - ] - } - ] + children: [{ + name: "statistics", + level: 1, + type: 0, + title: "统计管理", + path: "/statistics", + component: "Main", + children: [{ + name: "goodsStatistics", + level: 2, + type: 0, + title: "商品统计", + path: "goodsStatistics", + component: "statistics/goods", + children: null + }, + { + name: "orderStatistics", + level: 2, + type: 0, + title: "订单统计", + path: "orderStatistics", + component: "statistics/order", + children: null + }, + { + name: "trafficStatistics", + level: 2, + type: 0, + title: "流量统计", + path: "trafficStatistics", + component: "statistics/traffic", + children: null + }, + ] + }] }, - { name: "settings", level: 0, @@ -602,22 +374,14 @@ export const result = [ title: "设置", path: "", component: "", - icon: "md-home", - isMenu: true, - url: "", description: "", - children: [ - { + children: [{ name: "user-manage", level: 1, type: 0, title: "页面设置", path: "user-manage", component: "sys/user-manage/userManage", - icon: "md-person", - isMenu: true, - url: "", - permTypes: [], children: [] }, { @@ -627,22 +391,13 @@ export const result = [ title: "配送设置", path: "", component: "Main", - icon: "md-person", - isMenu: true, - url: "", - permTypes: [], - children: [ - { + children: [{ name: "shipTemplate", level: 2, type: 0, title: "配送模板", path: "shipTemplate", component: "shop/ship/shipTemplate", - icon: "md-person", - isMenu: true, - url: "", - permTypes: [], children: null }, { @@ -652,10 +407,6 @@ export const result = [ title: "物流公司", path: "logistics", component: "shop/ship/logistics", - icon: "md-person", - isMenu: true, - url: "", - permTypes: [], children: null } ] @@ -667,88 +418,52 @@ export const result = [ title: "店铺管理", path: "/shop", component: "Main", - icon: "md-person", - isMenu: true, - url: "", description: "", - children: [ - { + children: [{ name: "shopSetting", - level: 2, type: 0, title: "店铺设置", path: "shopSetting", component: "shop/shopSetting", - icon: "md-log-in", - isMenu: true, - url: null, - description: null, children: null, - permTypes: [] }, { name: "shopAddress", - level: 2, type: 0, title: "自提管理", path: "shopAddress", component: "shop/shopAddress", - icon: "md-log-in", - isMenu: true, - url: null, - description: null, children: null, - permTypes: [] } - ] } ] }, { name: "messages", - level: 0, type: -1, title: "消息", path: "", component: "", - icon: "md-home", - isMenu: true, - url: "", - description: "", - children: [ - { - name: "user-manage", - - level: 1, + children: [{ + name: "user-manage", + level: 1, + type: 0, + title: "系统消息", + path: "user-manage", + component: "sys/user-manage/userManage", + children: [{ + name: "message_index", + level: 2, type: 0, title: "系统消息", - path: "user-manage", - component: "sys/user-manage/userManage", - icon: "md-person", - isMenu: true, - url: "", - permTypes: [], - children: [ - { - name: "message_index", - - level: 2, - type: 0, - title: "系统消息", - path: "message", - component: "message", - icon: "md-person", - isMenu: true, - url: "", - permTypes: [], - children: null - } - ] - } - ] + path: "message", + component: "message", + children: null + }] + }] } ]; diff --git a/seller/src/libs/util.js b/seller/src/libs/util.js index f850e358..3f28faae 100644 --- a/seller/src/libs/util.js +++ b/seller/src/libs/util.js @@ -1,7 +1,4 @@ -import axios from 'axios'; -import { getMenuList } from '@/api/index'; import lazyLoading from './lazyLoading.js'; -import router from '@/router/index'; import Cookies from "js-cookie"; import { result } from './routerJson.js'; @@ -233,7 +230,6 @@ util.openNewPage = function (vm, name, argu, query) { if (query) { tag.query = query; } - console.log(tag); vm.$store.commit('increateTag', tag); } } @@ -399,7 +395,6 @@ util.initMenuData = function (vm, data) { let nav = { name: e.name, title: e.title, - icon: e.icon } navList.push(nav); }) @@ -450,20 +445,17 @@ util.initRouterNode = function (routers, data) { // data为所有子菜单数 for (var item of data) { let menu = Object.assign({}, item); - // menu.component = import(`@/views/${menu.component}.vue`); menu.component = lazyLoading(menu.component); if (item.children && item.children.length > 0) { menu.children = []; util.initRouterNode(menu.children, item.children); } - let meta = {}; - // 给页面添加权限、标题、第三方网页链接 - meta.permTypes = menu.permTypes ? menu.permTypes : null; + // 给页面添加标题 meta.title = menu.title ? menu.title + " - lilishop商家后台" : null; - meta.url = menu.url ? menu.url : null; - meta.firstRouterName = item.firstRouterName + meta.firstRouterName = menu.firstRouterName + meta.keepAlive = menu.keepAlive ? true : false menu.meta = meta; routers.push(menu); diff --git a/seller/src/styles/table-common.scss b/seller/src/styles/table-common.scss index e03d6086..10e830c4 100644 --- a/seller/src/styles/table-common.scss +++ b/seller/src/styles/table-common.scss @@ -11,14 +11,6 @@ .select-clear { margin-left: 10px; } - - .page { - margin-top: 2vh; - } - - .drop-down { - margin-left: 5px; - } } .tree-list { diff --git a/seller/src/views/Main.vue b/seller/src/views/Main.vue index 378a1c36..4947c187 100644 --- a/seller/src/views/Main.vue +++ b/seller/src/views/Main.vue @@ -39,9 +39,12 @@