1

src/user_pages/billDetail/index.tsx

@@ -8,7 +8,7 @@ import httpService from "@/services/httpService";
 import { TransactionType, TransactionSubType } from "@/user_pages/wallet/index";
 import "./index.scss";
 import img from "@/config/images";
-import { BackNavbar } from "@/components"
+import { GeneralNavbar } from "@/components"
 
 enum FreezeActions {
   Unfreeze = "unfreeze",
@@ -93,9 +93,9 @@ const BillDetail: React.FC = () => {
         </View>
       </View> */}
       {/* 顶部导航栏 */}
-      <BackNavbar
+      <GeneralNavbar
         title={pageTitle}
-        showBackButton={true}
+        showBack={true}
         showAvatar={false}
         onBack={() => {
           Taro.navigateBack();

src/user_pages/downloadBill/index.tsx

@@ -6,7 +6,7 @@ import dayjs from "dayjs";
 import "./index.scss";
 import { DialogCalendarCard } from "@/components/index";
 // import { CalendarUI } from "@/components";
-import { CommonPopup, BackNavbar } from "@/components";
+import { CommonPopup, GeneralNavbar } from "@/components";
 import httpService from "@/services/httpService";
 import img from "@/config/images";
 
@@ -263,9 +263,9 @@ const DownloadBill: React.FC = () => {
         </View>
       </View> */}
       {/* 顶部导航栏 */}
-      <BackNavbar
+      <GeneralNavbar
         title={pageTitle}
-        showBackButton={true}
+        showBack={true}
         showAvatar={false}
         onBack={() => {
           Taro.navigateBack();

src/user_pages/downloadBillRecords/index.tsx

@@ -5,7 +5,7 @@ import "./index.scss";
 import httpService from "@/services/httpService";
 import Taro, { useReachBottom } from "@tarojs/taro";
 import img from "@/config/images";
-import { EmptyState, BackNavbar } from "@/components";
+import { EmptyState, GeneralNavbar } from "@/components";
 
 interface BillRecord {
   id: number;
@@ -82,9 +82,9 @@ const DownloadBillRecords: React.FC = () => {
         </View>
       </View> */}
       {/* 顶部导航栏 */}
-      <BackNavbar
+      <GeneralNavbar
         title={pageTitle}
-        showBackButton={true}
+        showBack={true}
         showAvatar={false}
         onBack={() => {
           Taro.navigateBack();

src/user_pages/edit/index.tsx

@@ -6,7 +6,7 @@ import "./index.scss";
 import { UserService, PickerOption } from "@/services/userService";
 import { clear_login_state } from "@/services/loginService";
 import { convert_db_gender_to_display } from "@/utils/genderUtils";
-import { EditModal, BackNavbar } from "@/components";
+import { EditModal, GeneralNavbar } from "@/components";
 import img from "@/config/images";
 import CommonDialog from "@/components/CommonDialog";
 import { useUserActions, useUserInfo } from "@/store/userStore";
@@ -366,11 +366,11 @@ const EditProfilePage: React.FC = () => {
         </View>
       </View> */}
       {/* 顶部导航栏 */}
-      <BackNavbar
+      <GeneralNavbar
         title=""
-        showBackButton={true}
+        showBack={true}
         showAvatar={false}
-        backgroundColor="unset"
+        backgroundColor="transparent"
         onBack={() => {
           Taro.navigateBack();
         }}

src/user_pages/other/index.tsx

@@ -16,7 +16,7 @@ import { UserService, UserInfoType } from "@/services/userService";
 import * as LoginService from "@/services/loginService";
 import CustomNavbar from "@/components/CustomNavbar";
 import { useGlobalState } from "@/store/global";
-import { BackNavbar } from "@/components";
+import { GeneralNavbar } from "@/components";
 
 const OtherUserPage: React.FC = () => {
   // 获取页面参数
@@ -229,11 +229,11 @@ const OtherUserPage: React.FC = () => {
         </View>
       </CustomNavbar> */}
       {/* 顶部导航栏 */}
-      <BackNavbar
+      <GeneralNavbar
         title=""
-        showBackButton={true}
+        showBack={true}
         showAvatar={false}
-        backgroundColor="unset"
+        backgroundColor="transparent"
         onBack={() => {
           Taro.navigateBack();
         }}

src/user_pages/queryTransactions/index.tsx

@@ -2,7 +2,7 @@ import { useState, useEffect, useRef } from "react";
 import { View, Image, Text } from "@tarojs/components";
 import { Input } from "@nutui/nutui-react-taro";
 import img from "@/config/images";
-import { withAuth, BackNavbar } from "@/components";
+import { withAuth, GeneralNavbar } from "@/components";
 import "./index.scss";
 import httpService from "@/services/httpService";
 import Taro, { useReachBottom } from "@tarojs/taro";
@@ -262,9 +262,9 @@ const QueryTransactions = () => {
           </View>
         </View> */}
         {/* 顶部导航栏 */}
-        <BackNavbar
+        <GeneralNavbar
           title={pageTitle}
-          showBackButton={true}
+          showBack={true}
           showAvatar={false}
           onBack={() => {
             Taro.navigateBack();

src/user_pages/setTransactionPassword/index.tsx

@@ -6,7 +6,7 @@ import "./index.scss";
 import httpService from "@/services/httpService";
 import { useKeyboardHeight } from "@/store/keyboardStore";
 import img from "@/config/images";
-import { BackNavbar } from "@/components";
+import { GeneralNavbar } from "@/components";
 
 interface FormFields {
   new_password: string;
@@ -154,9 +154,9 @@ const SetTransactionPassword: React.FC = () => {
         </View>
       </View> */}
       {/* 顶部导航栏 */}
-      <BackNavbar
+      <GeneralNavbar
         title={pageTitle}
-        showBackButton={true}
+        showBack={true}
         showAvatar={false}
         onBack={() => {
           Taro.navigateBack();

src/user_pages/validPhone/index.tsx

@@ -7,7 +7,7 @@ import httpService from "@/services/httpService";
 import { useUserInfo } from "@/store/userStore";
 import { useKeyboardHeight } from "@/store/keyboardStore";
 import img from "@/config/images";
-import { BackNavbar } from "@/components";
+import { GeneralNavbar } from "@/components";
 
 interface FormFields {
   phone?: string;
@@ -127,9 +127,9 @@ const ValidPhone: React.FC = () => {
         </View>
       </View> */}
       {/* 顶部导航栏 */}
-      <BackNavbar
+      <GeneralNavbar
         title={pageTitle}
-        showBackButton={true}
+        showBack={true}
         showAvatar={false}
         onBack={() => {
           Taro.navigateBack();

src/user_pages/wallet/index.tsx

@@ -4,7 +4,7 @@ import Taro, { useDidShow, useReachBottom } from "@tarojs/taro";
 import "./index.scss";
 import { CommonPopup, EmptyState } from "@/components";
 import httpService from "@/services/httpService";
-import { withAuth, BackNavbar } from "@/components";
+import { withAuth, GeneralNavbar } from "@/components";
 import { PopupPicker } from "@/components/Picker/index";
 import { handleCustomerService } from "@/services/userService";
 import img from "@/config/images";
@@ -475,9 +475,9 @@ const WalletPage: React.FC = () => {
         </View>
       </View> */}
       {/* 顶部导航栏 */}
-      <BackNavbar
+      <GeneralNavbar
         title={pageTitle}
-        showBackButton={true}
+        showBack={true}
         showAvatar={false}
         onBack={() => {
           Taro.navigateBack();

src/user_pages/withdrawal/index.tsx

@@ -4,7 +4,7 @@ import Taro, { useDidShow } from "@tarojs/taro";
 
 import httpService from "@/services/httpService";
 import "./index.scss";
-import { CommonPopup, BackNavbar } from "@/components";
+import { CommonPopup, GeneralNavbar } from "@/components";
 import { useKeyboardHeight } from "@/store/keyboardStore";
 import img from "@/config/images";
 
@@ -298,9 +298,9 @@ const Withdrawal: React.FC = () => {
         </View>
       </View> */}
       {/* 顶部导航栏 */}
-      <BackNavbar
+      <GeneralNavbar
         title={pageTitle}
-        showBackButton={true}
+        showBack={true}
         showAvatar={false}
         onBack={() => {
           const pages = Taro.getCurrentPages()