From 514b4a467ecc3dd90281669aeef044fce3bdb59e Mon Sep 17 00:00:00 2001
From: maqian <maqian@shopex.cn>
Date: Fri, 7 Aug 2026 16:52:32 +0800
Subject: [PATCH] [TBID:ECX-9664] chore: merge master changes for release

---
 public/index.html                             |   2 +-
 src/api/selfhelpform.js                       |   8 +
 src/components/sp-form-plus/form-field.js     |   4 +-
 src/components/sp-icon/lucide-registry.js     |   8 +-
 .../sp-picker/pickers/picker-zitilist.vue     |   3 +
 src/i18n/locales/ar.json                      |   3 +
 src/i18n/locales/en.json                      |   3 +
 src/i18n/locales/zh-CN.json                   |   3 +
 src/i18n/locales/zh-TW.json                   |   3 +
 src/layout/basic/components/license-logo.vue  |   7 +-
 src/layout/basic/layout-sidebar.vue           |   7 +-
 src/router/index.js                           |   2 +
 src/router/routes/modules/sellers.js          |   2 +-
 src/router/routes/shopadmin/setting.js        |   2 +-
 src/router/src/route-setting.js               |   2 +-
 src/router/src/route-shopadmin-shopsetting.js |   2 +-
 src/utils/fetch.js                            |  11 +-
 src/utils/index.js                            |   1 +
 src/utils/publicPath.js                       |  30 +
 src/view/auth/login.vue                       |   4 +-
 src/view/base/account/roles.vue               | 263 -------
 src/view/base/account/storeroles.vue          | 278 --------
 src/view/base/shuyunLogin/index.vue           |   4 +-
 src/view/goods/mainCategory.vue               |  83 ++-
 src/view/mall/goods/audit/list.vue            | 154 +++--
 .../mall/marketing/distributionOrders.vue     | 143 ++--
 .../marketing/distributor_editor/index.vue    |   3 +-
 src/view/mall/trade/normalorders/list.vue     | 467 +++++++------
 src/view/mall/trade/shipping/templates.vue    |  11 +
 .../selfservice/registrationactivity.vue      | 149 ++--
 src/view/merchant/components/DaoDianZiti.vue  |   5 +-
 src/view/shoplist.vue                         |   4 +-
 src/view/wxapp/category/list.vue              |  28 +-
 src/views/core/authentication/login.vue       |  13 +-
 .../core/authentication/merchant-login.vue    |   9 +-
 src/views/core/authentication/shop-login.vue  |   9 +-
 .../core/authentication/shuyun-login.vue      |   4 +-
 .../core/authentication/supplier-login.vue    |   9 +-
 src/views/settings/role-store.vue             | 650 ++++++++++++++++++
 src/views/settings/systemConfig/payment.vue   |  27 +-
 src/views/store/shop-list.vue                 |   3 +-
 41 files changed, 1408 insertions(+), 1015 deletions(-)
 create mode 100644 src/utils/publicPath.js
 delete mode 100755 src/view/base/account/roles.vue
 delete mode 100755 src/view/base/account/storeroles.vue
 create mode 100755 src/views/settings/role-store.vue

diff --git a/public/index.html b/public/index.html
index 27779c4..a4ede0f 100755
--- a/public/index.html
+++ b/public/index.html
@@ -11,7 +11,7 @@
     <link rel="stylesheet" href="//at.alicdn.com/t/c/font_3832401_lyx1hsdvyee.css" />
     <link
       rel="shortcut icon"
-      href="<%= process.env.VUE_APP_PLATFORM === 'shuyun' ? '/favicon-shuyun.ico' : '/favicon.ico' %>"
+      href="<%= BASE_URL %><%= process.env.VUE_APP_PLATFORM === 'shuyun' ? 'favicon-shuyun.ico' : 'favicon.ico' %>"
     />
     <link rel="stylesheet" href="<%= BASE_URL %>loading.css" data-app-loading="inject-css" />
   </head>
diff --git a/src/api/selfhelpform.js b/src/api/selfhelpform.js
index d877f36..3ddc60e 100755
--- a/src/api/selfhelpform.js
+++ b/src/api/selfhelpform.js
@@ -175,6 +175,14 @@ export function regActivityUpdate(query) {
   })
 }
 
+export function regActivitySetIsShow(query) {
+  return fetch({
+    url: '/selfhelp/registrationActivity/setIsShow',
+    method: 'put',
+    params: query
+  })
+}
+
 // 活动
 export function regActivityInvalid(query) {
   return fetch({
diff --git a/src/components/sp-form-plus/form-field.js b/src/components/sp-form-plus/form-field.js
index b77e75f..366203f 100755
--- a/src/components/sp-form-plus/form-field.js
+++ b/src/components/sp-form-plus/form-field.js
@@ -252,7 +252,7 @@ export default {
             size={this.size || 'small'}
             type='date'
             value={this.modelValue}
-            prefix-icon={false}
+            prefix-icon=""
             {...props}
             on-input={this.handleInput}
           />
@@ -279,7 +279,7 @@ export default {
                 text: this.$t(s.text)
               }))
             }}
-            prefix-icon={false}
+            prefix-icon=""
             onInput={this.handleInput}
           />
         </div>
diff --git a/src/components/sp-icon/lucide-registry.js b/src/components/sp-icon/lucide-registry.js
index b426493..c176d1a 100644
--- a/src/components/sp-icon/lucide-registry.js
+++ b/src/components/sp-icon/lucide-registry.js
@@ -61,11 +61,17 @@ export const LUCIDE_ICONS = {
   Trash2
 }
 
+/** 与 HTML/内置名冲突时，全局注册用别名；LUCIDE_ICONS 键名不变，SpIcon 仍可用 name="image" */
+const GLOBAL_NAME_ALIASES = {
+  Image: 'ImageIcon'
+}
+
 /**
  * @param {import('vue').default} Vue
  */
 export function installLucideGlobal(Vue) {
   Object.keys(LUCIDE_ICONS).forEach((name) => {
-    Vue.component(name, LUCIDE_ICONS[name])
+    const globalName = GLOBAL_NAME_ALIASES[name] || name
+    Vue.component(globalName, LUCIDE_ICONS[name])
   })
 }
diff --git a/src/components/sp-picker/pickers/picker-zitilist.vue b/src/components/sp-picker/pickers/picker-zitilist.vue
index 35ed76d..91fda17 100755
--- a/src/components/sp-picker/pickers/picker-zitilist.vue
+++ b/src/components/sp-picker/pickers/picker-zitilist.vue
@@ -88,6 +88,9 @@ export default {
         ...params,
         name: this.formData.keywords
       }
