diff --git a/src/user_pages/billDetail/index.tsx b/src/user_pages/billDetail/index.tsx index cf63674..d123baa 100644 --- a/src/user_pages/billDetail/index.tsx +++ b/src/user_pages/billDetail/index.tsx @@ -8,7 +8,8 @@ import httpService from "@/services/httpService"; import { TransactionType, TransactionSubType } from "@/user_pages/wallet/index"; import "./index.scss"; import img from "@/config/images"; -import { GeneralNavbar } from "@/components" +import { GeneralNavbar } from "@/components"; +import { useGlobalState } from "@/store/global"; enum FreezeActions { Unfreeze = "unfreeze", @@ -33,6 +34,9 @@ interface BillDetail { } const BillDetail: React.FC = () => { + // 获取导航栏高度信息 + const { statusNavbarHeightInfo } = useGlobalState() || {}; + const { totalHeight = 98 } = statusNavbarHeightInfo || {}; // 获取当前页面的配置 const currentPage = Taro.getCurrentInstance(); const pageConfig = currentPage.page?.config; @@ -101,7 +105,10 @@ const BillDetail: React.FC = () => { Taro.navigateBack(); }} /> - + 现金交易 (元) {billDetail.transaction_type === "expense" ? "-" : "+"} diff --git a/src/user_pages/downloadBill/index.tsx b/src/user_pages/downloadBill/index.tsx index 4ff6e15..366d1ba 100644 --- a/src/user_pages/downloadBill/index.tsx +++ b/src/user_pages/downloadBill/index.tsx @@ -9,6 +9,7 @@ import { DialogCalendarCard } from "@/components/index"; import { CommonPopup, GeneralNavbar } from "@/components"; import httpService from "@/services/httpService"; import img from "@/config/images"; +import { useGlobalState } from "@/store/global"; export enum TransactionSubType { All = "", @@ -31,6 +32,9 @@ interface TransactionLoadParams { date_range?: string[]; } const DownloadBill: React.FC = () => { + // 获取导航栏高度信息 + const { statusNavbarHeightInfo } = useGlobalState() || {}; + const { totalHeight = 98 } = statusNavbarHeightInfo || {}; // 获取当前页面的配置 const currentPage = Taro.getCurrentInstance(); const pageConfig = currentPage.page?.config; @@ -271,7 +275,10 @@ const DownloadBill: React.FC = () => { Taro.navigateBack(); }} /> - + 最长可导出三个月的账单 示例文件 diff --git a/src/user_pages/downloadBillRecords/index.tsx b/src/user_pages/downloadBillRecords/index.tsx index 0668a5d..b075585 100644 --- a/src/user_pages/downloadBillRecords/index.tsx +++ b/src/user_pages/downloadBillRecords/index.tsx @@ -6,6 +6,7 @@ import httpService from "@/services/httpService"; import Taro, { useReachBottom } from "@tarojs/taro"; import img from "@/config/images"; import { EmptyState, GeneralNavbar } from "@/components"; +import { useGlobalState } from "@/store/global"; interface BillRecord { id: number; @@ -24,6 +25,9 @@ interface BillRecord { } const DownloadBillRecords: React.FC = () => { + // 获取导航栏高度信息 + const { statusNavbarHeightInfo } = useGlobalState() || {}; + const { totalHeight = 98 } = statusNavbarHeightInfo || {}; // 获取当前页面的配置 const currentPage = Taro.getCurrentInstance(); const pageConfig = currentPage.page?.config; @@ -90,7 +94,10 @@ const DownloadBillRecords: React.FC = () => { Taro.navigateBack(); }} /> - + {records.length ? records.map((record) => ( {record.file_name} diff --git a/src/user_pages/queryTransactions/index.tsx b/src/user_pages/queryTransactions/index.tsx index 7bdc093..b976604 100644 --- a/src/user_pages/queryTransactions/index.tsx +++ b/src/user_pages/queryTransactions/index.tsx @@ -6,6 +6,7 @@ import { withAuth, GeneralNavbar } from "@/components"; import "./index.scss"; import httpService from "@/services/httpService"; import Taro, { useReachBottom } from "@tarojs/taro"; +import { useGlobalState } from "@/store/global"; interface Transaction { id: number; user_id: number; @@ -30,6 +31,9 @@ interface TransactionLoadParams { } const QueryTransactions = () => { + // 获取导航栏高度信息 + const { statusNavbarHeightInfo } = useGlobalState() || {}; + const { totalHeight = 98 } = statusNavbarHeightInfo || {}; // 获取当前页面的配置 const currentPage = Taro.getCurrentInstance(); const pageConfig = currentPage.page?.config; @@ -271,7 +275,10 @@ const QueryTransactions = () => { }} /> {/* 搜索 */} - + { + // 获取导航栏高度信息 + const { statusNavbarHeightInfo } = useGlobalState() || {}; + const { totalHeight = 98 } = statusNavbarHeightInfo || {}; // 获取当前页面的配置 const currentPage = Taro.getCurrentInstance(); const pageConfig = currentPage.page?.config; @@ -162,7 +166,10 @@ const SetTransactionPassword: React.FC = () => { Taro.navigateBack(); }} /> - + 交易密码 { + // 获取导航栏高度信息 + const { statusNavbarHeightInfo } = useGlobalState() || {}; + const { totalHeight = 98 } = statusNavbarHeightInfo || {}; // 获取当前页面的配置 const currentPage = Taro.getCurrentInstance(); const pageConfig = currentPage.page?.config; @@ -135,7 +139,10 @@ const ValidPhone: React.FC = () => { Taro.navigateBack(); }} /> - + 手机号 diff --git a/src/user_pages/withdrawal/index.tsx b/src/user_pages/withdrawal/index.tsx index c3a6f8b..527c356 100644 --- a/src/user_pages/withdrawal/index.tsx +++ b/src/user_pages/withdrawal/index.tsx @@ -6,6 +6,7 @@ import httpService from "@/services/httpService"; import "./index.scss"; import { CommonPopup, GeneralNavbar } from "@/components"; import { useKeyboardHeight } from "@/store/keyboardStore"; +import { useGlobalState } from "@/store/global"; import img from "@/config/images"; interface WalletInfo { @@ -17,6 +18,9 @@ interface WalletInfo { } const Withdrawal: React.FC = () => { + // 获取导航栏高度信息 + const { statusNavbarHeightInfo } = useGlobalState() || {}; + const { totalHeight = 98 } = statusNavbarHeightInfo || {}; // 获取当前页面的配置 const currentPage = Taro.getCurrentInstance(); const pageConfig = currentPage.page?.config; @@ -311,7 +315,10 @@ const Withdrawal: React.FC = () => { Taro.navigateBack(); }} /> - + 提现金额 ¥