From e0c0c59e730207ced759fbfb1a758f1d88b0b842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?= Date: Fri, 8 Aug 2025 16:25:50 +0800 Subject: [PATCH] =?UTF-8?q?FEAT=20=3D>=20=E6=9C=AC=E6=AC=A1=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E9=A1=B9=E7=9B=AE=E4=B8=BA=EF=BC=9A=E5=B0=86=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=AE=A1=E7=90=86=E8=B7=AF=E5=BE=84=E4=BB=8E=20"/devi?= =?UTF-8?q?ces"=20=E4=BF=AE=E6=94=B9=E4=B8=BA=20"/mine/devices"=EF=BC=8C?= =?UTF-8?q?=E4=BB=A5=E7=BB=9F=E4=B8=80=E8=B7=AF=E7=94=B1=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E5=B9=B6=E6=8F=90=E5=8D=87=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nkebao/src/pages/mobile/home/index.tsx | 2 +- nkebao/src/pages/mobile/mine/main/index.tsx | 2 +- .../traffic-distribution/form/index.tsx | 21 +++++++------------ nkebao/src/router/config.ts | 8 +++---- nkebao/src/router/module/mine.tsx | 4 ++-- 5 files changed, 15 insertions(+), 22 deletions(-) diff --git a/nkebao/src/pages/mobile/home/index.tsx b/nkebao/src/pages/mobile/home/index.tsx index 60244b37e..9f4a65b66 100644 --- a/nkebao/src/pages/mobile/home/index.tsx +++ b/nkebao/src/pages/mobile/home/index.tsx @@ -125,7 +125,7 @@ const Home: React.FC = () => { }, []); const handleDevicesClick = () => { - navigate("/devices"); + navigate("/mine/devices"); }; const handleWechatClick = () => { diff --git a/nkebao/src/pages/mobile/mine/main/index.tsx b/nkebao/src/pages/mobile/mine/main/index.tsx index 95fb40902..e43ce2604 100644 --- a/nkebao/src/pages/mobile/mine/main/index.tsx +++ b/nkebao/src/pages/mobile/mine/main/index.tsx @@ -44,7 +44,7 @@ const Mine: React.FC = () => { description: "管理您的设备和微信账号", icon: , count: stats.devices, - path: "/devices", + path: "/mine/devices", bgColor: "#e6f7ff", iconColor: "#1890ff", }, diff --git a/nkebao/src/pages/mobile/workspace/traffic-distribution/form/index.tsx b/nkebao/src/pages/mobile/workspace/traffic-distribution/form/index.tsx index bf82ae584..dcadca5ce 100644 --- a/nkebao/src/pages/mobile/workspace/traffic-distribution/form/index.tsx +++ b/nkebao/src/pages/mobile/workspace/traffic-distribution/form/index.tsx @@ -9,14 +9,12 @@ import { message, Checkbox, } from "antd"; -import { LeftOutlined } from "@ant-design/icons"; import { useNavigate, useParams } from "react-router-dom"; import style from "./index.module.scss"; import StepIndicator from "@/components/StepIndicator"; import Layout from "@/components/Layout/Layout"; import NavCommon from "@/components/NavCommon"; import AccountSelection from "@/components/AccountSelection"; -import { getAccountList } from "@/components/AccountSelection/api"; import { AccountItem } from "@/components/AccountSelection/data"; import { getTrafficDistributionDetail, @@ -118,15 +116,7 @@ const TrafficDistributionForm: React.FC = () => { setMaxPerDay(config.maxPerDay); setTimeType(config.timeType); - // 设置账号信息 - 这里需要根据实际API返回的数据结构调整 - // 暂时使用ID创建简单的AccountItem对象 - const accountItems = config.account.map((id: any) => ({ - id: Number(id), - userName: `账号${id}`, - realName: "", - departmentName: "", - })); - setSelectedAccounts(accountItems); + setSelectedAccounts(config.accountGroupsOptions); // 设置时间范围 - 使用dayjs格式 if (config.timeType === 2 && config.startTime && config.endTime) { @@ -243,6 +233,9 @@ const TrafficDistributionForm: React.FC = () => { @@ -252,19 +245,19 @@ const TrafficDistributionForm: React.FC = () => { className={style.radioGroup} > - 均分配{" "} + 均分配 (流量将均分分配给所有客服) - 优先级分配{" "} + 优先级分配 (按客服优先级顺序分配) - 比例分配{" "} + 比例分配 (按设置比例分配流量) diff --git a/nkebao/src/router/config.ts b/nkebao/src/router/config.ts index 1b560e874..2b8271a01 100644 --- a/nkebao/src/router/config.ts +++ b/nkebao/src/router/config.ts @@ -20,7 +20,7 @@ export const routeGroups = { // 设备管理 devices: { name: "设备管理", - routes: ["/devices", "/devices/:id"], + routes: ["/mine/devices", "/mine/devices/:id"], }, // 微信号管理 @@ -113,8 +113,8 @@ export const routePermissions = { "/scene", "/work", "/mine", - "/devices", - "/devices/:id", + "/mine/devices", + "/mine/devices/:id", "/wechat-accounts", "/wechat-accounts/:id", "/workspace", @@ -141,7 +141,7 @@ export const routeTitles: Record = { "/scene": "场景获客", "/work": "工作台", "/mine": "我的", - "/devices": "设备管理", + "/mine/devices": "设备管理", "/wechat-accounts": "微信号管理", "/workspace": "工作台", "/scenarios": "场景管理", diff --git a/nkebao/src/router/module/mine.tsx b/nkebao/src/router/module/mine.tsx index 9bdb1ac34..4c16cc055 100644 --- a/nkebao/src/router/module/mine.tsx +++ b/nkebao/src/router/module/mine.tsx @@ -20,12 +20,12 @@ const routes = [ auth: true, }, { - path: "/devices", + path: "/mine/devices", element: , auth: true, }, { - path: "/devices/:id", + path: "/mine/devices/:id", element: , auth: true, },