From feee08239caf29981e155fbb862f45499ba4c748 Mon Sep 17 00:00:00 2001 From: liaoxinyu Date: Mon, 31 Mar 2025 09:09:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E5=B8=81=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/img/icon/tishi.png | Bin 0 -> 6418 bytes src/assets/img/icon/zhuanzan.png | Bin 0 -> 367 bytes src/components/SecondaryNav.vue | 9 +- src/i18n/en.json | 19 +- src/i18n/tw.json | 19 +- src/router/wallet.js | 8 +- src/views/wallet/exchange-assets.vue | 8 +- src/views/wallet/funding.vue | 82 +++++- src/views/wallet/withdrawal.vue | 415 +++++++++++++++++++++++++++ static/css/bootstrap.min.css | 3 +- 10 files changed, 546 insertions(+), 17 deletions(-) create mode 100644 src/assets/img/icon/tishi.png create mode 100644 src/assets/img/icon/zhuanzan.png create mode 100644 src/views/wallet/withdrawal.vue diff --git a/src/assets/img/icon/tishi.png b/src/assets/img/icon/tishi.png new file mode 100644 index 0000000000000000000000000000000000000000..7b45fffad5bfaf648eae1caa5ec02ee30c2000a7 GIT binary patch literal 6418 zcmV+t8SUnYP)Py2%t=H+RCr$PU3rvL<(2>4*DQ@JZL`>21=xs!{TgURz(j?(L_|k%Bhg7lL&$N- z{E>-SPiD@MoH2iRPLiV;^T()U9G8ra8aE=Nh$D&Ok`Yj$>1q~{wW?d7p%G;1?z(es zy=v%gYI#-l-uJ!t>fLkd)WQ1Rckg$&KotQ)0So~!2tY-eK{tTo0FE%@FcCTk*w2K$%xE)!csH=C0@#*hY;B0r_JRZ} z^TAZ+>(9FUb=$eRvJx}8l9&!gBY-JHs80h_h1vx0Ee4?}39N^KkGhUxO=BJHSHawG zJVGF+cT7%N5H2OcY-U_cz!Z;eW)m3iGhr1Ne+^G=YnRFz$gw!jW8i8K=6V>o`Tm}o zKv;n!mYY#po^Nnae=j>A$Kt$zfg242^O;cAnj5?JVCv%x9+H8Joc4aH;T2-@e= zq+XgQa6pd5c?JyJ4aS{bQnVLjA%L0j2LO+lQCi~#nVga#FhJha##eSH@dE(YJEfd} z&m*?=d5>u9SFWIZ9GuYlar#`kg( z_xVY|K9!Xj_+>+ce&rYWeF5ZHD~t2u{_q-2IjqEM_|Il7y{epZfebwj7UYNzJ&ERZ*~@y*F3e#gLgrxqK|Q<4UDfbkP^?T zCxP73%KyfUe=14s;lu7|fbozSr60O8dGWJ)3dkw19N}RAGmBqR_@vt!AmBr0{G*q= zgPs9$^KQO_3@mYb6TwV|QXp?g@FD|vOyvSYUfMLU$c)hAs<mDG!-vY1Oz|HqJF=zl#TLp}*2F@A{$iIC`?I2v{hSS7x zAgA5VZv+1F*ol3+eIKy(b0B^INU}GfVh}KHBrtIdFn%Q9Lp!^vvJ!Kgc4s>dkBfSR;o5SD3&s@7-?f z=s1LF#TJ1n8pyFYKML|zG3}NF@Zo2GI5$Gdt^s)goHH3XbCk!l#8_fR>8@g=DhkN4 z-8>%#mKMX%jc3G#ylRu>nG4Cj2F{IGwzH>*Fu#~ubHxEU!IEI;iKJ1vR$JZ#>_6$xA7%z?RnEY6R+{O8KFgX*K8ZeEp2=WC$Y-z z#BPmiKMcIKPJfKBTkF$3?`ea8YtQpWtOgmFZMUb1Z6JFgJoDfYVA(q0Sf}po4mSVc zmB4l9>$jN;3HP)GPhRYneFA(L+Qdq>K^!O7G#>`v+`1ydWEimXvC-Cyx@Pr4rF+KF<@Zj{slQ6l6pI z^H7X2M^MJlu&h9CPVmnN__YooZE6MH+oFTBGd!c!z{O{u8uNSbDDd89tLTeg>F*i= zxy{f)4E($yLchtxJNt>ODZ)*z+Fo4aU-z@rnYgSz_cp)T4D4#x0fo|eiivUK1*OkZ z^80lD4_% zhY7f%K0+(|PmmGFy0Skc7)b7n{YvMb3CPC|eefwD87+P!agf|RLsL9PmY2TFKu)l< znW|E)qsiEnSTH`a@z>P7*Vn_496Fe7w&-V<3@X0(_SVpjN> zu9^x&Pf>B^746<{g`)bI5@tI zi=k|61>X1Z&5Z1mTrXal=f&2I{UqS2`Urie_uQudIi|s^kV1lQ#oSo3+BwCn5c9$g z1>v4t*12FNAYq@1=@j##50G_*YySCTU|&Fjg07xs73I!FJKL?=8$qCRYk`Z-(Xf(! z;hlYftf4HdI0q#6E+`~5Bj!%Y?lchFcxB9gwU~45&#f0~$o1=2mbNdDH8?@!WRepq zXf(MNXdDknV;do4H0^>50G_u^CYH15=ukzzXqgIzSNUbO1->%Cr;#;V*A+d?r5bO<^yKpw*LFC zC{I>BVJD}6oNg(m^p(rcu?9ZCl@<}@M3$3TC3POh$i_O_p8~Ru1k?Zi8z3)xAq7VR zIuccT5>qW8D-NQUqJt8~7*en_Aa PFW@O1ly;8tUA6zIxDT(ta7>T@RDRqDKS+D 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 literal 0 HcmV?d00001 diff --git a/src/assets/img/icon/zhuanzan.png b/src/assets/img/icon/zhuanzan.png new file mode 100644 index 0000000000000000000000000000000000000000..a85dbd54433b298f5c79a1ffe4d2bfb07ffa8cc7 GIT binary patch literal 367 zcmV-#0g(QQP)Px$DM>^@R9HvtmcdQLFc3xmrU6=j7NCJWKnc*o*N7Vp?9u=?Wc?PP1UPI1(88t# z8i;l+!O9yFk{HJUDVBVk`EUMsY%ehJT1>2u8Q}jpAnBImW2&<=$N@ON^NYO)> zhc~lzC%_ouUbHuWbMA=px0MI+8#6m<-=KRSA;=-s4Dk0HaLz6FbMANYRUbhw@XY}~ z0Yy=)lB)yHByZ|@a{)Apw>jWnJilYsvcbJp@kW3c)vp*yzIEXx_Db^Vr<_Trpa$?x z@}jGtu>eYvXI - + +
@@ -835,7 +836,10 @@ export default { addressText(){ $("#withdraw").modal("hide"); this.$router.push("/wallet/address") - } + }, + enterWithdraw1(item){ + this.$router.push(`/wallet/withdrawal`) + }, }, created() { diff --git a/src/views/wallet/funding.vue b/src/views/wallet/funding.vue index 39cf5dd..bce8c85 100644 --- a/src/views/wallet/funding.vue +++ b/src/views/wallet/funding.vue @@ -3,7 +3,7 @@
-
{{$t('wallet.recharge')}}&{{$t('wallet.withdrawal')}}
+
{{$t('wallet.recharge')}}&{{$t('common.c16')}}
@@ -14,7 +14,8 @@ {{$t('wallet.rechargeRecord')}}
  • - {{$t('wallet.withdrawalRecord')}} + + {{$t('common.c27')}}
    • + {{$t('contract.c0')}} + {{$t('nav.rejection')}} @@ -98,14 +100,21 @@ {{ item.amount }} {{item.withdrawal_fee}} - {{item.status_text}} +
    {{item.status_text}}
    +
    {{updateTimer(item.datetime)}}
    - + + +
    +
    {{item.remark}}
    +
    {{$t('common.c20')}}
    +
    + @@ -159,6 +168,7 @@ export default { search_coin: '', // 搜索币种 submitStatus: '', // 提交状态 timeRange: [], + timer: null, } }, @@ -248,6 +258,47 @@ export default { load3() { console.log('load3') }, + // 根据日期判断是工作日还是周末 + isWeekend(date) { + const day = date.getDay(); // 0（周日）到 6（周六） + return day === 0 || day === 6; + }, + // 根据日期动态计算目标时间 + getTargetTime(datetime) { + const now = new Date(); + const target = new Date( Date.parseTime(datetime) ); + const isWeekend = this.isWeekend(target); + + // 如果是周末，设置为 24 小时后 + if (isWeekend) { + target.setHours(target.getHours() + 24); + } else { + // 如果是工作日，设置为 12 小时后 + target.setHours(target.getHours() + 12); + } + const countdownMilliseconds = isWeekend ? 24 * 60 * 60 * 1000 : 12 * 60 * 60 * 1000; + return target.getTime() + countdownMilliseconds; + }, + updateTimer(val){ + const now = Date.now(); + const timer = this.getTargetTime(val) + const diff = timer - now; + if (diff <= 0) { + return '00:00:00'; + } + + const hours = Math.floor((diff % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60)); + const minutes = Math.floor((diff % (1000 * 60 * 60)) / (1000 * 60)); + const seconds = Math.floor((diff % (1000 * 60)) / 1000); + + return `${hours < 10 ? '0'+hours: hours}:${minutes < 10 ? '0'+minutes: minutes}:${seconds < 10 ? '0'+seconds: seconds}`; + }, + remarktext(val){ + const now = new Date() + const target = new Date(Date.parseTime(Date.parse(val))) + const diff = now.getTime() - target.getTime() + return diff > 12 * 60 * 60 * 1000 + } }, watch: { @@ -265,7 +316,15 @@ export default { }else{ this.currentTab = "deposit"; } - + + this.timer = setInterval(() => { + this.withdrawRecords.forEach((item) => { + if (item.status === 0) { + // 手动触发 Vue 的响应式更新 + this.$forceUpdate(); + } + }); + }, 1000); } }; @@ -285,4 +344,13 @@ export default { color: #101010 !important; background-color: #fff !important; } +.status_text{ + font-size: 14px; + color: #53b987; + text-shadow: 1px 1px rgba(83, 185, 135, 0.8); +} +.status_text1{ + font-size: 14px; + color: #D31027; +} diff --git a/src/views/wallet/withdrawal.vue b/src/views/wallet/withdrawal.vue new file mode 100644 index 0000000..6c21a71 --- /dev/null +++ b/src/views/wallet/withdrawal.vue @@ -0,0 +1,415 @@ + + + + + + \ No newline at end of file diff --git a/static/css/bootstrap.min.css b/static/css/bootstrap.min.css index 12199f6..c969bd8 100644 --- a/static/css/bootstrap.min.css +++ b/static/css/bootstrap.min.css @@ -646,7 +646,8 @@ pre code { .container-md, .container-sm, .container-xl { - max-width: 1140px + /* max-width: 1140px */ + max-width: 1340px } }