From aa2eac8d519c514c6548b460faf408820618024a Mon Sep 17 00:00:00 2001
From: yml2213 <a2213290201@gmail.com>
Date: Tue, 4 Aug 2026 11:25:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E4=B8=BB=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=E6=A0=8F=E7=88=B6=E5=AD=90=E8=8F=9C=E5=8D=95=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=E6=80=81=E4=B8=8E=E6=A0=91=E5=BD=A2=E5=88=86=E6=94=AF=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/index.css                   | 40 +++++++-----
 frontend/src/layouts/MainLayout.tsx      |  4 +-
 frontend/src/pages/PlatformMerchants.tsx | 79 ++----------------------
 3 files changed, 33 insertions(+), 90 deletions(-)

diff --git a/frontend/src/index.css b/frontend/src/index.css
index fd1931b..a164f33 100644
--- a/frontend/src/index.css
+++ b/frontend/src/index.css
@@ -254,8 +254,8 @@ a:hover {
 .app-sidebar__item {
   display: flex;
   align-items: center;
-  min-height: 44px;
-  padding: 10px 14px;
+  min-height: 40px;
+  padding: 8px 12px;
   border-radius: var(--radius-md);
   font-size: 14px;
   font-weight: 600;
@@ -263,7 +263,17 @@ a:hover {
 
 .app-sidebar__item:hover {
   color: #2563eb;
-  background: #eff6ff;
+  background: #f1f5f9;
+}
+
+.app-sidebar__item--parent-active {
+  color: #2563eb !important;
+  font-weight: 700;
+  background: transparent !important;
+}
+
+.app-sidebar__item--parent-active .app-sidebar__icon {
+  color: #2563eb !important;
 }
 
 .app-sidebar__item--active {
@@ -328,28 +338,30 @@ a:hover {
 .app-sidebar__children {
   display: flex;
   flex-direction: column;
-  gap: 4px;
-  margin-top: 4px;
-  padding-left: 36px;
+  gap: 2px;
+  margin: 2px 0 4px 22px;
+  padding-left: 10px;
+  border-left: 1.5px solid #e2e8f0;
 }
 
 .app-sidebar__child {
-  min-height: 38px;
-  padding: 8px 12px;
-  border-radius: var(--radius-sm);
-  font-size: 13.5px;
+  min-height: 34px;
+  padding: 6px 12px;
+  border-radius: 6px;
+  font-size: 13px;
   font-weight: 500;
+  color: #64748b;
 }
 
 .app-sidebar__child:hover:not(:disabled) {
   color: #2563eb;
-  background: #eff6ff;
+  background: #f1f5f9;
 }
 
 .app-sidebar__child--active {
-  color: #1d4ed8 !important;
-  background: #dbeafe !important;
-  font-weight: 600;
+  color: #2563eb !important;
+  background: #eff6ff !important;
+  font-weight: 700;
 }
 
 .app-sidebar--collapsed .app-sidebar__brand {
diff --git a/frontend/src/layouts/MainLayout.tsx b/frontend/src/layouts/MainLayout.tsx
index 5c52916..2cc7268 100644
--- a/frontend/src/layouts/MainLayout.tsx
+++ b/frontend/src/layouts/MainLayout.tsx
@@ -258,10 +258,12 @@ export default function MainLayout() {
             const isOpen = openKeys.includes(section.key)
             const isSelected = selectedKey === section.key
             const hasSelectedChild = section.children?.some((child) => child.key === selectedKey)
+            const isParentActive = hasSelectedChild
+            const isSingleActive = isSelected && !section.children?.length
             return (
               <div className="app-sidebar__group" key={section.key}>
                 <button
-                  className={`app-sidebar__item${isSelected || hasSelectedChild ? ' app-sidebar__item--active' : ''}${section.disabled ? ' app-sidebar__item--disabled' : ''}`}
+                  className={`app-sidebar__item${isSingleActive ? ' app-sidebar__item--active' : ''}${isParentActive ? ' app-sidebar__item--parent-active' : ''}${section.disabled ? ' app-sidebar__item--disabled' : ''}`}
                   type="button"
                   onClick={() => toggleSection(section)}
                   title={collapsed ? section.label : undefined}
diff --git a/frontend/src/pages/PlatformMerchants.tsx b/frontend/src/pages/PlatformMerchants.tsx
index 4776a9e..4430e54 100644
--- a/frontend/src/pages/PlatformMerchants.tsx
+++ b/frontend/src/pages/PlatformMerchants.tsx
@@ -14,21 +14,13 @@ import {
   Typography,
   message,
 } from 'antd'
-import { GiftOutlined, PlusOutlined, ReloadOutlined, TeamOutlined, WalletOutlined } from '@ant-design/icons'
+import { GiftOutlined, PlusOutlined, ReloadOutlined, WalletOutlined } from '@ant-design/icons'
 import type { ColumnsType } from 'antd/es/table'
-import { useNavigate } from 'react-router-dom'
 import { platformApi } from '../api'
-import type { Merchant, MerchantMember, PageResult, ProductCatalogItem, WalletAccount } from '../types'
+import type { Merchant, PageResult, ProductCatalogItem, WalletAccount } from '../types'
 import { formatDateTime } from '../utils/time'
 import { PageHeader } from '../components/PageHeader'
 
-const memberRoleOptions = [
-  { value: 'owner', label: '负责人' },
-  { value: 'operator', label: '运营' },
-  { value: 'finance', label: '财务' },
-  { value: 'viewer', label: '只读' },
-]
-
 const featureOptions = [
   { value: 'products', label: '商品' },
   { value: 'orders', label: '订单' },
@@ -38,12 +30,10 @@ const featureOptions = [
 ]
 
 export default function PlatformMerchants() {
-  const navigate = useNavigate()
   const [data, setData] = useState<PageResult<Merchant>>({ list: [], total: 0, page: 1, size: 10 })
   const [loading, setLoading] = useState(false)
   const [createOpen, setCreateOpen] = useState(false)
   const [settingsOpen, setSettingsOpen] = useState(false)
-  const [memberOpen, setMemberOpen] = useState(false)
   const [assignOpen, setAssignOpen] = useState(false)
   const [assignLoading, setAssignLoading] = useState(false)
   const [assignSubmitting, setAssignSubmitting] = useState(false)
@@ -57,7 +47,6 @@ export default function PlatformMerchants() {
   const [adjustWallet, setAdjustWallet] = useState<WalletAccount | null>(null)
   const [createForm] = Form.useForm()
   const [settingsForm] = Form.useForm()
-  const [memberForm] = Form.useForm()
   const [adjustForm] = Form.useForm()
 
   const load = useCallback(async (page = data.page, size = data.size) => {
@@ -117,22 +106,6 @@ export default function PlatformMerchants() {
     }
   }
 
-  const submitMember = async () => {
-    if (!selectedMerchant) return
-    const values = await memberForm.validateFields()
-    try {
-      await platformApi.addMember(selectedMerchant.id, {
-        user_id: values.user_id,
-        role: values.role as MerchantMember['role'],
-        is_default: values.is_default,
-      })
-      message.success('成员已添加')
-      setMemberOpen(false)
-    } catch (e) {
-      message.error(e instanceof Error ? e.message : '添加失败')
-    }
-  }
-
   const openAdjust = async (record: Merchant) => {
     setSelectedMerchant(record)
     setAdjustOpen(true)
@@ -259,21 +232,10 @@ export default function PlatformMerchants() {
     {
       title: '操作',
       key: 'action',
-      width: 240,
+      width: 180,
       fixed: 'right',
       render: (_, record) => (
         <Space size={0}>
-          <Button
-            type="link"
-            size="small"
-            onClick={() => {
-              localStorage.setItem('merchant_id', String(record.id))
-              message.success('当前商户已切换')
-              navigate('/merchant-center')
-            }}
-          >
-            进入
-          </Button>
           <Button
             type="link"
             size="small"
@@ -306,19 +268,6 @@ export default function PlatformMerchants() {
           >
             调整积分
           </Button>
-          <Button
-            type="link"
-            size="small"
-            icon={<TeamOutlined />}
-            onClick={() => {
-              setSelectedMerchant(record)
-              memberForm.resetFields()
-              memberForm.setFieldsValue({ role: 'operator', is_default: false })
-              setMemberOpen(true)
-            }}
-          >
-            成员
-          </Button>
         </Space>
       ),
     },
@@ -328,7 +277,7 @@ export default function PlatformMerchants() {
     <div>
       <PageHeader
         title="平台商户管理"
-        subtitle="平台管理员维护各分销商户租户、分配商品库、配置手续费费率与授权成员"
+        subtitle="平台管理员维护各分销商户租户、分配商品库、配置手续费费率与积分调整"
         breadcrumbs={[{ title: '商户管理' }]}
         extra={
           <Space>
@@ -508,26 +457,6 @@ export default function PlatformMerchants() {
         </Spin>
       </Modal>
 
-      <Modal
-        title={selectedMerchant ? `添加成员：${selectedMerchant.name}` : '添加成员'}
-        open={memberOpen}
-        onOk={submitMember}
-        onCancel={() => setMemberOpen(false)}
-        destroyOnClose
-      >
-        <Form form={memberForm} layout="vertical" style={{ marginTop: 16 }}>
-          <Form.Item name="user_id" label="用户 ID" rules={[{ required: true }]}>
-            <InputNumber min={1} precision={0} style={{ width: '100%' }} />
-          </Form.Item>
-          <Form.Item name="role" label="角色" rules={[{ required: true }]}>
-            <Select options={memberRoleOptions} />
-          </Form.Item>
-          <Form.Item name="is_default" label="默认商户">
-            <Select options={[{ value: true, label: '是' }, { value: false, label: '否' }]} />
-          </Form.Item>
-        </Form>
-      </Modal>
-
       <Modal
         title={selectedMerchant ? `分配商品：${selectedMerchant.name}` : '分配商品'}
         open={assignOpen}