From 2432f7817cbdadcf6cbd699f2a6ab6ac68bb6359 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 17:24:37 +0800 Subject: [PATCH 01/39] =?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=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=B5=81=E9=87=8F=E5=88=86=E9=85=8D=E9=80=89=E9=A1=B9=E7=9A=84?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E6=A0=BC=E5=BC=8F=EF=BC=8C=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E5=A4=9A=E4=BD=99=E7=9A=84=E7=A9=BA=E6=A0=BC=E4=BB=A5=E6=8F=90?= =?UTF-8?q?=E5=8D=87=E4=BB=A3=E7=A0=81=E6=95=B4=E6=B4=81=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mobile/workspace/traffic-distribution/form/index.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 bf82ae58..34fde44d 100644 --- a/nkebao/src/pages/mobile/workspace/traffic-distribution/form/index.tsx +++ b/nkebao/src/pages/mobile/workspace/traffic-distribution/form/index.tsx @@ -252,19 +252,19 @@ const TrafficDistributionForm: React.FC = () => { className={style.radioGroup} > - 均分配{" "} + 均分配 (流量将均分分配给所有客服) - 优先级分配{" "} + 优先级分配 (按客服优先级顺序分配) - 比例分配{" "} + 比例分配 (按设置比例分配流量) From 22cc5755faada83f8c20cdb20fea9fe24fb5b9bc 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: Wed, 13 Aug 2025 11:32:17 +0800 Subject: [PATCH 02/39] =?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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nkebao/postcss.config.js | 14 +++++------ nkebao/技术栈.md | 50 ++++++++++++++++++++-------------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/nkebao/postcss.config.js b/nkebao/postcss.config.js index 34ea9ede..82ee5d38 100644 --- a/nkebao/postcss.config.js +++ b/nkebao/postcss.config.js @@ -1,8 +1,8 @@ -module.exports = { - plugins: { - 'postcss-pxtorem': { - rootValue: 16, - propList: ['*'], - }, - }, +module.exports = { + plugins: { + 'postcss-pxtorem': { + rootValue: 16, + propList: ['*'], + }, + }, }; \ No newline at end of file diff --git a/nkebao/技术栈.md b/nkebao/技术栈.md index be554562..a565619f 100644 --- a/nkebao/技术栈.md +++ b/nkebao/技术栈.md @@ -1,26 +1,26 @@ -## 使用技术栈 -- React 18 -- TypeScript -- Vite（新一代前端构建工具） -- axios -- sass (scss) -- React Router v6 -- antd-mobile -- antd（已设置基础单位为 rem，配合 postcss-pxtorem） -- postcss-pxtorem（px 转 rem，移动端适配） -- ESLint + Prettier（代码规范与自动格式化） -- 路径别名 @ 指向 src 目录 - -## 关于兼容与工程化 -- 自动化脚本（yarn lint、yarn dev 等） -- 移动端 rem 适配（html 根字体 + pxtorem） -- iOS 浏览器滚动回弹兼容问题已通过全局样式处理 -- 支持 VS Code 编辑器自动格式化（推荐配合 ESLint/Prettier 插件） - -## 目录结构简要 -- src/ 业务源码（pages、api、styles、App.tsx、main.tsx 等） -- public/ 静态资源目录 -- index.html 项目入口（根目录） -- vite.config.ts 构建与路径别名配置 -- tsconfig.json TypeScript 配置 +## 使用技术栈 +- React 18 +- TypeScript +- Vite（新一代前端构建工具） +- axios +- sass (scss) +- React Router v6 +- antd-mobile +- antd（已设置基础单位为 rem，配合 postcss-pxtorem） +- postcss-pxtorem（px 转 rem，移动端适配） +- ESLint + Prettier（代码规范与自动格式化） +- 路径别名 @ 指向 src 目录 + +## 关于兼容与工程化 +- 自动化脚本（yarn lint、yarn dev 等） +- 移动端 rem 适配（html 根字体 + pxtorem） +- iOS 浏览器滚动回弹兼容问题已通过全局样式处理 +- 支持 VS Code 编辑器自动格式化（推荐配合 ESLint/Prettier 插件） + +## 目录结构简要 +- src/ 业务源码（pages、api、styles、App.tsx、main.tsx 等） +- public/ 静态资源目录 +- index.html 项目入口（根目录） +- vite.config.ts 构建与路径别名配置 +- tsconfig.json TypeScript 配置 - .eslintrc.js 代码规范配置 \ No newline at end of file From e2dfd4487428f862325b605ca82bdfb430468fd1 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: Wed, 13 Aug 2025 12:18:43 +0800 Subject: [PATCH 03/39] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=A8=AD=E5=82=99?= =?UTF-8?q?=E9=81=B8=E6=93=87=E7=B5=84=E4=BB=B6=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=A8=AD=E5=82=99=E9=A0=AD=E5=83=8F=E5=92=8C=E5=A5=BD=E5=8F=8B?= =?UTF-8?q?=E6=95=B8=E6=93=9A=E9=A1=AF=E7=A4=BA=EF=BC=8C=E8=AA=BF=E6=95=B4?= =?UTF-8?q?=E6=A8=A3=E5=BC=8F=E4=BB=A5=E6=8F=90=E5=8D=87=E7=94=A8=E6=88=B6?= =?UTF-8?q?=E9=AB=94=E9=A9=97=EF=BC=8C=E4=B8=A6=E6=9B=B4=E6=96=B0=E7=9B=B8?= =?UTF-8?q?=E9=97=9C=E6=95=B8=E6=93=9A=E7=B5=90=E6=A7=8B=E4=BB=A5=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E6=96=B0=E5=B1=AC=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cunkebao/dist/.vite/manifest.json | 2 +- Cunkebao/dist/index.html | 2 +- .../src/components/DeviceSelection/data.ts | 2 + .../DeviceSelection/index.module.scss | 158 ++++++++++++---- .../src/components/DeviceSelection/index.tsx | 45 ++++- .../DeviceSelection/selectionPopup.tsx | 82 ++++++--- .../pages/mobile/mine/content/form/index.tsx | 4 +- .../pages/mobile/mine/content/list/index.tsx | 2 +- .../mobile/mine/devices/index.module.scss | 173 ++++++++++++++++++ .../src/pages/mobile/mine/devices/index.tsx | 137 ++++++++------ Cunkebao/src/types/device.ts | 1 + 11 files changed, 489 insertions(+), 119 deletions(-) create mode 100644 Cunkebao/src/pages/mobile/mine/devices/index.module.scss diff --git a/Cunkebao/dist/.vite/manifest.json b/Cunkebao/dist/.vite/manifest.json index 4f0c258e..5c1e7050 100644 --- a/Cunkebao/dist/.vite/manifest.json +++ b/Cunkebao/dist/.vite/manifest.json @@ -33,7 +33,7 @@ "name": "vendor" }, "index.html": { - "file": "assets/index-D3HSx5Yt.js", + "file": "assets/index-DTZ_ow5W.js", "name": "index", "src": "index.html", "isEntry": true, diff --git a/Cunkebao/dist/index.html b/Cunkebao/dist/index.html index f79f7013..a3b55d54 100644 --- a/Cunkebao/dist/index.html +++ b/Cunkebao/dist/index.html @@ -11,7 +11,7 @@ - + diff --git a/Cunkebao/src/components/DeviceSelection/data.ts b/Cunkebao/src/components/DeviceSelection/data.ts index abc9a214..e3e189e6 100644 --- a/Cunkebao/src/components/DeviceSelection/data.ts +++ b/Cunkebao/src/components/DeviceSelection/data.ts @@ -8,6 +8,8 @@ export interface DeviceSelectionItem { wxid?: string; nickname?: string; usedInPlans?: number; + avatar?: string; + totalFriend?: number; } // 组件属性接口 diff --git a/Cunkebao/src/components/DeviceSelection/index.module.scss b/Cunkebao/src/components/DeviceSelection/index.module.scss index ea776f81..33642dd7 100644 --- a/Cunkebao/src/components/DeviceSelection/index.module.scss +++ b/Cunkebao/src/components/DeviceSelection/index.module.scss @@ -67,60 +67,154 @@ } .deviceItem { display: flex; - align-items: flex-start; - gap: 12px; - padding: 16px; - border-radius: 12px; - border: 1px solid #f0f0f0; + flex-direction: column; + gap: 8px; + padding: 12px; background: #fff; - cursor: pointer; - transition: background 0.2s; + border-radius: 12px; + box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06); + transition: all 0.2s ease; + border: 1px solid #f5f5f5; + &:hover { - background: #f5f6fa; + transform: translateY(-1px); + box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1); + } +} + +.headerRow { + display: flex; + align-items: center; + gap: 8px; + margin-bottom: 8px; +} + +.checkboxContainer { + flex-shrink: 0; +} + +.imeiText { + font-size: 13px; + color: #666; + font-family: monospace; + flex: 1; +} + +.mainContent { + display: flex; + align-items: center; + gap: 12px; + cursor: pointer; + padding: 8px; + border-radius: 8px; + transition: background-color 0.2s ease; + + &:hover { + background-color: #f8f9fa; } } .deviceCheckbox { - margin-top: 4px; + flex-shrink: 0; } .deviceInfo { flex: 1; + min-width: 0; + display: flex; + align-items: center; + gap: 12px; } +.deviceAvatar { + width: 64px; + height: 64px; + border-radius: 6px; + background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); + display: flex; + align-items: center; + justify-content: center; + overflow: hidden; + box-shadow: 0 2px 8px rgba(102, 126, 234, 0.25); + flex-shrink: 0; + + img { + width: 100%; + height: 100%; + object-fit: cover; + } + + .avatarText { + font-size: 18px; + color: #fff; + font-weight: 700; + text-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); + } +} + +.deviceContent { + flex: 1; + min-width: 0; +} + .deviceInfoRow { display: flex; align-items: center; - justify-content: space-between; + gap: 6px; + margin-bottom: 6px; } .deviceName { - font-weight: 500; font-size: 16px; - color: #222; + font-weight: 600; + color: #1a1a1a; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } .statusOnline { - width: 56px; - height: 24px; - border-radius: 12px; - background: #52c41a; - color: #fff; - font-size: 13px; - display: flex; - align-items: center; - justify-content: center; + font-size: 11px; + padding: 1px 6px; + border-radius: 8px; + color: #52c41a; + background: #f6ffed; + border: 1px solid #b7eb8f; + font-weight: 500; } .statusOffline { - width: 56px; - height: 24px; - border-radius: 12px; - background: #e5e6eb; - color: #888; - font-size: 13px; - display: flex; - align-items: center; - justify-content: center; + font-size: 11px; + padding: 1px 6px; + border-radius: 8px; + color: #ff4d4f; + background: #fff2f0; + border: 1px solid #ffccc7; + font-weight: 500; } .deviceInfoDetail { + display: flex; + flex-direction: column; + gap: 4px; +} + +.infoItem { + display: flex; + align-items: center; + gap: 8px; +} + +.infoLabel { font-size: 13px; - color: #888; - margin-top: 4px; + color: #666; + min-width: 50px; +} + +.infoValue { + font-size: 13px; + color: #333; + + &.imei { + font-family: monospace; + } + + &.friendCount { + font-weight: 500; + } } .loadingBox { display: flex; diff --git a/Cunkebao/src/components/DeviceSelection/index.tsx b/Cunkebao/src/components/DeviceSelection/index.tsx index 9d31e268..997c56f2 100644 --- a/Cunkebao/src/components/DeviceSelection/index.tsx +++ b/Cunkebao/src/components/DeviceSelection/index.tsx @@ -86,11 +86,52 @@ const DeviceSelection: React.FC = ({ style={{ display: "flex", alignItems: "center", - padding: "4px 8px", + padding: "8px 12px", borderBottom: "1px solid #f0f0f0", fontSize: 14, }} > + {/* 头像 */} +
+ {device.avatar ? ( + 头像 + ) : ( + + {(device.memo || device.wechatId || "设")[0]} + + )} +
+
= ({ textOverflow: "ellipsis", }} > - 【 {device.memo}】 - {device.wechatId} + {device.memo} - {device.wechatId}
{!readonly && ( - - - -); + scenarioOptions, + onConfirm, +}) => { + const [selectedDevices, setSelectedDevices] = useState( + [], + ); + const [packageId, setPackageId] = useState("all"); + const [scenarioId, setScenarioId] = useState("all"); + const [valueLevel, setValueLevel] = useState("all"); + const [userStatus, setUserStatus] = useState("all"); + + const handleApply = () => { + onConfirm({ + deviceIds: selectedDevices.map(d => d.id.toString()), + packageId, + scenarioId, + valueLevel, + userStatus, + }); + onClose(); + }; + + const handleReset = () => { + setSelectedDevices([]); + setPackageId("all"); + setScenarioId("all"); + setValueLevel("all"); + setUserStatus("all"); + }; + + return ( + +
+ 筛选选项 +
+
+
设备
+ +
+
+
流量池
+ ({ label: s.name, value: s.id })), + ]} + /> +
+
+
用户价值
+ setUserStatus(v as UserStatus)} + options={statusOptions} + /> +
+
+ + +
+ + ); +}; export default FilterModal; diff --git a/Cunkebao/src/pages/mobile/mine/traffic-pool/list/api.ts b/Cunkebao/src/pages/mobile/mine/traffic-pool/list/api.ts index 0a6162a8..de5bfff1 100644 --- a/Cunkebao/src/pages/mobile/mine/traffic-pool/list/api.ts +++ b/Cunkebao/src/pages/mobile/mine/traffic-pool/list/api.ts @@ -17,3 +17,14 @@ export async function fetchPackageOptions(): Promise { { id: "pkg-2", name: "测试流量池" }, ]; } + +// 获取获客场景列表 +export async function fetchScenarioOptions(): Promise { + // TODO: 替换为真实接口 + return [ + { id: "scenario-1", name: "朋友圈推广" }, + { id: "scenario-2", name: "群聊引流" }, + { id: "scenario-3", name: "公众号推广" }, + { id: "scenario-4", name: "线下活动" }, + ]; +} diff --git a/Cunkebao/src/pages/mobile/mine/traffic-pool/list/data.ts b/Cunkebao/src/pages/mobile/mine/traffic-pool/list/data.ts index f437b129..65ad7f55 100644 --- a/Cunkebao/src/pages/mobile/mine/traffic-pool/list/data.ts +++ b/Cunkebao/src/pages/mobile/mine/traffic-pool/list/data.ts @@ -43,3 +43,9 @@ export type ValueLevel = "all" | "high" | "medium" | "low"; // 状态类型 export type UserStatus = "all" | "added" | "pending" | "failed" | "duplicate"; + +// 获客场景类型 +export interface ScenarioOption { + id: string; + name: string; +} diff --git a/Cunkebao/src/pages/mobile/mine/traffic-pool/list/dataAnyx.tsx b/Cunkebao/src/pages/mobile/mine/traffic-pool/list/dataAnyx.tsx index 7a84040a..b0d3f8ee 100644 --- a/Cunkebao/src/pages/mobile/mine/traffic-pool/list/dataAnyx.tsx +++ b/Cunkebao/src/pages/mobile/mine/traffic-pool/list/dataAnyx.tsx @@ -1,11 +1,16 @@ import { useState, useEffect, useMemo } from "react"; -import { fetchTrafficPoolList, fetchPackageOptions } from "./api"; +import { + fetchTrafficPoolList, + fetchPackageOptions, + fetchScenarioOptions, +} from "./api"; import type { TrafficPoolUser, DeviceOption, PackageOption, ValueLevel, UserStatus, + ScenarioOption, } from "./data"; import { Toast } from "antd-mobile"; @@ -19,10 +24,11 @@ export function useTrafficPoolListLogic() { // 筛选相关 const [showFilter, setShowFilter] = useState(false); - const [deviceOptions, setDeviceOptions] = useState([]); const [packageOptions, setPackageOptions] = useState([]); - const [deviceId, setDeviceId] = useState("all"); + const [scenarioOptions, setScenarioOptions] = useState([]); + const [selectedDevices, setSelectedDevices] = useState([]); const [packageId, setPackageId] = useState("all"); + const [scenarioId, setScenarioId] = useState("all"); const [valueLevel, setValueLevel] = useState("all"); const [userStatus, setUserStatus] = useState("all"); @@ -47,15 +53,38 @@ export function useTrafficPoolListLogic() { const getList = async () => { setLoading(true); try { - const res = await fetchTrafficPoolList({ + const params: any = { page, pageSize, keyword: search, - // deviceId, - // packageId, - // valueLevel, - // userStatus, - }); + }; + + // 添加筛选参数 + if (selectedDevices.length > 0) { + params.deviceId = selectedDevices.map(d => d.id).join(","); + } + if (packageId !== "all") { + params.packageId = packageId; + } + if (scenarioId !== "all") { + params.taskId = scenarioId; + } + if (valueLevel !== "all") { + params.userValue = + valueLevel === "high" ? 3 : valueLevel === "medium" ? 2 : 1; + } + if (userStatus !== "all") { + params.addStatus = + userStatus === "added" + ? 1 + : userStatus === "pending" + ? 0 + : userStatus === "failed" + ? -1 + : -2; + } + + const res = await fetchTrafficPoolList(params); setList(res.list || []); setTotal(res.total || 0); } finally { @@ -66,13 +95,22 @@ export function useTrafficPoolListLogic() { // 获取筛选项 useEffect(() => { fetchPackageOptions().then(setPackageOptions); + fetchScenarioOptions().then(setScenarioOptions); }, []); // 筛选条件变化时刷新列表 useEffect(() => { getList(); // eslint-disable-next-line - }, [page, search /*, deviceId, packageId, valueLevel, userStatus*/]); + }, [ + page, + search, + selectedDevices, + packageId, + scenarioId, + valueLevel, + userStatus, + ]); // 全选/反选 const handleSelectAll = (checked: boolean) => { @@ -108,8 +146,9 @@ export function useTrafficPoolListLogic() { // 筛选重置 const resetFilter = () => { - setDeviceId("all"); + setSelectedDevices([]); setPackageId("all"); + setScenarioId("all"); setValueLevel("all"); setUserStatus("all"); }; @@ -125,12 +164,14 @@ export function useTrafficPoolListLogic() { setSearch, showFilter, setShowFilter, - deviceOptions, packageOptions, - deviceId, - setDeviceId, + scenarioOptions, + selectedDevices, + setSelectedDevices, packageId, setPackageId, + scenarioId, + setScenarioId, valueLevel, setValueLevel, userStatus, diff --git a/Cunkebao/src/pages/mobile/mine/traffic-pool/list/index.tsx b/Cunkebao/src/pages/mobile/mine/traffic-pool/list/index.tsx index 7e000524..4702737d 100644 --- a/Cunkebao/src/pages/mobile/mine/traffic-pool/list/index.tsx +++ b/Cunkebao/src/pages/mobile/mine/traffic-pool/list/index.tsx @@ -7,7 +7,7 @@ import { } from "@ant-design/icons"; import { Input, Button, Checkbox } from "antd"; import styles from "./index.module.scss"; -import { List, Empty, Avatar, Modal, Selector, Toast, Card } from "antd-mobile"; +import { Empty, Avatar } from "antd-mobile"; import { useNavigate } from "react-router-dom"; import NavCommon from "@/components/NavCommon"; import { useTrafficPoolListLogic } from "./dataAnyx"; @@ -18,20 +18,6 @@ import BatchAddModal from "./BatchAddModal"; const defaultAvatar = "https://cdn.jsdelivr.net/gh/maokaka/static/avatar-default.png"; -const valueLevelOptions = [ - { label: "全部", value: "all" }, - { label: "高价值", value: "high" }, - { label: "中价值", value: "medium" }, - { label: "低价值", value: "low" }, -]; -const statusOptions = [ - { label: "全部", value: "all" }, - { label: "已添加", value: "added" }, - { label: "待添加", value: "pending" }, - { label: "添加失败", value: "failed" }, - { label: "重复", value: "duplicate" }, -]; - const TrafficPoolList: React.FC = () => { const navigate = useNavigate(); const { @@ -45,12 +31,14 @@ const TrafficPoolList: React.FC = () => { setSearch, showFilter, setShowFilter, - deviceOptions, packageOptions, - deviceId, - setDeviceId, + scenarioOptions, + selectedDevices, + setSelectedDevices, packageId, setPackageId, + scenarioId, + setScenarioId, valueLevel, setValueLevel, userStatus, @@ -169,17 +157,26 @@ const TrafficPoolList: React.FC = () => { setShowFilter(false)} - deviceOptions={deviceOptions} + onConfirm={filters => { + // 更新筛选条件 + setSelectedDevices( + filters.deviceIds.map(id => ({ + id: parseInt(id), + memo: "", + imei: "", + wechatId: "", + status: "offline" as const, + })), + ); + setPackageId(filters.packageId); + setScenarioId(filters.scenarioId); + setValueLevel(filters.valueLevel); + setUserStatus(filters.userStatus); + // 重新获取列表 + getList(); + }} packageOptions={packageOptions} - deviceId={deviceId} - setDeviceId={setDeviceId} - packageId={packageId} - setPackageId={setPackageId} - valueLevel={valueLevel} - setValueLevel={setValueLevel} - userStatus={userStatus} - setUserStatus={setUserStatus} - onReset={resetFilter} + scenarioOptions={scenarioOptions} />
{list.length === 0 && !loading ? ( @@ -192,7 +189,9 @@ const TrafficPoolList: React.FC = () => { className={styles.card} style={{ cursor: "pointer" }} onClick={() => - navigate(`/traffic-pool/detail/${item.sourceId}/${item.id}`) + navigate( + `/mine/traffic-pool/detail/${item.sourceId}/${item.id}`, + ) } >
diff --git a/Cunkebao/src/router/module/mine.tsx b/Cunkebao/src/router/module/mine.tsx index e41f455d..e5c33623 100644 --- a/Cunkebao/src/router/module/mine.tsx +++ b/Cunkebao/src/router/module/mine.tsx @@ -36,12 +36,12 @@ const routes = [ auth: true, }, { - path: "/traffic-pool", + path: "/mine/traffic-pool", element: , auth: true, }, { - path: "/traffic-pool/detail/:wxid/:userId", + path: "/mine/traffic-pool/detail/:wxid/:userId", element: , auth: true, }, From 94df1469c002897358d65b4eabe9431d51bec25f 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: Wed, 13 Aug 2025 17:07:51 +0800 Subject: [PATCH 06/39] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B5=81=E9=87=8F?= =?UTF-8?q?=E6=B1=A0=E5=88=97=E8=A1=A8=E7=9B=B8=E9=97=9C=E9=82=8F=E8=BC=AF?= =?UTF-8?q?=EF=BC=8C=E6=9B=BF=E6=8F=9B=E7=8D=B2=E5=AE=A2=E5=A0=B4=E6=99=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E8=AA=BF=E6=95=B4=E7=94=A8=E6=88=B6?= =?UTF-8?q?=E5=83=B9=E5=80=BC=E5=92=8C=E7=8B=80=E6=85=8B=E7=9A=84=E7=AF=A9?= =?UTF-8?q?=E9=81=B8=E9=82=8F=E8=BC=AF=EF=BC=8C=E4=B8=A6=E5=84=AA=E5=8C=96?= =?UTF-8?q?=E7=AF=A9=E9=81=B8=E6=A8=A1=E6=85=8B=E6=A1=86=E7=9A=84=E7=8B=80?= =?UTF-8?q?=E6=85=8B=E7=AE=A1=E7=90=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mine/traffic-pool/list/FilterModal.tsx | 79 ++++++++++--------- .../mobile/mine/traffic-pool/list/api.ts | 9 +-- .../mine/traffic-pool/list/dataAnyx.tsx | 30 +++---- .../mobile/mine/traffic-pool/list/index.tsx | 11 +-- 4 files changed, 56 insertions(+), 73 deletions(-) diff --git a/Cunkebao/src/pages/mobile/mine/traffic-pool/list/FilterModal.tsx b/Cunkebao/src/pages/mobile/mine/traffic-pool/list/FilterModal.tsx index baeb21c1..3acd9879 100644 --- a/Cunkebao/src/pages/mobile/mine/traffic-pool/list/FilterModal.tsx +++ b/Cunkebao/src/pages/mobile/mine/traffic-pool/list/FilterModal.tsx @@ -1,14 +1,9 @@ -import React, { useState } from "react"; +import React, { useState, useEffect } from "react"; import { Popup } from "antd-mobile"; import { Select, Button } from "antd"; import DeviceSelection from "@/components/DeviceSelection"; -import type { - PackageOption, - ValueLevel, - UserStatus, - ScenarioOption, -} from "./data"; - +import type { UserStatus, ScenarioOption } from "./data"; +import { fetchScenarioOptions } from "./api"; import { DeviceSelectionItem } from "@/components/DeviceSelection/data"; interface FilterModalProps { @@ -18,59 +13,69 @@ interface FilterModalProps { deviceIds: string[]; packageId: string; scenarioId: string; - valueLevel: ValueLevel; - userStatus: UserStatus; + userValue: number; + userStatus: number; }) => void; - packageOptions: PackageOption[]; scenarioOptions: ScenarioOption[]; } const valueLevelOptions = [ - { label: "全部价值", value: "all" }, - { label: "高价值", value: "high" }, - { label: "中价值", value: "medium" }, - { label: "低价值", value: "low" }, + { label: "全部价值", value: 0 }, + { label: "高价值", value: 1 }, + { label: "中价值", value: 2 }, + { label: "低价值", value: 3 }, ]; const statusOptions = [ - { label: "全部状态", value: "all" }, - { label: "已添加", value: "added" }, - { label: "待添加", value: "pending" }, - { label: "添加失败", value: "failed" }, - { label: "重复", value: "duplicate" }, + { label: "全部状态", value: 0 }, + { label: "已添加", value: 1 }, + { label: "待添加", value: 2 }, + { label: "重复", value: 3 }, + { label: "添加失败", value: -1 }, ]; const FilterModal: React.FC = ({ visible, onClose, - packageOptions, - scenarioOptions, onConfirm, }) => { const [selectedDevices, setSelectedDevices] = useState( [], ); - const [packageId, setPackageId] = useState("all"); - const [scenarioId, setScenarioId] = useState("all"); - const [valueLevel, setValueLevel] = useState("all"); - const [userStatus, setUserStatus] = useState("all"); + const [packageId, setPackageId] = useState(""); + const [scenarioId, setScenarioId] = useState(""); + const [userValue, setUserValue] = useState(0); + const [userStatus, setUserStatus] = useState(0); + const [scenarioOptions, setScenarioOptions] = useState([]); + const [packageOptions, setPackageOptions] = useState([]); + + useEffect(() => { + if (visible) { + fetchScenarioOptions().then(res => { + setScenarioOptions(res); + }); + } + }, [visible]); const handleApply = () => { - onConfirm({ + const params = { deviceIds: selectedDevices.map(d => d.id.toString()), packageId, scenarioId, - valueLevel, + userValue, userStatus, - }); + }; + console.log(params); + + onConfirm(params); onClose(); }; const handleReset = () => { setSelectedDevices([]); - setPackageId("all"); - setScenarioId("all"); - setValueLevel("all"); - setUserStatus("all"); + setPackageId(""); + setScenarioId(""); + setUserValue(0); + setUserStatus(0); }; return ( @@ -100,7 +105,7 @@ const FilterModal: React.FC = ({ value={packageId} onChange={setPackageId} options={[ - { label: "全部流量池", value: "all" }, + { label: "全部流量池", value: "" }, ...packageOptions.map(p => ({ label: p.name, value: p.id })), ]} /> @@ -112,7 +117,7 @@ const FilterModal: React.FC = ({ value={scenarioId} onChange={setScenarioId} options={[ - { label: "全部场景", value: "all" }, + { label: "全部场景", value: "" }, ...scenarioOptions.map(s => ({ label: s.name, value: s.id })), ]} /> @@ -121,8 +126,8 @@ const FilterModal: React.FC = ({
用户价值
- - - { {current === 1 && (
目标设置
-
-
目标用户数
- -
{targetUserCount} 人
+ + {/* Tab 切换 */} +
+
+
setTargetSelectionTab("device")} + > + 设备选择 +
+
setTargetSelectionTab("account")} + > + 客服选择 +
+
-
-
目标客户类型
- -
-
-
获客场景
- ({ - label: s.label, - value: s.value, - }))} - value={targetScenarios} - onChange={setTargetScenarios} - className={style.checkboxGroup} - /> + + {/* Tab 内容 */} +
+ {targetSelectionTab === "device" && ( +
+ { + setSelectedDevices(devices); + setDeviceGroupsOptions(devices); + }} + placeholder="请选择设备" + showSelectedList={true} + selectedListMaxHeight={300} + deviceGroups={deviceGroups} + /> +
+ )} + {targetSelectionTab === "account" && ( +
+ { + setSelectedAccounts(accounts); + setAccountGroupsOptions(accounts); + }} + placeholder="请选择客服" + showSelectedList={true} + selectedListMaxHeight={300} + accountGroups={accountGroups} + /> +
+ )}
)} diff --git a/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/index.tsx b/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/index.tsx index c636c8fc..22ac3823 100644 --- a/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/index.tsx +++ b/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/index.tsx @@ -343,7 +343,7 @@ const TrafficDistributionList: React.FC = () => { } loading={loading} footer={ -
+
Date: Thu, 14 Aug 2025 18:13:35 +0800 Subject: [PATCH 16/39] =?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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cunkebao/src/styles/global.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/Cunkebao/src/styles/global.scss b/Cunkebao/src/styles/global.scss index f822f8eb..0b681cc6 100644 --- a/Cunkebao/src/styles/global.scss +++ b/Cunkebao/src/styles/global.scss @@ -270,7 +270,6 @@ button { padding: 14px 0; background: white; border-radius: 12px; - margin-top: 16px; box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1); :global(.ant-pagination) { From a66f9b01ebe89ecd96cf4a6d30056934b49c953f 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, 15 Aug 2025 14:15:03 +0800 Subject: [PATCH 17/39] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=8C=89=E9=88=95?= =?UTF-8?q?=E7=9A=84=E4=B8=8A=E9=82=8A=E8=B7=9D=E6=A8=A3=E5=BC=8F=EF=BC=8C?= =?UTF-8?q?=E4=BB=A5=E6=94=B9=E5=96=84=E6=95=B4=E9=AB=94=E4=BD=88=E5=B1=80?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cunkebao/public/iOS_WebClip.mobileconfig | 68 ++++++++++++++ Cunkebao/src/components/LineChart.tsx | 8 ++ ckApp/test.html | 109 +++++++++++++++++++++++ 3 files changed, 185 insertions(+) create mode 100644 Cunkebao/public/iOS_WebClip.mobileconfig create mode 100644 ckApp/test.html diff --git a/Cunkebao/public/iOS_WebClip.mobileconfig b/Cunkebao/public/iOS_WebClip.mobileconfig new file mode 100644 index 00000000..0f502185 --- /dev/null +++ b/Cunkebao/public/iOS_WebClip.mobileconfig @@ -0,0 +1,68 @@ + + + + + ConsentText + + default + 请点击右上角「下一步」按钮↗️ + 如果需要输入密码，请输入锁屏密码继续安装。 + + 第一次使用需要加载比较长时间，请耐心等待。 + 轻量版永不掉签，仅是在手机桌面添加一个平台入口。该安装证书已通过苹果官方认证，安全可靠，不会修改任何手机设置，请放心安装使用。 + + 永久地址为：https://m.xmbaiqi.com + + + PayloadContent + + + FullScreen + + Icon + + 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 + + IsRemovable + + Label + 存客宝 + PayloadDescription + 配置 Web Clip 设置 + PayloadDisplayName + Web Clip + PayloadIdentifier + com.apple.webClip.managed.46594155-65DD-1564-41DC-35EGEWGRGRW + PayloadType + com.apple.webClip.managed + PayloadUUID + 46594155-65DD-1564-41DC-35EGEWGRGRW + PayloadVersion + 1 + Precomposed + + URL + https://m.xmbaiqi.com + + + PayloadDescription + 请点击右上角「安装」按钮↗️ + 如果需要输入密码，请输入锁屏密码继续安装。 + 第一次使用需要加载比较长时间，请耐心等待。 + 轻量版永不掉签，仅是在手机桌面添加一个平台入口。该安装证书已通过苹果官方认证，安全可靠，不会修改任何手机设置，请放心安装使用。 + WePoker永久地址https://m.xmbaiqi.com + + PayloadDisplayName + WePoker + PayloadIdentifier + iMac-Pro.5DF561DF5D-2D6D-24GE-2E7H-5GE7G5REG + PayloadRemovalDisallowed + + PayloadType + Configuration + PayloadUUID + DF561DF5D-2D6D-24GE-2E7H-5GE7G5REG + PayloadVersion + 2 + + diff --git a/Cunkebao/src/components/LineChart.tsx b/Cunkebao/src/components/LineChart.tsx index bb93e512..ff99ba11 100644 --- a/Cunkebao/src/components/LineChart.tsx +++ b/Cunkebao/src/components/LineChart.tsx @@ -43,6 +43,14 @@ const LineChart: React.FC = ({ lineStyle: { color: "#1677ff" }, itemStyle: { color: "#1677ff" }, }, + { + data: [3, 99, 12, 14, 8, 0, 0], + type: "line", + smooth: true, + symbol: "circle", + lineStyle: { color: "green" }, + itemStyle: { color: "red" }, + }, ], grid: { left: 40, right: 24, top: 40, bottom: 32 }, }; diff --git a/ckApp/test.html b/ckApp/test.html new file mode 100644 index 00000000..9da1b56f --- /dev/null +++ b/ckApp/test.html @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + My PWA with Custom Icons + + + + +
+

Custom PWA Icons

+

Your app will now have proper icons when added to home screen

+ +
+ App Icon Preview +
+ +

Make sure to use all required icon sizes for best results across devices

+
+ + + + + \ No newline at end of file From 9cd285223b66c4b6f789907ba839f5c9c94f76f5 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, 15 Aug 2025 17:42:52 +0800 Subject: [PATCH 18/39] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=80=E6=A2=9D?= =?UTF-8?q?=E7=B6=A0=E8=89=B2=E5=B9=B3=E6=BB=91=E7=B7=9A=E5=9C=96=E6=95=B8?= =?UTF-8?q?=E6=93=9A=EF=BC=8C=E4=B8=A6=E8=AA=BF=E6=95=B4=E7=9B=B8=E6=87=89?= =?UTF-8?q?=E7=9A=84=E6=A8=A3=E5=BC=8F=E5=B1=AC=E6=80=A7=E4=BB=A5=E6=8F=90?= =?UTF-8?q?=E5=8D=87=E5=8F=AF=E8=A6=96=E5=8C=96=E6=95=88=E6=9E=9C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cunkebao/public/iOS_WebClip.mobileconfig | 68 -- Cunkebao/src/components/LineChart2.tsx | 57 ++ .../pages/mobile/scenarios/plan/list/api.ts | 9 + .../plan/list/components/AccountListModal.tsx | 175 ++++ .../plan/list/components/DeviceListModal.tsx | 175 ++++ .../plan/list/components/OreadyAdd.tsx | 175 ++++ .../plan/list/components/PoolListModal.tsx | 161 ++++ .../plan/list/components/Popups.module.scss | 744 ++++++++++++++++++ .../pages/mobile/scenarios/plan/list/data.ts | 1 + .../scenarios/plan/list/index.module.scss | 19 + .../mobile/scenarios/plan/list/index.tsx | 114 ++- Cunkebao/src/utils/chartColors.ts | 67 ++ 12 files changed, 1681 insertions(+), 84 deletions(-) delete mode 100644 Cunkebao/public/iOS_WebClip.mobileconfig create mode 100644 Cunkebao/src/components/LineChart2.tsx create mode 100644 Cunkebao/src/pages/mobile/scenarios/plan/list/components/AccountListModal.tsx create mode 100644 Cunkebao/src/pages/mobile/scenarios/plan/list/components/DeviceListModal.tsx create mode 100644 Cunkebao/src/pages/mobile/scenarios/plan/list/components/OreadyAdd.tsx create mode 100644 Cunkebao/src/pages/mobile/scenarios/plan/list/components/PoolListModal.tsx create mode 100644 Cunkebao/src/pages/mobile/scenarios/plan/list/components/Popups.module.scss create mode 100644 Cunkebao/src/utils/chartColors.ts diff --git a/Cunkebao/public/iOS_WebClip.mobileconfig b/Cunkebao/public/iOS_WebClip.mobileconfig deleted file mode 100644 index 0f502185..00000000 --- a/Cunkebao/public/iOS_WebClip.mobileconfig +++ /dev/null @@ -1,68 +0,0 @@ - - - - - ConsentText - - default - 请点击右上角「下一步」按钮↗️ - 如果需要输入密码，请输入锁屏密码继续安装。 - - 第一次使用需要加载比较长时间，请耐心等待。 - 轻量版永不掉签，仅是在手机桌面添加一个平台入口。该安装证书已通过苹果官方认证，安全可靠，不会修改任何手机设置，请放心安装使用。 - - 永久地址为：https://m.xmbaiqi.com - - - PayloadContent - - - FullScreen - - Icon - - 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 - - IsRemovable - - Label - 存客宝 - PayloadDescription - 配置 Web Clip 设置 - PayloadDisplayName - Web Clip - PayloadIdentifier - com.apple.webClip.managed.46594155-65DD-1564-41DC-35EGEWGRGRW - PayloadType - com.apple.webClip.managed - PayloadUUID - 46594155-65DD-1564-41DC-35EGEWGRGRW - PayloadVersion - 1 - Precomposed - - URL - https://m.xmbaiqi.com - - - PayloadDescription - 请点击右上角「安装」按钮↗️ - 如果需要输入密码，请输入锁屏密码继续安装。 - 第一次使用需要加载比较长时间，请耐心等待。 - 轻量版永不掉签，仅是在手机桌面添加一个平台入口。该安装证书已通过苹果官方认证，安全可靠，不会修改任何手机设置，请放心安装使用。 - WePoker永久地址https://m.xmbaiqi.com - - PayloadDisplayName - WePoker - PayloadIdentifier - iMac-Pro.5DF561DF5D-2D6D-24GE-2E7H-5GE7G5REG - PayloadRemovalDisallowed - - PayloadType - Configuration - PayloadUUID - DF561DF5D-2D6D-24GE-2E7H-5GE7G5REG - PayloadVersion - 2 - - diff --git a/Cunkebao/src/components/LineChart2.tsx b/Cunkebao/src/components/LineChart2.tsx new file mode 100644 index 00000000..2a6f401e --- /dev/null +++ b/Cunkebao/src/components/LineChart2.tsx @@ -0,0 +1,57 @@ +import React from "react"; +import ReactECharts from "echarts-for-react"; +import { getChartColor } from "@/utils/chartColors"; + +interface LineChartProps { + title?: string; + xData: string[]; + yData: any[]; + height?: number | string; +} + +const LineChart: React.FC = ({ + title = "", + xData, + yData, + height = 200, +}) => { + const option = { + title: { + text: title, + left: "center", + textStyle: { fontSize: 16 }, + }, + tooltip: { trigger: "axis" }, + xAxis: { + type: "category", + data: xData, + boundaryGap: false, + }, + yAxis: { + type: "value", + boundaryGap: ["10%", "10%"], // 上下留白 + min: (value: any) => value.min - 10, // 下方多留一点空间 + max: (value: any) => value.max + 10, // 上方多留一点空间 + minInterval: 1, + axisLabel: { margin: 12 }, + }, + series: [ + ...yData.map((item, index) => { + const color = getChartColor(index); + return { + data: item, + type: "line", + smooth: true, + symbol: "circle", + lineStyle: { color }, + itemStyle: { color }, + }; + }), + ], + grid: { left: 40, right: 24, top: 40, bottom: 32 }, + }; + + return ; +}; + +export default LineChart; diff --git a/Cunkebao/src/pages/mobile/scenarios/plan/list/api.ts b/Cunkebao/src/pages/mobile/scenarios/plan/list/api.ts index 8562ee44..26377d6c 100644 --- a/Cunkebao/src/pages/mobile/scenarios/plan/list/api.ts +++ b/Cunkebao/src/pages/mobile/scenarios/plan/list/api.ts @@ -30,3 +30,12 @@ export function deletePlan(planId: string): Promise> { export function getWxMinAppCode(planId: string): Promise> { return request(`/v1/plan/getWxMinAppCode`, { taskId: planId }, "GET"); } +//获客列表 +export function getUserList(planId: string, type: number) { + return request(`/v1/plan/getUserList`, { planId, type }, "GET"); +} + +//获客列表 +export function getFriendRequestTaskStats(taskId: string) { + return request(`/v1/dashboard/friendRequestTaskStats`, { taskId }, "GET"); +} diff --git a/Cunkebao/src/pages/mobile/scenarios/plan/list/components/AccountListModal.tsx b/Cunkebao/src/pages/mobile/scenarios/plan/list/components/AccountListModal.tsx new file mode 100644 index 00000000..dd8cff30 --- /dev/null +++ b/Cunkebao/src/pages/mobile/scenarios/plan/list/components/AccountListModal.tsx @@ -0,0 +1,175 @@ +import React, { useEffect, useState } from "react"; +import { Popup, Avatar, SpinLoading } from "antd-mobile"; +import { Button, message } from "antd"; +import { CloseOutlined } from "@ant-design/icons"; +import style from "./Popups.module.scss"; +import { getUserList } from "../api"; + +interface AccountItem { + id: string | number; + nickname?: string; + wechatId?: string; + avatar?: string; + status?: string; + userinfo: { + alias: string; + nickname: string; + avatar: string; + wechatId: string; + }; + phone?: string; +} + +interface AccountListModalProps { + visible: boolean; + onClose: () => void; + ruleId?: number; + ruleName?: string; +} + +const AccountListModal: React.FC = ({ + visible, + onClose, + ruleId, + ruleName, +}) => { + const [accounts, setAccounts] = useState([]); + const [loading, setLoading] = useState(false); + + // 获取账号数据 + const fetchAccounts = async () => { + if (!ruleId) return; + + setLoading(true); + try { + const detailRes = await getUserList(ruleId.toString(), 1); + const accountData = detailRes?.list || []; + setAccounts(accountData); + } catch (error) { + console.error("获取账号详情失败:", error); + message.error("获取账号详情失败"); + } finally { + setLoading(false); + } + }; + + // 当弹窗打开且有ruleId时，获取数据 + useEffect(() => { + if (visible && ruleId) { + fetchAccounts(); + } + }, [visible, ruleId]); + + const title = ruleName ? `${ruleName} - 已添加账号列表` : "已添加账号列表"; + const getStatusColor = (status?: string) => { + switch (status) { + case "normal": + return "#52c41a"; + case "limited": + return "#faad14"; + case "blocked": + return "#ff4d4f"; + default: + return "#d9d9d9"; + } + }; + + const getStatusText = (status?: string) => { + switch (status) { + case "normal": + return "正常"; + case "limited": + return "受限"; + case "blocked": + return "封禁"; + default: + return "未知"; + } + }; + + return ( + +
+ {/* 头部 */} +
+

{title}

+
+ + {/* 账号列表 */} +
+ {loading ? ( +
+ +
+ 正在加载账号列表... +
+
+ ) : accounts.length > 0 ? ( + accounts.map((account, index) => ( +
+
+ +
+
+
+ {account.userinfo.nickname || + account.userinfo.alias || + `账号${account.id}`} +
+
+ {account.userinfo.wechatId || "未绑定微信号"} +
+
+
+ + + {getStatusText(account.status)} + +
+
+ )) + ) : ( +
+
暂无账号数据
+
+ )} +
+ + {/* 底部统计 */} +
+
+ 共 {accounts.length} 个账号 +
+
+
+ + ); +}; + +export default AccountListModal; diff --git a/Cunkebao/src/pages/mobile/scenarios/plan/list/components/DeviceListModal.tsx b/Cunkebao/src/pages/mobile/scenarios/plan/list/components/DeviceListModal.tsx new file mode 100644 index 00000000..111483cd --- /dev/null +++ b/Cunkebao/src/pages/mobile/scenarios/plan/list/components/DeviceListModal.tsx @@ -0,0 +1,175 @@ +import React, { useEffect, useState } from "react"; +import { Popup, Avatar, SpinLoading } from "antd-mobile"; +import { Button, message } from "antd"; +import { CloseOutlined } from "@ant-design/icons"; +import style from "./Popups.module.scss"; +import { getPlanDetail } from "../api"; + +interface DeviceItem { + id: string | number; + memo?: string; + imei?: string; + wechatId?: string; + status?: "online" | "offline"; + avatar?: string; + totalFriend?: number; +} + +interface DeviceListModalProps { + visible: boolean; + onClose: () => void; + ruleId?: number; + ruleName?: string; +} + +const DeviceListModal: React.FC = ({ + visible, + onClose, + ruleId, + ruleName, +}) => { + const [devices, setDevices] = useState([]); + const [loading, setLoading] = useState(false); + + // 获取设备数据 + const fetchDevices = async () => { + if (!ruleId) return; + + setLoading(true); + try { + const detailRes = await getPlanDetail(ruleId.toString()); + const deviceData = detailRes?.deveiceGroupsOptions || []; + setDevices(deviceData); + } catch (error) { + console.error("获取设备详情失败:", error); + message.error("获取设备详情失败"); + } finally { + setLoading(false); + } + }; + + // 当弹窗打开且有ruleId时，获取数据 + useEffect(() => { + if (visible && ruleId) { + fetchDevices(); + } + }, [visible, ruleId]); + + const title = ruleName ? `${ruleName} - 分发设备列表` : "分发设备列表"; + const getStatusColor = (status?: string) => { + return status === "online" ? "#52c41a" : "#ff4d4f"; + }; + + const getStatusText = (status?: string) => { + return status === "online" ? "在线" : "离线"; + }; + + return ( + +
+ {/* 头部 */} +
+

{title}

+
+ + {/* 设备列表 */} +
+ {loading ? ( +
+ +
正在加载设备列表...
+
+ ) : devices.length > 0 ? ( + devices.map((device, index) => ( +
+ {/* 顶部行：IMEI */} +
+ + IMEI: {device.imei?.toUpperCase() || "-"} + +
+ + {/* 主要内容区域：头像和详细信息 */} +
+ {/* 头像 */} +
+ {device.avatar ? ( + 头像 + ) : ( + + {(device.memo || device.wechatId || "设")[0]} + + )} +
+ + {/* 设备信息 */} +
+
+

+ {device.memo || "未命名设备"} +

+ + {getStatusText(device.status)} + +
+ +
+
+ 微信号: + + {device.wechatId || "未绑定"} + +
+
+ 好友数: + + {device.totalFriend ?? "-"} + +
+
+
+
+
+ )) + ) : ( +
+
暂无设备数据
+
+ )} +
+ + {/* 底部统计 */} +
+
+ 共 {devices.length} 个设备 +
+
+
+ + ); +}; + +export default DeviceListModal; diff --git a/Cunkebao/src/pages/mobile/scenarios/plan/list/components/OreadyAdd.tsx b/Cunkebao/src/pages/mobile/scenarios/plan/list/components/OreadyAdd.tsx new file mode 100644 index 00000000..fa6e1853 --- /dev/null +++ b/Cunkebao/src/pages/mobile/scenarios/plan/list/components/OreadyAdd.tsx @@ -0,0 +1,175 @@ +import React, { useEffect, useState } from "react"; +import { Popup, Avatar, SpinLoading } from "antd-mobile"; +import { Button, message } from "antd"; +import { CloseOutlined } from "@ant-design/icons"; +import style from "./Popups.module.scss"; +import { getUserList } from "../api"; + +interface AccountItem { + id: string | number; + nickname?: string; + wechatId?: string; + avatar?: string; + status?: string; + userinfo: { + alias: string; + nickname: string; + avatar: string; + wechatId: string; + }; + phone?: string; +} + +interface AccountListModalProps { + visible: boolean; + onClose: () => void; + ruleId?: number; + ruleName?: string; +} + +const AccountListModal: React.FC = ({ + visible, + onClose, + ruleId, + ruleName, +}) => { + const [accounts, setAccounts] = useState([]); + const [loading, setLoading] = useState(false); + + // 获取账号数据 + const fetchAccounts = async () => { + if (!ruleId) return; + + setLoading(true); + try { + const detailRes = await getUserList(ruleId.toString(), 2); + const accountData = detailRes?.list || []; + setAccounts(accountData); + } catch (error) { + console.error("获取账号详情失败:", error); + message.error("获取账号详情失败"); + } finally { + setLoading(false); + } + }; + + // 当弹窗打开且有ruleId时，获取数据 + useEffect(() => { + if (visible && ruleId) { + fetchAccounts(); + } + }, [visible, ruleId]); + + const title = ruleName ? `${ruleName} - 已添加账号列表` : "已添加账号列表"; + const getStatusColor = (status?: string) => { + switch (status) { + case "normal": + return "#52c41a"; + case "limited": + return "#faad14"; + case "blocked": + return "#ff4d4f"; + default: + return "#d9d9d9"; + } + }; + + const getStatusText = (status?: string) => { + switch (status) { + case "normal": + return "正常"; + case "limited": + return "受限"; + case "blocked": + return "封禁"; + default: + return "未知"; + } + }; + + return ( + +
+ {/* 头部 */} +
+

{title}

+
+ + {/* 账号列表 */} +
+ {loading ? ( +
+ +
+ 正在加载账号列表... +
+
+ ) : accounts.length > 0 ? ( + accounts.map((account, index) => ( +
+
+ +
+
+
+ {account.userinfo.nickname || + account.userinfo.alias || + `账号${account.id}`} +
+
+ {account.userinfo.wechatId || "未绑定微信号"} +
+
+
+ + + {getStatusText(account.status)} + +
+
+ )) + ) : ( +
+
暂无账号数据
+
+ )} +
+ + {/* 底部统计 */} +
+
+ 共 {accounts.length} 个账号 +
+
+
+ + ); +}; + +export default AccountListModal; diff --git a/Cunkebao/src/pages/mobile/scenarios/plan/list/components/PoolListModal.tsx b/Cunkebao/src/pages/mobile/scenarios/plan/list/components/PoolListModal.tsx new file mode 100644 index 00000000..a084dc3c --- /dev/null +++ b/Cunkebao/src/pages/mobile/scenarios/plan/list/components/PoolListModal.tsx @@ -0,0 +1,161 @@ +import React, { useEffect, useState } from "react"; +import { Popup, SpinLoading } from "antd-mobile"; +import { Button, message } from "antd"; +import { CloseOutlined } from "@ant-design/icons"; +import style from "./Popups.module.scss"; +import { getFriendRequestTaskStats } from "../api"; +import LineChart2 from "@/components/LineChart2"; +interface StatisticsData { + totalAll: number; + totalError: number; + totalPass: number; + totalPassRate: number; + totalSuccess: number; + totalSuccessRate: number; +} + +interface PoolListModalProps { + visible: boolean; + onClose: () => void; + ruleId?: number; + ruleName?: string; +} + +const PoolListModal: React.FC = ({ + visible, + onClose, + ruleId, + ruleName, +}) => { + const [statistics, setStatistics] = useState({ + totalAll: 0, + totalError: 0, + totalPass: 0, + totalPassRate: 0, + totalSuccess: 0, + totalSuccessRate: 0, + }); + + const [xData, setXData] = useState([]); + const [yData, setYData] = useState([]); + const [loading, setLoading] = useState(false); + + // 当弹窗打开且有ruleId时，获取数据 + useEffect(() => { + if (visible && ruleId) { + setLoading(true); + getFriendRequestTaskStats(ruleId.toString()) + .then(res => { + console.log(res); + setXData(res.dateArray); + setYData([ + res.allNumArray, + res.errorNumArray, + res.passNumArray, + res.passRateArray, + res.successNumArray, + res.successRateArray, + ]); + setStatistics(res.totalStats); + setLoading(false); + }) + .finally(() => { + setLoading(false); + }); + } + }, [visible, ruleId]); + + const title = ruleName ? `${ruleName} - 累计统计数据` : "累计统计数据"; + return ( + +
+ {/* 头部 */} +
+

{title}

+
+ + {/* 统计数据表格 */} +
+ {loading ? ( +
+ +
+ 正在加载统计数据... +
+
+ ) : ( +
+
+
总计
+
+ {statistics.totalAll} +
+
+
+
扫码
+
+ {statistics.totalError} +
+
+
+
成功
+
+ {statistics.totalSuccess} +
+
+
+
失败
+
+ {statistics.totalError} +
+
+
+
通过
+
+ {statistics.totalPass} +
+
+
+
成功率
+
+ {statistics.totalSuccessRate}% +
+
+
+
通过率
+
+ {statistics.totalPassRate}% +
+
+
+ )} +
+ + {/* 趋势图占位 */} +
+
趋势图
+
+ +
+
+
+ + ); +}; + +export default PoolListModal; diff --git a/Cunkebao/src/pages/mobile/scenarios/plan/list/components/Popups.module.scss b/Cunkebao/src/pages/mobile/scenarios/plan/list/components/Popups.module.scss new file mode 100644 index 00000000..cbfce7c1 --- /dev/null +++ b/Cunkebao/src/pages/mobile/scenarios/plan/list/components/Popups.module.scss @@ -0,0 +1,744 @@ +.listToolbar { + display: flex; + align-items: center; + padding: 12px 0; + border-bottom: 1px solid #f0f0f0; + background: #fff; + font-size: 16px; + color: #222; +} + +.ruleList { + padding: 0 16px; +} + +.ruleCard { + background: #fff; + border-radius: 12px; + box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04); + margin-bottom: 20px; + padding: 16px; + border: 1px solid #ececec; + transition: + box-shadow 0.2s, + border-color 0.2s; + position: relative; +} +.ruleCard:hover { + box-shadow: 0 4px 16px rgba(0, 0, 0, 0.08); + border-color: #b3e5fc; +} + +.ruleHeader { + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: 8px; +} +.ruleName { + font-size: 17px; + font-weight: 600; + color: #222; +} + +.ruleStatus { + display: flex; + align-items: center; + gap: 8px; +} + +.ruleSwitch { + margin-left: 4px; +} + +.ruleMenu { + margin-left: 8px; + cursor: pointer; + color: #888; + font-size: 18px; +} + +.ruleMeta { + display: flex; + justify-content: space-between; + margin-bottom: 10px; + font-size: 15px; + color: #444; + font-weight: 500; +} +.ruleMetaItem { + flex: 1; + text-align: center; + transition: background-color 0.2s ease; +} +.ruleMetaItem:not(:last-child) { + border-right: 1px solid #f0f0f0; +} +.ruleMetaItem:hover { + background-color: #f8f9fa; + border-radius: 6px; +} + +.ruleDivider { + border-top: 1px solid #f0f0f0; + margin: 12px 0 10px 0; +} + +.ruleStats { + display: flex; + justify-content: space-between; + font-size: 16px; + color: #222; + font-weight: 600; + margin-bottom: 8px; +} +.ruleStatsItem { + flex: 1; + text-align: center; +} +.ruleStatsItem:not(:last-child) { + border-right: 1px solid #f0f0f0; +} + +.ruleFooter { + display: flex; + justify-content: space-between; + font-size: 12px; + color: #888; + margin-top: 6px; + align-items: center; +} + +.ruleFooterIcon { + margin-right: 4px; + vertical-align: middle; + font-size: 15px; + position: relative; + top: -2px; +} + +.empty { + text-align: center; + color: #bbb; + padding: 40px 0; +} + +.pagination { + display: flex; + justify-content: center; + padding: 16px 0; + background: #fff; +} + +// 账号列表弹窗样式 +.accountModal { + height: 100%; + display: flex; + flex-direction: column; +} + +.accountModalHeader { + display: flex; + align-items: center; + justify-content: space-between; + padding: 16px 20px; + border-bottom: 1px solid #f0f0f0; + background: #fff; +} + +.accountModalTitle { + margin: 0; + font-size: 18px; + font-weight: 600; + color: #222; +} + +.accountModalClose { + border: none; + background: none; + color: #888; + font-size: 16px; +} + +.accountList { + flex: 1; + overflow-y: auto; + padding: 0 20px; +} + +.accountItem { + display: flex; + align-items: center; + padding: 12px 0; + border-bottom: 1px solid #f5f5f5; +} + +.accountItem:last-child { + border-bottom: none; +} + +.accountAvatar { + margin-right: 12px; + flex-shrink: 0; +} + +.accountInfo { + flex: 1; + min-width: 0; +} + +.accountName { + font-size: 16px; + font-weight: 500; + color: #222; + margin-bottom: 4px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.accountWechatId { + font-size: 14px; + color: #888; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.accountStatus { + display: flex; + align-items: center; + gap: 6px; + flex-shrink: 0; +} + +.statusDot { + width: 8px; + height: 8px; + border-radius: 50%; +} + +.statusText { + font-size: 13px; + color: #666; +} + +.accountEmpty { + display: flex; + align-items: center; + justify-content: center; + height: 200px; + color: #888; +} + +.accountEmptyText { + font-size: 16px; +} + +.accountLoading { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + height: 200px; + gap: 16px; + padding: 20px; +} + +.accountLoadingText { + font-size: 15px; + color: #666; + font-weight: 500; +} + +.accountModalFooter { + padding: 16px 20px; + border-top: 1px solid #f0f0f0; + background: #fff; +} + +.accountStats { + text-align: center; + font-size: 14px; + color: #666; +} + +// 设备列表弹窗样式 +.deviceModal { + height: 100%; + display: flex; + flex-direction: column; +} + +.deviceModalHeader { + display: flex; + align-items: center; + justify-content: space-between; + padding: 16px 20px; + border-bottom: 1px solid #f0f0f0; + background: #fff; +} + +.deviceModalTitle { + margin: 0; + font-size: 18px; + font-weight: 600; + color: #222; +} + +.deviceModalClose { + border: none; + background: none; + color: #888; + font-size: 16px; +} + +.deviceList { + flex: 1; + overflow-y: auto; + padding: 0 20px; +} + +.deviceItem { + background: #fff; + border-radius: 12px; + padding: 12px; + margin-bottom: 12px; + box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04); + border: 1px solid #ececec; + transition: all 0.2s ease; +} + +.deviceItem:hover { + transform: translateY(-1px); + box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1); +} + +.deviceHeaderRow { + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: 8px; +} + +.deviceImeiText { + font-size: 13px; + color: #888; + font-weight: 500; +} + +.deviceMainContent { + display: flex; + align-items: center; +} + +.deviceAvatar { + width: 48px; + height: 48px; + border-radius: 12px; + background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); + display: flex; + align-items: center; + justify-content: center; + margin-right: 12px; + flex-shrink: 0; + box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1); + overflow: hidden; +} + +.deviceAvatar img { + width: 100%; + height: 100%; + object-fit: cover; + border-radius: 12px; +} + +.deviceAvatarText { + color: #fff; + font-size: 18px; + font-weight: 600; + text-shadow: 0 1px 2px rgba(0, 0, 0, 0.3); +} + +.deviceInfo { + flex: 1; + min-width: 0; +} + +.deviceInfoHeader { + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: 6px; +} + +.deviceName { + margin: 0; + font-size: 16px; + font-weight: 600; + color: #222; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + flex: 1; + margin-right: 8px; +} + +.deviceStatusBadge { + padding: 2px 8px; + border-radius: 10px; + font-size: 12px; + font-weight: 500; + flex-shrink: 0; +} + +.deviceStatusOnline { + background: rgba(82, 196, 26, 0.1); + color: #52c41a; +} + +.deviceStatusOffline { + background: rgba(255, 77, 79, 0.1); + color: #ff4d4f; +} + +.deviceInfoList { + display: flex; + flex-direction: column; + gap: 4px; +} + +.deviceInfoItem { + display: flex; + align-items: center; + font-size: 13px; +} + +.deviceInfoLabel { + color: #888; + margin-right: 6px; + min-width: 50px; +} + +.deviceInfoValue { + color: #444; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.deviceFriendCount { + color: #1890ff; + font-weight: 500; +} + +.deviceEmpty { + display: flex; + align-items: center; + justify-content: center; + height: 200px; + color: #888; +} + +.deviceEmptyText { + font-size: 16px; +} + +.deviceLoading { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + height: 200px; + gap: 16px; + padding: 20px; +} + +.deviceLoadingText { + font-size: 15px; + color: #666; + font-weight: 500; +} + +.deviceModalFooter { + padding: 16px 20px; + border-top: 1px solid #f0f0f0; + background: #fff; +} + +.deviceStats { + text-align: center; + font-size: 14px; + color: #666; +} + +// 流量池列表弹窗样式 +.poolModal { + height: 100%; + display: flex; + flex-direction: column; +} + +.poolModalHeader { + display: flex; + align-items: center; + justify-content: space-between; + padding: 16px 20px; + border-bottom: 1px solid #f0f0f0; + background: #fff; +} + +.poolModalTitle { + margin: 0; + font-size: 18px; + font-weight: 600; + color: #222; +} + +.poolModalClose { + border: none; + background: none; + color: #888; + font-size: 16px; +} + +.poolList { + flex: 1; + overflow-y: auto; + padding: 0 20px; +} + +.poolItem { + background: #fff; + border-radius: 12px; + padding: 12px; + margin-bottom: 12px; + box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04); + border: 1px solid #ececec; + transition: all 0.2s ease; +} + +.poolItem:hover { + transform: translateY(-1px); + box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1); +} + +.poolMainContent { + display: flex; + align-items: flex-start; +} + +.poolIcon { + width: 48px; + height: 48px; + border-radius: 12px; + background: linear-gradient(135deg, #1890ff 0%, #722ed1 100%); + display: flex; + align-items: center; + justify-content: center; + margin-right: 12px; + flex-shrink: 0; + box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1); +} + +.poolIconText { + color: #fff; + font-size: 18px; + font-weight: 600; + text-shadow: 0 1px 2px rgba(0, 0, 0, 0.3); +} + +.poolInfo { + flex: 1; + min-width: 0; +} + +.poolInfoHeader { + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: 6px; +} + +.poolName { + margin: 0; + font-size: 16px; + font-weight: 600; + color: #222; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + flex: 1; + margin-right: 8px; +} + +.poolUserCount { + padding: 2px 8px; + border-radius: 10px; + font-size: 12px; + font-weight: 500; + background: rgba(24, 144, 255, 0.1); + color: #1890ff; + flex-shrink: 0; +} + +.poolInfoList { + display: flex; + flex-direction: column; + gap: 4px; + margin-bottom: 8px; +} + +.poolInfoItem { + display: flex; + align-items: center; + font-size: 13px; +} + +.poolInfoLabel { + color: #888; + margin-right: 6px; + min-width: 60px; +} + +.poolInfoValue { + color: #444; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.poolTags { + display: flex; + flex-wrap: wrap; + gap: 6px; +} + +.poolTag { + padding: 2px 8px; + border-radius: 10px; + font-size: 11px; + background: rgba(0, 0, 0, 0.05); + color: #666; + border: 1px solid rgba(0, 0, 0, 0.1); +} + +.poolLoading { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + height: 200px; + gap: 16px; + padding: 20px; +} + +.poolLoadingText { + font-size: 15px; + color: #666; + font-weight: 500; +} + +.poolEmpty { + display: flex; + align-items: center; + justify-content: center; + height: 200px; + color: #888; +} + +.poolEmptyText { + font-size: 16px; +} + +.poolModalFooter { + padding: 16px 20px; + border-top: 1px solid #f0f0f0; + background: #fff; +} + +.poolStats { + text-align: center; + font-size: 14px; + color: #666; +} + +// 统计数据弹窗样式 +.statisticsContent { + flex: 1; + overflow-y: auto; + padding: 0 20px; +} + +.statisticsLoading { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + height: 200px; + gap: 16px; + padding: 20px; +} + +.statisticsLoadingText { + font-size: 15px; + color: #666; + font-weight: 500; +} + +.statisticsTable { + padding: 16px 0; +} + +.statisticsRow { + display: flex; + align-items: center; + justify-content: space-between; + padding: 12px 0; + border-bottom: 1px solid #f5f5f5; +} + +.statisticsRow:last-child { + border-bottom: none; +} + +.statisticsLabel { + font-size: 15px; + color: #666; + font-weight: 500; +} + +.statisticsValue { + font-size: 16px; + color: #222; + font-weight: 600; +} + +.trendChart { + padding: 20px; + border-top: 1px solid #f0f0f0; + background: #fff; +} + +.chartTitle { + font-size: 16px; + font-weight: 600; + color: #222; + margin-bottom: 16px; +} + +.chartPlaceholder { + height: 200px; + background: #f8f9fa; + border-radius: 12px; + display: flex; + align-items: center; + justify-content: center; + border: 2px dashed #d9d9d9; +} + +.chartNote { + font-size: 14px; + color: #888; + text-align: center; +} diff --git a/Cunkebao/src/pages/mobile/scenarios/plan/list/data.ts b/Cunkebao/src/pages/mobile/scenarios/plan/list/data.ts index 9c1397f8..77e1df19 100644 --- a/Cunkebao/src/pages/mobile/scenarios/plan/list/data.ts +++ b/Cunkebao/src/pages/mobile/scenarios/plan/list/data.ts @@ -20,6 +20,7 @@ export interface Task { acquiredCount?: number; addedCount?: number; passRate?: number; + passCount?: number; } export interface ApiSettings { diff --git a/Cunkebao/src/pages/mobile/scenarios/plan/list/index.module.scss b/Cunkebao/src/pages/mobile/scenarios/plan/list/index.module.scss index 0b574ee6..d5fc2004 100644 --- a/Cunkebao/src/pages/mobile/scenarios/plan/list/index.module.scss +++ b/Cunkebao/src/pages/mobile/scenarios/plan/list/index.module.scss @@ -139,6 +139,25 @@ padding: 12px; text-align: center; border: 1px solid #e9ecef; + cursor: pointer; + transition: all 0.2s ease; + position: relative; + + &:hover { + background: #e6f7ff; + border-color: #91d5ff; + transform: translateY(-1px); + box-shadow: 0 2px 8px rgba(24, 144, 255, 0.15); + } + + &:active { + transform: translateY(0); + box-shadow: 0 1px 4px rgba(24, 144, 255, 0.1); + } + + &:hover::after { + opacity: 1; + } } .stat-label { diff --git a/Cunkebao/src/pages/mobile/scenarios/plan/list/index.tsx b/Cunkebao/src/pages/mobile/scenarios/plan/list/index.tsx index 9981d48e..5e3573c1 100644 --- a/Cunkebao/src/pages/mobile/scenarios/plan/list/index.tsx +++ b/Cunkebao/src/pages/mobile/scenarios/plan/list/index.tsx @@ -35,6 +35,10 @@ import style from "./index.module.scss"; import { Task, ApiSettings, PlanDetail } from "./data"; import PlanApi from "./planApi"; import { buildApiUrl } from "@/utils/apiUrl"; +import DeviceListModal from "./components/DeviceListModal"; +import AccountListModal from "./components/AccountListModal"; +import OreadyAdd from "./components/OreadyAdd"; +import PoolListModal from "./components/PoolListModal"; const ScenarioList: React.FC = () => { const { scenarioId, scenarioName } = useParams<{ @@ -58,6 +62,19 @@ const ScenarioList: React.FC = () => { const [currentTaskId, setCurrentTaskId] = useState(""); const [showActionMenu, setShowActionMenu] = useState(null); + // 设备列表弹窗状态 + const [showDeviceList, setShowDeviceList] = useState(false); + const [currentTask, setCurrentTask] = useState(null); + + // 账号列表弹窗状态 + const [showAccountList, setShowAccountList] = useState(false); + + // 已添加弹窗状态 + const [showOreadyAdd, setShowOreadyAdd] = useState(false); + + // 通过率弹窗状态 + const [showPoolList, setShowPoolList] = useState(false); + // 分页相关状态 const [currentPage, setCurrentPage] = useState(1); const [hasMore, setHasMore] = useState(true); @@ -233,19 +250,28 @@ const ScenarioList: React.FC = () => { } }; - // 卡片点击处理 - 执行二维码动作 - const handleCardClick = (taskId: string, event: React.MouseEvent) => { - // 检查点击是否在更多按钮区域内 - const target = event.target as HTMLElement; - const moreButton = target.closest(`.${style["more-btn"]}`); + // 处理设备列表弹窗 + const handleShowDeviceList = (task: Task) => { + setCurrentTask(task); + setShowDeviceList(true); + }; - // 如果点击的是更多按钮或其子元素，不执行卡片点击动作 - if (moreButton) { - return; - } + // 处理账号列表弹窗 + const handleShowAccountList = (task: Task) => { + setCurrentTask(task); + setShowAccountList(true); + }; - // 执行二维码动作 - handleShowQrCode(taskId); + // 处理已添加弹窗 + const handleShowOreadyAdd = (task: Task) => { + setCurrentTask(task); + setShowOreadyAdd(true); + }; + + // 处理通过率弹窗 + const handleShowPoolList = (task: Task) => { + setCurrentTask(task); + setShowPoolList(true); }; const getStatusColor = (status: number) => { @@ -433,25 +459,49 @@ const ScenarioList: React.FC = () => { {/* 统计数据网格 */}
-
+
{ + e.stopPropagation(); // 阻止事件冒泡，避免触发卡片点击 + handleShowDeviceList(task); + }} + >
设备数
{deviceCount(task)}
-
+
{ + e.stopPropagation(); // 阻止事件冒泡，避免触发卡片点击 + handleShowAccountList(task); + }} + >
已获客
{task?.acquiredCount || 0}
-
+
{ + e.stopPropagation(); // 阻止事件冒泡，避免触发卡片点击 + handleShowOreadyAdd(task); + }} + >
已添加
- {task.addedCount || 0} + {task.passCount || 0}
-
+
{ + e.stopPropagation(); // 阻止事件冒泡，避免触发卡片点击 + handleShowPoolList(task); + }} + >
通过率
{task.passRate}% @@ -581,6 +631,38 @@ const ScenarioList: React.FC = () => {
+ + {/* 设备列表弹窗 */} + setShowDeviceList(false)} + ruleId={currentTask?.id ? parseInt(currentTask.id) : undefined} + ruleName={currentTask?.name} + /> + + {/* 账号列表弹窗 */} + setShowAccountList(false)} + ruleId={currentTask?.id ? parseInt(currentTask.id) : undefined} + ruleName={currentTask?.name} + /> + + {/* 已添加弹窗 */} + setShowOreadyAdd(false)} + ruleId={currentTask?.id ? parseInt(currentTask.id) : undefined} + ruleName={currentTask?.name} + /> + + {/* 通过率弹窗 */} + setShowPoolList(false)} + ruleId={currentTask?.id ? parseInt(currentTask.id) : undefined} + ruleName={currentTask?.name} + />
); diff --git a/Cunkebao/src/utils/chartColors.ts b/Cunkebao/src/utils/chartColors.ts new file mode 100644 index 00000000..6290fab9 --- /dev/null +++ b/Cunkebao/src/utils/chartColors.ts @@ -0,0 +1,67 @@ +// 预定义的颜色数组，确保颜色不重复且美观 +const CHART_COLORS = [ + "#1677ff", // 蓝色 + "#52c41a", // 绿色 + "#fa8c16", // 橙色 + "#eb2f96", // 粉色 + "#722ed1", // 紫色 + "#13c2c2", // 青色 + "#fa541c", // 红色 + "#2f54eb", // 深蓝色 + "#faad14", // 黄色 + "#a0d911", // 青绿色 + "#f5222d", // 红色 + "#1890ff", // 天蓝色 + "#52c41a", // 绿色 + "#fa8c16", // 橙色 + "#eb2f96", // 粉色 +]; + +/** + * 获取图表颜色 + * @param index 颜色索引 + * @returns 颜色值 + */ +export const getChartColor = (index: number): string => { + return CHART_COLORS[index % CHART_COLORS.length]; +}; + +/** + * 获取多个图表颜色 + * @param count 需要的颜色数量 + * @returns 颜色数组 + */ +export const getChartColors = (count: number): string[] => { + return Array.from({ length: count }, (_, index) => getChartColor(index)); +}; + +/** + * 获取随机图表颜色 + * @returns 随机颜色值 + */ +export const getRandomChartColor = (): string => { + const randomIndex = Math.floor(Math.random() * CHART_COLORS.length); + return CHART_COLORS[randomIndex]; +}; + +/** + * 获取渐变色数组 + * @param baseColor 基础颜色 + * @param count 渐变数量 + * @returns 渐变色数组 + */ +export const getGradientColors = ( + baseColor: string, + count: number, +): string[] => { + // 这里可以实现颜色渐变逻辑 + // 暂时返回相同颜色的数组 + return Array.from({ length: count }, () => baseColor); +}; + +export default { + getChartColor, + getChartColors, + getRandomChartColor, + getGradientColors, +}; From 94196b1fe38484d76a48b7ff7f96fe92c8b119b8 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, 15 Aug 2025 17:53:42 +0800 Subject: [PATCH 19/39] =?UTF-8?q?=E5=A4=B4=E9=83=A8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cunkebao/src/components/LineChart.tsx | 8 -------- .../mobile/workspace/traffic-distribution/list/index.tsx | 9 ++++++++- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Cunkebao/src/components/LineChart.tsx b/Cunkebao/src/components/LineChart.tsx index ff99ba11..bb93e512 100644 --- a/Cunkebao/src/components/LineChart.tsx +++ b/Cunkebao/src/components/LineChart.tsx @@ -43,14 +43,6 @@ const LineChart: React.FC = ({ lineStyle: { color: "#1677ff" }, itemStyle: { color: "#1677ff" }, }, - { - data: [3, 99, 12, 14, 8, 0, 0], - type: "line", - smooth: true, - symbol: "circle", - lineStyle: { color: "green" }, - itemStyle: { color: "red" }, - }, ], grid: { left: 40, right: 24, top: 40, bottom: 32 }, }; diff --git a/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/index.tsx b/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/index.tsx index 22ac3823..b36a58ef 100644 --- a/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/index.tsx +++ b/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/index.tsx @@ -14,7 +14,6 @@ import { import NavCommon from "@/components/NavCommon"; import { fetchDistributionRuleList, - updateDistributionRule, toggleDistributionRuleStatus, deleteDistributionRule, } from "./api"; @@ -288,6 +287,14 @@ const TrafficDistributionList: React.FC = () => { 总流量池数量
+
+ + {item.config?.total?.totalUsers || 0} + +
+ 分发统计 +
+
From 504220f630529d5cff2f3c59a6339c15d0d6bbfe 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, 15 Aug 2025 17:59:22 +0800 Subject: [PATCH 20/39] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B6?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=B5=B1=E8=A8=88=E5=8A=9F=E8=83=BD=EF=BC=8C?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=BB=E9=A0=81=E9=9D=A2=E4=BB=A5=E9=A1=AF?= =?UTF-8?q?=E7=A4=BA=E7=94=A8=E6=88=B6=E7=9B=B8=E9=97=9C=E6=95=B8=E6=93=9A?= =?UTF-8?q?=EF=BC=8C=E4=B8=A6=E8=AA=BF=E6=95=B4=E7=9B=B8=E6=87=89=E7=9A=84?= =?UTF-8?q?=E7=8B=80=E6=85=8B=E7=AE=A1=E7=90=86=E9=82=8F=E8=BC=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cunkebao/src/pages/mobile/mine/main/api.ts | 4 ++++ Cunkebao/src/pages/mobile/mine/main/index.tsx | 20 +++++++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Cunkebao/src/pages/mobile/mine/main/api.ts b/Cunkebao/src/pages/mobile/mine/main/api.ts index e74a965a..e5a76cb8 100644 --- a/Cunkebao/src/pages/mobile/mine/main/api.ts +++ b/Cunkebao/src/pages/mobile/mine/main/api.ts @@ -3,3 +3,7 @@ import request from "@/api/request"; export function getDashboard() { return request("/v1/dashboard", {}, "GET"); } +// 用户信息统计 +export function getUserInfoStats() { + return request("/v1/dashboard/userInfoStats", {}, "GET"); +} diff --git a/Cunkebao/src/pages/mobile/mine/main/index.tsx b/Cunkebao/src/pages/mobile/mine/main/index.tsx index b6fd294f..45358e3f 100644 --- a/Cunkebao/src/pages/mobile/mine/main/index.tsx +++ b/Cunkebao/src/pages/mobile/mine/main/index.tsx @@ -12,7 +12,7 @@ import MeauMobile from "@/components/MeauMobile/MeauMoible"; import Layout from "@/components/Layout/Layout"; import style from "./index.module.scss"; import { useUserStore } from "@/store/module/user"; -import { getDashboard } from "./api"; +import { getDashboard, getUserInfoStats } from "./api"; import NavCommon from "@/components/NavCommon"; const Mine: React.FC = () => { const navigate = useNavigate(); @@ -24,6 +24,12 @@ const Mine: React.FC = () => { content: 156, balance: 0, }); + const [userInfoStats, setUserInfoStats] = useState({ + contentLibraryNum: 0, + deviceNum: 0, + userNum: 0, + wechatNum: 0, + }); // 用户信息 const currentUserInfo = { @@ -43,7 +49,7 @@ const Mine: React.FC = () => { title: "设备管理", description: "管理您的设备和微信账号", icon: , - count: stats.devices, + count: userInfoStats.deviceNum, path: "/mine/devices", bgColor: "#e6f7ff", iconColor: "#1890ff", @@ -53,7 +59,7 @@ const Mine: React.FC = () => { title: "微信号管理", description: "管理微信账号和好友", icon: , - count: stats.wechat, + count: userInfoStats.wechatNum, path: "/wechat-accounts", bgColor: "#f6ffed", iconColor: "#52c41a", @@ -63,7 +69,7 @@ const Mine: React.FC = () => { title: "流量池", description: "管理用户流量池和分组", icon: , - count: stats.traffic, + count: userInfoStats.userNum, path: "/mine/traffic-pool", bgColor: "#f9f0ff", iconColor: "#722ed1", @@ -73,7 +79,7 @@ const Mine: React.FC = () => { title: "内容库", description: "管理营销内容和素材", icon: , - count: stats.content, + count: userInfoStats.contentLibraryNum, path: "/mine/content", bgColor: "#fff7e6", iconColor: "#fa8c16", @@ -83,7 +89,7 @@ const Mine: React.FC = () => { title: "触客宝", description: "触客宝", icon: , - count: stats.content, + count: 0, path: "/mine/ckbox", bgColor: "#fff7e6", iconColor: "#fa8c16", @@ -101,6 +107,8 @@ const Mine: React.FC = () => { content: 999, balance: res.balance || 0, }); + const res2 = await getUserInfoStats(); + setUserInfoStats(res2); } catch (error) { console.error("加载统计数据失败:", error); } From c7e90fc917a0ded1f3c3ceda1b22f8235f1162e4 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, 15 Aug 2025 19:15:56 +0800 Subject: [PATCH 21/39] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B6?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=B5=B1=E8=A8=88=E5=8A=9F=E8=83=BD=EF=BC=8C?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=BB=E9=A0=81=E9=9D=A2=E4=BB=A5=E9=A1=AF?= =?UTF-8?q?=E7=A4=BA=E7=94=A8=E6=88=B6=E7=9B=B8=E9=97=9C=E6=95=B8=E6=93=9A?= =?UTF-8?q?=EF=BC=8C=E4=B8=A6=E8=AA=BF=E6=95=B4=E7=8B=80=E6=85=8B=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E9=82=8F=E8=BC=AF=E4=BB=A5=E6=8F=90=E5=8D=87=E6=80=A7?= =?UTF-8?q?=E8=83=BD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cunkebao/src/android-polyfills.ts | 352 ++++++++++++++++++ .../components/AndroidCompatibilityCheck.tsx | 228 ++++++++++++ .../src/components/CompatibilityCheck.tsx | 125 +++++++ Cunkebao/src/polyfills.ts | 176 +++++++++ Cunkebao/兼容性说明.md | 177 +++++++++ 5 files changed, 1058 insertions(+) create mode 100644 Cunkebao/src/android-polyfills.ts create mode 100644 Cunkebao/src/components/AndroidCompatibilityCheck.tsx create mode 100644 Cunkebao/src/components/CompatibilityCheck.tsx create mode 100644 Cunkebao/src/polyfills.ts create mode 100644 Cunkebao/兼容性说明.md diff --git a/Cunkebao/src/android-polyfills.ts b/Cunkebao/src/android-polyfills.ts new file mode 100644 index 00000000..583fd397 --- /dev/null +++ b/Cunkebao/src/android-polyfills.ts @@ -0,0 +1,352 @@ +// Android 专用 polyfill - 解决Android 7等低版本系统的兼容性问题 + +// 检测是否为Android设备 +const isAndroid = () => { + return /Android/i.test(navigator.userAgent); +}; + +// 检测Android版本 +const getAndroidVersion = () => { + const match = navigator.userAgent.match(/Android\s+(\d+)/); + return match ? parseInt(match[1]) : 0; +}; + +// 检测是否为低版本Android +const isLowVersionAndroid = () => { + const version = getAndroidVersion(); + return version <= 7; // Android 7及以下版本 +}; + +// 只在Android设备上执行polyfill +if (isAndroid() && isLowVersionAndroid()) { + console.log("检测到低版本Android系统，启用兼容性polyfill"); + + // 修复Array.prototype.includes在Android WebView中的问题 + if (!Array.prototype.includes) { + Array.prototype.includes = function (searchElement, fromIndex) { + if (this == null) { + throw new TypeError('"this" is null or not defined'); + } + var o = Object(this); + var len = o.length >>> 0; + if (len === 0) { + return false; + } + var n = fromIndex | 0; + var k = Math.max(n >= 0 ? n : len + n, 0); + while (k < len) { + if (o[k] === searchElement) { + return true; + } + k++; + } + return false; + }; + } + + // 修复String.prototype.includes在Android WebView中的问题 + if (!String.prototype.includes) { + String.prototype.includes = function (search, start) { + if (typeof start !== "number") { + start = 0; + } + if (start + search.length > this.length) { + return false; + } else { + return this.indexOf(search, start) !== -1; + } + }; + } + + // 修复String.prototype.startsWith在Android WebView中的问题 + if (!String.prototype.startsWith) { + String.prototype.startsWith = function (searchString, position) { + position = position || 0; + return this.substr(position, searchString.length) === searchString; + }; + } + + // 修复String.prototype.endsWith在Android WebView中的问题 + if (!String.prototype.endsWith) { + String.prototype.endsWith = function (searchString, length) { + if (length === undefined || length > this.length) { + length = this.length; + } + return ( + this.substring(length - searchString.length, length) === searchString + ); + }; + } + + // 修复Array.prototype.find在Android WebView中的问题 + if (!Array.prototype.find) { + Array.prototype.find = function (predicate) { + if (this == null) { + throw new TypeError("Array.prototype.find called on null or undefined"); + } + if (typeof predicate !== "function") { + throw new TypeError("predicate must be a function"); + } + var list = Object(this); + var length = parseInt(list.length) || 0; + var thisArg = arguments[1]; + for (var i = 0; i < length; i++) { + var element = list[i]; + if (predicate.call(thisArg, element, i, list)) { + return element; + } + } + return undefined; + }; + } + + // 修复Array.prototype.findIndex在Android WebView中的问题 + if (!Array.prototype.findIndex) { + Array.prototype.findIndex = function (predicate) { + if (this == null) { + throw new TypeError( + "Array.prototype.findIndex called on null or undefined", + ); + } + if (typeof predicate !== "function") { + throw new TypeError("predicate must be a function"); + } + var list = Object(this); + var length = parseInt(list.length) || 0; + var thisArg = arguments[1]; + for (var i = 0; i < length; i++) { + var element = list[i]; + if (predicate.call(thisArg, element, i, list)) { + return i; + } + } + return -1; + }; + } + + // 修复Object.assign在Android WebView中的问题 + if (typeof Object.assign !== "function") { + Object.assign = function (target) { + if (target == null) { + throw new TypeError("Cannot convert undefined or null to object"); + } + var to = Object(target); + for (var index = 1; index < arguments.length; index++) { + var nextSource = arguments[index]; + if (nextSource != null) { + for (var nextKey in nextSource) { + if (Object.prototype.hasOwnProperty.call(nextSource, nextKey)) { + to[nextKey] = nextSource[nextKey]; + } + } + } + } + return to; + }; + } + + // 修复Array.from在Android WebView中的问题 + if (!Array.from) { + Array.from = (function () { + var toStr = Object.prototype.toString; + var isCallable = function (fn) { + return ( + typeof fn === "function" || toStr.call(fn) === "[object Function]" + ); + }; + var toInteger = function (value) { + var number = Number(value); + if (isNaN(number)) { + return 0; + } + if (number === 0 || !isFinite(number)) { + return number; + } + return (number > 0 ? 1 : -1) * Math.floor(Math.abs(number)); + }; + var maxSafeInteger = Math.pow(2, 53) - 1; + var toLength = function (value) { + var len = toInteger(value); + return Math.min(Math.max(len, 0), maxSafeInteger); + }; + return function from(arrayLike) { + var C = this; + var items = Object(arrayLike); + if (arrayLike == null) { + throw new TypeError( + "Array.from requires an array-like object - not null or undefined", + ); + } + var mapFunction = arguments.length > 1 ? arguments[1] : void undefined; + var T; + if (typeof mapFunction !== "undefined") { + if (typeof mapFunction !== "function") { + throw new TypeError( + "Array.from: when provided, the second argument must be a function", + ); + } + if (arguments.length > 2) { + T = arguments[2]; + } + } + var len = toLength(items.length); + var A = isCallable(C) ? Object(new C(len)) : new Array(len); + var k = 0; + var kValue; + while (k < len) { + kValue = items[k]; + if (mapFunction) { + A[k] = + typeof T === "undefined" + ? mapFunction(kValue, k) + : mapFunction.call(T, kValue, k); + } else { + A[k] = kValue; + } + k += 1; + } + A.length = len; + return A; + }; + })(); + } + + // 修复requestAnimationFrame在Android WebView中的问题 + if (!window.requestAnimationFrame) { + window.requestAnimationFrame = function (callback) { + return setTimeout(function () { + callback(Date.now()); + }, 1000 / 60); + }; + } + + if (!window.cancelAnimationFrame) { + window.cancelAnimationFrame = function (id) { + clearTimeout(id); + }; + } + + // 修复IntersectionObserver在Android WebView中的问题 + if (!window.IntersectionObserver) { + window.IntersectionObserver = function (callback, options) { + this.callback = callback; + this.options = options || {}; + this.observers = []; + + this.observe = function (element) { + this.observers.push(element); + // 简单的实现，实际项目中可能需要更复杂的逻辑 + setTimeout(() => { + this.callback([ + { + target: element, + isIntersecting: true, + intersectionRatio: 1, + }, + ]); + }, 100); + }; + + this.unobserve = function (element) { + var index = this.observers.indexOf(element); + if (index > -1) { + this.observers.splice(index, 1); + } + }; + + this.disconnect = function () { + this.observers = []; + }; + }; + } + + // 修复ResizeObserver在Android WebView中的问题 + if (!window.ResizeObserver) { + window.ResizeObserver = function (callback) { + this.callback = callback; + this.observers = []; + + this.observe = function (element) { + this.observers.push(element); + }; + + this.unobserve = function (element) { + var index = this.observers.indexOf(element); + if (index > -1) { + this.observers.splice(index, 1); + } + }; + + this.disconnect = function () { + this.observers = []; + }; + }; + } + + // 修复URLSearchParams在Android WebView中的问题 + if (!window.URLSearchParams) { + window.URLSearchParams = function (init) { + this.params = {}; + + if (init) { + if (typeof init === "string") { + if (init.charAt(0) === "?") { + init = init.slice(1); + } + var pairs = init.split("&"); + for (var i = 0; i < pairs.length; i++) { + var pair = pairs[i].split("="); + var key = decodeURIComponent(pair[0]); + var value = decodeURIComponent(pair[1] || ""); + this.append(key, value); + } + } + } + + this.append = function (name, value) { + if (!this.params[name]) { + this.params[name] = []; + } + this.params[name].push(value); + }; + + this.get = function (name) { + return this.params[name] ? this.params[name][0] : null; + }; + + this.getAll = function (name) { + return this.params[name] || []; + }; + + this.has = function (name) { + return !!this.params[name]; + }; + + this.set = function (name, value) { + this.params[name] = [value]; + }; + + this.delete = function (name) { + delete this.params[name]; + }; + + this.toString = function () { + var pairs = []; + for (var key in this.params) { + if (this.params.hasOwnProperty(key)) { + for (var i = 0; i < this.params[key].length; i++) { + pairs.push( + encodeURIComponent(key) + + "=" + + encodeURIComponent(this.params[key][i]), + ); + } + } + } + return pairs.join("&"); + }; + }; + } + + console.log("Android兼容性polyfill已加载完成"); +} diff --git a/Cunkebao/src/components/AndroidCompatibilityCheck.tsx b/Cunkebao/src/components/AndroidCompatibilityCheck.tsx new file mode 100644 index 00000000..55bc0cc0 --- /dev/null +++ b/Cunkebao/src/components/AndroidCompatibilityCheck.tsx @@ -0,0 +1,228 @@ +import React, { useEffect, useState } from "react"; + +interface AndroidCompatibilityInfo { + isAndroid: boolean; + androidVersion: number; + chromeVersion: number; + webViewVersion: number; + issues: string[]; + suggestions: string[]; +} + +const AndroidCompatibilityCheck: React.FC = () => { + const [compatibility, setCompatibility] = useState({ + isAndroid: false, + androidVersion: 0, + chromeVersion: 0, + webViewVersion: 0, + issues: [], + suggestions: [], + }); + + useEffect(() => { + const checkAndroidCompatibility = () => { + const ua = navigator.userAgent; + const issues: string[] = []; + const suggestions: string[] = []; + let isAndroid = false; + let androidVersion = 0; + let chromeVersion = 0; + let webViewVersion = 0; + + // 检测Android系统 + if (ua.indexOf("Android") > -1) { + isAndroid = true; + const androidMatch = ua.match(/Android\s+(\d+)/); + if (androidMatch) { + androidVersion = parseInt(androidMatch[1]); + } + + // 检测Chrome版本 + const chromeMatch = ua.match(/Chrome\/(\d+)/); + if (chromeMatch) { + chromeVersion = parseInt(chromeMatch[1]); + } + + // 检测WebView版本 + const webViewMatch = ua.match(/Version\/\d+\.\d+/); + if (webViewMatch) { + const versionMatch = webViewMatch[0].match(/\d+/); + if (versionMatch) { + webViewVersion = parseInt(versionMatch[0]); + } + } + + // Android 7 (API 24) 兼容性检查 + if (androidVersion === 7) { + issues.push("Android 7 系统对ES6+特性支持不完整"); + suggestions.push("建议升级到Android 8+或使用最新版Chrome"); + } + + // Android 6 (API 23) 兼容性检查 + if (androidVersion === 6) { + issues.push("Android 6 系统对现代Web特性支持有限"); + suggestions.push("强烈建议升级系统或使用最新版Chrome"); + } + + // Chrome版本检查 + if (chromeVersion > 0 && chromeVersion < 50) { + issues.push(`Chrome版本过低 (${chromeVersion})，建议升级到50+`); + suggestions.push("请在Google Play商店更新Chrome浏览器"); + } + + // WebView版本检查 + if (webViewVersion > 0 && webViewVersion < 50) { + issues.push(`WebView版本过低 (${webViewVersion})，可能影响应用功能`); + suggestions.push("建议使用Chrome浏览器或更新系统WebView"); + } + + // 检测特定问题 + const features = { + Promise: typeof Promise !== "undefined", + fetch: typeof fetch !== "undefined", + "Array.from": typeof Array.from !== "undefined", + "Object.assign": typeof Object.assign !== "undefined", + "String.includes": typeof String.prototype.includes !== "undefined", + "Array.includes": typeof Array.prototype.includes !== "undefined", + requestAnimationFrame: typeof requestAnimationFrame !== "undefined", + IntersectionObserver: typeof IntersectionObserver !== "undefined", + ResizeObserver: typeof ResizeObserver !== "undefined", + URLSearchParams: typeof URLSearchParams !== "undefined", + TextEncoder: typeof TextEncoder !== "undefined", + AbortController: typeof AbortController !== "undefined", + }; + + Object.entries(features).forEach(([feature, supported]) => { + if (!supported) { + issues.push(`${feature} 特性不支持`); + } + }); + + // 微信内置浏览器检测 + if (ua.indexOf("MicroMessenger") > -1) { + issues.push("微信内置浏览器对某些Web特性支持有限"); + suggestions.push("建议在系统浏览器中打开以获得最佳体验"); + } + + // QQ内置浏览器检测 + if (ua.indexOf("QQ/") > -1) { + issues.push("QQ内置浏览器对某些Web特性支持有限"); + suggestions.push("建议在系统浏览器中打开以获得最佳体验"); + } + } + + setCompatibility({ + isAndroid, + androidVersion, + chromeVersion, + webViewVersion, + issues, + suggestions, + }); + }; + + checkAndroidCompatibility(); + }, []); + + if (!compatibility.isAndroid || compatibility.issues.length === 0) { + return null; + } + + return ( +
+
+ 🚨 Android 兼容性警告 +
+ +
+ 系统版本: Android {compatibility.androidVersion} + {compatibility.chromeVersion > 0 && + ` | Chrome: ${compatibility.chromeVersion}`} + {compatibility.webViewVersion > 0 && + ` | WebView: ${compatibility.webViewVersion}`} +
+ +
+
+ 检测到的问题: +
+
+ {compatibility.issues.map((issue, index) => ( +
+ • {issue} +
+ ))} +
+
+ + {compatibility.suggestions.length > 0 && ( +
+
+ 建议解决方案: +
+
+ {compatibility.suggestions.map((suggestion, index) => ( +
+ • {suggestion} +
+ ))} +
+
+ )} + +
+ 💡 应用已启用兼容模式，但建议升级系统以获得最佳体验 +
+ + +
+ ); +}; + +export default AndroidCompatibilityCheck; diff --git a/Cunkebao/src/components/CompatibilityCheck.tsx b/Cunkebao/src/components/CompatibilityCheck.tsx new file mode 100644 index 00000000..563d4242 --- /dev/null +++ b/Cunkebao/src/components/CompatibilityCheck.tsx @@ -0,0 +1,125 @@ +import React, { useEffect, useState } from "react"; + +interface CompatibilityInfo { + isCompatible: boolean; + browser: string; + version: string; + issues: string[]; +} + +const CompatibilityCheck: React.FC = () => { + const [compatibility, setCompatibility] = useState({ + isCompatible: true, + browser: "", + version: "", + issues: [], + }); + + useEffect(() => { + const checkCompatibility = () => { + const ua = navigator.userAgent; + const issues: string[] = []; + let browser = "Unknown"; + let version = "Unknown"; + + // 检测浏览器类型和版本 + if (ua.indexOf("Chrome") > -1) { + browser = "Chrome"; + const match = ua.match(/Chrome\/(\d+)/); + version = match ? match[1] : "Unknown"; + if (parseInt(version) < 50) { + issues.push("Chrome版本过低，建议升级到50+"); + } + } else if (ua.indexOf("Firefox") > -1) { + browser = "Firefox"; + const match = ua.match(/Firefox\/(\d+)/); + version = match ? match[1] : "Unknown"; + if (parseInt(version) < 50) { + issues.push("Firefox版本过低，建议升级到50+"); + } + } else if (ua.indexOf("Safari") > -1 && ua.indexOf("Chrome") === -1) { + browser = "Safari"; + const match = ua.match(/Version\/(\d+)/); + version = match ? match[1] : "Unknown"; + if (parseInt(version) < 10) { + issues.push("Safari版本过低，建议升级到10+"); + } + } else if (ua.indexOf("MSIE") > -1 || ua.indexOf("Trident") > -1) { + browser = "Internet Explorer"; + const match = ua.match(/(?:MSIE |rv:)(\d+)/); + version = match ? match[1] : "Unknown"; + issues.push("Internet Explorer不受支持，建议使用现代浏览器"); + } else if (ua.indexOf("Edge") > -1) { + browser = "Edge"; + const match = ua.match(/Edge\/(\d+)/); + version = match ? match[1] : "Unknown"; + if (parseInt(version) < 12) { + issues.push("Edge版本过低，建议升级到12+"); + } + } + + // 检测ES6+特性支持 + const features = { + Promise: typeof Promise !== "undefined", + fetch: typeof fetch !== "undefined", + "Array.from": typeof Array.from !== "undefined", + "Object.assign": typeof Object.assign !== "undefined", + "String.includes": typeof String.prototype.includes !== "undefined", + "Array.includes": typeof Array.prototype.includes !== "undefined", + }; + + Object.entries(features).forEach(([feature, supported]) => { + if (!supported) { + issues.push(`${feature} 特性不支持`); + } + }); + + setCompatibility({ + isCompatible: issues.length === 0, + browser, + version, + issues, + }); + }; + + checkCompatibility(); + }, []); + + if (compatibility.isCompatible) { + return null; // 兼容时不需要显示 + } + + return ( +
+
+ 浏览器兼容性警告 +
+
+ 当前浏览器: {compatibility.browser} {compatibility.version} +
+
+ {compatibility.issues.map((issue, index) => ( +
{issue}
+ ))} +
+
+ 建议使用 Chrome 50+、Firefox 50+、Safari 10+ 或 Edge 12+ +
+
+ ); +}; + +export default CompatibilityCheck; diff --git a/Cunkebao/src/polyfills.ts b/Cunkebao/src/polyfills.ts new file mode 100644 index 00000000..078b12d0 --- /dev/null +++ b/Cunkebao/src/polyfills.ts @@ -0,0 +1,176 @@ +// ES5兼容性polyfill - 确保在低版本浏览器中正常运行 +// 特别针对Android 7等低版本内核优化 + +// 基础polyfill +import "core-js/stable"; +import "regenerator-runtime/runtime"; + +// Promise支持 +import "core-js/features/promise"; + +// Array方法支持 +import "core-js/features/array/from"; +import "core-js/features/array/find"; +import "core-js/features/array/includes"; +import "core-js/features/array/find-index"; +import "core-js/features/array/fill"; +import "core-js/features/array/copy-within"; + +// Object方法支持 +import "core-js/features/object/assign"; +import "core-js/features/object/entries"; +import "core-js/features/object/values"; +import "core-js/features/object/keys"; + +// String方法支持 +import "core-js/features/string/includes"; +import "core-js/features/string/starts-with"; +import "core-js/features/string/ends-with"; +import "core-js/features/string/pad-start"; +import "core-js/features/string/pad-end"; +import "core-js/features/string/trim-start"; +import "core-js/features/string/trim-end"; +import "core-js/features/string/repeat"; + +// Number方法支持 +import "core-js/features/number/is-finite"; +import "core-js/features/number/is-integer"; +import "core-js/features/number/is-nan"; +import "core-js/features/number/is-safe-integer"; + +// Math方法支持 +import "core-js/features/math/sign"; +import "core-js/features/math/trunc"; +import "core-js/features/math/cbrt"; +import "core-js/features/math/clz32"; +import "core-js/features/math/imul"; +import "core-js/features/math/fround"; +import "core-js/features/math/hypot"; + +// Map和Set支持 +import "core-js/features/map"; +import "core-js/features/set"; +import "core-js/features/weak-map"; +import "core-js/features/weak-set"; + +// Symbol支持 +import "core-js/features/symbol"; +import "core-js/features/symbol/for"; +import "core-js/features/symbol/key-for"; + +// 正则表达式支持 +import "core-js/features/regexp/flags"; +import "core-js/features/regexp/sticky"; + +// 函数支持 +import "core-js/features/function/name"; +import "core-js/features/function/has-instance"; + +// 全局对象支持 +import "core-js/features/global-this"; + +// 确保全局对象可用 +if (typeof window !== "undefined") { + // 确保Promise在全局可用 + if (!window.Promise) { + window.Promise = require("core-js/features/promise"); + } + + // 确保fetch在全局可用 + if (!window.fetch) { + window.fetch = require("whatwg-fetch"); + } + + // 确保requestAnimationFrame在全局可用 + if (!window.requestAnimationFrame) { + window.requestAnimationFrame = function (callback) { + return setTimeout(callback, 1000 / 60); + }; + } + + if (!window.cancelAnimationFrame) { + window.cancelAnimationFrame = function (id) { + clearTimeout(id); + }; + } + + // 确保IntersectionObserver在全局可用 + if (!window.IntersectionObserver) { + window.IntersectionObserver = function (callback, options) { + return { + observe: function () {}, + unobserve: function () {}, + disconnect: function () {}, + }; + }; + } + + // 确保ResizeObserver在全局可用 + if (!window.ResizeObserver) { + window.ResizeObserver = function (callback) { + return { + observe: function () {}, + unobserve: function () {}, + disconnect: function () {}, + }; + }; + } + + // 确保MutationObserver在全局可用 + if (!window.MutationObserver) { + window.MutationObserver = function (callback) { + return { + observe: function () {}, + disconnect: function () {}, + }; + }; + } + + // 确保Performance API在全局可用 + if (!window.performance) { + window.performance = { + now: function () { + return Date.now(); + }, + }; + } + + // 确保URLSearchParams在全局可用 + if (!window.URLSearchParams) { + window.URLSearchParams = require("core-js/features/url-search-params"); + } + + // 确保URL在全局可用 + if (!window.URL) { + window.URL = require("core-js/features/url"); + } + + // 确保AbortController在全局可用 + if (!window.AbortController) { + window.AbortController = function () { + return { + signal: { + aborted: false, + addEventListener: function () {}, + removeEventListener: function () {}, + }, + abort: function () { + this.signal.aborted = true; + }, + }; + }; + } + + // 确保AbortSignal在全局可用 + if (!window.AbortSignal) { + window.AbortSignal = { + abort: function () { + return { + aborted: true, + addEventListener: function () {}, + removeEventListener: function () {}, + }; + }, + }; + } +} diff --git a/Cunkebao/兼容性说明.md b/Cunkebao/兼容性说明.md new file mode 100644 index 00000000..dc77df52 --- /dev/null +++ b/Cunkebao/兼容性说明.md @@ -0,0 +1,177 @@ +# 存客宝项目 - 浏览器兼容性说明 + +## 🎯 **兼容性目标** + +本项目已配置为支持以下浏览器版本： + +- **Chrome**: 50+ +- **Firefox**: 50+ +- **Safari**: 10+ +- **Edge**: 12+ +- **Internet Explorer**: 11+ (部分功能受限) +- **Android**: 4.4+ (特别优化Android 7) +- **iOS**: 9+ + +## 🔧 **兼容性配置** + +### 1. **Polyfill 支持** + +项目已集成以下 polyfill 来确保低版本浏览器兼容性： + +- **core-js**: ES6+ 特性支持 +- **regenerator-runtime**: async/await 支持 +- **whatwg-fetch**: fetch API 支持 +- **Android专用polyfill**: 针对Android 7等低版本系统优化 + +### 2. **构建配置** + +- 使用 **terser** 进行代码压缩 +- 配置了 **browserslist** 目标浏览器 +- 添加了兼容性检测组件 +- 特别针对Android设备优化 + +### 3. **特性支持** + +项目通过 polyfill 支持以下 ES6+ 特性： + +- ✅ Promise +- ✅ fetch API +- ✅ Array.from, Array.find, Array.includes, Array.findIndex +- ✅ Object.assign, Object.entries, Object.values, Object.keys +- ✅ String.includes, String.startsWith, String.endsWith +- ✅ Map, Set, WeakMap, WeakSet +- ✅ Symbol +- ✅ requestAnimationFrame +- ✅ IntersectionObserver +- ✅ ResizeObserver +- ✅ URLSearchParams +- ✅ AbortController + +## 🚀 **使用方法** + +### 开发环境 + +```bash +pnpm dev +``` + +### 生产构建 + +```bash +pnpm build +``` + +### 预览构建结果 + +```bash +pnpm preview +``` + +## 📱 **Android 特别优化** + +### **Android 7 兼容性** + +Android 7 (API 24) 系统对ES6+特性支持不完整，项目已特别优化： + +#### **问题解决：** + +- ✅ Array.prototype.includes 方法缺失 +- ✅ String.prototype.includes 方法缺失 +- ✅ Object.assign 方法缺失 +- ✅ Array.from 方法缺失 +- ✅ requestAnimationFrame 缺失 +- ✅ IntersectionObserver 缺失 +- ✅ URLSearchParams 缺失 + +#### **解决方案：** + +- 使用自定义polyfill补充缺失方法 +- 提供降级实现确保功能可用 +- 自动检测Android版本并启用相应polyfill + +### **Android WebView 优化** + +- 针对系统WebView进行特别优化 +- 支持微信、QQ等内置浏览器 +- 提供降级方案确保基本功能可用 + +## ⚠️ **注意事项** + +1. **Android 7 支持** + - 已启用兼容模式，基本功能可用 + - 建议升级到Android 8+或使用最新版Chrome + - 部分高级特性可能受限 + +2. **Android 6 及以下** + - 支持有限，建议升级系统 + - 使用最新版Chrome浏览器 + - 部分功能可能不可用 + +3. **移动端兼容性** + - iOS Safari 10+ + - Android Chrome 50+ + - 微信内置浏览器 (部分功能受限) + - QQ内置浏览器 (部分功能受限) + +4. **性能考虑** + - polyfill 会增加包体积 + - 现代浏览器会自动忽略不需要的 polyfill + - Android设备上会有额外的兼容性检测 + +## 🔍 **兼容性检测** + +项目包含自动兼容性检测功能： + +### **通用检测** + +- 在低版本浏览器中会显示警告提示 +- 控制台会输出兼容性信息 +- 建议用户升级浏览器 + +### **Android专用检测** + +- 自动检测Android系统版本 +- 检测Chrome和WebView版本 +- 识别微信、QQ等内置浏览器 +- 提供针对性的解决方案建议 + +## 📝 **更新日志** + +### v3.0.0 + +- ✅ 添加 ES5 兼容性支持 +- ✅ 集成 core-js polyfill +- ✅ 添加兼容性检测组件 +- ✅ 优化构建配置 +- ✅ **新增Android 7专用polyfill** +- ✅ **新增Android兼容性检测** +- ✅ **优化移动端体验** + +## 🛠️ **故障排除** + +如果遇到兼容性问题： + +1. **Android设备问题** + - 检查Android系统版本 + - 确认Chrome浏览器版本 + - 查看控制台错误信息 + - 尝试使用系统浏览器而非内置浏览器 + +2. **通用问题** + - 检查浏览器版本是否在支持范围内 + - 查看控制台是否有错误信息 + - 确认 polyfill 是否正确加载 + - 尝试清除浏览器缓存 + +3. **性能问题** + - 在低版本设备上可能加载较慢 + - 建议使用WiFi网络 + - 关闭不必要的浏览器扩展 + +## 📞 **技术支持** + +如有兼容性问题，请联系开发团队。 + +### **特别说明** + +本项目已针对Android 7等低版本系统进行了特别优化，通过代码弥补了系统内核对ES6+特性支持不完整的问题。虽然不能完全替代系统升级，但可以确保应用在低版本Android设备上正常运行。 From 85f4ca9744327bf4ae09f765a2217de1b806b250 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: Sat, 16 Aug 2025 11:24:07 +0800 Subject: [PATCH 22/39] =?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=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=20index.html=20=E5=92=8C=20manifest.json=20=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E8=B3=87=E6=BA=90=E5=BC=95=E7=94=A8=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=20token2=20=E6=94=AF=E6=8C=81=E6=96=BC=E8=AB=8B=E6=B1=82?= =?UTF-8?q?=E6=A8=A1=E7=B5=84=EF=BC=8C=E4=B8=A6=E8=AA=BF=E6=95=B4=20ChatWi?= =?UTF-8?q?ndow=20=E7=B5=84=E4=BB=B6=E7=9A=84=E6=A8=A3=E5=BC=8F=E4=BB=A5?= =?UTF-8?q?=E6=94=B9=E5=96=84=E9=A1=AF=E7=A4=BA=E6=95=88=E6=9E=9C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cunkebao/dist/.vite/manifest.json | 4 +-- Cunkebao/dist/index.html | 4 +-- Cunkebao/src/api/request.ts | 16 ++++++++-- .../ChatWindow/ChatWindow.module.scss | 31 ++++++++++++++----- .../pc/ckbox/components/ChatWindow/index.tsx | 16 +++++----- Cunkebao/src/store/module/user.ts | 10 ++++-- 6 files changed, 57 insertions(+), 24 deletions(-) diff --git a/Cunkebao/dist/.vite/manifest.json b/Cunkebao/dist/.vite/manifest.json index 99f0a5cd..739932df 100644 --- a/Cunkebao/dist/.vite/manifest.json +++ b/Cunkebao/dist/.vite/manifest.json @@ -33,7 +33,7 @@ "name": "vendor" }, "index.html": { - "file": "assets/index-BRxvrekd.js", + "file": "assets/index-Bos-kh2O.js", "name": "index", "src": "index.html", "isEntry": true, @@ -44,7 +44,7 @@ "_charts-D0fT04H8.js" ], "css": [ - "assets/index-qTkOjY3P.css" + "assets/index-4EWIsBVv.css" ] } } \ No newline at end of file diff --git a/Cunkebao/dist/index.html b/Cunkebao/dist/index.html index 8648bac5..dd832d12 100644 --- a/Cunkebao/dist/index.html +++ b/Cunkebao/dist/index.html @@ -11,13 +11,13 @@ - + - +
diff --git a/Cunkebao/src/api/request.ts b/Cunkebao/src/api/request.ts index 6394d22e..8cce9cac 100644 --- a/Cunkebao/src/api/request.ts +++ b/Cunkebao/src/api/request.ts @@ -6,7 +6,7 @@ import axios, { } from "axios"; import { Toast } from "antd-mobile"; import { useUserStore } from "@/store/module/user"; -const { token } = useUserStore.getState(); +const { token, token2 } = useUserStore.getState(); const DEFAULT_DEBOUNCE_GAP = 1000; const debounceMap = new Map(); @@ -19,7 +19,13 @@ const instance: AxiosInstance = axios.create({ }); instance.interceptors.request.use((config: any) => { - if (token) { + // 从配置中获取是否使用token2 + const useToken2 = config.useToken2; + + if (useToken2 && token2) { + config.headers = config.headers || {}; + config.headers["Authorization"] = `Bearer ${token2}`; + } else if (token) { config.headers = config.headers || {}; config.headers["Authorization"] = `Bearer ${token}`; } @@ -56,6 +62,7 @@ export function request( method: Method = "GET", config?: AxiosRequestConfig, debounceGap?: number, + isToken2?: boolean, ): Promise { const gap = typeof debounceGap === "number" ? debounceGap : DEFAULT_DEBOUNCE_GAP; @@ -72,7 +79,10 @@ export function request( url, method, ...config, - }; + } as any; + + // 添加自定义属性 + (axiosConfig as any).useToken2 = isToken2; // 如果是FormData，不设置Content-Type，让浏览器自动设置 if (data instanceof FormData) { diff --git a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/ChatWindow.module.scss b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/ChatWindow.module.scss index 7df79562..076eaf59 100644 --- a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/ChatWindow.module.scss +++ b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/ChatWindow.module.scss @@ -21,32 +21,47 @@ height: 64px; min-height: 64px; flex-shrink: 0; + gap: 16px; // 确保信息区域和按钮区域有足够间距 - .chatInfo { + .chatHeaderInfo { display: flex; align-items: center; gap: 12px; + flex: 1; + min-width: 0; // 防止flex子元素溢出 - .chatDetails { - .chatName { + .chatHeaderDetails { + flex: 1; + display: flex; + align-items: center; + + .chatHeaderName { font-size: 16px; font-weight: 600; color: #262626; display: flex; align-items: center; gap: 8px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + margin-right: 30px; - .onlineStatus { + .chatHeaderOnlineStatus { font-size: 12px; color: #52c41a; font-weight: normal; + flex-shrink: 0; // 防止在线状态被压缩 } } - .chatStatus { + .chatHeaderType { font-size: 12px; color: #8c8c8c; margin-top: 2px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } } } @@ -447,9 +462,9 @@ height: 56px; min-height: 56px; - .chatInfo { - .chatDetails { - .chatName { + .chatHeaderInfo { + .chatHeaderDetails { + .chatHeaderName { font-size: 14px; } } diff --git a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx index 6e2ead3e..b9e0ff20 100644 --- a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx +++ b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx @@ -263,22 +263,24 @@ const ChatWindow: React.FC = ({ {/* 聊天头部 */}
-
+
: } /> -
-
+
+
{chat.name} {chat.online && ( - 在线 + 在线 )}
-
- {chat.type === "group" ? "群聊" : "私聊"} -
diff --git a/Cunkebao/src/store/module/user.ts b/Cunkebao/src/store/module/user.ts index 07838d87..d73315c4 100644 --- a/Cunkebao/src/store/module/user.ts +++ b/Cunkebao/src/store/module/user.ts @@ -22,9 +22,11 @@ export interface User { interface UserState { user: User | null; token: string | null; + token2: string | null; isLoggedIn: boolean; setUser: (user: User) => void; setToken: (token: string) => void; + setToken2: (token2: string) => void; clearUser: () => void; login: (token: string, userInfo: User, deviceTotal: number) => void; logout: () => void; @@ -34,10 +36,12 @@ export const useUserStore = createPersistStore( set => ({ user: null, token: null, + token2: null, isLoggedIn: false, setUser: user => set({ user, isLoggedIn: true }), setToken: token => set({ token }), - clearUser: () => set({ user: null, token: null, isLoggedIn: false }), + setToken2: token2 => set({ token2 }), + clearUser: () => set({ user: null, token: null, token2: null, isLoggedIn: false }), login: (token, userInfo, deviceTotal) => { // 只将token存储到localStorage localStorage.setItem("token", token); @@ -75,7 +79,8 @@ export const useUserStore = createPersistStore( logout: () => { // 清除localStorage中的token localStorage.removeItem("token"); - set({ user: null, token: null, isLoggedIn: false }); + localStorage.removeItem("token2"); + set({ user: null, token: null, token2: null, isLoggedIn: false }); }, }), { @@ -83,6 +88,7 @@ export const useUserStore = createPersistStore( partialize: state => ({ user: state.user, token: state.token, + token2: state.token2, isLoggedIn: state.isLoggedIn, }), onRehydrateStorage: () => state => { From 7dd20b0a9b2d8bccab819130c1e8ae39f5cbedb9 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: Sat, 16 Aug 2025 16:31:02 +0800 Subject: [PATCH 23/39] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20VITE=5FAPI=5FBASE=5F?= =?UTF-8?q?URL2=20=E7=92=B0=E5=A2=83=E8=AE=8A=E6=95=B8=EF=BC=8C=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E8=AB=8B=E6=B1=82=E6=A8=A1=E7=B5=84=E4=BB=A5=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=20token2=20=E6=94=AF=E6=8C=81=EF=BC=8C=E4=B8=A6?= =?UTF-8?q?=E5=9C=A8=E7=99=BB=E9=8C=84=E9=A0=81=E9=9D=A2=E4=B8=AD=E6=95=B4?= =?UTF-8?q?=E5=90=88=E6=96=B0=E7=9A=84=20token=20=E7=99=BB=E9=8C=84?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E8=AA=BF=E6=95=B4=E7=8B=80=E6=85=8B?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BB=A5=E6=94=AF=E6=8C=81=E5=A4=9A=E5=80=8B?= =?UTF-8?q?=20token=20=E7=9A=84=E5=AD=98=E5=84=B2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cunkebao/.env.development | 1 + Cunkebao/.env.production | 1 + Cunkebao/src/api/request.ts | 16 ++---- Cunkebao/src/api/request2.ts | 79 ++++++++++++++++++++++++++++++ Cunkebao/src/pages/login/Login.tsx | 70 +++++++++++++++++++------- Cunkebao/src/pages/login/api.ts | 44 ++++++----------- Cunkebao/src/store/module/user.ts | 8 ++- 7 files changed, 157 insertions(+), 62 deletions(-) create mode 100644 Cunkebao/src/api/request2.ts diff --git a/Cunkebao/.env.development b/Cunkebao/.env.development index c008d630..3fa6d21b 100644 --- a/Cunkebao/.env.development +++ b/Cunkebao/.env.development @@ -1,4 +1,5 @@ # 基础环境变量示例 VITE_API_BASE_URL=http://www.yishi.com +VITE_API_BASE_URL2=https://kf.quwanzhi.com:9991 # VITE_API_BASE_URL=https://ckbapi.quwanzhi.com VITE_APP_TITLE=存客宝 diff --git a/Cunkebao/.env.production b/Cunkebao/.env.production index d71cee1d..5b58400c 100644 --- a/Cunkebao/.env.production +++ b/Cunkebao/.env.production @@ -1,4 +1,5 @@ # 基础环境变量示例 VITE_API_BASE_URL=https://ckbapi.quwanzhi.com +VITE_API_BASE_URL2=https://kf.quwanzhi.com:9991 # VITE_API_BASE_URL=http://www.yishi.com VITE_APP_TITLE=存客宝 diff --git a/Cunkebao/src/api/request.ts b/Cunkebao/src/api/request.ts index 8cce9cac..6394d22e 100644 --- a/Cunkebao/src/api/request.ts +++ b/Cunkebao/src/api/request.ts @@ -6,7 +6,7 @@ import axios, { } from "axios"; import { Toast } from "antd-mobile"; import { useUserStore } from "@/store/module/user"; -const { token, token2 } = useUserStore.getState(); +const { token } = useUserStore.getState(); const DEFAULT_DEBOUNCE_GAP = 1000; const debounceMap = new Map(); @@ -19,13 +19,7 @@ const instance: AxiosInstance = axios.create({ }); instance.interceptors.request.use((config: any) => { - // 从配置中获取是否使用token2 - const useToken2 = config.useToken2; - - if (useToken2 && token2) { - config.headers = config.headers || {}; - config.headers["Authorization"] = `Bearer ${token2}`; - } else if (token) { + if (token) { config.headers = config.headers || {}; config.headers["Authorization"] = `Bearer ${token}`; } @@ -62,7 +56,6 @@ export function request( method: Method = "GET", config?: AxiosRequestConfig, debounceGap?: number, - isToken2?: boolean, ): Promise { const gap = typeof debounceGap === "number" ? debounceGap : DEFAULT_DEBOUNCE_GAP; @@ -79,10 +72,7 @@ export function request( url, method, ...config, - } as any; - - // 添加自定义属性 - (axiosConfig as any).useToken2 = isToken2; + }; // 如果是FormData，不设置Content-Type，让浏览器自动设置 if (data instanceof FormData) { diff --git a/Cunkebao/src/api/request2.ts b/Cunkebao/src/api/request2.ts new file mode 100644 index 00000000..544181c4 --- /dev/null +++ b/Cunkebao/src/api/request2.ts @@ -0,0 +1,79 @@ +import axios, { + AxiosInstance, + AxiosRequestConfig, + Method, + AxiosResponse, +} from "axios"; +import { Toast } from "antd-mobile"; +import { useUserStore } from "@/store/module/user"; +const { token2 } = useUserStore.getState(); +const DEFAULT_DEBOUNCE_GAP = 1000; +const debounceMap = new Map(); + +interface RequestConfig extends AxiosRequestConfig { + headers: { + Client?: string; + "Content-Type"?: string; + }; +} + +const instance: AxiosInstance = axios.create({ + baseURL: (import.meta as any).env?.VITE_API_BASE_URL2 || "/api", + timeout: 20000, + headers: { + "Content-Type": "application/json", + Client: "kefu-client", + }, +}); + +instance.interceptors.request.use((config: any) => { + if (token2) { + config.headers = config.headers || {}; + config.headers["Authorization"] = `Bearer ${token2}`; + } + return config; +}); + +instance.interceptors.response.use( + (res: AxiosResponse) => { + return res.data; + }, + err => { + Toast.show({ content: err.message || "网络异常", position: "top" }); + return Promise.reject(err); + }, +); + +export function request( + url: string, + data?: any, + method: Method = "GET", + config?: RequestConfig, + debounceGap?: number, +): Promise { + const gap = + typeof debounceGap === "number" ? debounceGap : DEFAULT_DEBOUNCE_GAP; + const key = `${method}_${url}_${JSON.stringify(data)}`; + const now = Date.now(); + const last = debounceMap.get(key) || 0; + if (gap > 0 && now - last < gap) { + // Toast.show({ content: '请求过于频繁，请稍后再试', position: 'top' }); + return Promise.reject("请求过于频繁，请稍后再试"); + } + debounceMap.set(key, now); + + const axiosConfig: RequestConfig = { + url, + method, + ...config, + }; + + if (method.toUpperCase() === "GET") { + axiosConfig.params = data; + } else { + axiosConfig.data = data; + } + return instance(axiosConfig); +} + +export default request; diff --git a/Cunkebao/src/pages/login/Login.tsx b/Cunkebao/src/pages/login/Login.tsx index 6617e26b..9691a663 100644 --- a/Cunkebao/src/pages/login/Login.tsx +++ b/Cunkebao/src/pages/login/Login.tsx @@ -7,7 +7,12 @@ import { UserOutline, } from "antd-mobile-icons"; import { useUserStore } from "@/store/module/user"; -import { loginWithPassword, loginWithCode, sendVerificationCode } from "./api"; +import { + loginWithPassword, + loginWithCode, + sendVerificationCode, + loginWithToken, +} from "./api"; import style from "./login.module.scss"; const Login: React.FC = () => { @@ -18,7 +23,7 @@ const Login: React.FC = () => { const [showPassword, setShowPassword] = useState(false); const [agreeToTerms, setAgreeToTerms] = useState(false); - const { login } = useUserStore(); + const { login, login2 } = useUserStore(); // 倒计时效果 useEffect(() => { @@ -66,32 +71,59 @@ const Login: React.FC = () => { Toast.show({ content: "请同意用户协议和隐私政策", position: "top" }); return; } - setLoading(true); - try { + getToken(values) + .then(() => { + getToken2(); + }) + .finally(() => { + setLoading(false); + }); + }; + const getToken = (values: any) => { + return new Promise((resolve, reject) => { // 添加typeId参数 const loginParams = { ...values, typeId: activeTab as number, }; - let response; - if (activeTab === 1) { - response = await loginWithPassword(loginParams); - } else { - response = await loginWithCode(loginParams); - } + const response = + activeTab === 1 + ? loginWithPassword(loginParams) + : loginWithCode(loginParams); - // 获取设备总数 - const deviceTotal = response.deviceTotal || 0; + response + .then(res => { + // 获取设备总数 + const deviceTotal = res.deviceTotal || 0; - // 更新状态管理（token会自动存储到localStorage，用户信息存储在状态管理中） - login(response.token, response.member, deviceTotal); - } catch (error: any) { - // 错误已在request中处理，这里不需要额外处理 - } finally { - setLoading(false); - } + // 更新状态管理（token会自动存储到localStorage，用户信息存储在状态管理中） + login(res.token, res.member, deviceTotal); + resolve(res); + }) + .catch(err => { + reject(err); + }); + }); + }; + + const getToken2 = () => { + return new Promise((resolve, reject) => { + const params = { + grant_type: "password", + password: "kr123456", + username: "kr_xf3", + }; + const response = loginWithToken(params); + response.then(res => { + login2(res.access_token); + resolve(res); + }); + response.catch(err => { + reject(err); + }); + }); }; // 第三方登录处理 diff --git a/Cunkebao/src/pages/login/api.ts b/Cunkebao/src/pages/login/api.ts index 9c1f6e6c..16d81e33 100644 --- a/Cunkebao/src/pages/login/api.ts +++ b/Cunkebao/src/pages/login/api.ts @@ -1,33 +1,5 @@ import request from "@/api/request"; -export interface LoginParams { - phone: string; - password?: string; - verificationCode?: string; -} - -export interface LoginResponse { - code: number; - msg: string; - data: { - token: string; - token_expired: string; - deviceTotal: number; // 设备总数 - member: { - id: string; - name: string; - phone: string; - s2_accountId: string; - avatar?: string; - email?: string; - }; - }; -} - -export interface SendCodeResponse { - code: number; - msg: string; -} - +import request2 from "@/api/request2"; // 密码登录 export function loginWithPassword(params: any) { return request("/v1/auth/login", params, "POST"); @@ -52,3 +24,17 @@ export function logout() { export function getUserInfo() { return request("/v1/auth/user-info", {}, "GET"); } +//触客宝登陆 +export function loginWithToken(params: any) { + return request2( + "/token", + params, + "POST", + { + headers: { + "Content-Type": "application/x-www-form-urlencoded", + }, + }, + 1000, + ); +} diff --git a/Cunkebao/src/store/module/user.ts b/Cunkebao/src/store/module/user.ts index d73315c4..aeb811a8 100644 --- a/Cunkebao/src/store/module/user.ts +++ b/Cunkebao/src/store/module/user.ts @@ -29,6 +29,7 @@ interface UserState { setToken2: (token2: string) => void; clearUser: () => void; login: (token: string, userInfo: User, deviceTotal: number) => void; + login2: (token2: string) => void; logout: () => void; } @@ -41,7 +42,8 @@ export const useUserStore = createPersistStore( setUser: user => set({ user, isLoggedIn: true }), setToken: token => set({ token }), setToken2: token2 => set({ token2 }), - clearUser: () => set({ user: null, token: null, token2: null, isLoggedIn: false }), + clearUser: () => + set({ user: null, token: null, token2: null, isLoggedIn: false }), login: (token, userInfo, deviceTotal) => { // 只将token存储到localStorage localStorage.setItem("token", token); @@ -76,6 +78,10 @@ export const useUserStore = createPersistStore( window.location.href = "/guide"; } }, + login2: token2 => { + localStorage.setItem("token2", token2); + set({ token2, isLoggedIn: true }); + }, logout: () => { // 清除localStorage中的token localStorage.removeItem("token"); From 8af3ad3549014e53cbec3f9d4d44f3fabd4c8db0 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: Sat, 16 Aug 2025 17:34:36 +0800 Subject: [PATCH 24/39] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B5=81=E9=87=8F?= =?UTF-8?q?=E5=88=86=E7=99=BC=E8=A8=98=E9=8C=84=E5=8A=9F=E8=83=BD=EF=BC=8C?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A8=A3=E5=BC=8F=E4=BB=A5=E6=94=B9=E5=96=84?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A2=9D=E5=92=8C=E5=88=86=E7=99=BC=E7=B5=B1?= =?UTF-8?q?=E8=A8=88=E5=BD=88=E7=AA=97=E7=9A=84=E9=A1=AF=E7=A4=BA=E6=95=88?= =?UTF-8?q?=E6=9E=9C=EF=BC=8C=E4=B8=A6=E5=9C=A8=E5=88=97=E8=A1=A8=E4=B8=AD?= =?UTF-8?q?=E6=95=B4=E5=90=88=E7=9B=B8=E6=87=89=E7=9A=84=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E9=82=8F=E8=BC=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../traffic-distribution/list/api.ts | 10 + .../list/components/SendRcrodModal.tsx | 232 ++++++++++++++++++ .../list/index.module.scss | 36 +++ .../traffic-distribution/list/index.tsx | 22 +- 4 files changed, 299 insertions(+), 1 deletion(-) create mode 100644 Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/components/SendRcrodModal.tsx diff --git a/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/api.ts b/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/api.ts index 93c5002e..67d4ba32 100644 --- a/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/api.ts +++ b/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/api.ts @@ -31,3 +31,13 @@ export function deleteDistributionRule(id: number): Promise { export function fetchDistributionRuleDetail(id: number): Promise { return request(`/v1/workbench/detail?id=${id}`, {}, "GET"); } + +//流量分发记录 +export function fetchTransferFriends(params: { + page?: number; + limit?: number; + keyword?: string; + workbenchId: number; +}) { + return request("/v1/workbench/transfer-friends", params, "GET"); +} diff --git a/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/components/SendRcrodModal.tsx b/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/components/SendRcrodModal.tsx new file mode 100644 index 00000000..e82d27e9 --- /dev/null +++ b/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/components/SendRcrodModal.tsx @@ -0,0 +1,232 @@ +import React, { useEffect, useState } from "react"; +import { Popup, Avatar, SpinLoading, Input } from "antd-mobile"; +import { Button, message, Pagination } from "antd"; +import { CloseOutlined, SearchOutlined } from "@ant-design/icons"; +import style from "../index.module.scss"; +import { fetchTransferFriends } from "../api"; + +interface SendRecordItem { + id: string | number; + nickname?: string; + wechatId?: string; + avatar?: string; + status?: string; + isRecycle?: number; + sendTime?: string; + sendCount?: number; +} + +interface SendRcrodModalProps { + visible: boolean; + onClose: () => void; + ruleId?: number; + ruleName?: string; +} + +const SendRcrodModal: React.FC = ({ + visible, + onClose, + ruleId, + ruleName, +}) => { + const [sendRecords, setSendRecords] = useState([]); + const [loading, setLoading] = useState(false); + const [searchQuery, setSearchQuery] = useState(""); + const [searchKeyword, setSearchKeyword] = useState(""); + const [currentPage, setCurrentPage] = useState(1); + const [total, setTotal] = useState(0); + const pageSize = 20; + + // 获取分发记录数据 + const fetchSendRecords = async (page = 1, keyword = "") => { + if (!ruleId || !visible) return; + + setLoading(true); + try { + const detailRes = await fetchTransferFriends({ + workbenchId: ruleId, + page, + limit: pageSize, + keyword, + }); + console.log(detailRes); + + const recordData = detailRes.list || []; + setSendRecords(recordData); + setTotal(detailRes.total || 0); + } catch (error) { + console.error("获取分发记录失败:", error); + message.error("获取分发记录失败"); + } finally { + setLoading(false); + } + }; + + // 当弹窗打开且有ruleId时，获取数据 + useEffect(() => { + if (visible && ruleId) { + setCurrentPage(1); + setSearchQuery(""); + setSearchKeyword(""); + fetchSendRecords(1, ""); + } + }, [visible, ruleId]); + + // 搜索关键词变化时触发搜索 + useEffect(() => { + if (!visible || !ruleId) return; + setCurrentPage(1); + fetchSendRecords(1, searchKeyword); + }, [searchKeyword, visible, ruleId]); + + // 页码变化 + useEffect(() => { + if (!visible || !ruleId || currentPage === 1) return; + fetchSendRecords(currentPage, searchKeyword); + }, [currentPage, visible, ruleId]); + + // 处理页码变化 + const handlePageChange = (page: number) => { + setCurrentPage(page); + }; + + // 处理搜索回车 + const handleSearchEnter = () => { + setSearchKeyword(searchQuery); + }; + + // 处理搜索输入 + const handleSearchChange = (value: string) => { + setSearchQuery(value); + }; + + const title = ruleName ? `${ruleName} - 分发统计` : "分发统计"; + const getRecycleColor = (isRecycle?: number) => { + switch (isRecycle) { + case 0: + return "#52c41a"; // 绿色 - 未回收 + case 1: + return "#ff4d4f"; // 红色 - 已回收 + default: + return "#d9d9d9"; // 灰色 - 未知状态 + } + }; + + const getRecycleText = (isRecycle?: number) => { + switch (isRecycle) { + case 0: + return "未回收"; + case 1: + return "已回收"; + default: + return "未知"; + } + }; + + return ( + +
+ {/* 头部 */} +
+

{title}

+
+ + {/* 搜索栏 */} +
+
+ + +
+
+ + {/* 分发记录列表 */} +
+ {loading ? ( +
+ +
+ 正在加载分发记录... +
+
+ ) : sendRecords.length > 0 ? ( + sendRecords.map((record, index) => ( +
+
+ +
+
+
+ {record.nickname || record.wechatId || `账号${record.id}`} +
+
+ {record.wechatId || "未绑定微信号"} +
+
+
+ + + {getRecycleText(record.isRecycle)} + +
+
+ )) + ) : ( +
+
暂无分发记录
+
+ )} +
+ + {/* 底部统计和分页 */} +
+
+ 共 {total} 条分发记录 +
+
+ +
+
+
+ + ); +}; + +export default SendRcrodModal; diff --git a/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/index.module.scss b/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/index.module.scss index 9f5adc14..1415242c 100644 --- a/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/index.module.scss +++ b/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/index.module.scss @@ -255,6 +255,9 @@ padding: 16px 20px; border-top: 1px solid #f0f0f0; background: #fff; + display: flex; + justify-content: space-between; + align-items: center; } .accountStats { @@ -263,6 +266,39 @@ color: #666; } +.searchBar { + padding: 16px 20px; + border-bottom: 1px solid #f0f0f0; + background: #fff; +} + +.searchInputWrapper { + position: relative; + display: flex; + align-items: center; +} + +.searchIcon { + position: absolute; + left: 12px; + top: 50%; + transform: translateY(-50%); + color: #999; + font-size: 16px; + z-index: 1; +} + +.searchInputWrapper :global(.adm-input) { + padding-left: 40px; + border-radius: 8px; + height: 40px; +} + +.paginationContainer { + display: flex; + justify-content: center; +} + // 设备列表弹窗样式 .deviceModal { height: 100%; diff --git a/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/index.tsx b/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/index.tsx index b36a58ef..f94f54ba 100644 --- a/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/index.tsx +++ b/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/index.tsx @@ -34,6 +34,7 @@ import { useNavigate } from "react-router-dom"; import AccountListModal from "./components/AccountListModal"; import DeviceListModal from "./components/DeviceListModal"; import PoolListModal from "./components/PoolListModal"; +import SendRcrodModal from "./components/SendRcrodModal"; const PAGE_SIZE = 10; @@ -57,6 +58,7 @@ const TrafficDistributionList: React.FC = () => { const [accountModalVisible, setAccountModalVisible] = useState(false); const [deviceModalVisible, setDeviceModalVisible] = useState(false); const [poolModalVisible, setPoolModalVisible] = useState(false); + const [sendRecordModalVisible, setSendRecordModalVisible] = useState(false); const [currentRule, setCurrentRule] = useState(null); const navigate = useNavigate(); @@ -153,6 +155,12 @@ const TrafficDistributionList: React.FC = () => { setPoolModalVisible(true); }; + // 显示分发统计弹窗 + const showSendRecord = (item: DistributionRule) => { + setCurrentRule(item); + setSendRecordModalVisible(true); + }; + const renderCard = (item: DistributionRule) => { const menu = ( handleMenuClick(key, item)}> @@ -287,7 +295,11 @@ const TrafficDistributionList: React.FC = () => { 总流量池数量
-
+
showSendRecord(item)} + > {item.config?.total?.totalUsers || 0} @@ -394,6 +406,14 @@ const TrafficDistributionList: React.FC = () => { ruleId={currentRule?.id} ruleName={currentRule?.name} /> + + {/* 分发统计弹窗 */} + setSendRecordModalVisible(false)} + ruleId={currentRule?.id} + ruleName={currentRule?.name} + /> ); }; From 60e5a682bda03efa2425e950c625d06b578b3e15 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: Sat, 16 Aug 2025 17:59:36 +0800 Subject: [PATCH 25/39] =?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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../list/components/SendRcrodModal.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/components/SendRcrodModal.tsx b/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/components/SendRcrodModal.tsx index e82d27e9..d74c5219 100644 --- a/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/components/SendRcrodModal.tsx +++ b/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/components/SendRcrodModal.tsx @@ -39,7 +39,7 @@ const SendRcrodModal: React.FC = ({ // 获取分发记录数据 const fetchSendRecords = async (page = 1, keyword = "") => { - if (!ruleId || !visible) return; + if (!ruleId) return; setLoading(true); try { @@ -74,16 +74,16 @@ const SendRcrodModal: React.FC = ({ // 搜索关键词变化时触发搜索 useEffect(() => { - if (!visible || !ruleId) return; + if (!visible || !ruleId || searchKeyword === "") return; setCurrentPage(1); fetchSendRecords(1, searchKeyword); - }, [searchKeyword, visible, ruleId]); + }, [searchKeyword]); // 页码变化 useEffect(() => { if (!visible || !ruleId || currentPage === 1) return; fetchSendRecords(currentPage, searchKeyword); - }, [currentPage, visible, ruleId]); + }, [currentPage]); // 处理页码变化 const handlePageChange = (page: number) => { From 1b1bd7536dc09b5da8a25304741293ce838fb4f3 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: Mon, 18 Aug 2025 11:30:56 +0800 Subject: [PATCH 26/39] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20VITE=5FAPI=5FWS=5FUR?= =?UTF-8?q?L=20=E7=92=B0=E5=A2=83=E8=AE=8A=E6=95=B8=EF=BC=8C=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E4=B8=BB=E7=A8=8B=E5=BC=8F=E4=BB=A5=E5=BC=95=E5=85=A5?= =?UTF-8?q?=E5=9A=B4=E6=A0=BC=E6=A8=A1=E5=BC=8F=E5=8C=85=E8=A3=9D=E5=99=A8?= =?UTF-8?q?=EF=BC=8C=E4=B8=A6=E5=9C=A8=E7=99=BB=E9=8C=84=E9=A0=81=E9=9D=A2?= =?UTF-8?q?=E4=B8=AD=E6=95=B4=E5=90=88=E8=A7=B8=E5=AE=A2=E5=AF=B6=E7=94=A8?= =?UTF-8?q?=E6=88=B6=E4=BF=A1=E6=81=AF=E7=8D=B2=E5=8F=96=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=8C=E8=AA=BF=E6=95=B4=E8=AB=8B=E6=B1=82=E6=A8=A1=E7=B5=84?= =?UTF-8?q?=E4=BB=A5=E5=8B=95=E6=85=8B=E7=8D=B2=E5=8F=96=20token2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cunkebao/.env.development | 1 + Cunkebao/.env.production | 1 + Cunkebao/src/api/request2.ts | 6 +- Cunkebao/src/components/WebSocketExample.tsx | 250 ++++++++++++ Cunkebao/src/main.tsx | 10 +- Cunkebao/src/pages/login/Login.tsx | 31 +- Cunkebao/src/pages/login/api.ts | 11 + Cunkebao/src/store/index.ts | 10 + Cunkebao/src/store/module/ckchat.data.ts | 51 +++ Cunkebao/src/store/module/ckchat.ts | 89 +++++ Cunkebao/src/store/module/websocket.ts | 376 +++++++++++++++++++ 11 files changed, 825 insertions(+), 11 deletions(-) create mode 100644 Cunkebao/src/components/WebSocketExample.tsx create mode 100644 Cunkebao/src/store/module/ckchat.data.ts create mode 100644 Cunkebao/src/store/module/ckchat.ts create mode 100644 Cunkebao/src/store/module/websocket.ts diff --git a/Cunkebao/.env.development b/Cunkebao/.env.development index 3fa6d21b..2ddb67f5 100644 --- a/Cunkebao/.env.development +++ b/Cunkebao/.env.development @@ -1,5 +1,6 @@ # 基础环境变量示例 VITE_API_BASE_URL=http://www.yishi.com VITE_API_BASE_URL2=https://kf.quwanzhi.com:9991 +VITE_API_WS_URL=wss://kf.quwanzhi.com:9993 # VITE_API_BASE_URL=https://ckbapi.quwanzhi.com VITE_APP_TITLE=存客宝 diff --git a/Cunkebao/.env.production b/Cunkebao/.env.production index 5b58400c..838935bb 100644 --- a/Cunkebao/.env.production +++ b/Cunkebao/.env.production @@ -1,5 +1,6 @@ # 基础环境变量示例 VITE_API_BASE_URL=https://ckbapi.quwanzhi.com VITE_API_BASE_URL2=https://kf.quwanzhi.com:9991 +VITE_API_WS_URL=wss://kf.quwanzhi.com:9993 # VITE_API_BASE_URL=http://www.yishi.com VITE_APP_TITLE=存客宝 diff --git a/Cunkebao/src/api/request2.ts b/Cunkebao/src/api/request2.ts index 544181c4..cacbdaf7 100644 --- a/Cunkebao/src/api/request2.ts +++ b/Cunkebao/src/api/request2.ts @@ -6,7 +6,6 @@ import axios, { } from "axios"; import { Toast } from "antd-mobile"; import { useUserStore } from "@/store/module/user"; -const { token2 } = useUserStore.getState(); const DEFAULT_DEBOUNCE_GAP = 1000; const debounceMap = new Map(); @@ -27,9 +26,12 @@ const instance: AxiosInstance = axios.create({ }); instance.interceptors.request.use((config: any) => { + // 在每次请求时动态获取最新的 token2 + const { token2 } = useUserStore.getState(); + if (token2) { config.headers = config.headers || {}; - config.headers["Authorization"] = `Bearer ${token2}`; + config.headers["Authorization"] = `bearer ${token2}`; } return config; }); diff --git a/Cunkebao/src/components/WebSocketExample.tsx b/Cunkebao/src/components/WebSocketExample.tsx new file mode 100644 index 00000000..060bd98b --- /dev/null +++ b/Cunkebao/src/components/WebSocketExample.tsx @@ -0,0 +1,250 @@ +import React, { useEffect, useState } from "react"; +import { Button, Card, List, Badge, Toast } from "antd-mobile"; +import { + useWebSocketStore, + WebSocketStatus, + WebSocketMessage, +} from "@/store/module/websocket"; + +/** + * WebSocket使用示例组件 + * 展示如何使用WebSocket store进行消息收发 + */ +const WebSocketExample: React.FC = () => { + const [messageInput, setMessageInput] = useState(""); + + // 使用WebSocket store + const { + status, + messages, + unreadCount, + connect, + disconnect, + sendMessage, + sendCommand, + clearMessages, + markAsRead, + reconnect, + } = useWebSocketStore(); + + // 连接状态显示 + const getStatusText = () => { + switch (status) { + case WebSocketStatus.DISCONNECTED: + return "未连接"; + case WebSocketStatus.CONNECTING: + return "连接中..."; + case WebSocketStatus.CONNECTED: + return "已连接"; + case WebSocketStatus.RECONNECTING: + return "重连中..."; + case WebSocketStatus.ERROR: + return "连接错误"; + default: + return "未知状态"; + } + }; + + // 获取状态颜色 + const getStatusColor = () => { + switch (status) { + case WebSocketStatus.CONNECTED: + return "success"; + case WebSocketStatus.CONNECTING: + case WebSocketStatus.RECONNECTING: + return "warning"; + case WebSocketStatus.ERROR: + return "danger"; + default: + return "default"; + } + }; + + // 发送消息 + const handleSendMessage = () => { + if (!messageInput.trim()) { + Toast.show({ content: "请输入消息内容", position: "top" }); + return; + } + + sendMessage({ + type: "chat", + content: { + text: messageInput, + timestamp: Date.now(), + }, + sender: "user", + receiver: "all", + }); + + setMessageInput(""); + }; + + // 发送命令 + const handleSendCommand = (cmdType: string) => { + sendCommand(cmdType, { + data: "示例数据", + timestamp: Date.now(), + }); + }; + + // 格式化时间 + const formatTime = (timestamp: number) => { + return new Date(timestamp).toLocaleTimeString(); + }; + + return ( +
+ +
+ +
+ + {getStatusText()} +
+ +
+ + + + + +
+ + + 0 ? `(${unreadCount} 条未读)` : ""}`} + extra={ +
+ + +
+ } + style={{ marginTop: "16px" }} + > + + {messages.length === 0 ? ( + 暂无消息 + ) : ( + messages.map((message: WebSocketMessage) => ( + +
+ {formatTime(message.timestamp)} - {message.type} +
+
+ {typeof message.content === "string" + ? message.content + : JSON.stringify(message.content, null, 2)} +
+ + )) + )} + + + + +
+ setMessageInput(e.target.value)} + placeholder="输入消息内容" + style={{ + flex: 1, + padding: "8px 12px", + border: "1px solid #d9d9d9", + borderRadius: "4px", + fontSize: "14px", + }} + onKeyPress={e => e.key === "Enter" && handleSendMessage()} + /> + +
+ +
+ + + + + +
+ + + +
+

1. 点击"连接"按钮建立WebSocket连接

+

2. 连接成功后可以发送消息和命令

+

3. 收到的消息会显示在消息列表中

+

4. 页面刷新后会自动重连（如果之前是连接状态）

+

5. 支持自动重连和错误处理

+
+ +
+ ); +}; + +export default WebSocketExample; diff --git a/Cunkebao/src/main.tsx b/Cunkebao/src/main.tsx index f4ae337c..3fa26fe3 100644 --- a/Cunkebao/src/main.tsx +++ b/Cunkebao/src/main.tsx @@ -2,7 +2,15 @@ import React from "react"; import { createRoot } from "react-dom/client"; import App from "./App"; import "./styles/global.scss"; +// 引入错误处理器来抑制findDOMNode警告 +import "./utils/errorHandler"; +import StrictModeWrapper from "./components/StrictModeWrapper"; // import VConsole from "vconsole"; // new VConsole(); + const root = createRoot(document.getElementById("root")!); -root.render(); +root.render( + + + +); diff --git a/Cunkebao/src/pages/login/Login.tsx b/Cunkebao/src/pages/login/Login.tsx index 9691a663..33f16e5b 100644 --- a/Cunkebao/src/pages/login/Login.tsx +++ b/Cunkebao/src/pages/login/Login.tsx @@ -7,11 +7,14 @@ import { UserOutline, } from "antd-mobile-icons"; import { useUserStore } from "@/store/module/user"; +import { useCkChatStore } from "@/store/module/ckchat"; +import { useWebSocketStore } from "@/store/module/websocket"; import { loginWithPassword, loginWithCode, sendVerificationCode, loginWithToken, + getChuKeBaoUserInfo, } from "./api"; import style from "./login.module.scss"; @@ -24,6 +27,7 @@ const Login: React.FC = () => { const [agreeToTerms, setAgreeToTerms] = useState(false); const { login, login2 } = useUserStore(); + const { setUserInfo, getAccountId } = useCkChatStore(); // 倒计时效果 useEffect(() => { @@ -71,15 +75,26 @@ const Login: React.FC = () => { Toast.show({ content: "请同意用户协议和隐私政策", position: "top" }); return; } - setLoading(true); - getToken(values) - .then(() => { - getToken2(); - }) - .finally(() => { - setLoading(false); + getToken(values).then(() => { + getChuKeBaoUserInfo().then(res => { + setUserInfo(res); + getToken2().then(Token => { + // // 使用WebSocket store连接 + // const { connect } = useWebSocketStore.getState(); + // connect({ + // accessToken: Token, + // accountId: getAccountId()?.toString() || "", + // client: "kefu-client", + // autoReconnect: true, + // reconnectInterval: 3000, + // maxReconnectAttempts: 5, + // }); + }); }); + setLoading(false); + }); }; + const getToken = (values: any) => { return new Promise((resolve, reject) => { // 添加typeId参数 @@ -118,7 +133,7 @@ const Login: React.FC = () => { const response = loginWithToken(params); response.then(res => { login2(res.access_token); - resolve(res); + resolve(res.access_token); }); response.catch(err => { reject(err); diff --git a/Cunkebao/src/pages/login/api.ts b/Cunkebao/src/pages/login/api.ts index 16d81e33..897abbc9 100644 --- a/Cunkebao/src/pages/login/api.ts +++ b/Cunkebao/src/pages/login/api.ts @@ -24,6 +24,12 @@ export function logout() { export function getUserInfo() { return request("/v1/auth/user-info", {}, "GET"); } + +// ================================================================== +// 触客宝接口; 2025年8月16日 17:19:15 +// 开发：yongpxu +// ================================================================== + //触客宝登陆 export function loginWithToken(params: any) { return request2( @@ -38,3 +44,8 @@ export function loginWithToken(params: any) { 1000, ); } + +// 获取触客宝用户信息 +export function getChuKeBaoUserInfo() { + return request2("/api/account/self", {}, "GET"); +} diff --git a/Cunkebao/src/store/index.ts b/Cunkebao/src/store/index.ts index 14263a67..f4f3d9af 100644 --- a/Cunkebao/src/store/index.ts +++ b/Cunkebao/src/store/index.ts @@ -2,11 +2,13 @@ export * from "./module/user"; export * from "./module/app"; export * from "./module/settings"; +export * from "./module/websocket"; // 导入store实例 import { useUserStore } from "./module/user"; import { useAppStore } from "./module/app"; import { useSettingsStore } from "./module/settings"; +import { useWebSocketStore } from "./module/websocket"; // 导出持久化store创建函数 export { @@ -32,6 +34,7 @@ export interface StoreState { user: ReturnType; app: ReturnType; settings: ReturnType; + websocket: ReturnType; } // 便利的store访问函数 @@ -39,12 +42,14 @@ export const getStores = (): StoreState => ({ user: useUserStore.getState(), app: useAppStore.getState(), settings: useSettingsStore.getState(), + websocket: useWebSocketStore.getState(), }); // 获取特定store状态 export const getUserStore = () => useUserStore.getState(); export const getAppStore = () => useAppStore.getState(); export const getSettingsStore = () => useSettingsStore.getState(); +export const getWebSocketStore = () => useWebSocketStore.getState(); // 清除所有持久化数据（使用工具函数） export const clearAllPersistedData = clearAllData; @@ -56,6 +61,7 @@ export const getPersistKeys = () => Object.values(PERSIST_KEYS); export const subscribeToUserStore = useUserStore.subscribe; export const subscribeToAppStore = useAppStore.subscribe; export const subscribeToSettingsStore = useSettingsStore.subscribe; +export const subscribeToWebSocketStore = useWebSocketStore.subscribe; // 组合订阅函数 export const subscribeToAllStores = (callback: (state: StoreState) => void) => { @@ -68,10 +74,14 @@ export const subscribeToAllStores = (callback: (state: StoreState) => void) => { const unsubscribeSettings = useSettingsStore.subscribe(() => { callback(getStores()); }); + const unsubscribeWebSocket = useWebSocketStore.subscribe(() => { + callback(getStores()); + }); return () => { unsubscribeUser(); unsubscribeApp(); unsubscribeSettings(); + unsubscribeWebSocket(); }; }; diff --git a/Cunkebao/src/store/module/ckchat.data.ts b/Cunkebao/src/store/module/ckchat.data.ts new file mode 100644 index 00000000..97c046a0 --- /dev/null +++ b/Cunkebao/src/store/module/ckchat.data.ts @@ -0,0 +1,51 @@ +// 账户信息接口 +export interface CkAccount { + id: number; + realName: string; + nickname: string | null; + memo: string | null; + avatar: string; + userName: string; + secret: string; + accountType: number; + departmentId: number; + useGoogleSecretKey: boolean; + hasVerifyGoogleSecret: boolean; +} + +// 权限片段接口 +export interface PrivilegeFrag { + // 根据实际数据结构补充 + [key: string]: any; +} + +// 租户信息接口 +export interface CkTenant { + id: number; + name: string; + guid: string; + thirdParty: string | null; + tenantType: number; + deployName: string; +} + +// 触客宝用户信息接口 +export interface CkUserInfo { + account: CkAccount; + privilegeFrags: PrivilegeFrag[]; + tenant: CkTenant; +} + +// 状态接口 +export interface CkChatState { + userInfo: CkUserInfo | null; + isLoggedIn: boolean; + setUserInfo: (userInfo: CkUserInfo) => void; + clearUserInfo: () => void; + updateAccount: (account: Partial) => void; + updateTenant: (tenant: Partial) => void; + getAccountId: () => number | null; + getTenantId: () => number | null; + getAccountName: () => string | null; + getTenantName: () => string | null; +} diff --git a/Cunkebao/src/store/module/ckchat.ts b/Cunkebao/src/store/module/ckchat.ts new file mode 100644 index 00000000..7d4a9337 --- /dev/null +++ b/Cunkebao/src/store/module/ckchat.ts @@ -0,0 +1,89 @@ +import { createPersistStore } from "@/store/createPersistStore"; + +import { CkChatState, CkUserInfo, CkAccount, CkTenant } from "./ckchat.data"; + +export const useCkChatStore = createPersistStore( + set => ({ + userInfo: null, + isLoggedIn: false, + + // 设置用户信息 + setUserInfo: (userInfo: CkUserInfo) => { + set({ userInfo, isLoggedIn: true }); + }, + + // 清除用户信息 + clearUserInfo: () => { + set({ userInfo: null, isLoggedIn: false }); + }, + + // 更新账户信息 + updateAccount: (account: Partial) => { + set(state => ({ + userInfo: state.userInfo + ? { + ...state.userInfo, + account: { ...state.userInfo.account, ...account }, + } + : null, + })); + }, + + // 更新租户信息 + updateTenant: (tenant: Partial) => { + set(state => ({ + userInfo: state.userInfo + ? { + ...state.userInfo, + tenant: { ...state.userInfo.tenant, ...tenant }, + } + : null, + })); + }, + + // 获取账户ID + getAccountId: () => { + const state = useCkChatStore.getState(); + return state.userInfo?.account?.id || null; + }, + + // 获取租户ID + getTenantId: () => { + const state = useCkChatStore.getState(); + return state.userInfo?.tenant?.id || null; + }, + + // 获取账户名称 + getAccountName: () => { + const state = useCkChatStore.getState(); + return ( + state.userInfo?.account?.realName || + state.userInfo?.account?.userName || + null + ); + }, + + // 获取租户名称 + getTenantName: () => { + const state = useCkChatStore.getState(); + return state.userInfo?.tenant?.name || null; + }, + }), + { + name: "ckchat-store", + partialize: state => ({ + userInfo: state.userInfo, + isLoggedIn: state.isLoggedIn, + }), + onRehydrateStorage: () => state => { + // console.log("CkChat store hydrated:", state); + }, + }, +); + +// 导出便捷的获取方法 +export const getCkAccountId = () => useCkChatStore.getState().getAccountId(); +export const getCkTenantId = () => useCkChatStore.getState().getTenantId(); +export const getCkAccountName = () => + useCkChatStore.getState().getAccountName(); +export const getCkTenantName = () => useCkChatStore.getState().getTenantName(); diff --git a/Cunkebao/src/store/module/websocket.ts b/Cunkebao/src/store/module/websocket.ts new file mode 100644 index 00000000..910fc7a7 --- /dev/null +++ b/Cunkebao/src/store/module/websocket.ts @@ -0,0 +1,376 @@ +import { createPersistStore } from "@/store/createPersistStore"; +import { Toast } from "antd-mobile"; +import { useUserStore } from "./user"; + +// WebSocket消息类型 +export interface WebSocketMessage { + id: string; + type: string; + content: any; + timestamp: number; + sender?: string; + receiver?: string; +} + +// WebSocket连接状态 +export enum WebSocketStatus { + DISCONNECTED = "disconnected", + CONNECTING = "connecting", + CONNECTED = "connected", + RECONNECTING = "reconnecting", + ERROR = "error", +} + +// WebSocket配置 +interface WebSocketConfig { + url: string; + client: string; + accountId: string; + accessToken: string; + autoReconnect: boolean; + reconnectInterval: number; + maxReconnectAttempts: number; +} + +interface WebSocketState { + // 连接状态 + status: WebSocketStatus; + ws: WebSocket | null; + + // 配置信息 + config: WebSocketConfig | null; + + // 消息相关 + messages: WebSocketMessage[]; + unreadCount: number; + + // 重连相关 + reconnectAttempts: number; + reconnectTimer: NodeJS.Timeout | null; + + // 方法 + connect: (config: Partial) => void; + disconnect: () => void; + sendMessage: (message: Omit) => void; + sendCommand: (cmdType: string, data?: any) => void; + clearMessages: () => void; + markAsRead: () => void; + reconnect: () => void; + + // 内部方法 + _handleOpen: () => void; + _handleMessage: (event: MessageEvent) => void; + _handleClose: (event: CloseEvent) => void; + _handleError: (event: Event) => void; + _startReconnectTimer: () => void; + _stopReconnectTimer: () => void; +} + +// 默认配置 +const DEFAULT_CONFIG: WebSocketConfig = { + url: (import.meta as any).env?.VITE_API_WS_URL || "ws://localhost:8080", + client: "kefu-client", + accountId: "", + accessToken: "", + autoReconnect: true, + reconnectInterval: 3000, + maxReconnectAttempts: 5, +}; + +export const useWebSocketStore = createPersistStore( + (set, get) => ({ + status: WebSocketStatus.DISCONNECTED, + ws: null, + config: null, + messages: [], + unreadCount: 0, + reconnectAttempts: 0, + reconnectTimer: null, + + // 连接WebSocket + connect: (config: Partial) => { + const currentState = get(); + + // 如果已经连接，先断开 + if (currentState.ws) { + currentState.disconnect(); + } + + // 合并配置 + const fullConfig: WebSocketConfig = { + ...DEFAULT_CONFIG, + ...config, + }; + + // 获取用户信息 + const { token, token2, user } = useUserStore.getState(); + const accessToken = fullConfig.accessToken || token2 || token; + + if (!accessToken) { + Toast.show({ content: "未找到有效的访问令牌", position: "top" }); + return; + } + + // 构建WebSocket URL + const params = { + client: fullConfig.client, + accountId: fullConfig.accountId || user?.s2_accountId || "", + accessToken: accessToken, + t: Date.now().toString(), + }; + + const wsUrl = + fullConfig.url + "?" + new URLSearchParams(params).toString(); + + set({ + status: WebSocketStatus.CONNECTING, + config: fullConfig, + }); + + try { + const ws = new WebSocket(wsUrl); + + // 绑定事件处理器 + ws.onopen = () => get()._handleOpen(); + ws.onmessage = event => get()._handleMessage(event); + ws.onclose = event => get()._handleClose(event); + ws.onerror = event => get()._handleError(event); + + set({ ws }); + + console.log("WebSocket连接创建成功", wsUrl); + } catch (error) { + console.error("WebSocket连接失败:", error); + set({ status: WebSocketStatus.ERROR }); + Toast.show({ content: "WebSocket连接失败", position: "top" }); + } + }, + + // 断开连接 + disconnect: () => { + const currentState = get(); + + if (currentState.ws) { + currentState.ws.close(); + } + + currentState._stopReconnectTimer(); + + set({ + status: WebSocketStatus.DISCONNECTED, + ws: null, + reconnectAttempts: 0, + }); + + console.log("WebSocket连接已断开"); + }, + + // 发送消息 + sendMessage: (message: Omit) => { + const currentState = get(); + + if ( + currentState.status !== WebSocketStatus.CONNECTED || + !currentState.ws + ) { + Toast.show({ content: "WebSocket未连接", position: "top" }); + return; + } + + const fullMessage: WebSocketMessage = { + ...message, + id: Date.now().toString(), + timestamp: Date.now(), + }; + + try { + currentState.ws.send(JSON.stringify(fullMessage)); + console.log("消息发送成功:", fullMessage); + } catch (error) { + console.error("消息发送失败:", error); + Toast.show({ content: "消息发送失败", position: "top" }); + } + }, + + // 发送命令 + sendCommand: (cmdType: string, data?: any) => { + const currentState = get(); + + if ( + currentState.status !== WebSocketStatus.CONNECTED || + !currentState.ws + ) { + Toast.show({ content: "WebSocket未连接", position: "top" }); + return; + } + + const { user } = useUserStore.getState(); + const { token, token2 } = useUserStore.getState(); + const accessToken = token2 || token; + + const command = { + accessToken: accessToken, + accountId: user?.s2_accountId, + client: currentState.config?.client || "kefu-client", + cmdType: cmdType, + seq: Date.now(), + ...data, + }; + + try { + currentState.ws.send(JSON.stringify(command)); + console.log("命令发送成功:", command); + } catch (error) { + console.error("命令发送失败:", error); + Toast.show({ content: "命令发送失败", position: "top" }); + } + }, + + // 清除消息 + clearMessages: () => { + set({ messages: [], unreadCount: 0 }); + }, + + // 标记为已读 + markAsRead: () => { + set({ unreadCount: 0 }); + }, + + // 重连 + reconnect: () => { + const currentState = get(); + + if (currentState.config) { + currentState.connect(currentState.config); + } + }, + + // 内部方法：处理连接打开 + _handleOpen: () => { + const currentState = get(); + + set({ + status: WebSocketStatus.CONNECTED, + reconnectAttempts: 0, + }); + + console.log("WebSocket连接成功"); + + // 发送登录命令 + if (currentState.config) { + currentState.sendCommand("CmdSignIn"); + } + + Toast.show({ content: "WebSocket连接成功", position: "top" }); + }, + + // 内部方法：处理消息接收 + _handleMessage: (event: MessageEvent) => { + try { + const data = JSON.parse(event.data); + console.log("收到WebSocket消息:", data); + + const currentState = get(); + const newMessage: WebSocketMessage = { + id: Date.now().toString(), + type: data.type || "message", + content: data, + timestamp: Date.now(), + sender: data.sender, + receiver: data.receiver, + }; + + set({ + messages: [...currentState.messages, newMessage], + unreadCount: currentState.unreadCount + 1, + }); + + // 可以在这里添加消息处理逻辑 + // 比如播放提示音、显示通知等 + } catch (error) { + console.error("解析WebSocket消息失败:", error); + } + }, + + // 内部方法：处理连接关闭 + _handleClose: (event: CloseEvent) => { + const currentState = get(); + + console.log("WebSocket连接关闭:", event.code, event.reason); + + set({ + status: WebSocketStatus.DISCONNECTED, + ws: null, + }); + + // 自动重连逻辑 + if ( + currentState.config?.autoReconnect && + currentState.reconnectAttempts < + (currentState.config?.maxReconnectAttempts || 5) + ) { + currentState._startReconnectTimer(); + } + }, + + // 内部方法：处理连接错误 + _handleError: (event: Event) => { + console.error("WebSocket连接错误:", event); + + set({ status: WebSocketStatus.ERROR }); + + Toast.show({ content: "WebSocket连接错误", position: "top" }); + }, + + // 内部方法：启动重连定时器 + _startReconnectTimer: () => { + const currentState = get(); + + currentState._stopReconnectTimer(); + + set({ + status: WebSocketStatus.RECONNECTING, + reconnectAttempts: currentState.reconnectAttempts + 1, + }); + + const timer = setTimeout(() => { + console.log( + `尝试重连 (${currentState.reconnectAttempts + 1}/${currentState.config?.maxReconnectAttempts})`, + ); + currentState.reconnect(); + }, currentState.config?.reconnectInterval || 3000); + + set({ reconnectTimer: timer }); + }, + + // 内部方法：停止重连定时器 + _stopReconnectTimer: () => { + const currentState = get(); + + if (currentState.reconnectTimer) { + clearTimeout(currentState.reconnectTimer); + set({ reconnectTimer: null }); + } + }, + }), + { + name: "websocket-store", + partialize: state => ({ + // 只持久化必要的状态，不持久化WebSocket实例 + status: state.status, + config: state.config, + messages: state.messages.slice(-100), // 只保留最近100条消息 + unreadCount: state.unreadCount, + reconnectAttempts: state.reconnectAttempts, + }), + onRehydrateStorage: () => state => { + // 页面刷新后，如果之前是连接状态，尝试重新连接 + if (state && state.status === WebSocketStatus.CONNECTED && state.config) { + // 延迟一下再重连，确保页面完全加载 + setTimeout(() => { + state.connect(state.config); + }, 1000); + } + }, + }, +); From 273ba8073cadb23529d5f527528c9becea214e19 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: Mon, 18 Aug 2025 11:33:56 +0800 Subject: [PATCH 27/39] =?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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cunkebao/src/main.tsx | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Cunkebao/src/main.tsx b/Cunkebao/src/main.tsx index 3fa26fe3..637e8569 100644 --- a/Cunkebao/src/main.tsx +++ b/Cunkebao/src/main.tsx @@ -3,14 +3,8 @@ import { createRoot } from "react-dom/client"; import App from "./App"; import "./styles/global.scss"; // 引入错误处理器来抑制findDOMNode警告 -import "./utils/errorHandler"; -import StrictModeWrapper from "./components/StrictModeWrapper"; // import VConsole from "vconsole"; // new VConsole(); const root = createRoot(document.getElementById("root")!); -root.render( - - - -); +root.render(); From dac3d51f8870922932f8ba67af58befa950cc383 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: Mon, 18 Aug 2025 18:01:59 +0800 Subject: [PATCH 28/39] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=87=AA=E5=8B=95?= =?UTF-8?q?=E5=BB=BA=E7=BE=A4=E5=8A=9F=E8=83=BD=EF=BC=8C=E8=AA=BF=E6=95=B4?= =?UTF-8?q?=20API=20=E6=8E=A5=E5=8F=A3=E4=BB=A5=E6=94=AF=E6=8C=81=E6=9C=8B?= =?UTF-8?q?=E5=8F=8B=E5=9C=88=E5=90=8C=E6=AD=A5=E4=BB=BB=E5=8B=99=EF=BC=8C?= =?UTF-8?q?=E5=84=AA=E5=8C=96=E8=A1=A8=E5=96=AE=E7=B5=90=E6=A7=8B=E5=8F=8A?= =?UTF-8?q?=E6=A8=A3=E5=BC=8F=EF=BC=8C=E4=B8=A6=E6=95=B4=E5=90=88=E5=B0=8E?= =?UTF-8?q?=E8=88=AA=E7=B5=84=E4=BB=B6=E4=BB=A5=E6=8F=90=E5=8D=87=E7=94=A8?= =?UTF-8?q?=E6=88=B6=E9=AB=94=E9=A9=97=E3=80=82=E6=9B=B4=E6=96=B0=E8=B3=87?= =?UTF-8?q?=E6=BA=90=E5=BC=95=E7=94=A8=E4=BB=A5=E7=A2=BA=E4=BF=9D=E6=AD=A3?= =?UTF-8?q?=E7=A2=BA=E5=8A=A0=E8=BC=89=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cunkebao/dist/.vite/manifest.json | 18 +- Cunkebao/dist/index.html | 8 +- .../workspace/auto-group/detail/index.tsx | 52 +-- .../mobile/workspace/auto-group/form/api.ts | 22 +- .../auto-group/form/index.module.scss | 11 +- .../workspace/auto-group/form/index.tsx | 341 ++++++++++-------- .../mobile/workspace/auto-group/form/types.ts | 53 +++ .../workspace/auto-group/list/index.tsx | 181 +++++----- 8 files changed, 383 insertions(+), 303 deletions(-) create mode 100644 Cunkebao/src/pages/mobile/workspace/auto-group/form/types.ts diff --git a/Cunkebao/dist/.vite/manifest.json b/Cunkebao/dist/.vite/manifest.json index 739932df..eae30d1e 100644 --- a/Cunkebao/dist/.vite/manifest.json +++ b/Cunkebao/dist/.vite/manifest.json @@ -1,9 +1,9 @@ { - "_charts-D0fT04H8.js": { - "file": "assets/charts-D0fT04H8.js", + "_charts-DHgoott5.js": { + "file": "assets/charts-DHgoott5.js", "name": "charts", "imports": [ - "_ui-qLeQLv1F.js", + "_ui-Upu1eBzw.js", "_vendor-2vc8h_ct.js" ] }, @@ -11,8 +11,8 @@ "file": "assets/ui-D0C0OGrH.css", "src": "_ui-D0C0OGrH.css" }, - "_ui-qLeQLv1F.js": { - "file": "assets/ui-qLeQLv1F.js", + "_ui-Upu1eBzw.js": { + "file": "assets/ui-Upu1eBzw.js", "name": "ui", "imports": [ "_vendor-2vc8h_ct.js" @@ -33,18 +33,18 @@ "name": "vendor" }, "index.html": { - "file": "assets/index-Bos-kh2O.js", + "file": "assets/index-Cqw-bDjj.js", "name": "index", "src": "index.html", "isEntry": true, "imports": [ "_vendor-2vc8h_ct.js", - "_ui-qLeQLv1F.js", + "_ui-Upu1eBzw.js", "_utils-6WF66_dS.js", - "_charts-D0fT04H8.js" + "_charts-DHgoott5.js" ], "css": [ - "assets/index-4EWIsBVv.css" + "assets/index-Ta4vyxDJ.css" ] } } \ No newline at end of file diff --git a/Cunkebao/dist/index.html b/Cunkebao/dist/index.html index dd832d12..1a1857e9 100644 --- a/Cunkebao/dist/index.html +++ b/Cunkebao/dist/index.html @@ -11,13 +11,13 @@ - + - + - + - +
diff --git a/Cunkebao/src/pages/mobile/workspace/auto-group/detail/index.tsx b/Cunkebao/src/pages/mobile/workspace/auto-group/detail/index.tsx index a0d88e7d..a82f5d73 100644 --- a/Cunkebao/src/pages/mobile/workspace/auto-group/detail/index.tsx +++ b/Cunkebao/src/pages/mobile/workspace/auto-group/detail/index.tsx @@ -1,17 +1,10 @@ import React, { useEffect, useState } from "react"; import { useParams, useNavigate } from "react-router-dom"; -import { - Card, - Button, - Toast, - ProgressBar, - Tag, - SpinLoading, -} from "antd-mobile"; +import { Card, Button, Toast, ProgressBar, Tag } from "antd-mobile"; import { TeamOutline, LeftOutline } from "antd-mobile-icons"; import { AlertOutlined } from "@ant-design/icons"; import Layout from "@/components/Layout/Layout"; -import MeauMobile from "@/components/MeauMobile/MeauMoible"; +import NavCommon from "@/components/NavCommon/index"; import style from "./index.module.scss"; interface GroupMember { @@ -280,37 +273,10 @@ const AutoGroupDetail: React.FC = () => { Toast.show({ content: "所有群组已创建完成" }); }; - if (loading) { - return ( - - -
建群详情
-
- } - footer={} - loading={true} - > -
- - ); - } - if (!taskDetail) { return ( - -
建群详情
-
- } - footer={} + header={ navigate(-1)} />} > @@ -330,14 +296,12 @@ const AutoGroupDetail: React.FC = () => { return ( - -
{taskDetail.name} - 建群详情
-
+ navigate(-1)} + /> } - footer={} + loading={loading} >
diff --git a/Cunkebao/src/pages/mobile/workspace/auto-group/form/api.ts b/Cunkebao/src/pages/mobile/workspace/auto-group/form/api.ts index 811d1e56..68dc7135 100644 --- a/Cunkebao/src/pages/mobile/workspace/auto-group/form/api.ts +++ b/Cunkebao/src/pages/mobile/workspace/auto-group/form/api.ts @@ -1,11 +1,17 @@ import request from "@/api/request"; -// 新建自动建群任务 -export function createAutoGroup(data: any) { - return request("/api/auto-group/create", data, "POST"); -} +// 创建朋友圈同步任务 +export const createAutoGroup = (params: any) => + request("/v1/workbench/create", params, "POST"); -// 编辑自动建群任务 -export function updateAutoGroup(id: string, data: any) { - return request(`/api/auto-group/update/${id}`, data, "POST"); -} +// 更新朋友圈同步任务 +export const updateAutoGroup = (params: any) => + request("/v1/workbench/update", params, "POST"); + +// 获取朋友圈同步任务详情 +export const getAutoGroupDetail = (id: string) => + request("/v1/workbench/detail", { id }, "GET"); + +// 获取朋友圈同步任务列表 +export const getAutoGroupList = (params: any) => + request("/v1/workbench/list", params, "GET"); diff --git a/Cunkebao/src/pages/mobile/workspace/auto-group/form/index.module.scss b/Cunkebao/src/pages/mobile/workspace/auto-group/form/index.module.scss index 6a7bd15a..df8a4331 100644 --- a/Cunkebao/src/pages/mobile/workspace/auto-group/form/index.module.scss +++ b/Cunkebao/src/pages/mobile/workspace/auto-group/form/index.module.scss @@ -22,13 +22,4 @@ text-align: center; } -.timeRangeRow { - display: flex; - align-items: center; - gap: 8px; -} -.groupSizeRow { - display: flex; - align-items: center; - gap: 8px; -} + diff --git a/Cunkebao/src/pages/mobile/workspace/auto-group/form/index.tsx b/Cunkebao/src/pages/mobile/workspace/auto-group/form/index.tsx index 1e7dc78d..4b039b3a 100644 --- a/Cunkebao/src/pages/mobile/workspace/auto-group/form/index.tsx +++ b/Cunkebao/src/pages/mobile/workspace/auto-group/form/index.tsx @@ -1,45 +1,36 @@ import React, { useState, useEffect } from "react"; import { useNavigate, useParams } from "react-router-dom"; -import { - Form, - Input, - Button, - Toast, - Switch, - Selector, - TextArea, - NavBar, -} from "antd-mobile"; -import { ArrowLeftOutlined } from "@ant-design/icons"; +import { Form, Toast, TextArea } from "antd-mobile"; +import { Input, InputNumber, Button, Switch } from "antd"; import Layout from "@/components/Layout/Layout"; import style from "./index.module.scss"; import { createAutoGroup, updateAutoGroup } from "./api"; +import { AutoGroupFormData } from "./types"; +import DeviceSelection from "@/components/DeviceSelection/index"; +import NavCommon from "@/components/NavCommon/index"; +import dayjs from "dayjs"; +import { DeviceSelectionItem } from "@/components/DeviceSelection/data"; -const defaultForm = { +const defaultForm: AutoGroupFormData = { name: "", - deviceCount: 1, - targetFriends: 0, - createInterval: 300, - maxGroupsPerDay: 10, - timeRange: { start: "09:00", end: "21:00" }, - groupSize: { min: 20, max: 50 }, - targetTags: [], - groupNameTemplate: "VIP客户交流群{序号}", - groupDescription: "", + type: 4, + deveiceGroups: [], // 设备组 + deveiceGroupsOptions: [], // 设备组选项 + startTime: dayjs().format("HH:mm"), // 开始时间 (HH:mm) + endTime: dayjs().add(1, "hour").format("HH:mm"), // 结束时间 (HH:mm) + groupSizeMin: 20, // 群组最小人数 + groupSizeMax: 50, // 群组最大人数 + maxGroupsPerDay: 10, // 每日最大建群数 + groupNameTemplate: "VIP客户交流群{序号}", // 群名称模板 + groupDescription: "", // 群描述 + status: 1, // 是否启用 (1: 启用, 0: 禁用) }; -const tagOptions = [ - { label: "VIP客户", value: "VIP客户" }, - { label: "高价值", value: "高价值" }, - { label: "潜在客户", value: "潜在客户" }, - { label: "中意向", value: "中意向" }, -]; - const AutoGroupForm: React.FC = () => { const navigate = useNavigate(); const { id } = useParams(); const isEdit = Boolean(id); - const [form, setForm] = useState(defaultForm); + const [form, setForm] = useState(defaultForm); const [loading, setLoading] = useState(false); useEffect(() => { @@ -48,15 +39,15 @@ const AutoGroupForm: React.FC = () => { setForm({ ...defaultForm, name: "VIP客户建群", - deviceCount: 2, - targetFriends: 156, - createInterval: 300, + deveiceGroups: [], + startTime: dayjs().format("HH:mm"), + endTime: dayjs().add(1, "hour").format("HH:mm"), + groupSizeMin: 20, + groupSizeMax: 50, maxGroupsPerDay: 20, - timeRange: { start: "09:00", end: "21:00" }, - groupSize: { min: 20, max: 50 }, - targetTags: ["VIP客户", "高价值"], groupNameTemplate: "VIP客户交流群{序号}", groupDescription: "VIP客户专属交流群，提供优质服务", + status: 1, }); } }, [isEdit, id]); @@ -65,7 +56,7 @@ const AutoGroupForm: React.FC = () => { setLoading(true); try { if (isEdit) { - await updateAutoGroup(id as string, form); + await updateAutoGroup(form); Toast.show({ content: "编辑成功" }); } else { await createAutoGroup(form); @@ -79,25 +70,24 @@ const AutoGroupForm: React.FC = () => { } }; + const setTaskName = (val: string) => { + setForm((f: any) => ({ ...f, name: val })); + }; + const setDeviceGroups = (val: DeviceSelectionItem[]) => { + console.log(val); + setForm((f: any) => ({ + ...f, + deveiceGroups: val.map(item => item.id), + deveiceGroupsOptions: val, + })); + }; return ( - navigate(-1)} - /> -
- } - > - - {isEdit ? "编辑建群任务" : "新建建群任务"} - - + navigate(-1)} + /> } >
@@ -106,7 +96,7 @@ const AutoGroupForm: React.FC = () => { footer={ + + setForm((f: any) => ({ ...f, maxGroupsPerDay: val || 1 })) + } + placeholder="请输入最大建群数" + step={1} + style={{ flex: 1 }} + /> + +
+ + - setForm((f: any) => ({ ...f, maxGroupsPerDay: Number(val) })) - } - placeholder="请输入最大建群数" + type="time" + style={{ width: 120 }} + value={form.startTime || ""} + onChange={e => { + setForm((f: any) => ({ ...f, startTime: e.target.value })); + }} /> - -
- - setForm((f: any) => ({ - ...f, - timeRange: { ...f.timeRange, start: val }, - })) - } - placeholder="开始时间" - /> - - - - setForm((f: any) => ({ - ...f, - timeRange: { ...f.timeRange, end: val }, - })) - } - placeholder="结束时间" - /> -
- - -
- - setForm((f: any) => ({ - ...f, - groupSize: { ...f.groupSize, min: Number(val) }, - })) - } - placeholder="最小人数" - /> - - - - setForm((f: any) => ({ - ...f, - groupSize: { ...f.groupSize, max: Number(val) }, - })) - } - placeholder="最大人数" - /> -
- - - setForm((f: any) => ({ ...f, targetTags: val }))} + + { + setForm((f: any) => ({ ...f, endTime: e.target.value })); + }} /> + +
+ + { + const newValue = val || 1; + setForm((f: any) => ({ + ...f, + groupSizeMin: Math.min(newValue, f.groupSizeMax), + })); + }} + placeholder="请输入最小人数" + step={1} + style={{ flex: 1 }} + /> + +
+ + +
+ + { + const newValue = val || 1; + setForm((f: any) => ({ + ...f, + groupSizeMax: Math.max(newValue, f.groupSizeMin), + })); + }} + placeholder="请输入最大人数" + step={1} + style={{ flex: 1 }} + /> + +
+ + - setForm((f: any) => ({ ...f, groupNameTemplate: val })) + setForm((f: any) => ({ + ...f, + groupNameTemplate: val.target.value, + })) } placeholder="请输入群名称模板" /> @@ -242,6 +272,23 @@ const AutoGroupForm: React.FC = () => { showCount /> + +
+ 状态 + + setForm((f: any) => ({ ...f, status: checked ? 1 : 0 })) + } + /> +
+
diff --git a/Cunkebao/src/pages/mobile/workspace/auto-group/form/types.ts b/Cunkebao/src/pages/mobile/workspace/auto-group/form/types.ts new file mode 100644 index 00000000..82856afa --- /dev/null +++ b/Cunkebao/src/pages/mobile/workspace/auto-group/form/types.ts @@ -0,0 +1,53 @@ +import { DeviceSelectionItem } from "@/components/DeviceSelection/data"; +// 自动建群表单数据类型定义 +export interface AutoGroupFormData { + id?: string; // 任务ID + type: number; // 任务类型 + name: string; // 任务名称 + deveiceGroups: string[]; // 设备组 + deveiceGroupsOptions: DeviceSelectionItem[]; // 设备组选项 + startTime: string; // 开始时间 (YYYY-MM-DD HH:mm:ss) + endTime: string; // 结束时间 (YYYY-MM-DD HH:mm:ss) + groupSizeMin: number; // 群组最小人数 + groupSizeMax: number; // 群组最大人数 + maxGroupsPerDay: number; // 每日最大建群数 + groupNameTemplate: string; // 群名称模板 + groupDescription: string; // 群描述 + status: number; // 是否启用 (1: 启用, 0: 禁用) +} + +// 表单验证规则 +export const formValidationRules = { + name: [ + { required: true, message: "请输入任务名称" }, + { min: 2, max: 50, message: "任务名称长度应在2-50个字符之间" }, + ], + deveiceGroups: [ + { required: true, message: "请选择设备组" }, + { type: "array", min: 1, message: "至少选择一个设备组" }, + ], + startTime: [{ required: true, message: "请选择开始时间" }], + endTime: [{ required: true, message: "请选择结束时间" }], + groupSizeMin: [ + { required: true, message: "请输入群组最小人数" }, + { type: "number", min: 1, max: 500, message: "群组最小人数应在1-500之间" }, + ], + groupSizeMax: [ + { required: true, message: "请输入群组最大人数" }, + { type: "number", min: 1, max: 500, message: "群组最大人数应在1-500之间" }, + ], + maxGroupsPerDay: [ + { required: true, message: "请输入每日最大建群数" }, + { + type: "number", + min: 1, + max: 100, + message: "每日最大建群数应在1-100之间", + }, + ], + groupNameTemplate: [ + { required: true, message: "请输入群名称模板" }, + { min: 2, max: 100, message: "群名称模板长度应在2-100个字符之间" }, + ], + groupDescription: [{ max: 200, message: "群描述不能超过200个字符" }], +}; diff --git a/Cunkebao/src/pages/mobile/workspace/auto-group/list/index.tsx b/Cunkebao/src/pages/mobile/workspace/auto-group/list/index.tsx index 0d919b57..806a3553 100644 --- a/Cunkebao/src/pages/mobile/workspace/auto-group/list/index.tsx +++ b/Cunkebao/src/pages/mobile/workspace/auto-group/list/index.tsx @@ -1,7 +1,7 @@ -import React, { useState } from "react"; +import React, { useEffect, useState } from "react"; import { useNavigate } from "react-router-dom"; import { Button, Card, Popover, Toast } from "antd-mobile"; -import { Input, Switch } from "antd"; +import { Input, Switch, Pagination } from "antd"; import { MoreOutline, AddCircleOutline, @@ -14,7 +14,7 @@ import { PlusOutlined, SearchOutlined, } from "@ant-design/icons"; - +import { getAutoGroupList } from "../form/api"; import Layout from "@/components/Layout/Layout"; import style from "./index.module.scss"; import NavCommon from "@/components/NavCommon"; @@ -22,91 +22,92 @@ import NavCommon from "@/components/NavCommon"; interface GroupTask { id: string; name: string; - status: "running" | "paused" | "completed"; - deviceCount: number; - targetFriends: number; - createdGroups: number; - lastCreateTime: string; - createTime: string; - creator: string; - createInterval: number; - maxGroupsPerDay: number; - timeRange: { start: string; end: string }; - groupSize: { min: number; max: number }; - targetTags: string[]; - groupNameTemplate: string; - groupDescription: string; + status: number; // 1 开启, 0 关闭 + deviceCount?: number; + targetFriends?: number; + createdGroups?: number; + lastCreateTime?: string; + createTime?: string; + creator?: string; + createInterval?: number; + maxGroupsPerDay?: number; + timeRange?: { start: string; end: string }; + groupSize?: { min: number; max: number }; + targetTags?: string[]; + groupNameTemplate?: string; + groupDescription?: string; } -const mockTasks: GroupTask[] = [ - { - id: "1", - name: "VIP客户建群", - deviceCount: 2, - targetFriends: 156, - createdGroups: 12, - lastCreateTime: "2025-02-06 13:12:35", - createTime: "2024-11-20 19:04:14", - creator: "admin", - status: "running", - createInterval: 300, - maxGroupsPerDay: 20, - timeRange: { start: "09:00", end: "21:00" }, - groupSize: { min: 20, max: 50 }, - targetTags: ["VIP客户", "高价值"], - groupNameTemplate: "VIP客户交流群{序号}", - groupDescription: "VIP客户专属交流群，提供优质服务", - }, - { - id: "2", - name: "产品推广建群", - deviceCount: 1, - targetFriends: 89, - createdGroups: 8, - lastCreateTime: "2024-03-04 14:09:35", - createTime: "2024-03-04 14:29:04", - creator: "manager", - status: "paused", - createInterval: 600, - maxGroupsPerDay: 10, - timeRange: { start: "10:00", end: "20:00" }, - groupSize: { min: 15, max: 30 }, - targetTags: ["潜在客户", "中意向"], - groupNameTemplate: "产品推广群{序号}", - groupDescription: "产品推广交流群，了解最新产品信息", - }, -]; +// 初始空列表；真实数据由接口返回 +const mockTasks: GroupTask[] = []; -const getStatusColor = (status: string) => { +const getStatusColor = (status: number) => { switch (status) { - case "running": + case 1: return style.statusRunning; - case "paused": + case 0: return style.statusPaused; - case "completed": - return style.statusCompleted; default: return style.statusPaused; } }; -const getStatusText = (status: string) => { +const getStatusText = (status: number) => { switch (status) { - case "running": - return "进行中"; - case "paused": - return "已暂停"; - case "completed": - return "已完成"; + case 1: + return "开启"; + case 0: + return "关闭"; default: - return "未知"; + return "关闭"; } }; const AutoGroupList: React.FC = () => { const navigate = useNavigate(); const [searchTerm, setSearchTerm] = useState(""); - const [tasks, setTasks] = useState(mockTasks); + const [tasks, setTasks] = useState([]); + const [page, setPage] = useState(1); + const [pageSize, setPageSize] = useState(10); + const [total, setTotal] = useState(0); + + const refreshTasks = async (p = page, ps = pageSize) => { + try { + const res: any = await getAutoGroupList({ type: 4, page: p, limit: ps }); + // 兼容不同返回结构 + const list = res?.list || res?.records || res?.data || []; + const totalCount = res?.total || res?.totalCount || list.length; + const normalized: GroupTask[] = (list as any[]).map(item => ({ + id: String(item.id), + name: item.name, + status: Number(item.status) === 1 ? 1 : 0, + deviceCount: Array.isArray(item.config?.devices) + ? item.config.devices.length + : 0, + maxGroupsPerDay: item.config?.maxGroupsPerDay ?? 0, + timeRange: { + start: item.config?.startTime ?? "-", + end: item.config?.endTime ?? "-", + }, + groupSize: { + min: item.config?.groupSizeMin ?? 0, + max: item.config?.groupSizeMax ?? 0, + }, + creator: item.creatorName ?? "", + createTime: item.createTime ?? "", + lastCreateTime: item.updateTime ?? "", + })); + setTasks(normalized); + setTotal(totalCount); + } catch (e) { + Toast.show({ content: "获取列表失败" }); + } + }; + + useEffect(() => { + refreshTasks(1, pageSize); + // eslint-disable-next-line react-hooks/exhaustive-deps + }, []); const handleDelete = (taskId: string) => { const taskToDelete = tasks.find(task => task.id === taskId); @@ -144,7 +145,7 @@ const AutoGroupList: React.FC = () => { task.id === taskId ? { ...task, - status: task.status === "running" ? "paused" : "running", + status: task.status === 1 ? 0 : 1, } : task, ), @@ -187,7 +188,7 @@ const AutoGroupList: React.FC = () => {
); From 0468531655ebe6f1bf88ca720b4358489e6d33f9 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: Mon, 18 Aug 2025 18:21:31 +0800 Subject: [PATCH 29/39] =?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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workspace/auto-group/form/index.tsx | 38 ++++++++++--------- .../mobile/workspace/auto-group/form/types.ts | 1 + 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/Cunkebao/src/pages/mobile/workspace/auto-group/form/index.tsx b/Cunkebao/src/pages/mobile/workspace/auto-group/form/index.tsx index 4b039b3a..86f0d1c2 100644 --- a/Cunkebao/src/pages/mobile/workspace/auto-group/form/index.tsx +++ b/Cunkebao/src/pages/mobile/workspace/auto-group/form/index.tsx @@ -4,7 +4,7 @@ import { Form, Toast, TextArea } from "antd-mobile"; import { Input, InputNumber, Button, Switch } from "antd"; import Layout from "@/components/Layout/Layout"; import style from "./index.module.scss"; -import { createAutoGroup, updateAutoGroup } from "./api"; +import { createAutoGroup, updateAutoGroup, getAutoGroupDetail } from "./api"; import { AutoGroupFormData } from "./types"; import DeviceSelection from "@/components/DeviceSelection/index"; import NavCommon from "@/components/NavCommon/index"; @@ -34,23 +34,27 @@ const AutoGroupForm: React.FC = () => { const [loading, setLoading] = useState(false); useEffect(() => { - if (isEdit) { - // 这里应请求详情接口，回填表单，演示用mock + // 这里应请求详情接口，回填表单，演示用mock + getAutoGroupDetail(id).then(res => { setForm({ ...defaultForm, - name: "VIP客户建群", - deveiceGroups: [], - startTime: dayjs().format("HH:mm"), - endTime: dayjs().add(1, "hour").format("HH:mm"), - groupSizeMin: 20, - groupSizeMax: 50, - maxGroupsPerDay: 20, - groupNameTemplate: "VIP客户交流群{序号}", - groupDescription: "VIP客户专属交流群，提供优质服务", - status: 1, + name: res.name, + deveiceGroups: res.config.deveiceGroups, + deveiceGroupsOptions: res.config.deveiceGroupsOptions, + startTime: res.config.startTime, + endTime: res.config.endTime, + groupSizeMin: res.config.groupSizeMin, + groupSizeMax: res.config.groupSizeMax, + maxGroupsPerDay: res.config.maxGroupsPerDay, + groupNameTemplate: res.config.groupNameTemplate, + groupDescription: res.config.groupDescription, + status: res.status, + type: res.type, + id: res.id, }); - } - }, [isEdit, id]); + console.log(form); + }); + }, [id]); const handleSubmit = async () => { setLoading(true); @@ -104,14 +108,14 @@ const AutoGroupForm: React.FC = () => { } > - + setTaskName(val.target.value)} placeholder="请输入任务名称" /> - + Date: Tue, 19 Aug 2025 10:35:25 +0800 Subject: [PATCH 30/39] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=87=AA=E5=8B=95?= =?UTF-8?q?=E5=BB=BA=E7=BE=A4=E8=A1=A8=E5=96=AE=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=8D=B2=E5=8F=96=E7=BE=A4=E7=B5=84=E8=A9=B3=E6=83=85=E7=9A=84?= =?UTF-8?q?=20API=20=E8=AA=BF=E7=94=A8=E4=BB=A5=E5=9B=9E=E5=A1=AB=E8=A1=A8?= =?UTF-8?q?=E5=96=AE=E6=95=B8=E6=93=9A=EF=BC=8C=E4=B8=A6=E8=AA=BF=E6=95=B4?= =?UTF-8?q?=E8=A1=A8=E5=96=AE=E7=B5=90=E6=A7=8B=E4=BB=A5=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=8B=95=E6=85=8B=E6=95=B8=E6=93=9A=E9=A1=AF=E7=A4=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workspace/auto-group/list/index.tsx | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/Cunkebao/src/pages/mobile/workspace/auto-group/list/index.tsx b/Cunkebao/src/pages/mobile/workspace/auto-group/list/index.tsx index 806a3553..61a35bad 100644 --- a/Cunkebao/src/pages/mobile/workspace/auto-group/list/index.tsx +++ b/Cunkebao/src/pages/mobile/workspace/auto-group/list/index.tsx @@ -38,9 +38,6 @@ interface GroupTask { groupDescription?: string; } -// 初始空列表；真实数据由接口返回 -const mockTasks: GroupTask[] = []; - const getStatusColor = (status: number) => { switch (status) { case 1: @@ -70,8 +67,10 @@ const AutoGroupList: React.FC = () => { const [page, setPage] = useState(1); const [pageSize, setPageSize] = useState(10); const [total, setTotal] = useState(0); + const [loading, setLoading] = useState(false); const refreshTasks = async (p = page, ps = pageSize) => { + setLoading(true); try { const res: any = await getAutoGroupList({ type: 4, page: p, limit: ps }); // 兼容不同返回结构 @@ -101,6 +100,8 @@ const AutoGroupList: React.FC = () => { setTotal(totalCount); } catch (e) { Toast.show({ content: "获取列表失败" }); + } finally { + setLoading(false); } }; @@ -197,6 +198,23 @@ const AutoGroupList: React.FC = () => {
} + footer={ +
+ { + setPage(p); + setPageSize(ps); + refreshTasks(p, ps); + }} + showSizeChanger + showTotal={t => `共 ${t} 条`} + /> +
+ } + loading={loading} >
@@ -295,21 +313,6 @@ const AutoGroupList: React.FC = () => { )) )}
- {/* 分页 */} -
- { - setPage(p); - setPageSize(ps); - refreshTasks(p, ps); - }} - showSizeChanger - showTotal={t => `共 ${t} 条`} - /> -
); From b6cef907f98188867a26d7c1ddf573992c1801db 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: Tue, 19 Aug 2025 10:54:31 +0800 Subject: [PATCH 31/39] =?UTF-8?q?=E8=AA=BF=E6=95=B4=E8=87=AA=E5=8B=95?= =?UTF-8?q?=E5=BB=BA=E7=BE=A4=E8=A1=A8=E5=96=AE=EF=BC=8C=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E7=BE=A4=E5=90=8D=E7=A8=B1=E6=A8=A1=E6=9D=BF=E7=9A=84=E9=A0=90?= =?UTF-8?q?=E8=A8=AD=E5=80=BC=EF=BC=8C=E4=B8=A6=E5=84=AA=E5=8C=96=E8=A1=A8?= =?UTF-8?q?=E5=96=AE=E9=A0=85=E7=9B=AE=E4=BB=A5=E6=94=AF=E6=8C=81=E5=8B=95?= =?UTF-8?q?=E6=85=8B=E6=95=B8=E6=93=9A=E9=A1=AF=E7=A4=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/mobile/workspace/auto-group/form/index.tsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Cunkebao/src/pages/mobile/workspace/auto-group/form/index.tsx b/Cunkebao/src/pages/mobile/workspace/auto-group/form/index.tsx index 86f0d1c2..2c946b0b 100644 --- a/Cunkebao/src/pages/mobile/workspace/auto-group/form/index.tsx +++ b/Cunkebao/src/pages/mobile/workspace/auto-group/form/index.tsx @@ -21,7 +21,7 @@ const defaultForm: AutoGroupFormData = { groupSizeMin: 20, // 群组最小人数 groupSizeMax: 50, // 群组最大人数 maxGroupsPerDay: 10, // 每日最大建群数 - groupNameTemplate: "VIP客户交流群{序号}", // 群名称模板 + groupNameTemplate: "", // 群名称模板 groupDescription: "", // 群描述 status: 1, // 是否启用 (1: 启用, 0: 禁用) }; @@ -39,8 +39,8 @@ const AutoGroupForm: React.FC = () => { setForm({ ...defaultForm, name: res.name, - deveiceGroups: res.config.deveiceGroups, - deveiceGroupsOptions: res.config.deveiceGroupsOptions, + deveiceGroups: res.config.deveiceGroups || [], + deveiceGroupsOptions: res.config.deveiceGroupsOptions || [], startTime: res.config.startTime, endTime: res.config.endTime, groupSizeMin: res.config.groupSizeMin, @@ -157,7 +157,7 @@ const AutoGroupForm: React.FC = () => {
- + { }} /> - + {
- + From eda7f0045385260b11407ad654b1ecd0983eaaf8 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: Tue, 19 Aug 2025 11:01:19 +0800 Subject: [PATCH 32/39] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=87=AA=E5=8B=95?= =?UTF-8?q?=E5=BB=BA=E7=BE=A4=20API=EF=BC=8C=E8=AA=BF=E6=95=B4=E7=8D=B2?= =?UTF-8?q?=E5=8F=96=E4=BB=BB=E5=8B=99=E5=88=97=E8=A1=A8=E7=9A=84=E8=B7=AF?= =?UTF-8?q?=E5=BE=91=EF=BC=8C=E4=B8=A6=E6=96=B0=E5=A2=9E=E8=A4=87=E8=A3=BD?= =?UTF-8?q?=E8=87=AA=E5=8B=95=E5=BB=BA=E7=BE=A4=E4=BB=BB=E5=8B=99=E7=9A=84?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=84=AA=E5=8C=96=E4=BB=BB=E5=8B=99?= =?UTF-8?q?=E8=A4=87=E8=A3=BD=E9=82=8F=E8=BC=AF=E4=BB=A5=E6=8F=90=E5=8D=87?= =?UTF-8?q?=E7=94=A8=E6=88=B6=E9=AB=94=E9=A9=97=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mobile/workspace/auto-group/list/api.ts | 11 +++++--- .../workspace/auto-group/list/index.tsx | 27 ++++++++++--------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/Cunkebao/src/pages/mobile/workspace/auto-group/list/api.ts b/Cunkebao/src/pages/mobile/workspace/auto-group/list/api.ts index e0cd0a9f..8ad39e81 100644 --- a/Cunkebao/src/pages/mobile/workspace/auto-group/list/api.ts +++ b/Cunkebao/src/pages/mobile/workspace/auto-group/list/api.ts @@ -1,8 +1,11 @@ import request from "@/api/request"; // 获取自动建群任务列表 -export function getAutoGroupList(params?: any) { - return request("/api/auto-group/list", params, "GET"); -} +// 获取朋友圈同步任务列表 +export const getAutoGroupList = (params: any) => + request("/v1/workbench/list", params, "GET"); -// 其他相关API可按需添加 +// 复制自动建群任务 +export function copyAutoGroupTask(id: string): Promise { + return request("/v1/workbench/copy", { id }, "POST"); +} diff --git a/Cunkebao/src/pages/mobile/workspace/auto-group/list/index.tsx b/Cunkebao/src/pages/mobile/workspace/auto-group/list/index.tsx index 61a35bad..613397f4 100644 --- a/Cunkebao/src/pages/mobile/workspace/auto-group/list/index.tsx +++ b/Cunkebao/src/pages/mobile/workspace/auto-group/list/index.tsx @@ -14,7 +14,7 @@ import { PlusOutlined, SearchOutlined, } from "@ant-design/icons"; -import { getAutoGroupList } from "../form/api"; +import { getAutoGroupList, copyAutoGroupTask } from "./api"; import Layout from "@/components/Layout/Layout"; import style from "./index.module.scss"; import NavCommon from "@/components/NavCommon"; @@ -126,17 +126,20 @@ const AutoGroupList: React.FC = () => { navigate(`/workspace/auto-group/${taskId}`); }; - const handleCopy = (taskId: string) => { - const taskToCopy = tasks.find(task => task.id === taskId); - if (taskToCopy) { - const newTask = { - ...taskToCopy, - id: `${Date.now()}`, - name: `${taskToCopy.name} (复制)`, - createTime: new Date().toISOString().replace("T", " ").substring(0, 19), - }; - setTasks([...tasks, newTask]); - Toast.show({ content: "复制成功" }); + // 复制任务 + const handleCopy = async (id: string) => { + try { + await copyAutoGroupTask(id); + Toast.show({ + content: "复制成功", + position: "top", + }); + refreshTasks(); // 重新获取列表 + } catch (error) { + Toast.show({ + content: "复制失败", + position: "top", + }); } }; From bd317d8fc01956dd53a7417cce356d0409655793 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: Tue, 19 Aug 2025 11:02:35 +0800 Subject: [PATCH 33/39] =?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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cunkebao/src/pages/mobile/workspace/auto-group/list/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cunkebao/src/pages/mobile/workspace/auto-group/list/index.tsx b/Cunkebao/src/pages/mobile/workspace/auto-group/list/index.tsx index 613397f4..8e44c600 100644 --- a/Cunkebao/src/pages/mobile/workspace/auto-group/list/index.tsx +++ b/Cunkebao/src/pages/mobile/workspace/auto-group/list/index.tsx @@ -202,7 +202,7 @@ const AutoGroupList: React.FC = () => { } footer={ -
+
Date: Tue, 19 Aug 2025 11:50:11 +0800 Subject: [PATCH 34/39] =?UTF-8?q?=E8=AA=BF=E6=95=B4=E8=87=AA=E5=8B=95?= =?UTF-8?q?=E5=BB=BA=E7=BE=A4=E5=88=97=E8=A1=A8=E9=A0=81=E8=85=B3=E6=A8=A3?= =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E5=B0=87=E5=8E=9F=E6=9C=89=E7=9A=84=E5=85=A7?= =?UTF-8?q?=E8=81=AF=E6=A8=A3=E5=BC=8F=E6=9B=BF=E6=8F=9B=E7=82=BA=20CSS=20?= =?UTF-8?q?=E9=A1=9E=E5=90=8D=E4=BB=A5=E6=8F=90=E5=8D=87=E5=8F=AF=E7=B6=AD?= =?UTF-8?q?=E8=AD=B7=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cunkebao/dist/.vite/manifest.json | 2 +- Cunkebao/dist/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cunkebao/dist/.vite/manifest.json b/Cunkebao/dist/.vite/manifest.json index eae30d1e..aa72c644 100644 --- a/Cunkebao/dist/.vite/manifest.json +++ b/Cunkebao/dist/.vite/manifest.json @@ -33,7 +33,7 @@ "name": "vendor" }, "index.html": { - "file": "assets/index-Cqw-bDjj.js", + "file": "assets/index-BYHOLezP.js", "name": "index", "src": "index.html", "isEntry": true, diff --git a/Cunkebao/dist/index.html b/Cunkebao/dist/index.html index 1a1857e9..2f4bf908 100644 --- a/Cunkebao/dist/index.html +++ b/Cunkebao/dist/index.html @@ -11,7 +11,7 @@ - + From a6945d1dc93482542fe0588690b7cb4389729d40 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: Tue, 19 Aug 2025 11:58:01 +0800 Subject: [PATCH 35/39] =?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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cunkebao/dist/.vite/manifest.json | 24 ++++++++++++------------ Cunkebao/dist/index.html | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Cunkebao/dist/.vite/manifest.json b/Cunkebao/dist/.vite/manifest.json index aa72c644..06a63548 100644 --- a/Cunkebao/dist/.vite/manifest.json +++ b/Cunkebao/dist/.vite/manifest.json @@ -1,18 +1,14 @@ { - "_charts-DHgoott5.js": { - "file": "assets/charts-DHgoott5.js", + "_charts-67loIxOq.js": { + "file": "assets/charts-67loIxOq.js", "name": "charts", "imports": [ - "_ui-Upu1eBzw.js", + "_ui-BHlOTTG9.js", "_vendor-2vc8h_ct.js" ] }, - "_ui-D0C0OGrH.css": { - "file": "assets/ui-D0C0OGrH.css", - "src": "_ui-D0C0OGrH.css" - }, - "_ui-Upu1eBzw.js": { - "file": "assets/ui-Upu1eBzw.js", + "_ui-BHlOTTG9.js": { + "file": "assets/ui-BHlOTTG9.js", "name": "ui", "imports": [ "_vendor-2vc8h_ct.js" @@ -21,6 +17,10 @@ "assets/ui-D0C0OGrH.css" ] }, + "_ui-D0C0OGrH.css": { + "file": "assets/ui-D0C0OGrH.css", + "src": "_ui-D0C0OGrH.css" + }, "_utils-6WF66_dS.js": { "file": "assets/utils-6WF66_dS.js", "name": "utils", @@ -33,15 +33,15 @@ "name": "vendor" }, "index.html": { - "file": "assets/index-BYHOLezP.js", + "file": "assets/index-L4plkNmD.js", "name": "index", "src": "index.html", "isEntry": true, "imports": [ "_vendor-2vc8h_ct.js", - "_ui-Upu1eBzw.js", + "_ui-BHlOTTG9.js", "_utils-6WF66_dS.js", - "_charts-DHgoott5.js" + "_charts-67loIxOq.js" ], "css": [ "assets/index-Ta4vyxDJ.css" diff --git a/Cunkebao/dist/index.html b/Cunkebao/dist/index.html index 2f4bf908..d8f29185 100644 --- a/Cunkebao/dist/index.html +++ b/Cunkebao/dist/index.html @@ -11,11 +11,11 @@ - + - + - + From 50db0410212d04ccc30e444864abea658170822c 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: Tue, 19 Aug 2025 12:12:50 +0800 Subject: [PATCH 36/39] =?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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cunkebao/dist/.vite/manifest.json | 24 ++++++++++++------------ Cunkebao/dist/index.html | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Cunkebao/dist/.vite/manifest.json b/Cunkebao/dist/.vite/manifest.json index 06a63548..aa72c644 100644 --- a/Cunkebao/dist/.vite/manifest.json +++ b/Cunkebao/dist/.vite/manifest.json @@ -1,14 +1,18 @@ { - "_charts-67loIxOq.js": { - "file": "assets/charts-67loIxOq.js", + "_charts-DHgoott5.js": { + "file": "assets/charts-DHgoott5.js", "name": "charts", "imports": [ - "_ui-BHlOTTG9.js", + "_ui-Upu1eBzw.js", "_vendor-2vc8h_ct.js" ] }, - "_ui-BHlOTTG9.js": { - "file": "assets/ui-BHlOTTG9.js", + "_ui-D0C0OGrH.css": { + "file": "assets/ui-D0C0OGrH.css", + "src": "_ui-D0C0OGrH.css" + }, + "_ui-Upu1eBzw.js": { + "file": "assets/ui-Upu1eBzw.js", "name": "ui", "imports": [ "_vendor-2vc8h_ct.js" @@ -17,10 +21,6 @@ "assets/ui-D0C0OGrH.css" ] }, - "_ui-D0C0OGrH.css": { - "file": "assets/ui-D0C0OGrH.css", - "src": "_ui-D0C0OGrH.css" - }, "_utils-6WF66_dS.js": { "file": "assets/utils-6WF66_dS.js", "name": "utils", @@ -33,15 +33,15 @@ "name": "vendor" }, "index.html": { - "file": "assets/index-L4plkNmD.js", + "file": "assets/index-BYHOLezP.js", "name": "index", "src": "index.html", "isEntry": true, "imports": [ "_vendor-2vc8h_ct.js", - "_ui-BHlOTTG9.js", + "_ui-Upu1eBzw.js", "_utils-6WF66_dS.js", - "_charts-67loIxOq.js" + "_charts-DHgoott5.js" ], "css": [ "assets/index-Ta4vyxDJ.css" diff --git a/Cunkebao/dist/index.html b/Cunkebao/dist/index.html index d8f29185..2f4bf908 100644 --- a/Cunkebao/dist/index.html +++ b/Cunkebao/dist/index.html @@ -11,11 +11,11 @@ - + - + - + From f9be0fad2d77017846fc689830ca020d9ffd50cd 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: Tue, 19 Aug 2025 14:57:25 +0800 Subject: [PATCH 37/39] =?UTF-8?q?feat(UpdateNotification):=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E6=9B=B4=E6=96=B0=E6=8F=90=E7=A4=BA=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=92=8C=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加 forceShow 和 onClose 属性支持强制显示和关闭回调 - 重新设计 UI 样式为顶部通知栏布局 - 新增"稍后"按钮支持延迟更新 - 优化动画效果和交互体验 --- .../components/UpdateNotification/index.tsx | 208 ++++++++++-------- 1 file changed, 122 insertions(+), 86 deletions(-) diff --git a/Cunkebao/src/components/UpdateNotification/index.tsx b/Cunkebao/src/components/UpdateNotification/index.tsx index 371b3d8a..d7169da7 100644 --- a/Cunkebao/src/components/UpdateNotification/index.tsx +++ b/Cunkebao/src/components/UpdateNotification/index.tsx @@ -1,22 +1,22 @@ import React, { useState, useEffect } from "react"; import { Button } from "antd-mobile"; import { updateChecker } from "@/utils/updateChecker"; -import { - ReloadOutlined, - CloudDownloadOutlined, - RocketOutlined, -} from "@ant-design/icons"; +import { ReloadOutlined } from "@ant-design/icons"; interface UpdateNotificationProps { position?: "top" | "bottom"; autoReload?: boolean; showToast?: boolean; + forceShow?: boolean; + onClose?: () => void; } const UpdateNotification: React.FC = ({ position = "top", autoReload = false, showToast = true, + forceShow = false, + onClose, }) => { const [hasUpdate, setHasUpdate] = useState(false); const [isVisible, setIsVisible] = useState(false); @@ -51,7 +51,19 @@ const UpdateNotification: React.FC = ({ updateChecker.forceReload(); }; - if (!isVisible || !hasUpdate) { + const handleLater = () => { + setIsVisible(false); + onClose?.(); + // 10分钟后再次检查 + setTimeout( + () => { + updateChecker.start(); + }, + 10 * 60 * 1000, + ); + }; + + if ((!isVisible || !hasUpdate) && !forceShow) { return null; } @@ -62,110 +74,134 @@ const UpdateNotification: React.FC = ({ top: 0, left: 0, right: 0, - bottom: 0, zIndex: 99999, - background: "linear-gradient(135deg, #1890ff 0%, #096dd9 100%)", + background: "linear-gradient(135deg, #1a1a1a 0%, #2d2d2d 100%)", color: "white", - display: "flex", - flexDirection: "column", - alignItems: "center", - justifyContent: "center", - padding: "20px", - textAlign: "center", + padding: "16px 16px", + boxShadow: "0 4px 20px rgba(0, 0, 0, 0.5)", + borderBottom: "1px solid rgba(255, 255, 255, 0.1)", + animation: "slideDownBar 0.3s ease-out", }} > - {/* 背景装饰 */}
- -
- - {/* 主要内容 */} -
- {/* 图标 */} + {/* 左侧内容 */}
- + {/* 更新图标 */} +
+ +
+ {/* 文本信息 */} +
+
+ 发现新版本 +
+
+ 建议立即更新获得更好体验 +
+
- {/* 标题 */} + {/* 右侧按钮组 */}
- 发现新版本 -
- - {/* 描述 */} -
- 为了给您提供更好的体验，请更新到最新版本 -
- - {/* 更新按钮 */} - - - {/* 提示文字 */} -
- 更新将自动重启应用 + +
{/* 动画样式 */} - + - + - + diff --git a/Cunkebao/src/components/UpdateNotification/index.tsx b/Cunkebao/src/components/UpdateNotification/index.tsx index d7169da7..79f37c84 100644 --- a/Cunkebao/src/components/UpdateNotification/index.tsx +++ b/Cunkebao/src/components/UpdateNotification/index.tsx @@ -78,6 +78,7 @@ const UpdateNotification: React.FC = ({ background: "linear-gradient(135deg, #1a1a1a 0%, #2d2d2d 100%)", color: "white", padding: "16px 16px", + paddingTop: "calc(16px + env(safe-area-inset-top))", boxShadow: "0 4px 20px rgba(0, 0, 0, 0.5)", borderBottom: "1px solid rgba(255, 255, 255, 0.1)", animation: "slideDownBar 0.3s ease-out", From d2560784a2702e938ffa903325cf56e656674cd6 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: Tue, 19 Aug 2025 15:20:00 +0800 Subject: [PATCH 39/39] =?UTF-8?q?feat(test):=20=E6=B7=BB=E5=8A=A0=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E9=80=9A=E7=9F=A5=E7=BB=84=E4=BB=B6=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加用于 --- .../pages/mobile/test/update-notification.tsx | 179 ++++++++++++++++++ Cunkebao/src/router/module/test.tsx | 6 + 2 files changed, 185 insertions(+) create mode 100644 Cunkebao/src/pages/mobile/test/update-notification.tsx diff --git a/Cunkebao/src/pages/mobile/test/update-notification.tsx b/Cunkebao/src/pages/mobile/test/update-notification.tsx new file mode 100644 index 00000000..dae1b936 --- /dev/null +++ b/Cunkebao/src/pages/mobile/test/update-notification.tsx @@ -0,0 +1,179 @@ +import React from "react"; +import UpdateNotification from "@/components/UpdateNotification"; + +const UpdateNotificationTest: React.FC = () => { + return ( +
+ {/* 更新通知组件 */} + + + {/* 页面内容 */} +
+
+

+ UpdateNotification 组件预览 +

+ +
+

+ 设计特点： +

+
    +
  • 酷黑风格横向条设计
    • +
  • 顶部固定定位，支持安全区域
    • +
  • 渐变背景和半透明边框
    • +
  • 蓝色主题按钮
    • +
  • 从上方滑入动画效果
    • +
  • 红色更新图标脉冲动画
    • +
  • 移动端优化的字体和按钮尺寸
    • +
+
+ +
+

+ 功能说明： +

+
    +
  • 点击“立即更新”会刷新页面
    • +
  • 点击“稍后”会隐藏通知，10分钟后重新检查
    • +
  • 通知固定在顶部，不会影响页面布局
    • +
  • 支持安全区域适配，确保在刘海屏设备上正常显示
    • +
  • 响应式设计，适配不同屏幕尺寸
    • +
+
+ +
+

+ 注意： + 此页面强制显示更新通知组件用于预览效果。在实际使用中，组件会根据更新检测结果自动显示或隐藏。 +

+
+
+ + {/* 模拟页面内容 */} +
+

+ 页面内容区域 +

+

+ 这里是页面的主要内容区域。更新通知栏固定在顶部，不会影响页面内容的正常显示和交互。 +

+

+ 页面内容会自动为顶部通知栏预留空间，确保内容不被遮挡。在有安全区域的设备上， + 通知栏会自动适配安全区域高度。 +

+
+ 模拟内容区域 +
+
+
+
+ ); +}; + +export default UpdateNotificationTest; diff --git a/Cunkebao/src/router/module/test.tsx b/Cunkebao/src/router/module/test.tsx index 1b568fb9..ab416284 100644 --- a/Cunkebao/src/router/module/test.tsx +++ b/Cunkebao/src/router/module/test.tsx @@ -1,6 +1,7 @@ import SelectTest from "@/pages/mobile/test/select"; import TestIndex from "@/pages/mobile/test/index"; import UploadTest from "@/pages/mobile/test/upload"; +import UpdateNotificationTest from "@/pages/mobile/test/update-notification"; import IframeDebugPage from "@/pages/iframe"; import { DEV_FEATURES } from "@/utils/env"; @@ -22,6 +23,11 @@ const componentTestRoutes = DEV_FEATURES.SHOW_TEST_PAGES element: , auth: true, }, + { + path: "/test/update-notification", + element: , + auth: true, + }, { path: "/test/iframe", element: ,