diff --git a/Touchkebao/src/pages/pc/ckbox/components/NavCommon/index.data.tsx b/Touchkebao/src/pages/pc/ckbox/components/NavCommon/index.data.tsx index 94ae6d0e..10818e4e 100644 --- a/Touchkebao/src/pages/pc/ckbox/components/NavCommon/index.data.tsx +++ b/Touchkebao/src/pages/pc/ckbox/components/NavCommon/index.data.tsx @@ -1,4 +1,8 @@ -import { BarChartOutlined, RobotOutlined } from "@ant-design/icons"; +import { + BarChartOutlined, + RobotOutlined, + ThunderboltOutlined, +} from "@ant-design/icons"; // 菜单项接口 export interface MenuItem { id: string; @@ -31,7 +35,7 @@ export const drawerMenuData = { appDesc: "AI智能营销系统", }, footer: { - balanceIcon: "⚡", + balanceIcon: , balanceLabel: "算力余额", balanceValue: "9307.423", }, diff --git a/Touchkebao/src/pages/pc/ckbox/components/NavCommon/index.module.scss b/Touchkebao/src/pages/pc/ckbox/components/NavCommon/index.module.scss index b76f5a60..77ab9442 100644 --- a/Touchkebao/src/pages/pc/ckbox/components/NavCommon/index.module.scss +++ b/Touchkebao/src/pages/pc/ckbox/components/NavCommon/index.module.scss @@ -89,8 +89,7 @@ cursor: pointer; .suanliIcon { - font-size: 20px; - color: #ffc107; + color: #52c41a; } &:hover { @@ -330,7 +329,7 @@ color: #666; .suanliIcon { - font-size: 20px; + color: #3d9c0d; } } diff --git a/Touchkebao/src/pages/pc/ckbox/components/NavCommon/index.tsx b/Touchkebao/src/pages/pc/ckbox/components/NavCommon/index.tsx index dcef7c34..afe391f6 100644 --- a/Touchkebao/src/pages/pc/ckbox/components/NavCommon/index.tsx +++ b/Touchkebao/src/pages/pc/ckbox/components/NavCommon/index.tsx @@ -7,6 +7,7 @@ import { CloseOutlined, LogoutOutlined, UserSwitchOutlined, + ThunderboltOutlined, } from "@ant-design/icons"; import { useUserStore } from "@/store/module/user"; @@ -163,7 +164,9 @@ const NavCommon: React.FC = ({ - ⚡ + + + 9307.423 = ({ contract }) => { {fallbackText} ); + // 添加调试信息 + console.log("MessageRecord - msgType:", msgType, "content:", content); + // 根据msgType进行消息类型判断 switch (msgType) { case 1: // 文本消息 @@ -255,14 +258,7 @@ const MessageRecord: React.FC = ({ contract }) => { case 49: // 小程序/文章/其他:图文、文件 return ; - case 1090519089: { - // 文本消息 - const extractedJson = extractJsonFromContent(content); - const newContent = extractedJson - ? JSON.stringify(extractedJson) - : content; - return ; - } + default: { // 兼容旧版本和未知消息类型的处理逻辑 if (typeof content !== "string" || !content.trim()) { @@ -604,7 +600,10 @@ const MessageRecord: React.FC = ({ contract }) => { {group.time} {group.messages .filter(v => ![10000].includes(v.msgType)) - .map(renderMessage)} + .map(msg => { + console.log("Rendering message with msgType:", msg.msgType); + return renderMessage(msg); + })} ))} diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/index.tsx index dd072845..3862e460 100644 --- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/index.tsx +++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/index.tsx @@ -97,21 +97,18 @@ const SidebarMenu: React.FC = ({ loading = false }) => { className={`${styles.tabItem} ${activeTab === "chats" ? styles.active : ""}`} onClick={() => setActiveTab("chats")} > - 聊天 setActiveTab("contracts")} > - 联系人 setActiveTab("groups")} > - 朋友圈 diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/VerticalUserList/VerticalUserList.module.scss b/Touchkebao/src/pages/pc/ckbox/weChat/components/VerticalUserList/VerticalUserList.module.scss index 5ec4e8fd..cf6db02e 100644 --- a/Touchkebao/src/pages/pc/ckbox/weChat/components/VerticalUserList/VerticalUserList.module.scss +++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/VerticalUserList/VerticalUserList.module.scss @@ -9,6 +9,7 @@ text-align: center; cursor: pointer; .allFriends { + padding-top: 15px; font-size: 12px; color: #333333; } @@ -48,6 +49,16 @@ } } } + .allUser { + width: 50px; + height: 50px; + border-radius: 50%; + border: 6px #1890ff solid; + display: flex; + align-items: center; + color: #333; + justify-content: center; + } } .messageBadge { diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/VerticalUserList/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/VerticalUserList/index.tsx index 38f60f48..fbcadb56 100644 --- a/Touchkebao/src/pages/pc/ckbox/weChat/components/VerticalUserList/index.tsx +++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/VerticalUserList/index.tsx @@ -1,9 +1,8 @@ import React from "react"; -import { Avatar, Badge, Tooltip } from "antd"; +import { Avatar, Badge } from "antd"; import styles from "./VerticalUserList.module.scss"; import { useCkChatStore, asyncKfSelected } from "@/store/module/ckchat/ckchat"; -import { TeamOutlined } from "@ant-design/icons"; const VerticalUserList: React.FC = () => { // 格式化消息数量显示 const formatMessageCount = (count: number) => { @@ -16,46 +15,53 @@ const VerticalUserList: React.FC = () => { }; const kfUserList = useCkChatStore(state => state.kfUserList); const kfSelected = useCkChatStore(state => state.kfSelected); - + const allCount = kfUserList + .map(v => v.messageCount || 0) + .reduce((pre, cur) => pre + cur, 0); return ( - handleUserSelect(0)} - > - - 全部好友 + + 微信号 + handleUserSelect(0)}> + + 全部 + + + {kfUserList.map(user => ( - - handleUserSelect(user.id)} + handleUserSelect(user.id)} + > + - - - {!user.avatar && user.name.charAt(0)} - - - - - + {!user.avatar && user.name.charAt(0)} + + + + ))}