+      if (this.value.rel_distributor_id) {
+        params.rel_distributor_id = this.value.rel_distributor_id
+      }
       return params
     },
     afterSearch(response) {
diff --git a/src/i18n/locales/ar.json b/src/i18n/locales/ar.json
index c861d3b..91c3c2e 100644
--- a/src/i18n/locales/ar.json
+++ b/src/i18n/locales/ar.json
@@ -11422,6 +11422,7 @@
   "15ecc99b.047fab": "منتهي",
   "15ecc99b.01be42": "سيتم إنهاء هذا النشاط نهائياً. متابعة؟",
   "15ecc99b.b69694": "تم تحديث حالة النشاط بنجاح",
+  "15ecc99b.69be67": "تم التعديل بنجاح",
   "3aa73191.6ea1fe": "المعلومات الأساسية",
   "3aa73191.39834b": "اسم النشاط",
   "3aa73191.7528b3": "أدخل اسم النشاط",
@@ -14969,6 +14970,7 @@
   "0bd6d248.e26c17": "حذف هذا التصنيف سيحذف جميع التصنيفات الفرعية. تأكيد؟",
   "0bd6d248.3b1083": "تم الحفظ بنجاح",
   "c7eb6efa.7b3c0e": "ربط تصنيف المبيعات",
+  "c7eb6efa.a1a244": "ربط تصنيف الإدارة",
   "c7eb6efa.c6aa35": "تحرير القالب",
   "c7eb6efa.6fef15": "إضافة قالب",
   "c7eb6efa.d9df76": "معرف الصفحة",
@@ -16643,6 +16645,7 @@
   "2dc17300.38cf16": "تأكيد",
   "2dc17300.625fb2": "إلغاء",
   "2dc17300.1fe03c": "تم حذف التصنيف بنجاح",
+  "2dc17300.6891b4": "عرض في الواجهة",
   "7de71dd3.8d3bf9": "نطاق التاريخ:",
   "7de71dd3.b44c0f": "تاريخ البداية",
   "7de71dd3.1d468b": "تاريخ النهاية",
diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index 3968406..7e84d14 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -11422,6 +11422,7 @@
   "15ecc99b.047fab": "Ended",
   "15ecc99b.01be42": "This will permanently terminate this activity. Continue?",
   "15ecc99b.b69694": "Activity status updated successfully",
+  "15ecc99b.69be67": "Modification successful",
   "3aa73191.6ea1fe": "Basic info",
   "3aa73191.39834b": "Activity name",
   "3aa73191.7528b3": "Enter activity name",
@@ -14969,6 +14970,7 @@
   "0bd6d248.e26c17": "Deleting this category will remove all its subcategories. Confirm?",
   "0bd6d248.3b1083": "Saved successfully",
   "c7eb6efa.7b3c0e": "Link sales category",
+  "c7eb6efa.a1a244": "Link management category",
   "c7eb6efa.c6aa35": "Edit template",
   "c7eb6efa.6fef15": "Add template",
   "c7eb6efa.d9df76": "Page ID",
@@ -16644,6 +16646,7 @@
   "2dc17300.38cf16": "OK",
   "2dc17300.625fb2": "Cancel",
   "2dc17300.1fe03c": "Category deleted successfully",
+  "2dc17300.6891b4": "Show on frontend",
   "7de71dd3.8d3bf9": "Date range:",
   "7de71dd3.b44c0f": "Start date",
   "7de71dd3.1d468b": "End date",
diff --git a/src/i18n/locales/zh-CN.json b/src/i18n/locales/zh-CN.json
index ae3d074..140a65e 100644
--- a/src/i18n/locales/zh-CN.json
+++ b/src/i18n/locales/zh-CN.json
@@ -11422,6 +11422,7 @@
   "15ecc99b.047fab": "已结束",
   "15ecc99b.01be42": "此操作将永久终止该活动, 是否继续?",
   "15ecc99b.b69694": "修改活动状态成功",
+  "15ecc99b.69be67": "修改成功",
   "3aa73191.6ea1fe": "基础信息",
   "3aa73191.39834b": "活动名称",
   "3aa73191.7528b3": "请输入活动名称",
@@ -14969,6 +14970,7 @@
   "0bd6d248.e26c17": "删该分类将会删除其所有子级，确认删除吗？",
   "0bd6d248.3b1083": "保存成功",
   "c7eb6efa.7b3c0e": "关联销售分类",
+  "c7eb6efa.a1a244": "关联管理分类",
   "c7eb6efa.c6aa35": "编辑模板",
   "c7eb6efa.6fef15": "添加模板",
   "c7eb6efa.d9df76": "页面ID",
@@ -16644,6 +16646,7 @@
   "2dc17300.38cf16": "确定",
   "2dc17300.625fb2": "取消",
   "2dc17300.1fe03c": "删除分类成功",
+  "2dc17300.6891b4": "前台是否显示",
   "7de71dd3.8d3bf9": "日期范围:",
   "7de71dd3.b44c0f": "开始日期",
   "7de71dd3.1d468b": "结束日期",
diff --git a/src/i18n/locales/zh-TW.json b/src/i18n/locales/zh-TW.json
index 4904c81..ef74497 100644
--- a/src/i18n/locales/zh-TW.json
+++ b/src/i18n/locales/zh-TW.json
@@ -11422,6 +11422,7 @@
   "15ecc99b.047fab": "已結束",
   "15ecc99b.01be42": "此操作將永久終止該活動, 是否繼續?",
   "15ecc99b.b69694": "修改活動狀態成功",
+  "15ecc99b.69be67": "修改成功",
   "3aa73191.6ea1fe": "基礎信息",
   "3aa73191.39834b": "活動名稱",
   "3aa73191.7528b3": "請輸入活動名稱",
@@ -14954,6 +14955,7 @@
   "0bd6d248.e26c17": "刪該分類將會刪除其所有子級，確認刪除嗎？",
   "0bd6d248.3b1083": "保存成功",
   "c7eb6efa.7b3c0e": "關聯銷售分類",
+  "c7eb6efa.a1a244": "關聯管理分類",
   "c7eb6efa.c6aa35": "編輯模板",
   "c7eb6efa.6fef15": "添加模板",
   "c7eb6efa.d9df76": "頁面ID",
@@ -16629,6 +16631,7 @@
   "2dc17300.38cf16": "確定",
   "2dc17300.625fb2": "取消",
   "2dc17300.1fe03c": "刪除分類成功",
+  "2dc17300.6891b4": "前臺是否顯示",
   "7de71dd3.8d3bf9": "日期範圍:",
   "7de71dd3.b44c0f": "開始日期",
   "7de71dd3.1d468b": "結束日期",
diff --git a/src/layout/basic/components/license-logo.vue b/src/layout/basic/components/license-logo.vue
index eecf552..787d80c 100644
--- a/src/layout/basic/components/license-logo.vue
+++ b/src/layout/basic/components/license-logo.vue
@@ -8,7 +8,7 @@
     <!-- If you remove or alter Shopex brand identifiers, you must obtain a branding removal license from Shopex.  Contact us at:  http://www.shopex.cn to purchase a branding removal license.   -->
     <div class="style-medium size-13 text-[#B3B3B3]">Powered by</div>
     <SpImage
-      src="/images/logo-powerby.png"
+      :src="logoPowerBySrc"
       class="cursor-pointer mt-1"
       height="15"
       fit="contain"
@@ -18,11 +18,14 @@
 </template>
 
 <script>
+import { resolvePublicAsset } from '@/utils'
+
 export default {
   name: 'LicenseLogo',
   data() {
     return {
-      isYD: process.env.VUE_APP_PLATFORM == 'yd'
+      isYD: process.env.VUE_APP_PLATFORM == 'yd',
+      logoPowerBySrc: resolvePublicAsset('images/logo-powerby.png')
     }
   },
   computed: {},
diff --git a/src/layout/basic/layout-sidebar.vue b/src/layout/basic/layout-sidebar.vue
index d14ba74..6f6c329 100755
--- a/src/layout/basic/layout-sidebar.vue
+++ b/src/layout/basic/layout-sidebar.vue
@@ -9,7 +9,7 @@
       <div class="flex items-center mt-2 px-2">
         <SpImage
           class="bg-white mx-auto"
-          :src="$store.state.system?.logo || '/images/logo.png'"
+          :src="$store.state.system?.logo || defaultLogo"
           height="38"
           fit="contain"
         />
@@ -101,7 +101,7 @@
 </template>
 
 <script>
-import { getBasePath, getSystemTitle } from '@/utils'
+import { getBasePath, getSystemTitle, resolvePublicAsset } from '@/utils'
 import Config from '@/config'
 
 export default {
@@ -111,7 +111,8 @@ export default {
       mainMenus: [],
       subMenus: [],
       //当前打开的二级菜单标识列表
-      openedMenus: []
+      openedMenus: [],
+      defaultLogo: resolvePublicAsset('images/logo.png')
     }
   },
   computed: {
diff --git a/src/router/index.js b/src/router/index.js
index fcd52aa..4060ca2 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -11,6 +11,8 @@ Vue.use(VueRouter)
 
 const router = new VueRouter({
   mode: 'history',
+  // 与 vue.config.js publicPath / VUE_APP_PUBLIC_PATH 对齐（宝塔部署为 /admin/）
+  base: process.env.VUE_APP_PUBLIC_PATH || '/',
   routes
 })
 
diff --git a/src/router/routes/modules/sellers.js b/src/router/routes/modules/sellers.js
index 8b5dd23..3f91c48 100755
--- a/src/router/routes/modules/sellers.js
+++ b/src/router/routes/modules/sellers.js
@@ -80,7 +80,7 @@ const routes = [
           aliasName: 'storemanager_application',
           icon: 'pay-circle',
           title: i18n.t('fb06c42c.20d385'),
-          permissions: ['sellers.sellersmanager.storemanager_application']
+          permissions: ['sellers.salesorganization.application']
         },
         component: () => import('@/view/mall/marketing/merchantVerify'),
         children: [
diff --git a/src/router/routes/shopadmin/setting.js b/src/router/routes/shopadmin/setting.js
index 38102bb..c6cdf6e 100755
--- a/src/router/routes/shopadmin/setting.js
+++ b/src/router/routes/shopadmin/setting.js
@@ -36,7 +36,7 @@ const routes = [
           title: '55c94d66.c115e5',
           permissions: ['shopsetting.distributor-staff.platformstaffroles']
         },
-        component: () => import('@/view/base/account/storeroles')
+        component: () => import('@/views/settings/role-store')
       },
       {
         name: `systemAccountDeliveryPersonManagement`,
diff --git a/src/router/src/route-setting.js b/src/router/src/route-setting.js
index d7d2e13..b9a2acd 100755
--- a/src/router/src/route-setting.js
+++ b/src/router/src/route-setting.js
@@ -26,7 +26,7 @@ export default {
     {
       path: 'staff/Merchantstaffroles',
       name: 'b51bc270.910b4e',
-      component: () => import('@/view/base/account/storeroles')
+      component: () => import('@/views/settings/role-store')
     },
     {
       path: 'delivery/logistics',
diff --git a/src/router/src/route-shopadmin-shopsetting.js b/src/router/src/route-shopadmin-shopsetting.js
index fb48572..1a1929d 100755
--- a/src/router/src/route-shopadmin-shopsetting.js
+++ b/src/router/src/route-shopadmin-shopsetting.js
@@ -17,7 +17,7 @@ export default {
     {
       path: 'staff/Merchantstaffroles',
       name: '9e5a95d6.910b4e',
-      component: () => import('@/view/base/account/storeroles')
+      component: () => import('@/views/settings/role-store')
     },
     {
       path: 'staff/selfdeliverystaff',
diff --git a/src/utils/fetch.js b/src/utils/fetch.js
index 4bedc88..18224f4 100755
--- a/src/utils/fetch.js
+++ b/src/utils/fetch.js
@@ -14,7 +14,8 @@ import {
   isInMerchant,
   isObject,
   IS_DISTRIBUTOR,
-  IS_SUPPLIER
+  IS_SUPPLIER,
+  resolveAppPath
 } from '@/utils'
 
 function resolveGetMethod(inst) {
@@ -55,13 +56,13 @@ export function errorToast(data) {
     // Router.push( { path: '/auth/login', replace: true } )
     // 如果是商家入驻
     if (isInMerchant()) {
-      window.location.href = '/merchant'
+      window.location.href = resolveAppPath('/merchant')
     } else if (IS_DISTRIBUTOR()) {
-      window.location.href = '/shopadmin'
+      window.location.href = resolveAppPath('/shopadmin')
     } else if (IS_SUPPLIER()) {
-      window.location.href = '/supplier'
+      window.location.href = resolveAppPath('/supplier')
     } else {
-      window.location.href = '/'
+      window.location.href = resolveAppPath('/')
     }
   } else {
     Vue.prototype.$message.error(message)
diff --git a/src/utils/index.js b/src/utils/index.js
index 6a42cfc..bcff948 100755
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -16,6 +16,7 @@ export * from './src/type-helper'
 export * from './src/utils'
 
 export * from './jwt'
+export { getPublicPath, resolvePublicAsset, resolveAppPath } from './publicPath'
 
 export { install as VuePrototype } from './src/prototype'
 
diff --git a/src/utils/publicPath.js b/src/utils/publicPath.js
new file mode 100644
index 0000000..8aa491c
--- /dev/null
+++ b/src/utils/publicPath.js
@@ -0,0 +1,30 @@
+/**
+ * 静态资源 / 应用路径（适配宝塔同域 /admin/ 等子路径部署）
+ * 构建时由 VUE_APP_PUBLIC_PATH 注入，本地开发默认为 /
+ */
+
+export function getPublicPath() {
+  const p = process.env.VUE_APP_PUBLIC_PATH || '/'
+  if (!p || p === '/') return ''
+  return String(p).replace(/\/+$/, '')
+}
+
+/**
+ * @param {string} path 相对 public 的路径，如 images/logo.png 或 /images/logo.png
+ * @returns {string}
+ */
+export function resolvePublicAsset(path = '') {
+  const clean = String(path || '').replace(/^\/+/, '')
+  const base = getPublicPath()
+  if (!clean) return base ? `${base}/` : '/'
+  return base ? `${base}/${clean}` : `/${clean}`
+}
+
+/**
+ * 带 publicPath 前缀的应用内跳转地址（如 login、shopadmin）
+ * @param {string} path
+ * @returns {string}
+ */
+export function resolveAppPath(path = '/') {
+  return resolvePublicAsset(path)
+}
diff --git a/src/view/auth/login.vue b/src/view/auth/login.vue
index 3286b28..a544d00 100755
--- a/src/view/auth/login.vue
+++ b/src/view/auth/login.vue
@@ -116,7 +116,7 @@ const login_bg_ecshopx = require(`@/assets/imgs/login-b2b2c.jpg`)
 const login_bg_free_ecshopx = require(`@/assets/imgs/login-free-ecshopx.jpg`)
 import { mapMutations } from 'vuex'
 import { requiredRules, MinRules } from '@/utils/validate'
-import { decodeJwtPayload, unescape } from '@/utils'
+import { decodeJwtPayload, unescape, resolveAppPath } from '@/utils'
 import loadingBtn from '@/components/loading-btn'
 export default {
   components: {
@@ -300,7 +300,7 @@ export default {
           this.$router.push({ path: '/supplier/setting/supplier_register' })
         }
       } else {
-        window.location.href = '/'
+        window.location.href = resolveAppPath('/')
       }
     }
   }
diff --git a/src/view/base/account/roles.vue b/src/view/base/account/roles.vue
deleted file mode 100755
index 3eee99d..0000000
--- a/src/view/base/account/roles.vue
+++ /dev/null
@@ -1,263 +0,0 @@
-<!--
-  Copyright © ShopeX （http://www.shopex.cn）. All rights reserved.
-  See LICENSE file for license details.
--->
-
-<template>
-  <div>
-    <el-row :gutter="20">
-      <el-col :span="12">
-        <el-button type="primary" icon="plus" @click="addRoleLabels">
-          {{ $t('31921bc0.596b04') }}
-        </el-button>
-      </el-col>
-      <el-col :span="12">
-        <el-input v-model="params.role_name" :placeholder="$t('31921bc0.10a6f1')">
-          <el-button slot="append" icon="el-icon-search" @click="roleSearch" />
-        </el-input>
-      </el-col>
-    </el-row>
-    <el-table v-loading="loading" :data="rolesList" :height="wheight - 160">
-      <el-table-column prop="role_name" :label="$t('31921bc0.10a6f1')" />
-      <el-table-column prop="permission" :label="$t('31921bc0.86a1be')">
-        <template slot-scope="scope">
-          <el-tree :data="scope.row.permission_tree" :props="defaultProps" />
-        </template>
-      </el-table-column>
-      <el-table-column :label="$t('31921bc0.2b6bc0')">
-        <template slot-scope="scope">
-          <div class="operating-icons gap-2">
-            <el-button type="text" @click="editRoleAction(scope.$index, scope.row)">
-              {{ $t('31921bc0.95b351') }}
-            </el-button>
-            <el-button type="text" @click="deleteRoleAction(scope.$index, scope.row)">
-              {{ $t('31921bc0.2f4aad') }}
-            </el-button>
-          </div>
-        </template>
-      </el-table-column>
-    </el-table>
-    <div v-if="total_count > params.pageSize" class="content-center content-top-padded">
-      <el-pagination
-        layout="prev, pager, next"
-        :current-page.sync="params.page"
-        :total="total_count"
-        :page-size="params.pageSize"
-        @current-change="handleCurrentChange"
-      />
-    </div>
-    <!-- 添加、编辑标识-开始 -->
-    <el-dialog :title="editRoleTitle" :visible.sync="editRoleVisible" :before-close="handleCancel">
-      <template>
-        <el-form ref="form" :model="form" class="demo-ruleForm" label-width="90px">
-          <el-form-item :label="$t('31921bc0.10a6f1')">
-            <el-col :span="14">
-              <el-input
-                v-model="form.role_name"
-                :maxlength="20"
-                :placeholder="$t('31921bc0.395730')"
-              />
-            </el-col>
-          </el-form-item>
-          <el-form-item :label="$t('31921bc0.86a1be')">
-            <el-tree
-              ref="tree"
-              :data="$store.getters.menus"
-              :default-checked-keys="defaultCheckedKeys"
-              node-key="shopmenu_id"
-              :props="defaultProps"
-              show-checkbox
-            />
-          </el-form-item>
-        </el-form>
-      </template>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click.native="handleCancel"> {{ $t('31921bc0.625fb2') }} </el-button>
-        <el-button type="primary" @click="submitRoleAction">
-          {{ $t('31921bc0.be5fbb') }}
-        </el-button>
-      </div>
-    </el-dialog>
-    <!-- 添加、编辑基础物料-结束 -->
-  </div>
-</template>
-<script>
-import { mapGetters } from 'vuex'
-import { Message } from 'element-ui'
-import {
-  createRoles,
-  getRolesInfo,
-  getRolesList,
-  updateRolesInfo,
-  deleteRole
-} from '../../../api/company'
-export default {
-  data() {
-    return {
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      isEdit: false,
-      editRoleVisible: false,
-      editRoleTitle: '',
-      form: {
-        role_name: '',
-        role_id: '',
-        permission: []
-      },
-      defaultCheckedKeys: [],
-      rolesList: [],
-      loading: false,
-      total_count: 0,
-      params: {
-        role_name: '',
-        page: 1,
-        pageSize: 20
-      }
-    }
-  },
-  computed: {
-    ...mapGetters(['wheight'])
-  },
-  mounted() {
-    this.getRolesDataList()
-  },
-  methods: {
-    handleCancel() {
-      this.editRoleVisible = false
-      this.$refs.tree.setCheckedKeys([])
-    },
-    handleCurrentChange(page_num) {
-      this.params.page = page_num
-      this.getRolesDataList()
-    },
-    addRoleLabels() {
-      // 添加物料弹框
-      this.editRoleTitle = this.$t('31921bc0.d36f39')
-      this.editRoleVisible = true
-      this.isEdit = false
-      this.form.role_name = ''
-      this.form.role_id = ''
-      this.form.permission = []
-      if (this.$refs.tree) {
-        this.$refs.tree.setCheckedKeys([])
-      } else {
-        this.defaultCheckedKeys = []
-      }
-    },
-    editRoleAction(index, row) {
-      // 编辑物料弹框
-      this.editRoleTitle = this.$t('31921bc0.b0acd5')
-      this.editRoleVisible = true
-      this.isEdit = true
-      this.form.role_name = row.role_name
-      this.form.role_id = row.role_id
-      if (this.$refs.tree) {
-        this.$refs.tree.setCheckedKeys(row.permission.shopmenu_ids)
-      } else {
-        this.defaultCheckedKeys = row.permission.shopmenu_ids
-      }
-    },
-    submitRoleAction() {
-      // 提交物料
-
-      var checkedNodes = this.$refs.tree.getCheckedNodes()
-      var checkedKeys = []
-      checkedNodes.forEach((item) => {
-        if (!item.isChildrenMenu) {
-          checkedKeys.push(item.shopmenu_id)
-        }
-      })
-
-      var version = this.$store.getters.menus[0].version
-      this.form.permission = { shopmenu_ids: checkedKeys, version: version }
-      if (this.form.role_id) {
-        updateRolesInfo(this.form.role_id, this.form).then((response) => {
-          this.editRoleVisible = false
-          this.getRolesDataList()
-          this.handleCancel()
-        })
-      } else {
-        createRoles(this.form).then((response) => {
-          this.editRoleVisible = false
-          this.getRolesDataList()
-          this.handleCancel()
-        })
-      }
-    },
-    roleSearch() {
-      this.params.page = 1
-      this.getRolesDataList()
-    },
-    getRolesDataList() {
-      this.loading = true
-      this.params.service_type = 'timescard'
-      getRolesList(this.params)
-        .then((response) => {
-          this.rolesList = response.data.data.list
-          this.total_count = response.data.data.total_count
-          this.loading = false
-        })
-        .catch((error) => {
-          this.loading = false
-          this.$message({
-            type: 'error',
-            message: this.$t('31921bc0.929b60')
-          })
-        })
-    },
-    deleteRoleAction(index, row) {
-      this.$confirm(this.$t('31921bc0.82cd52'), this.$t('31921bc0.02d981'), {
-        confirmButtonText: this.$t('31921bc0.38cf16'),
-        cancelButtonText: this.$t('31921bc0.625fb2'),
-        type: 'warning'
-      })
-        .then(() => {
-          deleteRole(row.role_id).then((response) => {
-            this.rolesList.splice(index, 1)
-            this.$message({
-              message: this.$t('31921bc0.0007d1'),
-              type: 'success',
-              duration: 5 * 1000
-            })
-          })
-        })
-        .catch(() => {
-          this.$message({
-            type: 'info',
-            message: this.$t('31921bc0.2111cc')
-          })
-        })
-    }
-  }
-}
-</script>
-<style lang="scss">
-.el-row {
-  margin-bottom: 20px;
-  &:last-child {
-    margin-bottom: 0;
-  }
-}
-.el-col {
-  border-radius: 4px;
-}
-.bg-purple-dark {
-  background: #99a9bf;
-}
-.bg-purple {
-  background: #d3dce6;
-}
-.bg-purple-light {
-  background: #e5e9f2;
-}
-.grid-content {
-  border-radius: 4px;
-  min-height: 10px;
-}
-.row-bg {
-  padding: 10px 0;
-  background-color: #f9fafc;
-}
-</style>
diff --git a/src/view/base/account/storeroles.vue b/src/view/base/account/storeroles.vue
deleted file mode 100755
index 7cb23bf..0000000
--- a/src/view/base/account/storeroles.vue
+++ /dev/null
@@ -1,278 +0,0 @@
-<!--
-  Copyright © ShopeX （http://www.shopex.cn）. All rights reserved.
-  See LICENSE file for license details.
--->
-
-<template>
-  <div>
-    <el-row :gutter="20">
-      <el-col :span="12">
-        <el-button type="primary" icon="plus" @click="addRoleLabels">
-          {{ $t('1d952be7.596b04') }}
-        </el-button>
-      </el-col>
-      <el-col :span="12">
-        <el-input v-model="params.role_name" :placeholder="$t('1d952be7.10a6f1')">
-          <el-button slot="append" icon="el-icon-search" @click="roleSearch" />
-        </el-input>
-      </el-col>
-    </el-row>
-    <el-table v-loading="loading" :data="rolesList" :height="wheight - 160">
-      <el-table-column prop="role_name" :label="$t('1d952be7.10a6f1')" />
-      <el-table-column prop="permission" :label="$t('1d952be7.86a1be')">
-        <template slot-scope="scope">
-          <el-tree :data="scope.row.permission_tree" :props="defaultProps" />
-        </template>
-      </el-table-column>
-      <el-table-column :label="$t('1d952be7.2b6bc0')">
-        <template slot-scope="scope">
-          <div class="operating-icons gap-2">
-            <el-button type="text" @click="editRoleAction(scope.$index, scope.row)">
-              {{ $t('1d952be7.95b351') }}
-            </el-button>
-            <el-button type="text" @click="deleteRoleAction(scope.$index, scope.row)">
-              {{ $t('1d952be7.2f4aad') }}
-            </el-button>
-          </div>
-        </template>
-      </el-table-column>
-    </el-table>
-    <div v-if="total_count > params.pageSize" class="content-center content-top-padded">
-      <el-pagination
-        layout="prev, pager, next"
-        :current-page.sync="params.page"
-        :total="total_count"
-        :page-size="params.pageSize"
-        @current-change="handleCurrentChange"
-      />
-    </div>
-    <!-- 添加、编辑标识-开始 -->
-    <el-dialog :title="editRoleTitle" :visible.sync="editRoleVisible" :before-close="handleCancel">
-      <template>
-        <el-form ref="form" :model="form" class="demo-ruleForm" label-width="90px">
-          <el-form-item :label="$t('1d952be7.10a6f1')">
-            <el-col :span="14">
-              <el-input
-                v-model="form.role_name"
-                :maxlength="20"
-                :placeholder="$t('1d952be7.395730')"
-              />
-            </el-col>
-          </el-form-item>
-          <el-form-item :label="$t('1d952be7.86a1be')">
-            <el-tree
-              ref="tree"
-              :data="menuTreeData"
-              :default-checked-keys="defaultCheckedKeys"
-              node-key="alias_name"
-              :props="defaultProps"
-              show-checkbox
-            />
-          </el-form-item>
-        </el-form>
-      </template>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click.native="handleCancel"> {{ $t('1d952be7.625fb2') }} </el-button>
-        <el-button type="primary" @click="submitRoleAction">
-          {{ $t('1d952be7.be5fbb') }}
-        </el-button>
-      </div>
-    </el-dialog>
-    <!-- 添加、编辑基础物料-结束 -->
-  </div>
-</template>
-<script>
-import { mapGetters } from 'vuex'
-import { Message } from 'element-ui'
-import {
-  createRoles,
-  getRolesInfo,
-  getRolesList,
-  updateRolesInfo,
-  deleteRole,
-  getPermissionList
-} from '../../../api/company'
-export default {
-  data() {
-    return {
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      isEdit: false,
-      editRoleVisible: false,
-      editRoleTitle: '',
-      form: {
-        role_name: '',
-        role_id: '',
-        role_source: 'distributor',
-        permission: []
-      },
-      defaultCheckedKeys: [],
-      rolesList: [],
-      loading: false,
-      total_count: 0,
-      params: {
-        role_name: '',
-        role_source: 'distributor',
-        page: 1,
-        pageSize: 20
-      },
-      menuTreeData: []
-    }
-  },
-  computed: {
-    ...mapGetters(['wheight'])
-  },
-  mounted() {
-    this.getMenu()
-    this.getRolesDataList()
-  },
-  methods: {
-    handleCancel() {
-      this.editRoleVisible = false
-      this.$refs.tree.setCheckedKeys([])
-    },
-    handleCurrentChange(page_num) {
-      this.params.page = page_num
-      this.getRolesDataList()
-    },
-    addRoleLabels() {
-      // 添加物料弹框
-      this.editRoleTitle = this.$t('1d952be7.d36f39')
-      this.editRoleVisible = true
-      this.isEdit = false
-      this.form.role_name = ''
-      this.form.role_id = ''
-      this.form.role_source = 'distributor'
-      this.form.permission = []
-      console.log(this.$refs.tree)
-      if (this.$refs.tree) {
-        this.$refs.tree.setCheckedKeys([])
-      } else {
-        this.defaultCheckedKeys = []
-      }
-    },
-    editRoleAction(index, row) {
-      // 编辑物料弹框
-      this.editRoleTitle = this.$t('1d952be7.b0acd5')
-      this.editRoleVisible = true
-      this.isEdit = true
-      this.form.role_source = 'distributor'
-      this.form.role_name = row.role_name
-      this.form.role_id = row.role_id
-      if (this.$refs.tree) {
-        this.$refs.tree.setCheckedKeys(row.permission.shopmenu_alias_name)
-      } else {
-        this.defaultCheckedKeys = row.permission.shopmenu_alias_name
-      }
-    },
-    submitRoleAction() {
-      // 提交物料
-
-      var checkedNodes = this.$refs.tree.getCheckedNodes()
-      var checkedKeys = []
-      checkedNodes.forEach((item) => {
-        if (!item.isChildrenMenu) {
-          checkedKeys.push(item.alias_name)
-        }
-      })
-
-      var version = 3 //this.$store.getters.menus[0].version
-      this.form.permission = { shopmenu_alias_name: checkedKeys, version: version }
-      if (this.form.role_id) {
-        updateRolesInfo(this.form.role_id, this.form).then((response) => {
-          this.editRoleVisible = false
-          this.getRolesDataList()
-          this.handleCancel()
-        })
-      } else {
-        createRoles(this.form).then((response) => {
-          this.editRoleVisible = false
-          this.getRolesDataList()
-          this.handleCancel()
-        })
-      }
-    },
-    roleSearch() {
-      this.params.page = 1
-      this.getRolesDataList()
-    },
-    getRolesDataList() {
-      this.loading = true
-      this.params.service_type = 'timescard'
-      getRolesList(this.params)
-        .then((response) => {
-          this.rolesList = response.data.data.list
-          this.total_count = response.data.data.total_count
-          this.loading = false
-        })
-        .catch((error) => {
-          this.loading = false
-          this.$message({
-            type: 'error',
-            message: this.$t('1d952be7.929b60')
-          })
-        })
-    },
-    deleteRoleAction(index, row) {
-      this.$confirm(this.$t('1d952be7.82cd52'), this.$t('1d952be7.02d981'), {
-        confirmButtonText: this.$t('1d952be7.38cf16'),
-        cancelButtonText: this.$t('1d952be7.625fb2'),
-        type: 'warning'
-      })
-        .then(() => {
-          deleteRole(row.role_id).then((response) => {
-            this.rolesList.splice(index, 1)
-            this.$message({
-              message: this.$t('1d952be7.0007d1'),
-              type: 'success',
-              duration: 5 * 1000
-            })
-          })
-        })
-        .catch(() => {
-          this.$message({
-            type: 'info',
-            message: this.$t('1d952be7.2111cc')
-          })
-        })
-    },
-    getMenu() {
-      let param = { version: 3 }
-      getPermissionList(param).then((res) => {
-        this.menuTreeData = res.data.data
-        console.log(this.menuTreeData)
-      })
-    }
-  }
-}
-</script>
-<style lang="scss">
-.el-row {
-  margin-bottom: 20px;
-  &:last-child {
-    margin-bottom: 0;
-  }
-}
-.el-col {
-  border-radius: 4px;
-}
-.bg-purple-dark {
-  background: #99a9bf;
-}
-.bg-purple {
-  background: #d3dce6;
-}
-.bg-purple-light {
-  background: #e5e9f2;
-}
-.grid-content {
-  border-radius: 4px;
-  min-height: 10px;
-}
-.row-bg {
-  padding: 10px 0;
-  background-color: #f9fafc;
-}
-</style>
diff --git a/src/view/base/shuyunLogin/index.vue b/src/view/base/shuyunLogin/index.vue
index 3dc437b..cbbb4b2 100755
--- a/src/view/base/shuyunLogin/index.vue
+++ b/src/view/base/shuyunLogin/index.vue
@@ -11,7 +11,7 @@
 
 <script>
 import { mapMutations } from 'vuex'
-import { decodeJwtPayload, unescape } from '@/utils'
+import { decodeJwtPayload, unescape, resolveAppPath } from '@/utils'
 export default {
   data() {
     return {
@@ -98,7 +98,7 @@ export default {
       } else if (this.loginType == 'merchant') {
         this.$router.push({ path: '/merchant' })
       } else {
-        window.location.href = '/'
+        window.location.href = resolveAppPath('/')
       }
     },
     async getAgreementContent() {
diff --git a/src/view/goods/mainCategory.vue b/src/view/goods/mainCategory.vue
index d01c080..562bdd4 100755
--- a/src/view/goods/mainCategory.vue
+++ b/src/view/goods/mainCategory.vue
@@ -112,6 +112,21 @@
             </div>
           </template>
         </el-table-column>
+        <el-table-column
+          v-if="showIsShowFront"
+          :label="$t('2dc17300.6891b4')"
+          width="120"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <el-switch
+              :value="scope.row.is_show_front"
+              active-value="1"
+              inactive-value="0"
+              @change="(val) => onIsShowFrontChange(scope.row, val)"
+            />
+          </template>
+        </el-table-column>
         <el-table-column prop="sort" :label="$t('2dc17300.53eb44')" width="140">
           <template slot-scope="scope">
             <div>{{ scope.row.sort }}</div>
@@ -177,7 +192,8 @@ export default {
         sort: 0,
         parent_id: 0,
         parent_name: '',
-        image_url: ''
+        image_url: '',
+        is_show_front: '1'
       },
       categoryFormList: [
         {
@@ -188,11 +204,6 @@ export default {
           required: true,
           message: this.$t('2dc17300.281bad')
         },
-        {
-          label: this.$t('2dc17300.53eb44'),
-          key: 'sort',
-          type: 'number'
-        },
         {
           label: this.$t('2dc17300.dc1eed'),
           key: 'parent_name',
@@ -204,6 +215,19 @@ export default {
           label: this.$t('2dc17300.b34dc8'),
           key: 'image_url',
           component: ({ key }, value) => <SpImagePicker v-model={value[key]} />
+        },
+        {
+          label: this.$t('2dc17300.6891b4'),
+          key: 'is_show_front',
+          isShow: () => this.showIsShowFront,
+          component: ({ key }, value) => (
+            <el-switch v-model={value[key]} active-value='1' inactive-value='0' />
+          )
+        },
+        {
+          label: this.$t('2dc17300.53eb44'),
+          key: 'sort',
+          type: 'number'
         }
       ],
       profitDialog: false,
@@ -244,6 +268,12 @@ export default {
       ]
     }
   },
+  computed: {
+    // 仅 B2B2C：bbc 构建 + platform 运行时展示「前台是否显示」
+    showIsShowFront() {
+      return process.env.VUE_APP_PLATFORM === 'bbc' && this.VERSION_PLATFORM()
+    }
+  },
   created() {
     this.mapData = new Map()
   },
@@ -277,18 +307,21 @@ export default {
         sort: 0,
         parent_id: 0,
         parent_name: '',
-        image_url: ''
+        image_url: '',
+        is_show_front: '1'
       }
       this.categoryDialog = true
     },
-    // 编辑分类
-    editCategory({ parent_id, category_id, category_name, sort, image_url }) {
+    // 编辑分类（与列表「前台是否显示」开关保持一致：统一为 '1'/'0'）
+    editCategory({ parent_id, category_id, category_name, sort, image_url, is_show_front }) {
+      const showFront = is_show_front === 1 || is_show_front === '1' || is_show_front === true
       this.categoryForm = {
         category_id,
         category_name,
         sort,
         parent_id,
-        image_url
+        image_url,
+        is_show_front: showFront ? '1' : '0'
       }
       this.categoryDialog = true
     },
@@ -302,10 +335,23 @@ export default {
         sort: 0,
         parent_id: category_id,
         parent_name: category_name,
-        image_url: ''
+        image_url: '',
+        is_show_front: '1'
       }
       this.categoryDialog = true
     },
+    async onIsShowFrontChange(row, val) {
+      try {
+        await this.$api.goods.editCategory({
+          category_id: row.category_id,
+          is_show_front: val
+        })
+        this.$set(row, 'is_show_front', val)
+        this.$message.success(this.$t('2dc17300.3bb47b'))
+      } catch (e) {
+        this.$message.error(e?.message || this.$t('2dc17300.02d981'))
+      }
+    },
     // 分润配置
     handleProfitPrice({
       parent_id,
@@ -375,10 +421,13 @@ export default {
         is_main_category: true
       })
       const list = res.map((item) => {
+        const showFront =
+          item.is_show_front === 1 || item.is_show_front === '1' || item.is_show_front === true
         return {
           ...item,
           image_url: item.image_url || '',
-          hasChildren: item.has_children == '1'
+          hasChildren: item.has_children == '1',
+          is_show_front: showFront ? '1' : '0'
         }
       })
       return list
@@ -390,13 +439,16 @@ export default {
       resolve(list)
     },
     async onCategoryFormSubmit() {
-      const { category_name, sort, image_url, parent_id, category_id } = this.categoryForm
+      const { category_name, sort, image_url, parent_id, category_id, is_show_front } =
+        this.categoryForm
+      const showFrontParams = this.showIsShowFront ? { is_show_front } : {}
       if (category_id) {
         await this.$api.goods.editCategory({
           category_name,
           sort,
           image_url,
-          category_id
+          category_id,
+          ...showFrontParams
         })
         this.$message.success(this.$t('2dc17300.3bb47b'))
         this.refreshNode(parent_id)
@@ -408,7 +460,8 @@ export default {
           sort,
           is_main_category: 1,
           image_url,
-          parent_id: parent_id != '0' ? parent_id : undefined
+          parent_id: parent_id != '0' ? parent_id : undefined,
+          ...showFrontParams
         })
         this.$message.success(this.$t('2dc17300.3fdaea'))
         this.refreshNode(parent_id)
diff --git a/src/view/mall/goods/audit/list.vue b/src/view/mall/goods/audit/list.vue
index 4a1a33b..c3739ae 100755
--- a/src/view/mall/goods/audit/list.vue
+++ b/src/view/mall/goods/audit/list.vue
@@ -7,59 +7,17 @@
   <div>
     <SpPage>
       <div v-if="$route.path.indexOf('editor') === -1">
-        <SpFilterForm :model="params" @onSearch="onSearch" @onReset="onSearch">
-          <SpFilterFormItem prop="keywords" :label="$t('c43c7afc.752597')">
-            <el-input v-model="params.keywords" :placeholder="$t('c43c7afc.d83187')" />
-          </SpFilterFormItem>
-          <SpFilterFormItem prop="goods_bn" :label="$t('c43c7afc.288587')">
-            <el-input v-model="params.goods_bn" :placeholder="$t('c43c7afc.36438f')" />
-          </SpFilterFormItem>
-          <SpFilterFormItem prop="item_bn" :label="$t('c43c7afc.8dd62f')">
-            <el-input v-model="params.item_bn" :placeholder="$t('c43c7afc.983e9f')" />
-          </SpFilterFormItem>
-          <SpFilterFormItem prop="regions_id" :label="$t('c43c7afc.efcb2d')">
-            <el-cascader
-              v-model="params.regions_id"
-              clearable
-              :placeholder="$t('c43c7afc.708c9d')"
-              :options="regions"
-            />
-          </SpFilterFormItem>
-          <SpFilterFormItem prop="approve_status" :label="$t('c43c7afc.2253ba')">
-            <el-select
-              v-model="params.approve_status"
-              clearable
-              :placeholder="$t('c43c7afc.708c9d')"
-            >
-              <el-option
-                v-for="item in salesStatus"
-                :key="item.value"
-                :label="item.title"
-                size="mini"
-                :value="item.value"
-              />
-            </el-select>
-          </SpFilterFormItem>
-          <SpFilterFormItem prop="distributor_id" :label="$t('c43c7afc.efa91f')">
-            <SpSelectShop
-              v-model="params.distributor_id"
-              @change="onDistributorChange"
-              clearable
-              :placeholder="$t('c43c7afc.708c9d')"
-            />
-          </SpFilterFormItem>
-          <SpFilterFormItem prop="main_cat_id" :label="$t('c43c7afc.e73602')">
-            <el-cascader
-              v-model="params.main_cat_id"
-              :placeholder="$t('c43c7afc.708c9d')"
-              clearable
-              :options="itemCategoryList"
-              :props="{ value: 'category_id', label: 'category_name', checkStrictly: true }"
-            />
-          </SpFilterFormItem>
-        </SpFilterForm>
+        <SpFormPlus
+          ref="searchForm"
+          v-model="params"
+          form-type="searchForm"
+          :inline="true"
+          :form-items="searchFormItems"
+          @submit="onSearch"
+          @reset="onSearch"
+        />
 
-        <div class="action-container">
+        <div class="action-container mt-4">
           <el-button type="primary" plain @click="Examine">{{ $t('c43c7afc.9fface') }}</el-button>
           <el-button type="primary" plain @click="batchItemsStatus('onsale')">
             {{ $t('c43c7afc.644c0d') }}
@@ -376,6 +334,92 @@ export default {
     ...mapGetters(['wheight']),
     tabList() {
       return this.tabListData.map((item) => ({ label: this.$t(item.labelKey), name: item.name }))
+    },
+    searchFormItems() {
+      return [
+        {
+          fieldName: 'keywords',
+          label: this.$t('c43c7afc.752597'),
+          component: 'input',
+          cellWidth: 1.3,
+          componentProps: {
+            placeholder: this.$t('c43c7afc.d83187')
+          }
+        },
+        {
+          fieldName: 'goods_bn',
+          label: this.$t('c43c7afc.288587'),
+          component: 'input',
+          cellWidth: 1.3,
+          componentProps: {
+            placeholder: this.$t('c43c7afc.36438f')
+          }
+        },
+        {
+          fieldName: 'item_bn',
+          label: this.$t('c43c7afc.8dd62f'),
+          component: 'input',
+          cellWidth: 1.3,
+          componentProps: {
+            placeholder: this.$t('c43c7afc.983e9f')
+          }
+        },
+        {
+          fieldName: 'regions_id',
+          label: this.$t('c43c7afc.efcb2d'),
+          component: 'cascader',
+          cellWidth: 1.3,
+          componentProps: {
+            clearable: true,
+            placeholder: this.$t('c43c7afc.708c9d'),
+            options: this.regions
+          }
+        },
+        {
+          fieldName: 'approve_status',
+          label: this.$t('c43c7afc.2253ba'),
+          component: 'select',
+          cellWidth: 1.3,
+          componentProps: {
+            clearable: true,
+            placeholder: this.$t('c43c7afc.708c9d'),
+            options: this.salesStatus.map((item) => ({
+              label: item.title,
+              value: item.value
+            }))
+          }
+        },
+        {
+          fieldName: 'distributor_id',
+          label: this.$t('c43c7afc.efa91f'),
+          cellWidth: 1.3,
+          component: ({ h, value, onInput }) => {
+            return h('SpSelectShop', {
+              props: {
+                value,
+                clearable: true,
+                size: 'small',
+                placeholder: this.$t('c43c7afc.708c9d')
+              },
+              on: {
+                input: (val) => onInput(val || 'all_distributor')
+              }
+            })
+          }
+        },
+        {
+          fieldName: 'main_cat_id',
+          label: this.$t('c43c7afc.e73602'),
+          component: 'cascader',
+          cellWidth: 1.3,
+          componentProps: {
+            clearable: true,
+            placeholder: this.$t('c43c7afc.708c9d'),
+            options: this.itemCategoryList,
+            props: { value: 'category_id', label: 'category_name', checkStrictly: true }
+          }
+        }
+      ]
     }
   },
   created() {
@@ -389,9 +433,6 @@ export default {
     this.fetchList()
   },
   methods: {
-    onDistributorChange(value) {
-      this.params.distributor_id = value ? value : 'all_distributor'
-    },
     async getMainCategory() {
       //管理分类
       const res = await this.$api.goods.getCategory({ is_main_category: true })
@@ -585,9 +626,6 @@ export default {
     width: 90%;
   }
 }
-.sp-filter-form {
-  margin-bottom: 16px;
-}
 .el-col {
   border-radius: 4px;
 }
diff --git a/src/view/mall/marketing/distributionOrders.vue b/src/view/mall/marketing/distributionOrders.vue
index ce7d97d..4e8a501 100755
--- a/src/view/mall/marketing/distributionOrders.vue
+++ b/src/view/mall/marketing/distributionOrders.vue
@@ -8,7 +8,16 @@
     <SpPage>
       <SpPlatformTip v-if="!VERSION_SHUYUN()" h5 app alipay />
 
-      <SearchForm class="mb-4" @submit="handleSearch" />
+      <SpFormPlus
+        ref="searchForm"
+        class="mb-4"
+        v-model="searchParams"
+        form-type="searchForm"
+        :inline="true"
+        :form-items="searchFormItems"
+        @submit="handleSearch"
+        @reset="handleSearch"
+      />
 
       <SpTabs :tab-list="tabList" v-model="activeTab" @change="handleTabChange" />
 
@@ -47,69 +56,6 @@ import { i18n } from '@/i18n'
 
 const LOCAL_ORDER_TYPE = _map(ORDER_TYPE, (item) => ({ label: item.title, value: item.value }))
 
-const [SearchForm, SearchFormApi] = useForm({
-  formType: 'searchForm',
-  formItems: [
-    {
-      component: 'Input',
-      componentProps: {
-        placeholder: i18n.t('2345face.6e4f4b')
-      },
-      fieldName: 'mobile',
-      // formItemClass: 'col-start-3',
-      label: i18n.t('2345face.8098e2'),
-      value: ''
-    },
-    {
-      component: 'Input',
-      componentProps: {
-        placeholder: i18n.t('2345face.e9e836')
-      },
-      fieldName: 'order_id',
-      label: i18n.t('2345face.1e8dc2'),
-      value: ''
-    },
-    {
-      component: 'Select',
-      componentProps: {
-        placeholder: i18n.t('2345face.249ee7'),
-        options: LOCAL_ORDER_TYPE
-      },
-      fieldName: 'order_class',
-      label: i18n.t('2345face.5cd56b'),
-      value: ''
-    },
-    {
-      component: 'DateTimePicker',
-      componentProps: {
-        type: 'datetimerange'
-      },
-      fieldName: 'create_time',
-      formItemClass: 'col-span-2',
-      label: i18n.t('2345face.56e3f8'),
-      value: []
-    }
-    // {
-    //   component: ({ h, value, onInput }) => {
-    //     return (
-    //       <SpSelectShop
-    //         value={value}
-    //         size="small"
-    //         placeholder="请选择店铺"
-    //         onChange={val => {
-    //           onInput(val)
-    //         }}
-    //       />
-    //     )
-    //   },
-    //   fieldName: 'distributor_id',
-    //   label: '店铺',
-    //   value: ''
-    // }
-  ],
-  inline: true
-})
-
 const [DeliveryForm, DeliveryFormApi] = useForm({
   formItems: [
     {
@@ -165,11 +111,14 @@ const [DeliveryForm, DeliveryFormApi] = useForm({
 })
 
 export default {
-  components: {
-    SearchForm: SearchForm
-  },
   data() {
     return {
+      searchParams: {
+        mobile: '',
+        order_id: '',
+        order_class: '',
+        create_time: []
+      },
       datapass_block: 1,
       finderSetting: createSetting({
         actions: [
@@ -318,11 +267,53 @@ export default {
       ]
     }
   },
-  mounted() {},
+  computed: {
+    searchFormItems() {
+      return [
+        {
+          fieldName: 'mobile',
+          label: this.$t('2345face.8098e2'),
+          component: 'input',
+          cellWidth: 1.3,
+          componentProps: {
+            placeholder: this.$t('2345face.6e4f4b')
+          }
+        },
+        {
+          fieldName: 'order_id',
+          label: this.$t('2345face.1e8dc2'),
+          component: 'input',
+          cellWidth: 1.3,
+          componentProps: {
+            placeholder: this.$t('2345face.e9e836')
+          }
+        },
+        {
+          fieldName: 'order_class',
+          label: this.$t('2345face.5cd56b'),
+          component: 'select',
+          cellWidth: 1.3,
+          componentProps: {
+            clearable: true,
+            placeholder: this.$t('2345face.249ee7'),
+            options: LOCAL_ORDER_TYPE
+          }
+        },
+        {
+          fieldName: 'create_time',
+          label: this.$t('2345face.56e3f8'),
+          component: 'datetimepicker',
+          cellWidth: 2,
+          componentProps: {
+            type: 'datetimerange'
+          }
+        }
+      ]
+    }
+  },
   methods: {
     beforeSearch(params) {
-      const { create_time, mobile, order_id, order_class, distributor_id } =
-        SearchFormApi.getFieldsValue()
+      const { create_time, mobile, order_id, order_class, distributor_id } = this.searchParams
       const _params = {
         ...params,
         order_type: 'normal',
@@ -330,9 +321,13 @@ export default {
         is_distribution: 1
       }
 
-      if (create_time.length > 0) {
-        _params.time_start_begin = create_time[0].getTime() / 1000
-        _params.time_start_end = create_time[1].getTime() / 1000
+      if (create_time && create_time.length > 0) {
+        const start = create_time[0]
+        const end = create_time[1]
+        _params.time_start_begin =
+          typeof start?.getTime === 'function' ? start.getTime() / 1000 : start / 1000
+        _params.time_start_end =
+          typeof end?.getTime === 'function' ? end.getTime() / 1000 : end / 1000
       }
 
       order_id && (_params.order_id = order_id)
@@ -352,7 +347,7 @@ export default {
     handleTabChange(tab) {
       this.$refs.finder.refresh(true)
     },
-    handleSearch(form) {
+    handleSearch() {
       this.$refs.finder.refresh(true)
     }
   }
diff --git a/src/view/mall/marketing/distributor_editor/index.vue b/src/view/mall/marketing/distributor_editor/index.vue
index 5a0bcce..2207af3 100755
--- a/src/view/mall/marketing/distributor_editor/index.vue
+++ b/src/view/mall/marketing/distributor_editor/index.vue
@@ -367,7 +367,8 @@ export default {
     },
     async onSelectZiti() {
       const { data } = await this.$picker.zitiList({
-        data: this.zitiList.map((item) => item.id)
+        data: this.zitiList.map((item) => item.id),
+        rel_distributor_id: this.distributor_id
       })
 
       console.log(this.zitiList.map((item) => item.id))
diff --git a/src/view/mall/trade/normalorders/list.vue b/src/view/mall/trade/normalorders/list.vue
index e8e3f11..876872c 100755
--- a/src/view/mall/trade/normalorders/list.vue
+++ b/src/view/mall/trade/normalorders/list.vue
@@ -6,224 +6,18 @@
 <template>
   <SpRouterView>
     <SpPage>
-      <SpFilterForm :model="params" @onSearch="onSearch" @onReset="onSearch">
-        <SpFilterFormItem prop="mobile" :label="$t('c95ea121.ce2bf3')">
-          <el-input v-model="params.mobile" :placeholder="$t('c95ea121.c746c6')" />
-        </SpFilterFormItem>
-        <SpFilterFormItem prop="order_id" :label="$t('c95ea121.070dce')">
-          <el-input v-model="params.order_id" :placeholder="$t('c95ea121.e9e836')" />
-        </SpFilterFormItem>
-        <SpFilterFormItem v-if="!isMicorMall" prop="receipt_type" :label="$t('c95ea121.b6ae11')">
-          <el-select v-model="params.receipt_type" clearable :placeholder="$t('c95ea121.708c9d')">
-            <el-option
-              v-for="item in distributionType"
-              :key="item.value"
-              size="mini"
-              :label="$t(item.title)"
-              :value="item.value"
-            />
-          </el-select>
-        </SpFilterFormItem>
-        <SpFilterFormItem
-          v-if="!VERSION_IN_PURCHASE()"
-          prop="source_id"
-          :label="$t('c95ea121.b36ea7')"
-        >
-          <el-select v-model="params.source_id" clearable :placeholder="$t('c95ea121.708c9d')">
-            <el-option
-              v-for="item in orderSourceList"
-              :key="item.value"
-              size="mini"
-              :label="item.title"
-              :value="item.value"
-            />
-          </el-select>
-        </SpFilterFormItem>
-        <SpFilterFormItem
-          v-if="VERSION_STANDARD() || IS_ADMIN()"
-          prop="supplier_name"
-          :label="$t('c95ea121.a54fd2')"
-        >
-          <el-input v-model="params.supplier_name" :placeholder="$t('c95ea121.55c61d')" />
-        </SpFilterFormItem>
-        <SpFilterFormItem
-          v-if="!VERSION_IN_PURCHASE()"
-          prop="order_class"
-          :label="$t('c95ea121.0e83be')"
-        >
-          <el-select v-model="params.order_class" clearable :placeholder="$t('c95ea121.708c9d')">
-            <el-option
-              v-for="item in orderType"
-              :key="item.value"
-              size="mini"
-              :label="$t(item.title)"
-              :value="item.value"
-            />
-          </el-select>
-        </SpFilterFormItem>
-        <!-- 是否处方药 -->
-        <SpFilterFormItem
-          v-if="is_pharma_industry"
-          prop="is_prescription_order"
-          :label="$t('c95ea121.b7a604')"
-        >
-          <el-select
-            v-model="params.is_prescription_order"
-            clearable
-            :placeholder="$t('c95ea121.708c9d')"
-          >
-            <el-option :label="$t('c95ea121.a8b0c2')" value="" />
-            <el-option :label="$t('c95ea121.0a60ac')" value="1" />
-            <el-option :label="$t('c95ea121.c9744f')" value="0" />
-          </el-select>
-        </SpFilterFormItem>
-        <SpFilterFormItem v-if="is_pharma_industry" prop="serial_no" :label="$t('c95ea121.4465a6')">
-          <el-input v-model="params.serial_no" :placeholder="$t('c95ea121.43d6ec')" />
-        </SpFilterFormItem>
-        <SpFilterFormItem
-          v-if="is_pharma_industry"
-          prop="user_family_name"
-          :label="$t('c95ea121.f3f325')"
-        >
-          <el-input v-model="params.user_family_name" :placeholder="$t('c95ea121.e5d7bb')" />
-        </SpFilterFormItem>
-        <SpFilterFormItem
-          v-if="!VERSION_IN_PURCHASE()"
-          prop="delivery_staff_id"
-          :label="$t('c95ea121.7f6b70')"
-        >
-          <el-select
-            v-model="params.delivery_staff_id"
-            clearable
-            :placeholder="$t('c95ea121.708c9d')"
-          >
-            <el-option
-              v-for="item in deliveryPersonnel"
-              :key="item.value"
-              size="mini"
-              :label="item.title"
-              :value="item.value"
-            />
-          </el-select>
-        </SpFilterFormItem>
-        <!-- <SpFilterFormItem prop="salespersonname" label="业务员:">
-          <el-input v-model="params.salespersonname" placeholder="请输入业务员" />
-        </SpFilterFormItem> -->
-        <SpFilterFormItem prop="role" :label="$t('c95ea121.e1f833')">
-          <el-select v-model="params.role" :placeholder="$t('c95ea121.708c9d')" clearable>
-            <el-option
-              v-for="item in roleList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </SpFilterFormItem>
-        <SpFilterFormItem prop="create_time" :label="$t('c95ea121.43c297')" size="max">
-          <el-date-picker
-            v-model="params.create_time"
-            clearable
-            type="datetimerange"
-            align="right"
-            format="yyyy-MM-dd HH:mm:ss"
-            :range-separator="$t('c95ea121.981cbe')"
-            :start-placeholder="$t('c95ea121.b44c0f')"
-            :end-placeholder="$t('c95ea121.1d468b')"
-            prefix-icon="null"
-            :default-time="defaultTime"
-            :picker-options="pickerOptions"
-          />
-        </SpFilterFormItem>
-        <SpFilterFormItem
-          v-if="!isMicorMall && !VERSION_IN_PURCHASE()"
-          prop="invoice_status"
-          :label="$t('c95ea121.dfc420')"
-        >
-          <el-select v-model="params.invoice_status" clearable :placeholder="$t('c95ea121.708c9d')">
-            <el-option
-              v-for="item in invoiceStatusArr"
-              :key="item.value"
-              size="mini"
-              :label="$t(item.title)"
-              :value="item.value"
-            />
-          </el-select>
-        </SpFilterFormItem>
-        <SpFilterFormItem prop="delivery_time" :label="$t('c95ea121.21524c')" size="max">
-          <el-date-picker
-            v-model="params.delivery_time"
-            clearable
-            type="datetimerange"
-            align="right"
-            format="yyyy-MM-dd HH:mm:ss"
-            :range-separator="$t('c95ea121.981cbe')"
-            :start-placeholder="$t('c95ea121.b44c0f')"
-            :end-placeholder="$t('c95ea121.1d468b')"
-            prefix-icon="null"
-            :default-time="defaultTime"
-            :picker-options="pickerOptions"
-          />
-        </SpFilterFormItem>
-        <SpFilterFormItem
-          v-if="!(VERSION_SHUYUN() || VERSION_B2C())"
-          prop="order_holder"
-          :label="$t('c95ea121.e56a5e')"
-        >
-          <el-select v-model="params.order_holder" clearable :placeholder="$t('c95ea121.708c9d')">
-            <el-option
-              v-for="item in orderCategory"
-              :key="item.value"
-              size="mini"
-              :label="$t(item.title)"
-              :value="item.value"
-            />
-          </el-select>
-        </SpFilterFormItem>
-        <SpFilterFormItem
-          v-if="
-            (!isMicorMall || login_type != 'distributor') &&
-            !VERSION_B2C() &&
-            !VERSION_IN_PURCHASE()
-          "
-          prop="distributor_id"
-          :label="$t('c95ea121.16f2bc')"
-        >
-          <SpSelectShop
-            v-model="params.distributor_id"
-            clearable
-            :placeholder="$t('c95ea121.708c9d')"
-            :query-params="{ show_distributor_self: 1 }"
-          />
-        </SpFilterFormItem>
-        <SpFilterFormItem
-          v-if="!VERSION_SHUYUN() && !VERSION_B2C() && !VERSION_IN_PURCHASE()"
-          prop="subDistrict"
-          :label="$t('c95ea121.d3063b')"
-        >
-          <el-cascader
-            v-model="params.subDistrict"
-            clearable
-            :props="{
-              value: 'id',
-              checkStrictly: true
-            }"
-            :options="subDistrictList"
-          />
-        </SpFilterFormItem>
-        <!-- <SpFilterFormItem prop="self_delivery_status" label="配送状态:">
-          <el-select v-model="params.self_delivery_status" clearable placeholder="请选择">
-            <el-option
-              v-for="item in distributionStatus"
-              :key="item.value"
-              size="mini"
-              :label="item.title"
-              :value="item.value"
-            />
-          </el-select>
-        </SpFilterFormItem> -->
-      </SpFilterForm>
+      <SpFormPlus
+        ref="searchForm"
+        :value="params"
+        form-type="searchForm"
+        :inline="true"
+        :form-items="searchFormItems"
+        @input="onSearchFormInput"
+        @submit="onSearch"
+        @reset="onSearch"
+      />
 
-      <div class="action-container">
+      <div class="action-container mt-4">
         <el-dropdown @command="handleExport">
           <el-button type="primary" plain>
             {{ $t('c95ea121.55405e') }}<i class="el-icon-arrow-down el-icon--right" />
@@ -760,7 +554,9 @@ export default {
         distributor_id: '', // 店铺
         subDistrict: [],
         salespersonname: '',
-        role: ''
+        role: '',
+        create_time: [],
+        delivery_time: []
       },
       deliveryPersonnel: [], //配送员信息
       datapass_block: 1, // 是否为数据脱敏
@@ -1390,7 +1186,233 @@ export default {
   },
 
   computed: {
-    ...mapGetters(['login_type', 'isMicorMall'])
+    ...mapGetters(['login_type', 'isMicorMall']),
+    searchFormItems() {
+      return [
+        {
+          fieldName: 'mobile',
+          label: this.$t('c95ea121.ce2bf3'),
+          component: 'input',
+          cellWidth: 1.3,
+          componentProps: {
+            placeholder: this.$t('c95ea121.c746c6')
+          }
+        },
+        {
+          fieldName: 'order_id',
+          label: this.$t('c95ea121.070dce'),
+          component: 'input',
+          cellWidth: 1.3,
+          componentProps: {
+            placeholder: this.$t('c95ea121.e9e836')
+          }
+        },
+        {
+          fieldName: 'receipt_type',
+          label: this.$t('c95ea121.b6ae11'),
+          component: 'select',
+          cellWidth: 1.3,
+          isShow: () => !this.isMicorMall,
+          componentProps: {
+            clearable: true,
+            placeholder: this.$t('c95ea121.708c9d'),
+            options: this.distributionType.map((item) => ({
+              label: this.$t(item.title),
+              value: item.value
+            }))
+          }
+        },
+        {
+          fieldName: 'source_id',
+          label: this.$t('c95ea121.b36ea7'),
+          component: 'select',
+          cellWidth: 1.3,
+          isShow: () => !this.VERSION_IN_PURCHASE(),
+          componentProps: {
+            clearable: true,
+            placeholder: this.$t('c95ea121.708c9d'),
+            options: this.orderSourceList.map((item) => ({
+              label: item.title,
+              value: item.value
+            }))
+          }
+        },
+        {
+          fieldName: 'supplier_name',
+          label: this.$t('c95ea121.a54fd2'),
+          component: 'input',
+          cellWidth: 1.3,
+          isShow: () => this.VERSION_STANDARD() || this.IS_ADMIN(),
+          componentProps: {
+            placeholder: this.$t('c95ea121.55c61d')
+          }
+        },
+        {
+          fieldName: 'order_class',
+          label: this.$t('c95ea121.0e83be'),
+          component: 'select',
+          cellWidth: 1.3,
+          isShow: () => !this.VERSION_IN_PURCHASE(),
+          componentProps: {
+            clearable: true,
+            placeholder: this.$t('c95ea121.708c9d'),
+            options: this.orderType.map((item) => ({
+              label: this.$t(item.title),
+              value: item.value
+            }))
+          }
+        },
+        {
+          fieldName: 'is_prescription_order',
+          label: this.$t('c95ea121.b7a604'),
+          component: 'select',
+          cellWidth: 1.3,
+          isShow: () => this.is_pharma_industry,
+          componentProps: {
+            clearable: true,
+            placeholder: this.$t('c95ea121.708c9d'),
+            options: [
+              { label: this.$t('c95ea121.a8b0c2'), value: '' },
+              { label: this.$t('c95ea121.0a60ac'), value: '1' },
+              { label: this.$t('c95ea121.c9744f'), value: '0' }
+            ]
+          }
+        },
+        {
+          fieldName: 'serial_no',
+          label: this.$t('c95ea121.4465a6'),
+          component: 'input',
+          cellWidth: 1.3,
+          isShow: () => this.is_pharma_industry,
+          componentProps: {
+            placeholder: this.$t('c95ea121.43d6ec')
+          }
+        },
+        {
+          fieldName: 'user_family_name',
+          label: this.$t('c95ea121.f3f325'),
+          component: 'input',
+          cellWidth: 1.3,
+          isShow: () => this.is_pharma_industry,
+          componentProps: {
+            placeholder: this.$t('c95ea121.e5d7bb')
+          }
+        },
+        {
+          fieldName: 'delivery_staff_id',
+          label: this.$t('c95ea121.7f6b70'),
+          component: 'select',
+          cellWidth: 1.3,
+          isShow: () => !this.VERSION_IN_PURCHASE(),
+          componentProps: {
+            clearable: true,
+            placeholder: this.$t('c95ea121.708c9d'),
+            options: this.deliveryPersonnel.map((item) => ({
+              label: item.title,
+              value: item.value
+            }))
+          }
+        },
+        {
+          fieldName: 'role',
+          label: this.$t('c95ea121.e1f833'),
+          component: 'select',
+          cellWidth: 1.3,
+          componentProps: {
+            clearable: true,
+            placeholder: this.$t('c95ea121.708c9d'),
+            options: this.roleList
+          }
+        },
+        {
+          fieldName: 'invoice_status',
+          label: this.$t('c95ea121.dfc420'),
+          component: 'select',
+          cellWidth: 1.3,
+          isShow: () => !this.isMicorMall && !this.VERSION_IN_PURCHASE(),
+          componentProps: {
+            clearable: true,
+            placeholder: this.$t('c95ea121.708c9d'),
+            options: this.invoiceStatusArr.map((item) => ({
+              label: this.$t(item.title),
+              value: item.value
+            }))
+          }
+        },
+        {
+          fieldName: 'order_holder',
+          label: this.$t('c95ea121.e56a5e'),
+          component: 'select',
+          cellWidth: 1.3,
+          isShow: () => !(this.VERSION_SHUYUN() || this.VERSION_B2C()),
+          componentProps: {
+            clearable: true,
+            placeholder: this.$t('c95ea121.708c9d'),
+            options: this.orderCategory.map((item) => ({
+              label: this.$t(item.title),
+              value: item.value
+            }))
+          }
+        },
+        {
+          fieldName: 'distributor_id',
+          label: this.$t('c95ea121.16f2bc'),
+          cellWidth: 1.3,
+          isShow: () =>
+            (!this.isMicorMall || this.login_type != 'distributor') &&
+            !this.VERSION_B2C() &&
+            !this.VERSION_IN_PURCHASE(),
+          component: ({ h, value, onInput }) => {
+            return h('SpSelectShop', {
+              props: {
+                value,
+                clearable: true,
+                size: 'small',
+                placeholder: this.$t('c95ea121.708c9d'),
+                queryParams: { show_distributor_self: 1 }
+              },
+              on: {
+                input: onInput
+              }
+            })
+          }
+        },
+        {
+          fieldName: 'subDistrict',
+          label: this.$t('c95ea121.d3063b'),
+          component: 'cascader',
+          cellWidth: 1.3,
+          isShow: () =>
+            !this.VERSION_SHUYUN() && !this.VERSION_B2C() && !this.VERSION_IN_PURCHASE(),
+          componentProps: {
+            clearable: true,
+            options: this.subDistrictList,
+            props: {
+              value: 'id',
+              checkStrictly: true
+            }
+          }
+        },
+        {
+          fieldName: 'create_time',
+          label: this.$t('c95ea121.43c297'),
+          component: 'datetimepicker',
+          cellWidth: 2,
+          componentProps: {
+            type: 'datetimerange'
+          }
+        },
+        {
+          fieldName: 'delivery_time',
+          label: this.$t('c95ea121.21524c'),
+          component: 'datetimepicker',
+          cellWidth: 2,
+          componentProps: {
+            type: 'datetimerange'
+          }
+        },
+      ]
+    }
   },
   watch: {
     'deliverGoodsForm.delivery_way'(e) {
@@ -1455,6 +1477,9 @@ export default {
     })
   },
   methods: {
+    onSearchFormInput(val) {
+      Object.assign(this.params, val)
+    },
     onSearch() {
       this.page.pageIndex = 1
       this.$nextTick(() => {
@@ -2378,10 +2403,6 @@ export default {
 }
 </script>
 <style lang="scss" scope>
-.sp-filter-form {
-  margin-bottom: 16px;
-}
-
 .dialog-changeprice,
 .dialog-cancelorder,
 .dialog-salesafter {
diff --git a/src/view/mall/trade/shipping/templates.vue b/src/view/mall/trade/shipping/templates.vue
index 48f9a8d..6cd2a25 100755
--- a/src/view/mall/trade/shipping/templates.vue
+++ b/src/view/mall/trade/shipping/templates.vue
@@ -135,6 +135,17 @@ export default {
       const refName = refMap[this.activeName]
       return refName ? this.$refs[refName] : null
     },
+    getActiveTabRef() {
+      const refMap = {
+        first: 'buyerTemplates',
+        second: 'weightTemplates',
+        third: 'numberTemplates',
+        fourth: 'priceTemplates',
+        fifth: 'volumeTemplates'
+      }
+      const refName = refMap[this.activeName]
+      return refName ? this.$refs[refName] : null
+    },
     getList() {
       const ref = this.getActiveTabRef()
       if (ref && typeof ref.getShippingTemplatesList === 'function') {
diff --git a/src/view/member/selfservice/registrationactivity.vue b/src/view/member/selfservice/registrationactivity.vue
index 6c3b1a8..5b3c1ff 100755
--- a/src/view/member/selfservice/registrationactivity.vue
+++ b/src/view/member/selfservice/registrationactivity.vue
@@ -8,38 +8,17 @@
     <SpRouterView>
       <SpPlatformTip v-if="!VERSION_SHUYUN()" h5 app alipay />
 
-      <SpFilterForm :model="params" @onSearch="onSearch" @onReset="onReset">
-        <SpFilterFormItem prop="field_title" :label="$t('15ecc99b.1cadc0')">
-          <el-input v-model="params.field_title" :placeholder="$t('15ecc99b.39834b')" />
-        </SpFilterFormItem>
-        <SpFilterFormItem prop="status" :label="$t('15ecc99b.13b5c7')">
-          <el-select v-model="params.status" :placeholder="$t('15ecc99b.3fea7c')">
-            <el-option
-              v-for="(item, index) in statusOption"
-              :key="index"
-              :label="$t(item.nameKey)"
-              :value="item.value"
-            />
-          </el-select>
-        </SpFilterFormItem>
-        <SpFilterFormItem prop="create_time" :label="$t('6b57cb80.374856')">
-          <el-date-picker
-            v-model="params.create_time"
-            type="daterange"
-            value-format="yyyy/MM/dd"
-            :placeholder="$t('6b57cb80.e08045')"
-          />
-        </SpFilterFormItem>
-        <SpFilterFormItem prop="distributor_id" :label="$t('6b57cb80.4de1b7')">
-          <SpSelectShop
-            v-model="params.distributor_id"
-            clearable
-            :placeholder="$t('ac2a6290.708c9d')"
-          />
-        </SpFilterFormItem>
-      </SpFilterForm>
+      <SpFormPlus
+        ref="searchForm"
+        v-model="params"
+        form-type="searchForm"
+        :inline="true"
+        :form-items="searchFormItems"
+        @submit="onSearch"
+        @reset="onReset"
+      />
 
-      <div class="action-container">
+      <div class="action-container mt-4">
         <el-button type="primary" icon="iconfont icon-xinzengcaozuo-01" @click="addElement">
           {{ $t('15ecc99b.e8c939') }}
         </el-button>
@@ -81,6 +60,17 @@
             </el-button>
           </template>
         </el-table-column>
+        <el-table-column :label="$t('5cceb5ec.ae57b1')" width="100">
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.is_show"
+              :active-value="1"
+              :inactive-value="0"
+              :disabled="IS_DISTRIBUTOR()"
+              @change="onIsShowChange(scope.row)"
+            />
+          </template>
+        </el-table-column>
         <el-table-column prop="activity_id" :label="$t('15ecc99b.c515f3')" width="100" />
         <el-table-column prop="activity_name" :label="$t('15ecc99b.39834b')" width="200" />
         <el-table-column :label="$t('15ecc99b.8c5a3c')" width="120">
@@ -144,7 +134,7 @@ export default {
   },
   data() {
     const initialParams = {
-      field_title: undefined,
+      field_title: '',
       status: '',
       create_time: [],
       distributor_id: ''
@@ -166,6 +156,75 @@ export default {
       dialogVisible: false
     }
   },
+  computed: {
+    searchFormItems() {
+      return [
+        {
+          fieldName: 'field_title',
+          label: this.$t('15ecc99b.39834b'),
+          component: 'input',
+          cellWidth: 1.3,
+          componentProps: {
+            placeholder: this.$t('15ecc99b.39834b'),
+            clearable: true
+          }
+        },
+        {
+          fieldName: 'status',
+          label: this.$t('15ecc99b.3fea7c'),
+          component: 'select',
+          cellWidth: 1.3,
+          componentProps: {
+            clearable: true,
+            placeholder: this.$t('15ecc99b.3fea7c'),
+            options: this.statusOption.map((item) => ({
+              label: this.$t(item.nameKey),
+              value: item.value
+            }))
+          }
+        },
+        {
+          fieldName: 'distributor_id',
+          label: this.$t('6b57cb80.4de1b7'),
+          cellWidth: 1.3,
+          component: ({ h, value, onInput }) => {
+            return h('SpSelectShop', {
+              props: {
+                value,
+                clearable: true,
+                size: 'small',
+                placeholder: this.$t('ac2a6290.708c9d')
+              },
+              on: {
+                input: onInput
+              }
+            })
+          }
+        },
+        {
+          fieldName: 'create_time',
+          label: this.$t('6b57cb80.374856'),
+          cellWidth: 2,
+          component: ({ h, value, onInput }) => {
+            return h('el-date-picker', {
+              props: {
+                value: value || [],
+                type: 'daterange',
+                valueFormat: 'yyyy/MM/dd',
+                clearable: true,
+                size: 'small',
+                startPlaceholder: this.$t('6b57cb80.e08045'),
+                endPlaceholder: this.$t('6b57cb80.e08045')
+              },
+              on: {
+                input: (val) => onInput(val || [])
+              }
+            })
+          }
+        }
+      ]
+    }
+  },
   watch: {},
   mounted() {
     this.fetchList()
@@ -189,7 +248,7 @@ export default {
     getParams() {
       const time = {}
       const create_time = this.params.create_time
-      if (create_time.length) {
+      if (Array.isArray(create_time) && create_time.length >= 2) {
         time.start_time = this.dateStrToTimeStamp(create_time[0] + ' 00:00:00')
         time.end_time = this.dateStrToTimeStamp(create_time[1] + ' 00:00:00')
       }
@@ -209,7 +268,10 @@ export default {
         ...this.getParams()
       }
       const { list, total_count } = await this.$api.selfhelpform.regActivityList(params)
-      this.tableList = list
+      this.tableList = (list || []).map((item) => ({
+        ...item,
+        is_show: item.is_show === false || item.is_show === 0 || item.is_show === '0' ? 0 : 1
+      }))
       this.page.total = total_count
       this.loading = false
     },
@@ -255,7 +317,7 @@ export default {
             regActivityInvalid({ activity_id: row.activity_id }).then((res) => {
               this.fetchList()
               this.$message({
-                message: this.$t('15ecc99b.b69694'),
+                message: this.$t('15ecc99b.69be67'),
                 type: 'success',
                 duration: 5 * 1000
               })
@@ -265,6 +327,19 @@ export default {
         }
       })
     },
+    async onIsShowChange(row) {
+      const nextValue = row.is_show
+      try {
+        await this.$api.selfhelpform.regActivitySetIsShow({
+          activity_id: row.activity_id,
+          is_show: nextValue
+        })
+        this.$message.success(this.$t('15ecc99b.69be67'))
+        this.fetchList()
+      } catch (e) {
+        row.is_show = nextValue === 1 ? 0 : 1
+      }
+    },
     onShowChange(row) {
       this.dialogData = row
       this.closeDialog(true)
@@ -288,10 +363,6 @@ export default {
   }
 }
 
-.sp-filter-form {
-  margin-bottom: 16px;
-}
-
 .el-col {
   border-radius: 4px;
 }
diff --git a/src/view/merchant/components/DaoDianZiti.vue b/src/view/merchant/components/DaoDianZiti.vue
index d74c1f2..5531477 100755
--- a/src/view/merchant/components/DaoDianZiti.vue
+++ b/src/view/merchant/components/DaoDianZiti.vue
@@ -12,7 +12,7 @@
 <template>
   <div class="daodianziti">
     <div class="tip">{{ $t('e18035cd.f3240d') }}</div>
-    <el-button type="text" @click="onSelectZiti">{{ $t('e18035cd.47c2de') }}</el-button>
+    <!-- <el-button type="text" @click="onSelectZiti">{{ $t('e18035cd.47c2de') }}</el-button> -->
     <SpFinder
       ref="finder"
       no-selection
@@ -103,7 +103,8 @@ export default {
     },
     async onSelectZiti() {
       const { data } = await this.$picker.zitiList({
-        data: this.zitiList.map((item) => item.id)
+        data: this.zitiList.map((item) => item.id),
+        rel_distributor_id: this.distributor_id
       })
 
       if (this.distributor_id) {
diff --git a/src/view/shoplist.vue b/src/view/shoplist.vue
index 08e74b2..a5643d0 100755
--- a/src/view/shoplist.vue
+++ b/src/view/shoplist.vue
@@ -57,7 +57,7 @@
 import { Message } from 'element-ui'
 import { getDistributorList } from '@/api/marketing'
 import { shopLoginSelectShopId } from '@/api/company'
-import { VERSION_STANDARD } from '@/utils'
+import { VERSION_STANDARD, resolveAppPath } from '@/utils'
 export default {
   data() {
     const system = VERSION_STANDARD() ? 'onex' : 'ecshopx'
@@ -85,7 +85,7 @@ export default {
       shopLoginSelectShopId({ set_distributor_id: data.distributor_id }).then((res) => {
         if (res.data.data.status) {
           this.$store.dispatch('setShopId', data.distributor_id)
-          window.location.href = '/'
+          window.location.href = resolveAppPath('/')
           // console.log(this.$store.getters.menus)
           // this.$router.push({ path: this.$store.getters.menus[0].children[0].url })
         }
diff --git a/src/view/wxapp/category/list.vue b/src/view/wxapp/category/list.vue
index 2ebd582..dc70aa9 100644
--- a/src/view/wxapp/category/list.vue
+++ b/src/view/wxapp/category/list.vue
@@ -12,7 +12,7 @@
     <SpDialog
       ref="groupDialogRef"
       v-model="showSettingSaleClassify"
-      :title="$t('c7eb6efa.7b3c0e')"
+      :title="linkCategoryLabel"
       :form="saleClassifyForm"
       :form-list="saleClassifyFormList"
       @onSubmit="onSaleClassifyFormSubmit"
@@ -68,6 +68,18 @@ export default {
     }
   },
   computed: {
+    isB2B2C() {
+      return this.VERSION_PLATFORM()
+    },
+    linkCategoryLabel() {
+      return this.isB2B2C ? this.$t('c7eb6efa.a1a244') : this.$t('c7eb6efa.7b3c0e')
+    },
+    categoryFormLabel() {
+      return this.isB2B2C ? this.$t('d81d8932.b3ed9f') : this.$t('c7eb6efa.392d49')
+    },
+    categoryFormPlaceholder() {
+      return this.isB2B2C ? this.$t('92f7db48.1ff189') : this.$t('c7eb6efa.8f1896')
+    },
     setting() {
       return createSetting({
         search: [
@@ -95,7 +107,7 @@ export default {
           },
           {
             key: 'category_name',
-            name: this.$t('c7eb6efa.7b3c0e'),
+            name: this.linkCategoryLabel,
             minWidth: 120
           },
           {
@@ -157,16 +169,16 @@ export default {
             }
           },
           {
-            name: this.$t('c7eb6efa.7b3c0e'),
+            name: this.linkCategoryLabel,
             key: 'link',
             type: 'button',
             buttonType: 'text',
             action: {
               handler: async ([row]) => {
                 this.categoryList = []
-                const res = await this.$api.goods.getCategory({
-                  parent_id: 0
-                })
+                const res = await this.$api.goods.getCategory(
+                  this.isB2B2C ? { is_main_category: true } : { parent_id: 0 }
+                )
                 const list = res.map((item) => ({
                   title: item.category_name,
                   value: item.category_id
@@ -230,11 +242,11 @@ export default {
     saleClassifyFormList() {
       return [
         {
-          label: this.$t('c7eb6efa.392d49'),
+          label: this.categoryFormLabel,
           key: 'category_id',
           type: 'select',
           maxlength: 150,
-          placeholder: this.$t('c7eb6efa.8f1896'),
+          placeholder: this.categoryFormPlaceholder,
           required: true,
           message: this.$t('c7eb6efa.281bad'),
           options: this.categoryList
diff --git a/src/views/core/authentication/login.vue b/src/views/core/authentication/login.vue
index 5810465..47460db 100755
--- a/src/views/core/authentication/login.vue
+++ b/src/views/core/authentication/login.vue
@@ -6,7 +6,7 @@
 <template>
   <div class="page-login bg-white relative flex flex-col justify-center">
     <div>
-      <img src="/images/logo.png" alt="logo" width="300" />
+      <img :src="logoSrc" alt="logo" width="300" />
       <!-- <div class="text-[14px] mt-2 ml-2 text-[#BЗBЗB3]">总部</div> -->
       <!-- If you remove or alter Shopex brand identifiers, you must obtain a branding removal license from Shopex.  Contact us at:  http://www.shopex.cn to purchase a branding removal license.   -->
       <div class="text-[28px] font-helvca mt-8 ml-2 text-[#333]">{{ $t('24b2720c.7d1eb0') }}</div>
@@ -33,7 +33,7 @@
 <script>
 import { useForm } from '@/composables'
 import Config from '@/config'
-import { decodeJwtPayload, getSystemTitle } from '@/utils'
+import { decodeJwtPayload, getSystemTitle, resolveAppPath, resolvePublicAsset } from '@/utils'
 import { i18n } from '@/i18n'
 
 const [Form, FormApi] = useForm({
@@ -93,7 +93,8 @@ export default {
     return {
       formApi: FormApi,
       loading: false,
-      recoderNumber: Config.recoder_number
+      recoderNumber: Config.recoder_number,
+      logoSrc: resolvePublicAsset('images/logo.png')
     }
   },
   computed: {
@@ -131,11 +132,11 @@ export default {
           // this.$router.push('/')
           setTimeout(() => {
             if (accessMenus.length == 1 && accessMenus[0].url == '/activelicense') {
-              window.location.href = '/activelicense'
+              window.location.href = resolveAppPath('/activelicense')
             } else if (accessMenus.length == 1 && accessMenus[0].url == '/login') {
-              window.location.href = '/login'
+              window.location.href = resolveAppPath('/login')
             } else {
-              window.location.href = '/'
+              window.location.href = resolveAppPath('/')
             }
             // this.$router.push('/')
           }, 700)
diff --git a/src/views/core/authentication/merchant-login.vue b/src/views/core/authentication/merchant-login.vue
index b254426..f302973 100755
--- a/src/views/core/authentication/merchant-login.vue
+++ b/src/views/core/authentication/merchant-login.vue
@@ -6,7 +6,7 @@
 <template>
   <div class="bg-white relative flex flex-col justify-center">
     <div>
-      <img src="/images/logo.png" alt="logo" width="300" />
+      <img :src="logoSrc" alt="logo" width="300" />
       <div class="text-[14px] mt-2 ml-2 text-[#BЗBЗB3]">{{ $t('2b0e6049.7849c8') }}</div>
       <div class="text-[28px] font-helvca mt-8 ml-2 text-[#333]">{{ $t('24b2720c.7d1eb0') }}</div>
     </div>
@@ -31,7 +31,7 @@
 <script>
 import { useForm } from '@/composables'
 import Config from '@/config'
-import { decodeJwtPayload, getSystemTitle } from '@/utils'
+import { decodeJwtPayload, getSystemTitle, resolveAppPath, resolvePublicAsset } from '@/utils'
 
 const [Form, FormApi] = useForm({
   formItems: [
@@ -69,7 +69,8 @@ export default {
     return {
       formApi: FormApi,
       loading: false,
-      recoderNumber: Config.recoder_number
+      recoderNumber: Config.recoder_number,
+      logoSrc: resolvePublicAsset('images/logo.png')
     }
   },
   computed: {
@@ -104,7 +105,7 @@ export default {
           await this.$store.dispatch('user/fetchAccessMenus')
           await this.$store.dispatch('user/fetchAccountInfo')
           setTimeout(() => {
-            window.location.href = '/merchant'
+            window.location.href = resolveAppPath('/merchant')
           }, 700)
         }
       } catch (error) {
diff --git a/src/views/core/authentication/shop-login.vue b/src/views/core/authentication/shop-login.vue
index a47eb1d..3ecfaf4 100755
--- a/src/views/core/authentication/shop-login.vue
+++ b/src/views/core/authentication/shop-login.vue
@@ -6,7 +6,7 @@
 <template>
   <div class="bg-white relative flex flex-col justify-center">
     <div>
-      <img src="/images/logo.png" alt="logo" width="300" />
+      <img :src="logoSrc" alt="logo" width="300" />
       <div class="text-[14px] mt-2 ml-2 text-[#BЗBЗB3]">{{ $t('f10528d1.b36e43') }}</div>
       <div class="text-[28px] font-helvca mt-8 ml-2 text-[#333]">{{ $t('24b2720c.7d1eb0') }}</div>
     </div>
@@ -31,7 +31,7 @@
 <script>
 import { useForm } from '@/composables'
 import Config from '@/config'
-import { decodeJwtPayload, getSystemTitle } from '@/utils'
+import { decodeJwtPayload, getSystemTitle, resolveAppPath, resolvePublicAsset } from '@/utils'
 
 const [Form, FormApi] = useForm({
   formItems: [
@@ -69,7 +69,8 @@ export default {
     return {
       formApi: FormApi,
       loading: false,
-      recoderNumber: Config.recoder_number
+      recoderNumber: Config.recoder_number,
+      logoSrc: resolvePublicAsset('images/logo.png')
     }
   },
   computed: {
@@ -104,7 +105,7 @@ export default {
           await this.$store.dispatch('user/fetchAccessMenus')
           await this.$store.dispatch('user/fetchAccountInfo')
           setTimeout(() => {
-            window.location.href = '/shopadmin/shoplist'
+            window.location.href = resolveAppPath('/shopadmin/shoplist')
           }, 700)
         }
       } catch (error) {
diff --git a/src/views/core/authentication/shuyun-login.vue b/src/views/core/authentication/shuyun-login.vue
index 0ef09bb..5094424 100755
--- a/src/views/core/authentication/shuyun-login.vue
+++ b/src/views/core/authentication/shuyun-login.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import { decodeJwtPayload } from '@/utils'
+import { decodeJwtPayload, resolveAppPath } from '@/utils'
 export default {
   name: 'Login',
   data() {
@@ -43,7 +43,7 @@ export default {
           await this.$store.dispatch('user/fetchAccessMenus')
           await this.$store.dispatch('user/fetchAccountInfo')
           setTimeout(() => {
-            window.location.href = '/'
+            window.location.href = resolveAppPath('/')
           }, 700)
         }
       } catch (error) {
diff --git a/src/views/core/authentication/supplier-login.vue b/src/views/core/authentication/supplier-login.vue
index d466c1d..cc08911 100755
--- a/src/views/core/authentication/supplier-login.vue
+++ b/src/views/core/authentication/supplier-login.vue
@@ -6,7 +6,7 @@
 <template>
   <div class="bg-white relative flex flex-col justify-center">
     <div>
-      <img src="/images/logo.png" alt="logo" width="300" />
+      <img :src="logoSrc" alt="logo" width="300" />
       <div class="text-[14px] mt-2 ml-2 text-[#BЗBЗB3]">{{ $t('65ffe27b.14f5bc') }}</div>
       <div class="text-[28px] font-helvca mt-8 ml-2 text-[#333]">{{ $t('24b2720c.7d1eb0') }}</div>
     </div>
@@ -31,7 +31,7 @@
 <script>
 import { useForm } from '@/composables'
 import Config from '@/config'
-import { decodeJwtPayload, getSystemTitle } from '@/utils'
+import { decodeJwtPayload, getSystemTitle, resolveAppPath, resolvePublicAsset } from '@/utils'
 
 const [Form, FormApi] = useForm({
   formItems: [
@@ -69,7 +69,8 @@ export default {
     return {
       formApi: FormApi,
       loading: false,
-      recoderNumber: Config.recoder_number
+      recoderNumber: Config.recoder_number,
+      logoSrc: resolvePublicAsset('images/logo.png')
     }
   },
   computed: {
@@ -104,7 +105,7 @@ export default {
           await this.$store.dispatch('user/fetchAccessMenus')
           await this.$store.dispatch('user/fetchAccountInfo')
           setTimeout(() => {
-            window.location.href = '/supplier'
+            window.location.href = resolveAppPath('/supplier')
           }, 700)
         }
       } catch (error) {
diff --git a/src/views/settings/role-store.vue b/src/views/settings/role-store.vue
new file mode 100755
index 0000000..f9fbd51
--- /dev/null
+++ b/src/views/settings/role-store.vue
@@ -0,0 +1,650 @@
+<!--
+  Copyright © ShopeX （http://www.shopex.cn）. All rights reserved.
+  See LICENSE file for license details.
+-->
+
+<template>
+  <SpPage>
+    <SpFormPlus
+      v-model="params"
+      form-type="searchForm"
+      :form-items="filterFormItems"
+      :inline="true"
+      label-position="left"
+      label-width="70px"
+      @submit="onSearch"
+      @reset="onReset"
+    />
+
+    <div class="action-container mt-5">
+      <el-button type="primary" @click="addRoleLabels">{{ $t('1d952be7.596b04') }}</el-button>
+    </div>
+
+    <div v-loading="loading" class="flex gap-4 mt-4 h-[calc(100vh-200px)]">
+      <div class="role-table-container flex flex-col w-[290px]">
+        <el-table
+          border
+          :data="rolesList"
+          :row-class-name="tableRowClassName"
+          height="calc(100vh - 300px)"
+          class="w-full cursor-pointer custom-table-header"
+          @row-click="selectRole"
+        >
+          <el-table-column
+            prop="role_name"
+            :label="$t('1d952be7.10a6f1')"
+            width="290px"
+            class="py-1"
+          >
+            <template slot-scope="{ row }">
+              <div class="flex justify-between items-center w-full pr-5">
+                <span :class="['role-name', activeRoleId === row.role_id ? 'text-primary' : '']">
+                  {{ row.role_name }}
+                </span>
+                <el-button
+                  type="text"
+                  class="hover:underline"
+                  @click.stop="deleteSpecificRole(row)"
+                >
+                  {{ $t('1d952be7.2f4aad') }}
+                </el-button>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <div
+          class="p-0.5 text-xs border border-[#ebeef5] border-t-0 rounded-b w-full flex items-center justify-center"
+        >
+          <el-pagination
+            layout="total, prev, pager, next"
+            :current-page="page.pageIndex"
+            :total="total_count"
+            :page-size="20"
+            :pager-count="3"
+            :small="true"
+            background
+            class="flex items-center justify-center"
+            @current-change="onCurrentChange"
+          />
+        </div>
+      </div>
+
+      <div class="flex flex-col flex-1">
+        <div
+          class="bg-[#F0F2F5] py-2 px-1.5 border border-[#ebeef5] pl-2.5 rounded-t flex justify-between items-center"
+        >
+          <span>{{
+            activeRole ? activeRole.role_name + $t('34fa19b2.36afa2') : $t('1d952be7.86a1be')
+          }}</span>
+          <el-button
+            type="primary"
+            :loading="saveLoading"
+            class="!mr-1"
+            @click="savePermissions"
+          >
+            {{ $t('1d952be7.be5fbb') }}
+          </el-button>
+        </div>
+
+        <div
+          class="flex-1 overflow-y-auto border border-[#ebeef5] border-t-0 rounded-b bg-[#fafbfc]"
+        >
+          <div
+            v-if="activeRole && menu && menu.length > 0"
+            class="bg-white rounded overflow-hidden"
+          >
+            <table class="w-full border-collapse">
+              <tbody>
+                <template v-for="firstMenu in menu">
+                  <template v-if="firstMenu.children && firstMenu.children.length > 0">
+                    <tr
+                      v-for="(secondMenu, secondIndex) in firstMenu.children"
+                      :key="`${firstMenu.alias_name}-${secondMenu.alias_name}`"
+                      class="hover:bg-[#f5f7fa] border-b border-[#ebeef5]"
+                    >
+                      <td
+                        v-if="secondIndex === 0"
+                        :rowspan="firstMenu.children.length"
+                        class="border-r border-[#ebeef5]"
+                      >
+                        <div class="flex items-center py-1">
+                          <el-checkbox
+                            class="pl-2"
+                            :value="isPermissionChecked(firstMenu.alias_name)"
+                            :indeterminate="isPermissionIndeterminate(firstMenu.alias_name)"
+                            @change="togglePermission(firstMenu.alias_name, $event)"
+                          >
+                            {{ firstMenu.name }}
+                          </el-checkbox>
+                        </div>
+                      </td>
+
+                      <td class="bg-[#fcfcfc] border-r border-[#ebeef5]">
+                        <div class="flex items-center py-2">
+                          <el-checkbox
+                            class="pl-2"
+                            :value="isPermissionChecked(secondMenu.alias_name)"
+                            :indeterminate="isPermissionIndeterminate(secondMenu.alias_name)"
+                            @change="togglePermission(secondMenu.alias_name, $event)"
+                          >
+                            {{ secondMenu.name }}
+                          </el-checkbox>
+                        </div>
+                      </td>
+
+                      <td>
+                        <div
+                          v-if="secondMenu.children && secondMenu.children.length > 0"
+                          class="flex flex-wrap gap-3 mt-2 mb-2"
+                        >
+                          <div v-for="thirdMenu in secondMenu.children" :key="thirdMenu.alias_name">
+                            <el-checkbox
+                              class="pl-2"
+                              :value="isPermissionChecked(thirdMenu.alias_name)"
+                              :indeterminate="isPermissionIndeterminate(thirdMenu.alias_name)"
+                              @change="togglePermission(thirdMenu.alias_name, $event)"
+                            >
+                              {{ thirdMenu.name }}
+                            </el-checkbox>
+                          </div>
+                        </div>
+                        <div v-else class="h-full flex items-center">
+                          <span class="no-data-text" />
+                        </div>
+                      </td>
+                    </tr>
+                  </template>
+
+                  <template v-else>
+                    <tr
+                      :key="firstMenu.alias_name"
+                      class="hover:bg-[#f5f7fa] border-b border-[#ebeef5]"
+                    >
+                      <td class="border-r border-[#ebeef5]">
+                        <div class="flex items-center py-2">
+                          <el-checkbox
+                            class="pl-2"
+                            :value="isPermissionChecked(firstMenu.alias_name)"
+                            @change="togglePermission(firstMenu.alias_name, $event)"
+                          >
+                            {{ firstMenu.name }}
+                          </el-checkbox>
+                        </div>
+                      </td>
+                      <td class="border-r border-[#ebeef5]">
+                        <div class="no-data-text" />
+                      </td>
+                      <td>
+                        <div class="no-data-text" />
+                      </td>
+                    </tr>
+                  </template>
+                </template>
+              </tbody>
+            </table>
+          </div>
+          <div
+            v-else
+            class="flex items-center justify-center h-[300px] text-[#909399] text-base bg-[#fafbfc]"
+          >
+            <div class="empty-text">
+              {{ activeRole ? $t('34fa19b2.7c1fcf') : $t('34fa19b2.5850fe') }}
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </SpPage>
+</template>
+
+<script>
+import { pageMixin } from '@/mixins'
+
+export default {
+  mixins: [pageMixin],
+  data() {
+    return {
+      menu: [],
+      form: {
+        role_name: '',
+        role_id: '',
+        role_source: 'distributor',
+        permission: {
+          shopmenu_alias_name: []
+        }
+      },
+      rolesList: [],
+      loading: false,
+      total_count: 0,
+      params: {
+        role_name: ''
+      },
+      activeRoleId: null,
+      activeRole: null,
+      activeRoleIndex: -1,
+      saveLoading: false,
+      originalPermissions: [],
+      currentPermissions: [],
+      permissionsChanged: false,
+      currentDialogPermissions: []
+    }
+  },
+  computed: {
+    filterFormItems() {
+      return [
+        {
+          formItemClass: 'w-1/3',
+          label: this.$t('1d952be7.10a6f1'),
+          fieldName: 'role_name',
+          component: 'input',
+          componentProps: {
+            placeholder: this.$t('34fa19b2.2a92f5')
+          }
+        }
+      ]
+    },
+    dialogFormItems() {
+      return [
+        {
+          label: this.$t('1d952be7.10a6f1'),
+          fieldName: 'role_name',
+          component: 'input',
+          componentProps: {
+            placeholder: this.$t('1d952be7.395730'),
+            style: {
+              width: '300px'
+            }
+          }
+        }
+      ]
+    }
+  },
+  watch: {
+    currentPermissions: {
+      handler(newPermissions) {
+        const originalSet = new Set(this.originalPermissions)
+        const currentSet = new Set(newPermissions)
+        const sizeSame = originalSet.size === currentSet.size
+        const contentSame = [...originalSet].every((perm) => currentSet.has(perm))
+        this.permissionsChanged = !(sizeSame && contentSame)
+      },
+      deep: true
+    }
+  },
+  mounted() {
+    this.page.pageSize = 20
+    this.getMenu()
+    this.fetchList()
+  },
+  methods: {
+    async getMenu() {
+      try {
+        const res = await this.$api.company.getPermissionList({ version: 3 })
+        this.menu = Array.isArray(res) ? res : res?.list || res?.data || []
+      } catch (e) {
+        this.menu = []
+      }
+    },
+    tableRowClassName({ row }) {
+      if (row.role_id === this.activeRoleId) {
+        return 'current-row'
+      }
+      return ''
+    },
+    findMenuItem(aliasName, menuList = null) {
+      const searchList = menuList || this.menu
+      for (const item of searchList) {
+        if (item.alias_name === aliasName) {
+          return item
+        }
+        if (item.children) {
+          const found = this.findMenuItem(aliasName, item.children)
+          if (found) return found
+        }
+      }
+      return null
+    },
+    getLeafPermissions(node) {
+      const permissions = []
+      if (!node) return permissions
+
+      if (!node.children || node.children.length === 0) {
+        if (node.alias_name) {
+          permissions.push(node.alias_name)
+        }
+        return permissions
+      }
+      node.children.forEach((child) => {
+        permissions.push(...this.getLeafPermissions(child))
+      })
+      return permissions
+    },
+    isNodeChecked(aliasName, permissions) {
+      const permList = permissions
+      const menuItem = this.findMenuItem(aliasName)
+      if (!menuItem) {
+        return permList.includes(aliasName) ? 2 : 0
+      }
+      if (!menuItem.children || menuItem.children.length === 0) {
+        return permList.includes(aliasName) ? 2 : 0
+      }
+      const leafPermissions = this.getLeafPermissions(menuItem)
+      const selectedLeafCount = leafPermissions.filter((leaf) => permList.includes(leaf)).length
+
+      if (selectedLeafCount === 0) {
+        return 0
+      } else if (selectedLeafCount === leafPermissions.length) {
+        return 2
+      } else {
+        return 1
+      }
+    },
+    getAllNodePermissions(node) {
+      const permissions = []
+      if (!node) return permissions
+
+      if (node.alias_name) {
+        permissions.push(node.alias_name)
+      }
+
+      if (node.children) {
+        node.children.forEach((child) => {
+          permissions.push(...this.getAllNodePermissions(child))
+        })
+      }
+      return permissions
+    },
+    isPermissionChecked(aliasName) {
+      const state = this.isNodeChecked(aliasName, this.currentPermissions)
+      return state === 2
+    },
+    isPermissionIndeterminate(aliasName) {
+      const state = this.isNodeChecked(aliasName, this.currentPermissions)
+      return state === 1
+    },
+    togglePermission(aliasName, checked) {
+      const menuItem = this.findMenuItem(aliasName)
+      const currentState = this.isNodeChecked(aliasName, this.currentPermissions)
+      if (currentState === 1) {
+        checked = true
+      }
+
+      if (checked) {
+        if (menuItem) {
+          const allPermissions = this.getAllNodePermissions(menuItem)
+          allPermissions.forEach((perm) => {
+            if (!this.currentPermissions.includes(perm)) {
+              this.currentPermissions.push(perm)
+            }
+          })
+        }
+      } else if (menuItem) {
+        const allPermissions = this.getAllNodePermissions(menuItem)
+        allPermissions.forEach((perm) => {
+          const index = this.currentPermissions.indexOf(perm)
+          if (index > -1) {
+            this.currentPermissions.splice(index, 1)
+          }
+        })
+      }
+      this.$forceUpdate()
+    },
+    async selectRole(role, index) {
+      if (this.activeRoleId === role.role_id) {
+        return
+      }
+
+      if (this.permissionsChanged && this.activeRoleId) {
+        try {
+          await this.$confirm(this.$t('34fa19b2.a6dd59'), this.$t('1d952be7.02d981'), {
+            confirmButtonText: this.$t('34fa19b2.1862d8'),
+            cancelButtonText: this.$t('1d952be7.625fb2'),
+            type: 'warning'
+          })
+        } catch {
+          return
+        }
+      }
+
+      this.activeRoleId = role.role_id
+      this.activeRole = role
+      this.activeRoleIndex = index
+
+      const apiPermissions = role.permission?.shopmenu_alias_name || []
+      this.originalPermissions = [...apiPermissions]
+      this.currentPermissions = [...apiPermissions]
+      this.permissionsChanged = false
+      this.$forceUpdate()
+    },
+    async savePermissions() {
+      if (!this.activeRole) {
+        return
+      }
+      try {
+        this.saveLoading = true
+        const updateData = {
+          role_name: this.activeRole.role_name,
+          role_id: this.activeRole.role_id,
+          role_source: 'distributor',
+          permission: {
+            shopmenu_alias_name: this.currentPermissions,
+            version: 3
+          }
+        }
+        await this.$api.company.updateRolesInfo(this.activeRole.role_id, updateData)
+        const roleIndex = this.rolesList.findIndex((r) => r.role_id === this.activeRoleId)
+        if (roleIndex !== -1) {
+          this.rolesList[roleIndex].permission = updateData.permission
+        }
+        this.originalPermissions = [...this.currentPermissions]
+        this.permissionsChanged = false
+
+        this.$message({
+          message: this.$t('34fa19b2.50e7aa'),
+          type: 'success',
+          duration: 2000
+        })
+      } catch (error) {
+        this.$message({
+          message: this.$t('34fa19b2.23a961'),
+          type: 'error',
+          duration: 2000
+        })
+      } finally {
+        this.saveLoading = false
+      }
+    },
+    addRoleLabels() {
+      this.form.role_name = ''
+      this.form.role_id = ''
+      this.form.role_source = 'distributor'
+      this.form.permission = {
+        shopmenu_alias_name: []
+      }
+      this.currentDialogPermissions = []
+
+      this.$dialog.open({
+        title: this.$t('1d952be7.d36f39'),
+        size: 'mini',
+        buttonConfirm: {
+          text: this.$t('1d952be7.be5fbb')
+        },
+        content: (
+          <SpFormPlus
+            v-model={this.form}
+            form-type='dialogForm'
+            form-items={this.dialogFormItems}
+            show-default-actions={false}
+          />
+        ),
+        confirmBefore: async () => {
+          const formData = {
+            role_name: this.form.role_name.trim(),
+            role_source: 'distributor',
+            permission: {
+              shopmenu_alias_name: this.currentDialogPermissions || [],
+              version: 3
+            }
+          }
+          await this.$api.company.createRoles(formData)
+          this.activeRoleId = null
+          this.activeRole = null
+          this.activeRoleIndex = -1
+          this.originalPermissions = []
+          this.currentPermissions = []
+          this.permissionsChanged = false
+          await this.fetchList()
+          this.$message.success(this.$t('34fa19b2.469266'))
+        }
+      })
+    },
+    async fetchList() {
+      this.loading = true
+      const { pageIndex: page, pageSize } = this.page
+
+      const requestParams = {
+        page,
+        pageSize,
+        service_type: 'timescard',
+        role_source: 'distributor',
+        role_name: this.params.role_name || ''
+      }
+
+      const previousActiveRoleId = this.activeRoleId
+
+      try {
+        const response = await this.$api.company.getRolesList(requestParams)
+        const data = response?.list ? response : response?.data || {}
+        this.rolesList = data.list || []
+        this.total_count = data.total_count || 0
+
+        this.originalPermissions = []
+        this.currentPermissions = []
+        this.permissionsChanged = false
+
+        let roleToSelect = null
+        let selectIndex = -1
+
+        if (previousActiveRoleId) {
+          const previousRole = this.rolesList.find((role) => role.role_id === previousActiveRoleId)
+          if (previousRole) {
+            roleToSelect = previousRole
+            selectIndex = this.rolesList.indexOf(previousRole)
+          }
+        }
+
+        if (!roleToSelect && this.rolesList.length > 0) {
+          roleToSelect = this.rolesList[0]
+          selectIndex = 0
+        }
+
+        if (roleToSelect) {
+          await this.selectRole(roleToSelect, selectIndex)
+        } else {
+          this.activeRole = null
+          this.activeRoleId = null
+          this.activeRoleIndex = -1
+        }
+      } catch (error) {
+        this.activeRoleId = null
+        this.activeRole = null
+        this.activeRoleIndex = -1
+        this.originalPermissions = []
+        this.currentPermissions = []
+        this.permissionsChanged = false
+        this.$message({
+          type: 'error',
+          message: this.$t('1d952be7.929b60')
+        })
+      } finally {
+        this.loading = false
+      }
+    },
+    async deleteSpecificRole(row) {
+      try {
+        await this.$confirm(this.$t('1d952be7.82cd52'), this.$t('1d952be7.02d981'), {
+          confirmButtonText: this.$t('1d952be7.38cf16'),
+          cancelButtonText: this.$t('1d952be7.625fb2'),
+          type: 'warning'
+        })
+        await this.$api.company.deleteRole(row.role_id)
+
+        const deletedIndex = this.rolesList.findIndex((r) => r.role_id === row.role_id)
+        if (deletedIndex !== -1) {
+          this.rolesList.splice(deletedIndex, 1)
+          this.total_count--
+
+          if (this.activeRoleId === row.role_id) {
+            this.originalPermissions = []
+            this.currentPermissions = []
+            this.permissionsChanged = false
+            this.activeRoleId = null
+            this.activeRole = null
+            this.activeRoleIndex = -1
+          }
+
+          if (this.rolesList.length > 0) {
+            const firstRole = this.rolesList[0]
+            if (firstRole && firstRole.role_id) {
+              await this.selectRole(firstRole, 0)
+            }
+          }
+        }
+
+        this.$message({
+          message: this.$t('1d952be7.0007d1'),
+          type: 'success',
+          duration: 5000
+        })
+      } catch (error) {
+        if (error === 'cancel' || error === 'close') {
+          this.$message({
+            type: 'info',
+            message: this.$t('1d952be7.2111cc')
+          })
+        } else {
+          this.$message({
+            message: this.$t('34fa19b2.89976e'),
+            type: 'error',
+            duration: 3000
+          })
+        }
+      }
+    },
+    onSearch() {
+      this.page.pageIndex = 1
+      this.fetchList()
+    },
+    onReset() {
+      this.params.role_name = ''
+      this.page.pageIndex = 1
+      this.activeRoleId = null
+      this.activeRole = null
+      this.activeRoleIndex = -1
+      this.originalPermissions = []
+      this.currentPermissions = []
+      this.permissionsChanged = false
+      this.fetchList()
+    },
+    onCurrentChange(val) {
+      this.page.pageIndex = val
+      this.fetchList()
+    }
+  }
+}
+</script>
+
+<style scoped>
+.role-table-container ::v-deep .el-table__body-wrapper {
+  @apply overflow-y-auto w-full overflow-x-hidden;
+}
+
+.role-table-container ::v-deep .el-table__row:hover > td {
+  @apply !bg-[color-mix(in_srgb,_white_90%,_var(--primary))];
+}
+
+.custom-table-header :deep(.el-table__header .cell) {
+  @apply py-1.5;
+}
+</style>
diff --git a/src/views/settings/systemConfig/payment.vue b/src/views/settings/systemConfig/payment.vue
index 7f6b04d..59b8570 100644
--- a/src/views/settings/systemConfig/payment.vue
+++ b/src/views/settings/systemConfig/payment.vue
@@ -102,7 +102,7 @@ const [BatchStatusForm, BatchStatusFormApi] = useForm({
   showDefaultActions: false
 })
 
-// 创建收款账户表单配置
+// 创建收款账户表单配置（勿在 formItems 写死 value，否则 SpFormPlus 会覆盖弹框传入的回显数据）
 const [AccountForm, AccountFormApi] = useForm({
   formType: 'normalForm',
   labelWidth: '120px',
@@ -113,7 +113,6 @@ const [AccountForm, AccountFormApi] = useForm({
       label: '收款人户名',
       component: 'input',
       formItemClass: 'w-2/4',
-      value: '',
       componentProps: {
         placeholder: '请输入收款人户名'
       },
@@ -124,7 +123,6 @@ const [AccountForm, AccountFormApi] = useForm({
       label: '银行账号',
       component: 'input',
       formItemClass: 'w-2/4',
-      value: '',
       componentProps: {
         placeholder: '请输入银行账号'
       },
@@ -135,7 +133,6 @@ const [AccountForm, AccountFormApi] = useForm({
       label: '开户银行',
       component: 'input',
       formItemClass: 'w-2/4',
-      value: '',
       componentProps: {
         placeholder: '请输入开户银行'
       },
@@ -146,7 +143,6 @@ const [AccountForm, AccountFormApi] = useForm({
       label: '银联号',
       component: 'input',
       formItemClass: 'w-2/4',
-      value: '',
       componentProps: {
         placeholder: '请输入银联号'
       },
@@ -156,7 +152,6 @@ const [AccountForm, AccountFormApi] = useForm({
       fieldName: 'pic',
       label: '银行LOGO',
       component: 'imagepicker',
-      value: '',
       componentProps: {
         multiple: false,
         limit: 1,
@@ -171,7 +166,6 @@ const [AccountForm, AccountFormApi] = useForm({
       label: '备注',
       component: 'input',
       formItemClass: 'w-2/4',
-      value: '',
       componentProps: {
         type: 'textarea',
         rows: 3,
@@ -182,7 +176,6 @@ const [AccountForm, AccountFormApi] = useForm({
       fieldName: 'is_default',
       label: '是否默认',
       component: 'radio',
-      value: 'false',
       componentProps: {
         options: [
           { label: '是', value: 'true' },
@@ -1344,7 +1337,7 @@ export default {
           is_default: 'false'
         }
       }
-      await this.$dialog.open({
+      const dialogPromise = this.$dialog.open({
         title: type == 'edit' ? this.$t('10d92d52.27e12d') : this.$t('10d92d52.89beb5'),
         size: 'medium',
         content: <CompAccountForm ref='accountsForm' value={this.accountsForm} />,
@@ -1356,6 +1349,22 @@ export default {
           }
         }
       })
+      // 弹框挂载后再回填，避免 SpFormPlus 初始化用空值覆盖
+      await this.$nextTick()
+      if (AccountFormApi.setFieldsValue) {
+        const form = this.accountsForm || {}
+        AccountFormApi.setFieldsValue({
+          bank_account_name: form.bank_account_name || '',
+          bank_account_no: form.bank_account_no || '',
+          bank_name: form.bank_name || '',
+          china_ums_no: form.china_ums_no || '',
+          pic: form.pic || '',
+          remark: form.remark || '',
+          is_default:
+            form.is_default === true || form.is_default === 'true' ? 'true' : 'false'
+        })
+      }
+      await dialogPromise
       const formData = await AccountFormApi.getFieldsValue()
       // 使用深拷贝避免引用问题
       let params = JSON.parse(JSON.stringify(formData))
diff --git a/src/views/store/shop-list.vue b/src/views/store/shop-list.vue
index 3c2d961..c378744 100755
--- a/src/views/store/shop-list.vue
+++ b/src/views/store/shop-list.vue
@@ -22,6 +22,7 @@ import moment from 'moment'
 import { createSetting } from '@shopex-ui/finder'
 import { LayoutHeader } from '@/layout/basic'
 import DEFAULT_CONFIG from '@/config'
+import { resolveAppPath } from '@/utils'
 
 export default {
   components: {
@@ -74,7 +75,7 @@ export default {
                 })
                 if (res.status) {
                   this.$store.commit('user/setShopId', { shopId: row.distributor_id })
-                  window.location.href = '/shopadmin'
+                  window.location.href = resolveAppPath('/shopadmin')
                 } else {
                   this.$message.error(this.$t('16bb187d.4a3301'))
                 }