diff --git a/src/api/wallet.js b/src/api/wallet.js index d7b92bb..58fa676 100644 --- a/src/api/wallet.js +++ b/src/api/wallet.js @@ -159,6 +159,18 @@ class Wallet { static addAdvice(data){ return server.post('/user/addAdvice',data,{loading:true}) } + static activity(data){ + return server.get('/financial/activity',{params:data}) + } + static financialNow(data){ + return server.post('/financial/financialNow',data,{loading:true}) + } + static financial_records(data){ + return server.get('/financial/financial_records',{params:data}) + } + static financial_redemption(data){ + return server.get('/financial/financial_redemption',{params:data}) + } } export default Wallet; diff --git a/src/assets/img/icon/hint.png b/src/assets/img/icon/hint.png new file mode 100644 index 0000000..74bd065 Binary files /dev/null and b/src/assets/img/icon/hint.png differ diff --git a/src/assets/img/icon/rise.png b/src/assets/img/icon/rise.png new file mode 100644 index 0000000..49ab124 Binary files /dev/null and b/src/assets/img/icon/rise.png differ diff --git a/src/components/CommonHeader.vue b/src/components/CommonHeader.vue index a7010d9..da50089 100644 --- a/src/components/CommonHeader.vue +++ b/src/components/CommonHeader.vue @@ -36,9 +36,9 @@ - + + @@ -221,6 +224,10 @@ export default { // label: this.$t("common.contactUs"), label: this.$t("common.c36"), url: "/contact-us" + }, + financialManagement: { + label: this.$t("common.d1"), + url: "/financialmanagement" }, about_us: { label: this.$t("home.about_us"), @@ -554,6 +561,9 @@ export default { // this.$router.push('/home') } this.getCollegeLinks() + if(!this.isLogin){ + this.$router.push('/home') + } } }; @@ -627,4 +637,12 @@ header nav a:hover { .borders:hover{ border: 1px solid #66E2DA; } +.active-text-color{ + color: #000 !important; + border-bottom: 0px !important; +} +.active-text-color1{ + color: #000 !important; + border-bottom: 0px !important; +} diff --git a/src/i18n/en.json b/src/i18n/en.json index 1a751b4..0df2bd6 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -192,7 +192,29 @@ "c14": "Please fill in the withdrawal password", "c15": "Reset withdrawal password", "c35": "send", - "c36": "Contact Us" + "c36": "Contact Us", + "d1": "manage finances", + "d2": "Financial Account", + "d3": "Easy to Earn Coins: Efficient, Time-Saving, and Effortless", + "d4": "High-Security Trading Platform, Keep Your Digital Assets Secure and Earn More", + "d5": "Product", + "d6": "Holding", + "d7": "History", + "d8": "Currency", + "d9": "Market Daily", + "d10": "Term", + "d11": "Operation", + "d12": "Subscription", + "d13": "Holding Period", + "d14": "Redemption", + "d15": "Redemption Time", + "d16": "Current/Fixed Deposit", + "d17": "Current Deposit", + "d18": "Financial Subscription", + "d19": "Financial Redemption", + "d20": "Redemption is not supported within the fixed term", + "d21": "Current Profit", + "d22": "Available Balance" }, "exchange": { "search": "Search", diff --git a/src/i18n/tw.json b/src/i18n/tw.json index 5f2a364..cbe269b 100644 --- a/src/i18n/tw.json +++ b/src/i18n/tw.json @@ -193,7 +193,28 @@ "c14": "請填写提款密碼", "c15": "重置提款密碼", "c35": "發送", - "c36": "關於我們" + "c36": "關於我們", + "d1": "理財", + "d2": "理財帳戶", + "d3": "簡單賺幣:高效、省時、省力", + "d4": "高安全性交易平台,讓您的數位資產安全無憂,收益更加可觀", + "d5": "產品", + "d6": "持有", + "d7": "歷史", + "d8": "幣種", + "d9": "市場日化", + "d10": "期限", + "d11": "操作", + "d12": "申購", + "d13": "持有時間", + "d14": "贖回", + "d15": "贖回時間", + "d16": "活期/定期", + "d17": "活期", + "d18": "理財申購", + "d19": "理財贖回", + "d20": "固定期限內不支援贖回", + "d21": "当前盈利" }, "exchange": { "search": "蒐索", @@ -935,7 +956,8 @@ "k8": "請先登錄進行申購 ", "k9": "請輸入認購碼", "l1": "漲幅比例", - "l2": "保證金" + "l2": "保證金", + "l4": "当前估值" }, "otc": { "a0": "請選擇交易類型", diff --git a/src/router/index.js b/src/router/index.js index f6f1094..b193b09 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -44,6 +44,8 @@ import Otc from "./otc"; import Notice from '@/views/notice' import NoticeDetail from '@/views/notice/detail' +import FinancialManagement from '@/views/financialManagement' + Vue.use(VueRouter); // 将多文件路由合并到一起 @@ -148,6 +150,11 @@ const routes = [{ path: "/about_us/:aid", component: Aboutus, props:true + }, + { + name: "financialmanagement", + path: "/financialmanagement", + component: FinancialManagement } ] diff --git a/src/views/components/inner-transfer.vue b/src/views/components/inner-transfer.vue index 990f36f..95bbb21 100644 --- a/src/views/components/inner-transfer.vue +++ b/src/views/components/inner-transfer.vue @@ -226,7 +226,10 @@ export default { }else if(n[0]==1){ this.toValue = [2]; this.form.to_account = this.toValue[0]; - } + }else if(n[0]==4){ + this.toValue = [1]; + this.form.to_account = this.toValue[0]; + } }, }, methods: { diff --git a/src/views/financialManagement/components/finances-bottom.vue b/src/views/financialManagement/components/finances-bottom.vue new file mode 100644 index 0000000..4ff4334 --- /dev/null +++ b/src/views/financialManagement/components/finances-bottom.vue @@ -0,0 +1,62 @@ + + + diff --git a/src/views/financialManagement/components/finances-history.vue b/src/views/financialManagement/components/finances-history.vue new file mode 100644 index 0000000..5c1aa7a --- /dev/null +++ b/src/views/financialManagement/components/finances-history.vue @@ -0,0 +1,182 @@ + + + + + \ No newline at end of file diff --git a/src/views/financialManagement/components/finances-hold.vue b/src/views/financialManagement/components/finances-hold.vue new file mode 100644 index 0000000..0378890 --- /dev/null +++ b/src/views/financialManagement/components/finances-hold.vue @@ -0,0 +1,248 @@ + + + + + \ No newline at end of file diff --git a/src/views/financialManagement/components/finances-product.vue b/src/views/financialManagement/components/finances-product.vue new file mode 100644 index 0000000..53615bb --- /dev/null +++ b/src/views/financialManagement/components/finances-product.vue @@ -0,0 +1,252 @@ + + + + + \ No newline at end of file diff --git a/src/views/financialManagement/index.vue b/src/views/financialManagement/index.vue new file mode 100644 index 0000000..cbdd4f1 --- /dev/null +++ b/src/views/financialManagement/index.vue @@ -0,0 +1,107 @@ + + + + + diff --git a/src/views/home/index.vue b/src/views/home/index.vue index d35143e..a6eeb62 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -128,7 +128,7 @@ -
+
{{ $t("homeNewText.hh1") }}
@@ -139,8 +139,8 @@
{{ $t("homeNewText.bb2") }}
{{ $t("homeNewText.bb3") }}
-
+
{{ item.symbol }} @@ -944,6 +944,13 @@ }, ]; }, + sortedMarketListHe() { + return [...this.marketListHe].sort((a, b) => { + if (a.symbol === 'BXPE') return -1; // BXPE 排在最前 + if (b.symbol === 'BXPE') return 1; + return 0; // 其他保持原顺序 + }); + } }, data() { diff --git a/src/views/purchase/index.vue b/src/views/purchase/index.vue index 2b92224..12c172b 100644 --- a/src/views/purchase/index.vue +++ b/src/views/purchase/index.vue @@ -7,7 +7,7 @@
{{ detail.coin_name }}
{{ $t("purchase.sendPrice") }}
- 1 {{ detail.coin_name }} = {{issue_price}} + 1 {{ detail.coin_name }} = {{detail.issue_price}} USDT
@@ -23,7 +23,8 @@ {{ $t("purchase.expected") }}
- {{ parseTime(detail.expected_time_online) }} + + {{ detail.expected_time_online }}
  • @@ -31,7 +32,8 @@ {{ $t("purchase.startTime") }}
  • - {{ parseTime(detail.start_subscription_time) }} + + {{ detail.start_subscription_time }}
  • @@ -39,7 +41,8 @@ {{ $t("purchase.applyForPurchase") }}
  • - {{ parseTime(detail.end_subscription_time) }} + + {{ detail.end_subscription_time }}
    @@ -70,12 +73,13 @@ :placeholder="$t('purchase.enterNum')" min="0" step="0.0000000001" - :data-message="$t('nav.b9',{num:10})" + title="" required aria-label="Username" v-model="num" aria-describedby="basic-addon1" /> +
    -
    +
    diff --git a/src/views/signIn/index.vue b/src/views/signIn/index.vue index 4070942..133af7f 100644 --- a/src/views/signIn/index.vue +++ b/src/views/signIn/index.vue @@ -90,10 +90,7 @@
    - - +
    diff --git a/src/views/signUp/agent.vue b/src/views/signUp/agent.vue index 5ad87a2..5bba9a5 100644 --- a/src/views/signUp/agent.vue +++ b/src/views/signUp/agent.vue @@ -156,7 +156,7 @@ - +
    diff --git a/src/views/signUp/index.vue b/src/views/signUp/index.vue index 0c2e5b8..80fe3a2 100644 --- a/src/views/signUp/index.vue +++ b/src/views/signUp/index.vue @@ -157,10 +157,7 @@ - - +