From 33f436ea77ff38db50aa9ef7053787de46a1954b Mon Sep 17 00:00:00 2001 From: Ultrame <1019265060@qq.com> Date: Thu, 2 Oct 2025 21:35:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/user_pages/downloadBill/index.scss | 15 ++++++++++++++- src/user_pages/downloadBill/index.tsx | 5 +++-- src/user_pages/queryTransactions/index.tsx | 14 ++++++++------ src/user_pages/validPhone/index.scss | 4 ++++ src/user_pages/validPhone/index.tsx | 2 +- src/user_pages/wallet/index.tsx | 2 ++ src/user_pages/withdrawal/index.scss | 8 +++----- src/user_pages/withdrawal/index.tsx | 6 +++--- 8 files changed, 38 insertions(+), 18 deletions(-) diff --git a/src/user_pages/downloadBill/index.scss b/src/user_pages/downloadBill/index.scss index e0682d9..96a7fe2 100644 --- a/src/user_pages/downloadBill/index.scss +++ b/src/user_pages/downloadBill/index.scss @@ -14,6 +14,7 @@ font-size: 16px; margin: 40px 0; text-align: center; + .button_text { color: #007aff; } @@ -21,6 +22,7 @@ .form_container { padding: 20px; + .form_item { height: 50px; border-bottom: 1px solid rgba(0, 0, 0, 0.05); @@ -50,6 +52,7 @@ justify-content: space-between; align-items: center; position: relative; + &::before, &::after { content: ""; @@ -78,7 +81,7 @@ border-radius: 20px; padding: 4px 8px; - & + .option_button { + &+.option_button { margin-left: 12px; } @@ -106,9 +109,11 @@ display: flex; flex-direction: column; align-items: center; + .button_text { color: #007aff; } + .download_button { width: 345px; height: 54px; @@ -129,9 +134,14 @@ font-style: normal; font-weight: 600; line-height: normal; + + &.disabled { + color: rgba(255, 255, 255, 0.30); + } } } } + // 过滤弹窗 .filter_popup { padding: 20px; @@ -140,6 +150,7 @@ .form_section { .form_item { margin-bottom: 20px; + .form_label { display: inline-block; font-family: PingFang SC; @@ -153,11 +164,13 @@ display: grid; grid-template-columns: repeat(3, 1fr); gap: 8px; + .option_item { background-color: #0000000D; text-align: center; padding: 8px; border-radius: 4px; + &.active { background-color: #000000; color: #fff; diff --git a/src/user_pages/downloadBill/index.tsx b/src/user_pages/downloadBill/index.tsx index 5632094..ed58d4b 100644 --- a/src/user_pages/downloadBill/index.tsx +++ b/src/user_pages/downloadBill/index.tsx @@ -174,9 +174,10 @@ const DownloadBill: React.FC = () => { setShowFilterPopup(false); }; const handleDownloadBill = async () => { + const { start, end } = dateRange; + if (!start || !end) return; try { const { transaction_sub_type } = load_transactions_params; - const { start, end } = dateRange; const date_range = [start, end]; const res = await httpService.post("/wallet/download_bill", { transaction_sub_type, date_range }); const { fileUrl, fileName } = res.data; @@ -297,7 +298,7 @@ const DownloadBill: React.FC = () => { > 下载记录 - diff --git a/src/user_pages/queryTransactions/index.tsx b/src/user_pages/queryTransactions/index.tsx index 051bace..721606c 100644 --- a/src/user_pages/queryTransactions/index.tsx +++ b/src/user_pages/queryTransactions/index.tsx @@ -44,9 +44,6 @@ const QueryTransactions = () => { const [totalpages, setTotalpages] = useState(1); useEffect(() => { getSearchHistory(); - // return () => { - // handleClear(); - // }; }, []); useEffect(() => { @@ -69,6 +66,7 @@ const QueryTransactions = () => { if (isInitialMount.current) { isInitialMount.current = false; } else { + if (load_transactions_params.keyword === "") return; handleSearch(); } }, [load_transactions_params]); @@ -102,6 +100,7 @@ const QueryTransactions = () => { * @description 点击清空输入内容 */ const handleClear = () => { + setKeyword(""); setTransactions([]); set_load_transactions_params((prev) => { return { ...prev, page: 1, keyword: "" }; @@ -113,6 +112,7 @@ const QueryTransactions = () => { * @param value */ const handleHistoryClick = (item: { id: number; keyword: string }) => { + setKeyword(item?.keyword); set_load_transactions_params((prev) => { return { ...prev, page: 1, keyword: item?.keyword }; }); @@ -126,6 +126,11 @@ const QueryTransactions = () => { setSearchHistory([]); }; + useEffect(() => { + if (load_transactions_params.keyword === "") return; + getSearchHistory(); + }, [load_transactions_params.keyword]) + /** * @description 点击搜索 */ @@ -135,9 +140,6 @@ const QueryTransactions = () => { const response = await httpService.post("/wallet/transactions", { ...load_transactions_params }); - if (load_transactions_params.keyword !== "") { - getSearchHistory(); - } if (response && response.data && response.data.list.length) { setTransactions([...transactions, ...response.data.list]); setTotalpages(response.data.totalPages); diff --git a/src/user_pages/validPhone/index.scss b/src/user_pages/validPhone/index.scss index e231107..1e8283c 100644 --- a/src/user_pages/validPhone/index.scss +++ b/src/user_pages/validPhone/index.scss @@ -45,5 +45,9 @@ border-radius: 16px; font-size: 16px; font-weight: 600; + + &.disabled { + color: rgba(255, 255, 255, 0.30); + } } } \ No newline at end of file diff --git a/src/user_pages/validPhone/index.tsx b/src/user_pages/validPhone/index.tsx index 9ee794c..7f5c011 100644 --- a/src/user_pages/validPhone/index.tsx +++ b/src/user_pages/validPhone/index.tsx @@ -86,7 +86,7 @@ const ValidPhone: React.FC = () => { { handleInput(e, "sms_code") }}> - + ); }; diff --git a/src/user_pages/wallet/index.tsx b/src/user_pages/wallet/index.tsx index d57b50f..b788df6 100644 --- a/src/user_pages/wallet/index.tsx +++ b/src/user_pages/wallet/index.tsx @@ -161,6 +161,7 @@ const WalletPage: React.FC = () => { set_load_transactions_params((prev) => { return { ...prev, + page: 1, type, transaction_sub_type, }; @@ -628,6 +629,7 @@ const WalletPage: React.FC = () => { const [year, month] = e; set_load_transactions_params({ ...load_transactions_params, + page: 1, date: `${year}-${String(month).padStart(2, "0")}`, }); }} diff --git a/src/user_pages/withdrawal/index.scss b/src/user_pages/withdrawal/index.scss index 7455877..c3d0003 100644 --- a/src/user_pages/withdrawal/index.scss +++ b/src/user_pages/withdrawal/index.scss @@ -27,6 +27,7 @@ color: #000; display: flex; align-items: flex-end; + overflow: hidden; gap: 8px; border-bottom: 0.5px solid var(--Fills-Tertiary, #7878801F); margin: 12px 0; @@ -38,17 +39,14 @@ Input { font-size: 32px; - overflow: unset; - text-overflow: unset; - height: 32px; - line-height: 32px; + height: 36px; + min-height: 0; margin: 0; padding: 0; border: none; background: none; color: inherit; outline: none; - box-sizing: border-box; -webkit-appearance: none; -moz-appearance: none; appearance: none; diff --git a/src/user_pages/withdrawal/index.tsx b/src/user_pages/withdrawal/index.tsx index 39f0533..9a56417 100644 --- a/src/user_pages/withdrawal/index.tsx +++ b/src/user_pages/withdrawal/index.tsx @@ -245,7 +245,7 @@ const Withdrawal: React.FC = () => { 提现金额 ¥ - + { !showTips && (Number(inputValue) !== 0) && ( @@ -255,7 +255,7 @@ const Withdrawal: React.FC = () => { {`我的余额:¥${walletInfo.balance}`} - (可提现余额:¥5000.00) + {/* (可提现余额:¥5000.00) */} 全部提现 @@ -297,7 +297,7 @@ const Withdrawal: React.FC = () => { hideFooter={true} style={{ bottom: isKeyboardVisible ? `${keyboardHeight}px` : undefined }} > - + {`¥${inputValue}`} {