Merge branch 'develop' into yongpxu-dev

# Conflicts:
#	Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx   resolved by yongpxu-dev version

Cunkebao/src/pages/pc/ckbox/components/ChatWindow/ChatWindow.module.scss

@@ -30,10 +30,18 @@
     flex: 1;
     min-width: 0; // 防止flex子元素溢出
 
+    :global(.ant-avatar) {
+      flex-shrink: 0;
+      width: 40px;
+      height: 40px;
+    }
+
     .chatHeaderDetails {
       flex: 1;
       display: flex;
-      align-items: center;
+      flex-direction: column;
+      justify-content: center;
+      min-width: 0;
 
       .chatHeaderName {
         font-size: 16px;
@@ -63,6 +71,28 @@
         overflow: hidden;
         text-overflow: ellipsis;
       }
+
+      .chatHeaderSubInfo {
+        display: flex;
+        gap: 12px;
+        margin-top: 2px;
+        font-size: 12px;
+        overflow: hidden;
+
+        .chatHeaderRemark {
+          color: #1890ff;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
+
+        .chatHeaderWechatId {
+          color: #8c8c8c;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
+      }
     }
   }
 
@@ -298,8 +328,16 @@
         align-items: center;
         gap: 16px;
 
+        :global(.ant-avatar) {
+          flex-shrink: 0;
+          width: 48px;
+          height: 48px;
+        }
+
         .profileInfo {
           flex: 1;
+          min-width: 0;
+          overflow: hidden;
 
           h4 {
             margin: 0 0 8px 0;
@@ -308,6 +346,18 @@
             color: #262626;
           }
 
+          .profileNickname {
+            margin: 0 0 8px 0;
+            font-size: 18px;
+            font-weight: 600;
+            color: #262626;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            max-width: 100%;
+            cursor: pointer;
+          }
+
           .profileStatus {
             margin: 0 0 4px 0;
             font-size: 12px;
@@ -319,6 +369,31 @@
             font-size: 12px;
             color: #8c8c8c;
           }
+
+          .profileRemark {
+            margin: 0 0 4px 0;
+            font-size: 12px;
+            color: #1890ff;
+            
+            :global(.ant-input) {
+              font-size: 12px;
+            }
+            
+            :global(.ant-btn) {
+              padding: 0;
+              width: 20px;
+              height: 20px;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+            }
+          }
+
+          .profileWechatId {
+            margin: 0;
+            font-size: 12px;
+            color: #8c8c8c;
+          }
         }
       }