From 0cf5acde1e2d5643ca928777adbaea30b58dbbfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=88=90?= <light.zhang@ysinc.com>
Date: Fri, 14 Nov 2025 23:38:24 +0800
Subject: [PATCH] 1

---
 src/components/CustomNavbar/index.module.scss | 10 -------
 src/components/CustomNavbar/index.tsx         | 27 -------------------
 src/user_pages/follow/index.tsx               | 19 +++++--------
 src/user_pages/other/index.tsx                |  1 -
 4 files changed, 7 insertions(+), 50 deletions(-)
 delete mode 100644 src/components/CustomNavbar/index.module.scss
 delete mode 100644 src/components/CustomNavbar/index.tsx

diff --git a/src/components/CustomNavbar/index.module.scss b/src/components/CustomNavbar/index.module.scss
deleted file mode 100644
index 68195a6..0000000
--- a/src/components/CustomNavbar/index.module.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-.customerNavbar {
-  position: fixed;
-  top: 0;
-  left: 0;
-  overflow: hidden;
-  z-index: 99;
-  width: 100%;
-  // 背景颜色通过 style 动态设置，默认 #FAFAFA
-  box-shadow: none;
-}
diff --git a/src/components/CustomNavbar/index.tsx b/src/components/CustomNavbar/index.tsx
deleted file mode 100644
index 0821054..0000000
--- a/src/components/CustomNavbar/index.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import { View } from "@tarojs/components";
-import styles from "./index.module.scss";
-import { useGlobalState } from "@/store/global";
-
-interface IProps {
-  children: any;
-  backgroundColor?: string; // 背景颜色，不设置则透明
-}
-
-const CustomNavbar = (props: IProps) => {
-  const { children, backgroundColor } = props;
-  const { statusNavbarHeightInfo } = useGlobalState();
-  const { statusBarHeight, navBarHeight } = statusNavbarHeightInfo;
-
-  return (
-    <View
-      className={styles.customerNavbar}
-      style={{
-        height: `${statusBarHeight + navBarHeight}px`,
-        backgroundColor: backgroundColor || 'transparent'
-      }}
-    >
-      {children}
-    </View>
-  );
-};
-export default CustomNavbar;
diff --git a/src/user_pages/follow/index.tsx b/src/user_pages/follow/index.tsx
index d58d93d..9d6ad64 100644
--- a/src/user_pages/follow/index.tsx
+++ b/src/user_pages/follow/index.tsx
@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import { View, Text, ScrollView } from '@tarojs/components';
 import Taro from '@tarojs/taro';
-import CustomNavbar from '@/components/CustomNavbar';
+import { GeneralNavbar } from '@/components';
 import FollowUserCard from '@/components/FollowUserCard';
 import { FollowService, FollowUser } from '@/services/followService';
 import { withAuth } from '@/components';
@@ -235,17 +235,12 @@ const FollowPage: React.FC = () => {
   return (
     <View className="follow_page">
       {/* 自定义导航栏 */}
-      <CustomNavbar backgroundColor="#FAFAFA">
-        <View className="navbar_content">
-          <View className="navbar_back" onClick={() => Taro.navigateBack()}>
-            <View className="back_icon" />
-          </View>
-          <Text className="navbar_title">粉丝</Text>
-          <View className="navbar_action">
-            <View className="action_icon" />
-          </View>
-        </View>
-      </CustomNavbar>
+      <GeneralNavbar 
+        title="粉丝"
+        titlePosition="left"
+        backgroundColor="#FAFAFA"
+        showBack={true}
+      />
 
       {/* 标签页导航 */}
       <View className="tab_navigation">
diff --git a/src/user_pages/other/index.tsx b/src/user_pages/other/index.tsx
index a58590b..43530f8 100644
--- a/src/user_pages/other/index.tsx
+++ b/src/user_pages/other/index.tsx
@@ -14,7 +14,6 @@ import {
 } from "@/components/UserInfo";
 import { UserService, UserInfoType } from "@/services/userService";
 import * as LoginService from "@/services/loginService";
-import CustomNavbar from "@/components/CustomNavbar";
 import { useGlobalState } from "@/store/global";
 import { GeneralNavbar } from "@/components";