diff --git a/src/api/trade/pricing/index.ts b/src/api/trade/pricing/index.ts index d0bd679..6fe2117 100644 --- a/src/api/trade/pricing/index.ts +++ b/src/api/trade/pricing/index.ts @@ -17,6 +17,15 @@ export function getPricingConfig(params: { subjectType: string; subjectId: strin }); } +/** 计价对象可选计费方式(workflow/business 使用;model 计价方式由配置规则决定,不调用) */ +export function getChargeModes(params: { subjectType: string; subjectId: string }) { + return request({ + url: '/shop-user-trade/pricing/controller/subjects/charge-modes', + method: 'get', + params, + }); +} + /** 新增/更新计价配置(id > 0 更新,0 新增;rules 传费率对象;id 兼容雪花字符串避免精度丢失) */ export function savePricingConfig(data: { id: string | number; diff --git a/src/layout/navBars/breadcrumb/user.vue b/src/layout/navBars/breadcrumb/user.vue index 01419d6..9dfa370 100644 --- a/src/layout/navBars/breadcrumb/user.vue +++ b/src/layout/navBars/breadcrumb/user.vue @@ -203,11 +203,12 @@ export default defineComponent({ } }, }) - .then(async () => { + .then(() => { // 手动退出登录也只清理登录态缓存,保留主题、语言等本地配置。 Session.clearAuth(); - // 显式回到登录页,避免保留之前受保护页面的重定向参数 - await router.replace('/login'); + // 整页跳转登录页(刷新重建路由实例):SPA 内 router.replace 不会重置已注册的动态路由, + // 重新登录时 setAddRoute 的 hasRoute 判断会跳过新菜单注册,出现"菜单显示但点击 404"(如价格管理页) + window.location.href = import.meta.env.BASE_URL + '#/login'; }) .catch(() => {}); } else if (path === 'wareHouse') { diff --git a/src/views/home/components/WorkflowFormCard.vue b/src/views/home/components/WorkflowFormCard.vue index 2f06165..ea224e3 100644 --- a/src/views/home/components/WorkflowFormCard.vue +++ b/src/views/home/components/WorkflowFormCard.vue @@ -33,6 +33,12 @@
+ + + + + +