diff --git a/seller/public/config.js b/seller/public/config.js index 19674034b..67e2801d8 100644 --- a/seller/public/config.js +++ b/seller/public/config.js @@ -3,7 +3,7 @@ var BASE = { * @description api请求基础路径 */ API_DEV: { - seller: "https://admin-api.pickmall.cn", + seller: "http://127.0.0.1:8887", }, API_PROD: { seller: "https://admin-api.pickmall.cn", diff --git a/seller/src/api/index.js b/seller/src/api/index.js index 0e2a51deb..e62ccc665 100644 --- a/seller/src/api/index.js +++ b/seller/src/api/index.js @@ -295,7 +295,7 @@ export const deleteDepartment = (ids, params) => { }; // 编辑部门 export const editDepartment = (ids, params) => { - return putRequest(`/department/${ids} `, params); + return putRequest(`/department/${ids}`, params); }; // 加载部门子级数据 export const loadDepartment = (id) => { diff --git a/seller/src/libs/util.js b/seller/src/libs/util.js index 98d757135..0414685cd 100644 --- a/seller/src/libs/util.js +++ b/seller/src/libs/util.js @@ -164,8 +164,14 @@ util.bootstrapDynamicRoutesFromCache = function () { } }; +/** 站点名称:优先取接口下发并缓存的站点名,兜底用本地配置 */ +util.getSiteName = function () { + return window.localStorage.getItem("sellersiteName") || config.title; +}; + util.title = function (title) { - title = title || `${config.title} 商家后台`; + const siteName = util.getSiteName(); + title = title ? `${title} - ${siteName}商家后台` : `${siteName} 商家后台`; window.document.title = title; }; @@ -508,9 +514,8 @@ util.initRouterNode = function (routers, data) { } const meta = {}; - meta.title = menu.title - ? menu.title + " - " + config.title + "商家后台" - : null; + // 站点后缀统一由 util.title 在路由跳转时动态拼接,避免初始化时定死 + meta.title = menu.title ? menu.title : null; meta.firstRouterName = item.firstRouterName; meta.keepAlive = menu.keepAlive ? true : false; menu.meta = meta; diff --git a/seller/src/router/router.js b/seller/src/router/router.js index 1de3618b8..4595dfb14 100644 --- a/seller/src/router/router.js +++ b/seller/src/router/router.js @@ -1,11 +1,11 @@ import Main from "@/views/Main.vue"; -import config from "@/config/index"; // 不作为Main组件的子页面展示的页面单独写,如下 export const loginRouter = { path: "/login", name: "login", meta: { - title: `登录 - ${config.title}商家后台` + // 站点后缀由 util.title 在路由跳转时动态拼接(站点名取自接口下发缓存) + title: "登录" }, component: () => import("@/views/login.vue") }; diff --git a/seller/src/styles/element.scss b/seller/src/styles/element.scss index 46e57cc61..9dc2f4b36 100644 --- a/seller/src/styles/element.scss +++ b/seller/src/styles/element.scss @@ -113,6 +113,11 @@ z-index: 4000 !important; } +/* 全局禁止 textarea 拖拽改变大小 */ +.el-textarea__inner { + resize: none; +} + /* 统一空状态:表格 / 树 / 列表无数据时的展示(未自定义 #empty 插槽的页面均生效) */ .el-table__empty-block { min-height: 160px; diff --git a/seller/src/views/ForgetPassword.vue b/seller/src/views/ForgetPassword.vue index 4b94906ed..bc7b8842d 100644 --- a/seller/src/views/ForgetPassword.vue +++ b/seller/src/views/ForgetPassword.vue @@ -107,7 +107,7 @@ Copyright © {{ year }} - Present {{ - config.title + siteName }} 版权所有 @@ -124,7 +124,7 @@ import { md5 } from "@/utils/md5.js"; import * as RegExp from "@/utils/regular.js"; import * as apiLogin from "@/api/index.js"; import { sendSms } from "@/api/common.js"; -import config from "@/config/index"; +import util from "@/libs/util.js"; import verify from "@/views/my-components/verify"; import { useAppStore } from "@/stores/app"; @@ -146,6 +146,8 @@ const form = reactive({ oncePasd: "", }); const year = new Date().getFullYear(); +// 站点名优先取接口下发缓存,兜底用本地配置 +const siteName = util.getSiteName(); const step = ref(0); const ruleInline = { mobile: [ diff --git a/seller/src/views/goods/goods-seller/alertQuantityWarn.vue b/seller/src/views/goods/goods-seller/alertQuantityWarn.vue index b93d51560..7de6e70cc 100644 --- a/seller/src/views/goods/goods-seller/alertQuantityWarn.vue +++ b/seller/src/views/goods/goods-seller/alertQuantityWarn.vue @@ -37,7 +37,12 @@ - + + + + + + @@ -54,7 +59,12 @@ - + + + + + + diff --git a/seller/src/views/goods/goods-seller/goods.vue b/seller/src/views/goods/goods-seller/goods.vue index ad0d77362..12656d4b4 100644 --- a/seller/src/views/goods/goods-seller/goods.vue +++ b/seller/src/views/goods/goods-seller/goods.vue @@ -6,74 +6,70 @@ :model="searchForm" inline label-width="70px" - class="search-form" + class="search-form goods-search-form" @keyup.enter="handleSearch" > -
- - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -89,7 +84,6 @@ v-model="searchForm.stockStatus" placeholder="全部" clearable - style="width: 240px" @change="onStockStatusChange" > @@ -97,34 +91,18 @@ - - ~ - +
+ + ~ + +
- - ~ - +
+ + ~ + +
搜索 @@ -172,7 +150,7 @@ @selection-change="onSelectionChange" > - +