diff --git a/seller/src/router/router.js b/seller/src/router/router.js index a3d66bdaa..22d4a102a 100644 --- a/seller/src/router/router.js +++ b/seller/src/router/router.js @@ -15,6 +15,26 @@ export const forgetPasswordRouter = { component: () => import("@/views/ForgetPassword.vue") }; +// 移动端楼层装修编辑器:全屏独立页,不在 Main(左侧菜单)布局内 +export const floorDecorationRouter = { + path: "/floorList/main", + name: "main", + meta: { + title: "移动装修" + }, + component: () => import("@/views/shop/wap/main.vue") +}; + +// PC端楼层装修编辑器:全屏独立页,不在 Main(左侧菜单)布局内 +export const pcFloorDecorationRouter = { + path: "/pcFloorList/main", + name: "renovation", + meta: { + title: "PC装修" + }, + component: () => import("@/views/shop/renovation.vue") +}; + // 作为Main组件的子页面展示但是不在左侧菜单显示的路由写在otherRouter里 export const otherRouter = { path: "/", @@ -168,20 +188,6 @@ export const otherRouter = { name: "orderVerification", component: () => import("@/views/order/order/orderVerification.vue") }, - { - path: "/floorList/main", - title: "移动装修", - name: "main", - meta: { title: "移动装修" }, - component: () => import("@/views/shop/wap/main.vue"), - }, - { - path: "/pcFloorList/main", - title: "PC装修", - name: "renovation", - meta: { title: "PC装修" }, - component: () => import("@/views/shop/renovation.vue"), - }, { path: "order-complaint-detail", title: "投诉详情", @@ -278,6 +284,27 @@ export const otherRouter = { name: "procurement-damage-report-operation", component: () => import("@/views/procurement/damage-report/operation.vue") }, + { + path: "stock/outbound/list", + title: "领用出库", + name: "stockOutboundList", + meta: { title: "领用出库" }, + component: () => import("@/views/stock/outbound/list.vue") + }, + { + path: "stock/outbound/operation", + title: "出库单操作", + name: "stock-outbound-operation", + meta: { title: "出库单操作" }, + component: () => import("@/views/stock/outbound/operation.vue") + }, + { + path: "stock/flow/list", + title: "库存流水", + name: "stockFlowList", + meta: { title: "库存流水" }, + component: () => import("@/views/stock/flow/list.vue") + }, { path: "alertQuantityWarnList", title: "预警商品", @@ -342,4 +369,4 @@ export const page500 = { component: () => import("@/views/error-page/500.vue") }; // 所有上面定义的路由都要写在下面的routers里 -export const routers = [loginRouter, forgetPasswordRouter, otherRouter, page500, page403]; +export const routers = [loginRouter, forgetPasswordRouter, floorDecorationRouter, pcFloorDecorationRouter, otherRouter, page500, page403]; diff --git a/seller/src/views/shop/floorList.vue b/seller/src/views/shop/floorList.vue index e8d37de37..e27db5659 100644 --- a/seller/src/views/shop/floorList.vue +++ b/seller/src/views/shop/floorList.vue @@ -10,7 +10,7 @@ />
- 添加页面 + 添加页面
@@ -42,7 +42,7 @@ @@ -85,7 +85,7 @@ diff --git a/seller/src/views/shop/wap/navbar.vue b/seller/src/views/shop/wap/navbar.vue index fb69cadca..dbb120f4c 100644 --- a/seller/src/views/shop/wap/navbar.vue +++ b/seller/src/views/shop/wap/navbar.vue @@ -254,6 +254,7 @@ function goBack() { if (window.history.state?.back) { router.go(-1); } else { + window.close(); router.push("/wapList"); } } diff --git a/seller/src/views/shop/wap/style.scss b/seller/src/views/shop/wap/style.scss index 1b301293b..980094b1b 100644 --- a/seller/src/views/shop/wap/style.scss +++ b/seller/src/views/shop/wap/style.scss @@ -2,6 +2,8 @@ display: flex; gap: 12px; height: calc(100vh - 96px); + min-width: 0; + overflow-x: auto; .model-view-menu { flex: 1.5; min-width: 250px; @@ -41,9 +43,11 @@ } .model-config { flex: 2.5; + min-width: 380px; } .model-view-content { flex: 6; + min-width: 400px; } .model-item { line-height: 1.4; diff --git a/seller/src/views/shop/wap/wapList.vue b/seller/src/views/shop/wap/wapList.vue index c59af2da5..47f559a42 100644 --- a/seller/src/views/shop/wap/wapList.vue +++ b/seller/src/views/shop/wap/wapList.vue @@ -10,7 +10,7 @@ />
- 添加页面 + 添加页面
@@ -35,7 +35,7 @@