From 0589623075b5c1b01d6c49c0e0ffbd518bc8fd7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BC=96=E7=A0=81=E5=B7=A5=E7=A8=8B=E5=B8=88?= Date: Thu, 20 Aug 2026 02:30:10 +0800 Subject: [PATCH] =?UTF-8?q?feat(pc-client):=20=E5=9C=A8=E5=8F=AF=E6=94=B9?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E6=8C=89=20v2=20=E9=87=8D=E6=95=B4=20Token?= =?UTF-8?q?=E3=80=81=E4=BE=A7=E6=A0=8F=E5=AE=BD=E5=BA=A6=E4=B8=8E=E5=A5=BD?= =?UTF-8?q?=E5=8F=8B=E7=94=B3=E8=AF=B7=E4=BA=94=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Cursor Co-authored-by: multica-agent --- .../src/components/ApplicationItem/index.tsx | 66 ++++++++----------- .../FlexibleSider/flexible-sider.module.scss | 4 +- .../contact/myFriends/FriendListItem.tsx | 10 ++- pc-client/src/styles/global.scss | 39 +++++------ 4 files changed, 58 insertions(+), 61 deletions(-) diff --git a/pc-client/src/components/ApplicationItem/index.tsx b/pc-client/src/components/ApplicationItem/index.tsx index 7fa4c96..2620935 100644 --- a/pc-client/src/components/ApplicationItem/index.tsx +++ b/pc-client/src/components/ApplicationItem/index.tsx @@ -7,7 +7,6 @@ import { Button, Spin } from "antd"; import { t } from "i18next"; import { memo, useCallback, useState } from "react"; -import arrow from "@/assets/images/contact/arrowTopRight.png"; import OIMAvatar from "@/components/OIMAvatar"; import { IMSDK } from "@/layout/MainContentWrap"; import { emit } from "@/utils/events"; @@ -51,12 +50,12 @@ const ApplicationItem = ({ const getStatusStr = () => { if (source.handleResult === ApplicationHandleResult.Agree) { - return t("application.agreed"); + return "已添加"; } if (source.handleResult === ApplicationHandleResult.Reject) { - return t("application.refused"); + return "已拒绝"; } - return t("application.pending"); + return isRecv ? "待处理" : "等待对方通过"; }; const getAvatarUrl = () => { @@ -83,17 +82,18 @@ const ApplicationItem = ({ return ( -
-
+
+
-
-

{getTitle()}

-

+

+

{getTitle()}

+

{getApplicationDesc()} {(isGroup || (!isGroup && !isRecv)) && ( @@ -101,42 +101,34 @@ const ApplicationItem = ({ )}

-

- {t("application.information")}: -

-

{source.reqMsg}

+ {source.reqMsg && ( +

{source.reqMsg}

+ )}
{showActionBtn && ( -
-
- -
-
- -
+
+ +
)} {!showActionBtn && ( -
- {!isRecv && } +

{getStatusStr()}

)} diff --git a/pc-client/src/components/FlexibleSider/flexible-sider.module.scss b/pc-client/src/components/FlexibleSider/flexible-sider.module.scss index aeaa272..33cba73 100644 --- a/pc-client/src/components/FlexibleSider/flexible-sider.module.scss +++ b/pc-client/src/components/FlexibleSider/flexible-sider.module.scss @@ -1,7 +1,7 @@ .sider_resize { - width: 300px; + width: 280px; min-width: 240px; - max-width: 45vw; + max-width: 400px; resize: horizontal; overflow: scroll; height: 100%; diff --git a/pc-client/src/pages/contact/myFriends/FriendListItem.tsx b/pc-client/src/pages/contact/myFriends/FriendListItem.tsx index b43597e..8cac9aa 100644 --- a/pc-client/src/pages/contact/myFriends/FriendListItem.tsx +++ b/pc-client/src/pages/contact/myFriends/FriendListItem.tsx @@ -11,11 +11,15 @@ const FriendListItem = ({ }) => { return (
showUserCard(friend.userID)} > - -
{friend.remark || friend.nickname}
+ +
+
+ {friend.remark || friend.nickname} +
+
); }; diff --git a/pc-client/src/styles/global.scss b/pc-client/src/styles/global.scss index c5944c1..93bc7f0 100644 --- a/pc-client/src/styles/global.scss +++ b/pc-client/src/styles/global.scss @@ -1,22 +1,28 @@ :root { --full-height: 100%; + --primary: #3b87f5; + --primary-active: #ebf3fe; + --primary-pressed: #2e75e0; + --avatar-gray: #8593a8; + --page-bg: #ffffff; + --chat-bg: #f5f6f8; + --search-bg: #f2f3f5; --chat-bubble: #ffffff; --chat-bubble-sender: #d6e7fc; --base-black: #1d2129; - --primary: #3b87f5; - --primary-active: #ebf3fe; - --top-search-bar: #3b87f5; --sub-text: #86909c; - --gap-text: #eeeeee; - --search-bg: #f2f3f5; - --chat-bg: #f5f6f8; --warn-text: #f53f3f; + --gap-text: #eeeeee; + --banner-bg: #3a3f47; + --mask-bg: #000000; + --success: #00b42a; + --warning: #ff7d00; + --top-search-bar: #3b87f5; --moment-text: #6085b1; --searchbar-height: 2.5rem; - --avatar-gray: #8593a8; - --search-bg: #f2f3f5; - --chat-bg: #f5f6f8; --call-wait-bg: #f2f8ff; + --radius-control: 8px; + --radius-modal: 12px; } @media only screen and (max-width: 600px) { @@ -28,8 +34,7 @@ html { height: var(--full-height); - font-family: "Noto Sans SC", "SF Pro SC", "SF Pro Text", "SF Pro Icons", "PingFang SC", - "Helvetica Neue", "Helvetica", "Arial", sans-serif; + font-family: "Noto Sans SC", "PingFang SC", "Microsoft YaHei", sans-serif; div { color: var(--base-black); @@ -44,22 +49,18 @@ body, } ::-webkit-scrollbar { - width: 6px; + width: 8px; background-color: transparent; } ::-webkit-scrollbar-track { background: transparent; } ::-webkit-scrollbar-thumb { - border-radius: 3px; - background: #b7bdcb; - box-shadow: 4px 4px 15px rgba(112, 124, 151, 0.05), - 2px 2px 10px rgba(112, 124, 151, 0.1), 1px 1px 50px rgba(112, 124, 151, 0.15); + border-radius: 4px; + background: rgba(0, 0, 0, 0.15); } ::-webkit-scrollbar-thumb:hover { - border-radius: 3px; - box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); - background-color: rgba(245, 238, 238, 1); + background: rgba(0, 0, 0, 0.25); } #chat-list {