Merge branch 'yongpxu-dev' into yongpxu-dev4

Touchkebao/src/pages/pc/ckbox/components/NavCommon/index.module.scss

@@ -79,7 +79,6 @@
     .userInfo {
       display: flex;
       align-items: center;
-      gap: 16px;
       padding: 8px 0;
 
       .suanli {
@@ -117,14 +116,14 @@
       height: 40px;
       border-radius: 80px;
       transition: all 0.3s;
-      border: 1px solid #e9ecef;
       background: #fff;
       cursor: pointer;
-
+      border: 1px solid #e9ecef;
       &:hover {
         background-color: #f8f9fa;
         border-color: #1890ff;
         box-shadow: 0 0px 12px rgba(24, 144, 255, 0.15);
+        border: 1px solid #e9ecef;
       }
 
       .anticon {
@@ -447,28 +446,3 @@
   color: #52c41a;
   margin: 2px 0 0 0;
 }
-
-// ===== 响应式设计 =====
-@media (max-width: 768px) {
-  .header {
-    padding: 0 12px;
-
-    .headerLeft {
-      .title {
-        font-size: 16px;
-      }
-    }
-
-    .headerRight {
-      .userInfo {
-        .username {
-          display: none;
-        }
-      }
-    }
-  }
-
-  .drawer {
-    width: 280px !important;
-  }
-}

Touchkebao/src/pages/pc/ckbox/components/NavCommon/index.tsx

@@ -180,14 +180,12 @@ const NavCommon: React.FC<NavCommonProps> = ({
                 />
               </div>
             </Dropdown>
-            <Badge count={messageCount} size="small">
-              <div
-                className={styles.messageButton}
-                onClick={handleMessageClick}
-              >
-                <BellOutlined style={{ fontSize: 18 }} />
-              </div>
-            </Badge>
+
+            <div className={styles.messageButton} onClick={handleMessageClick}>
+              <Badge count={messageCount} size="small">
+                <BellOutlined style={{ fontSize: 20 }} />
+              </Badge>
+            </div>
           </Space>
         </div>
       </Header>