diff --git a/src/user_pages/billDetail/index.tsx b/src/user_pages/billDetail/index.tsx index f396cc3..371c70a 100644 --- a/src/user_pages/billDetail/index.tsx +++ b/src/user_pages/billDetail/index.tsx @@ -8,6 +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" enum FreezeActions { Unfreeze = "unfreeze", @@ -75,7 +76,7 @@ const BillDetail: React.FC = () => { return ( {/* 导航栏 */} - + {/* { {pageTitle} - + */} + {/* 顶部导航栏 */} + { + Taro.navigateBack(); + }} + /> 现金交易 (元) diff --git a/src/user_pages/queryTransactions/index.scss b/src/user_pages/queryTransactions/index.scss index 1198c22..782bb60 100644 --- a/src/user_pages/queryTransactions/index.scss +++ b/src/user_pages/queryTransactions/index.scss @@ -46,7 +46,7 @@ font-size: 20px; letter-spacing: 0.38px; - & > .detail-navigator-back-icon { + &>.detail-navigator-back-icon { width: 32px; height: 32px; } @@ -249,6 +249,22 @@ gap: 4px; width: 68px; + .type_text_tag { + font-size: 8px; + font-weight: normal; + color: #ff9500; + border-radius: 999px !important; + padding: 4px; + background-color: rgba(#ff9500, 0.1); + border: solid 1px #ff9500; + + &.success { + color: #000; + background-color: rgba(0, 0, 0, .1); + border-color: #000; + } + } + .transaction_amount { font-size: 12px; font-weight: 600; @@ -279,4 +295,4 @@ padding: 20px 0 40px; background: #fff; } -} +} \ No newline at end of file diff --git a/src/user_pages/queryTransactions/index.tsx b/src/user_pages/queryTransactions/index.tsx index 9088630..dc78ddd 100644 --- a/src/user_pages/queryTransactions/index.tsx +++ b/src/user_pages/queryTransactions/index.tsx @@ -16,6 +16,7 @@ interface Transaction { create_time: string; last_modify_time: string; related_id: number; + type_text: string; } interface History { @@ -372,9 +373,14 @@ const QueryTransactions = () => { - - {get_amount_display(transaction)} - + + + {transaction.type_text} + + + {get_amount_display(transaction)} + + 余额 ¥{format_amount(transaction.amount)} diff --git a/src/user_pages/wallet/index.scss b/src/user_pages/wallet/index.scss index f56f999..ac46887 100644 --- a/src/user_pages/wallet/index.scss +++ b/src/user_pages/wallet/index.scss @@ -11,6 +11,7 @@ width: 0; height: 0; } + .custom-navbar { height: 56px; /* 通常与原生导航栏高度一致 */ @@ -48,7 +49,7 @@ font-size: 20px; letter-spacing: 0.38px; - & > .detail-navigator-back-icon { + &>.detail-navigator-back-icon { width: 32px; height: 32px; } @@ -250,6 +251,7 @@ } .transaction_list { + .loading_state, .empty_state { padding: 40px 20px; @@ -314,6 +316,12 @@ padding: 4px; background-color: rgba(#ff9500, 0.1); border: solid 1px #ff9500; + + &.success { + color: #000; + background-color: rgba(0, 0, 0, .1); + border-color: #000; + } } .transaction_amount { @@ -420,6 +428,7 @@ .filter_popup { .popup_content { padding: 16px 20px; + .form_section { .form_item { margin-bottom: 20px; @@ -453,4 +462,4 @@ } } } -} +} \ No newline at end of file diff --git a/src/user_pages/wallet/index.tsx b/src/user_pages/wallet/index.tsx index 3b6a1a5..8073226 100644 --- a/src/user_pages/wallet/index.tsx +++ b/src/user_pages/wallet/index.tsx @@ -613,7 +613,7 @@ const WalletPage: React.FC = () => { - + {transaction.type_text}