diff --git a/src/assets/img/icon/tishi.png b/src/assets/img/icon/tishi.png new file mode 100644 index 0000000..7b45fff Binary files /dev/null and b/src/assets/img/icon/tishi.png differ diff --git a/src/assets/img/icon/zhuanzan.png b/src/assets/img/icon/zhuanzan.png new file mode 100644 index 0000000..a85dbd5 Binary files /dev/null and b/src/assets/img/icon/zhuanzan.png differ diff --git a/src/components/SecondaryNav.vue b/src/components/SecondaryNav.vue index fb04eb4..758200b 100644 --- a/src/components/SecondaryNav.vue +++ b/src/components/SecondaryNav.vue @@ -50,11 +50,16 @@ export default { // }, { url: `/wallet/funding`, - label: this.$t('common.rechargeWithdraw') + // label: this.$t('common.rechargeWithdraw') + label: this.$t('common.c19') },{ url: `/wallet/address`, label: this.$t('common.addressManagement'), - } + }, + { + url: `/wallet/withdrawal`, + label: this.$t('common.c16'), + } ]; }, diff --git a/src/i18n/en.json b/src/i18n/en.json index 0986a62..9e3a93a 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -35,7 +35,8 @@ "c6": "Time of issue", "c7": "White paper address", "c8": "Official website address", - "c9": "brief introduction" + "c9": "brief introduction", + "rejection":"Reason for rejection" }, "common": { "million": "million", @@ -221,7 +222,21 @@ "c12": "Rejection Information", "c13": "Withdrawal password", "c14": "Please fill in the withdrawal password", - "c15": "Reset withdrawal password" + "c15": "Reset withdrawal password", + "c16": "Send", + "c17": "Transfer Address", + "c18": "Transfer Amount", + "c19": "Recharge/Transfer", + "c20": "Contact customer service", + "c21": "Select Currency", + "c22": "Password and Email Verification Code", + "c23": "Estimated arrival time", + "c24": "Received quantity", + "c25": "Withdrawal", + "c26": "The transfer quantity cannot be greater than {name}", + "c27": "Transfer Records", + "c28": "confirm", + "c29": "Please check your withdrawal address carefully and make sure it is filled in correctly. If you miss or fill in the wrong information, you may lose your assets." }, "exchange": { "search": "Search", diff --git a/src/i18n/tw.json b/src/i18n/tw.json index fbdf075..8cf93aa 100644 --- a/src/i18n/tw.json +++ b/src/i18n/tw.json @@ -35,7 +35,8 @@ "c6": "發行時間", "c7": "白皮書地址", "c8": "官網地址", - "c9": "簡介" + "c9": "簡介", + "rejection":"拒絕理由" }, "common": { "million": "幾百萬", @@ -222,7 +223,21 @@ "c12": "駁回信息", "c13": "提款密碼", "c14": "請填写提款密碼", - "c15": "重置提款密碼" + "c15": "重置提款密碼", + "c16": "轉移", + "c17": "轉移地址", + "c18": "轉移金額", + "c19": "充值/轉移", + "c20": "聯絡客服", + "c21": "選擇幣種", + "c22": "密碼及邮箱驗證碼", + "c23": "預計到帳時間", + "c24": "到帳數量", + "c25": "提現", + "c26": "轉移數量不能大於{name}", + "c27": "轉移記錄", + "c28": "確認", + "c29": "請認真核對您的提幣地址，務必檢查是否正確填寫。如果您漏添或填錯，將有可能對您的資產造成損失" }, "exchange": { "search": "搜索", diff --git a/src/router/wallet.js b/src/router/wallet.js index 4d1bbc0..470b90d 100644 --- a/src/router/wallet.js +++ b/src/router/wallet.js @@ -7,6 +7,7 @@ import Reward from '@/views/wallet/reward'; import Funding from '@/views/wallet/funding'; import Address from '@/views/wallet/address'; import Otc from '@/views/wallet/otc-assets'; +import Withdrawal from '@/views/wallet/withdrawal'; export default [ { @@ -47,5 +48,10 @@ export default [ name : "otcAssets", path : "/wallet/otc", // 地址管理 component : Otc - } + }, + { + name : "withdrawal", + path : "/wallet/withdrawal", // 提币管理 + component : Withdrawal + }, ] \ No newline at end of file diff --git a/src/views/wallet/exchange-assets.vue b/src/views/wallet/exchange-assets.vue index 1319eaf..a600b56 100644 --- a/src/views/wallet/exchange-assets.vue +++ b/src/views/wallet/exchange-assets.vue @@ -167,7 +167,8 @@
- + +
@@ -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 } }