diff --git a/.gitignore b/.gitignore
index d0a811b..ddaf3df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ node_modules/
src/config/env.ts
.vscode
*.http
+env.ts
diff --git a/src/user_pages/setTransactionPassword/index.tsx b/src/user_pages/setTransactionPassword/index.tsx
index eb886e2..9735cdb 100644
--- a/src/user_pages/setTransactionPassword/index.tsx
+++ b/src/user_pages/setTransactionPassword/index.tsx
@@ -62,7 +62,7 @@ const SetTransactionPassword: React.FC = () => {
const { new_password, confirm_password, sms_code } = formData;
if (handleType === "set") {
setValid(
- !sms_code && new_password.length === 6 && confirm_password.length === 6
+ !!sms_code && new_password.length === 6 && confirm_password.length === 6
);
} else {
setValid(new_password.length === 6 && confirm_password.length === 6);
diff --git a/src/user_pages/wallet/index.scss b/src/user_pages/wallet/index.scss
index 1d1e4c0..e88218c 100644
--- a/src/user_pages/wallet/index.scss
+++ b/src/user_pages/wallet/index.scss
@@ -303,7 +303,18 @@
flex-direction: column;
align-items: flex-end;
gap: 4px;
- width: 68px;
+ width: 100px;
+
+
+ .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;
+ }
.transaction_amount {
font-size: 12px;
@@ -311,6 +322,7 @@
color: #000;
line-height: 1.5;
text-align: right;
+ margin-left: 3px;
}
.balance_info {
diff --git a/src/user_pages/wallet/index.tsx b/src/user_pages/wallet/index.tsx
index bd62747..9a0fa74 100644
--- a/src/user_pages/wallet/index.tsx
+++ b/src/user_pages/wallet/index.tsx
@@ -20,13 +20,16 @@ interface Transaction {
create_time: string;
last_modify_time: string;
related_id: number;
+ type_text: string | null;
+ total_balance_after:string;
+
}
// 钱包信息类型
interface WalletInfo {
balance: number;
frozen_balance?: number;
- total_balance?: number;
+ total_balance: number;
total_income?: number;
total_withdraw?: number;
}
@@ -292,7 +295,7 @@ const WalletPage: React.FC = () => {
}
if (wallet_info.balance <= 0) {
Taro.showToast({
- title: "余额不足",
+ title: "可提现金额不足",
icon: "error",
duration: 2000,
});
@@ -473,14 +476,14 @@ const WalletPage: React.FC = () => {
¥
- {Math.floor(wallet_info.balance)}
+ {(wallet_info.total_balance)?.toFixed(2)}
-
+ {/*
.
{((wallet_info.balance % 1) * 100)
.toFixed(0)
.padStart(2, "0")}
-
+ */}