From 421087f05bbcee88211f2b95afd4843da521998b Mon Sep 17 00:00:00 2001
From: jhzh <1628036192@qq.com>
Date: Tue, 22 Jul 2025 16:02:58 +0800
Subject: [PATCH] 1
---
src/locales/zh.json | 19 ++
src/page/home/smart_list.vue | 2
src/components/foot.vue | 45 +++--
src/page/home/home.vue | 101 +++++-------
src/assets/foot/yindao.png | 0
src/page/home/guide.vue | 115 ++++++++++++++
src/page/list/trading-list.vue | 11 +
src/locales/jp.json | 55 ++++--
src/axios/api.js | 3
src/router/index.js | 21 ++
src/components/Language/index.vue | 10
src/assets/foot/yindao_active.png | 0
src/page/home/newPage.vue | 11
src/locales/en.json | 19 ++
src/page/list/tradingList/tabs.vue | 6
src/page/login/login.vue | 4
src/page/newUser/index.vue | 24 +-
17 files changed, 320 insertions(+), 126 deletions(-)
diff --git a/src/assets/foot/yindao.png b/src/assets/foot/yindao.png
new file mode 100644
index 0000000..f08c247
--- /dev/null
+++ b/src/assets/foot/yindao.png
Binary files differ
diff --git a/src/assets/foot/yindao_active.png b/src/assets/foot/yindao_active.png
new file mode 100644
index 0000000..76a5156
--- /dev/null
+++ b/src/assets/foot/yindao_active.png
Binary files differ
diff --git a/src/axios/api.js b/src/axios/api.js
index 16d33b4..49968e0 100644
--- a/src/axios/api.js
+++ b/src/axios/api.js
@@ -1,6 +1,9 @@
import { post, get } from "@/axios/index";
// import APIUrl from '@/axios/api.url'
+export function getIndexData(options) {
+ return post("/api/stock/getIndexData.do", options);
+}
export function listIntraday(options) {
return post("/api/intraday/listIntraday.do", options);
}
diff --git a/src/components/Language/index.vue b/src/components/Language/index.vue
index d944ea5..8218907 100644
--- a/src/components/Language/index.vue
+++ b/src/components/Language/index.vue
@@ -42,11 +42,11 @@
{
text: "English",
lang: "en"
- }
- // {
- // text: "简体中文",
- // lang: "zh-CN",
- // },
+ },
+ {
+ text: "简体中文",
+ lang: "zh-CN",
+ },
// { text: "हिंदी", lang: "hi" },
// {
// text: "Deutsch",
diff --git a/src/components/foot.vue b/src/components/foot.vue
index 5cff97b..0008603 100644
--- a/src/components/foot.vue
+++ b/src/components/foot.vue
@@ -45,24 +45,7 @@
{{ $t("hj225") }}
</div>
</div>
- <!-- <div
- :class="touch == 3 ? 'footDemos' : 'footDemo'"
- @click="goRouter('/favorites', 3)"
- >
- <div class="footImgDeft">
- <img
- v-show="$store.state.select == '/favorites'"
- src="~@/assets/foot/ic_favorites_take.png"
- />
- <img
- v-show="$store.state.select != '/favorites'"
- src="~@/assets/foot/ic_favorites_default.png"
- />
- </div>
- <div :class="$store.state.select == '/favorites' ? 'blueFont' : ''">
- {{ $t("hj282") }}
- </div>
- </div> -->
+
<div
:class="touch == 4 ? 'footDemos' : 'footDemo'"
@click="goRouter('/warehouse', 4)"
@@ -81,6 +64,25 @@
{{ $t("hj226") }}
</div>
</div>
+ <div
+ :class="touch == 3 ? 'footDemos' : 'footDemo'"
+ @click="goRouter('/guide', 3)"
+ >
+ <div class="footImgDeft">
+ <img
+ v-show="$store.state.select == '/guide'"
+ src="@/assets/foot/yindao_active.png"
+ />
+ <img
+ v-show="$store.state.select != '/guide'"
+ src="@/assets/foot/yindao.png"
+ />
+ </div>
+ <div :class="$store.state.select == '/guide' ? 'blueFont' : ''">
+ {{ $t("引导") }}
+ </div>
+ </div>
+
<div
:class="touch == 5 ? 'footDemos' : 'footDemo'"
@click="goRouter('/user', 5)"
@@ -139,8 +141,8 @@
}
.footDemo {
- /* width: 1.8rem; */
- width: 0.8rem;
+ width: 1.8rem;
+ /* width: 0.8rem; */
display: flex;
flex-direction: column;
justify-content: center;
@@ -151,7 +153,8 @@
}
.footDemos {
- width: 0.8rem;
+ /* width: 0.8rem; */
+ width: 1.8rem;
display: flex;
flex-direction: column;
justify-content: center;
diff --git a/src/locales/en.json b/src/locales/en.json
index fd294e1..5141b7a 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -1,4 +1,21 @@
{
+ "确认密码": "Confirm password",
+ "当前密码": "Current password",
+ "密钥": "Security key",
+ "明细": "Details",
+ "提现卡": "Withdrawal card",
+ "点差盈亏": "Spread profit and loss",
+ "主题切换": "Change theme",
+ "语言切换": "Switch language",
+ "账户信息": "Account information",
+ "个人设置": "Personal settings",
+ "我的关注": "My watchlist (or 'Featured stocks')",
+ "申购": "Apply",
+ "功能指引": "Function guide",
+ "资金操作": "Capital operations",
+ "引导": "Guide",
+ "日経指数": "Nikkei average stock price",
+ "智能日内":"Day Trading",
"日股": "Japanese stocks",
"日股資產": "Japanese stock assets",
"日股可用": "Japanese stocks available",
@@ -597,4 +614,4 @@
"电话号码": "telephone number",
"当前充值渠道已关闭请选择在线客服进行充值。": "The current recharge channel has been closed Please choose online customer service to recharge.",
"删除": "Delete"
-}
\ No newline at end of file
+}
diff --git a/src/locales/jp.json b/src/locales/jp.json
index e5d6d16..2c1ad95 100644
--- a/src/locales/jp.json
+++ b/src/locales/jp.json
@@ -1,4 +1,21 @@
{
+ "确认密码":"パスワード確認",
+ "当前密码":"現在のパスワード",
+ "密钥":"セキュリティキー",
+ "明细":"明細",
+ "提现卡":"出金カード",
+ "点差盈亏":"スプレッド損益",
+ "主题切换":"テーマ変更",
+ "语言切换":"言語切替",
+ "账户信息":"アカウント情報",
+ "个人设置":"个人设置",
+ "我的关注":"マイウォッチリスト（または「注目銘柄」）",
+ "申购":"申込",
+ "功能指引":"機能ガイド",
+ "资金操作":"資金操作",
+ "引导":"ガイド",
+ "日経指数":"日経平均株価",
+ "智能日内":"デイトレード",
"日股": "日本株",
"日股資產": "日本株資産",
"日股可用": "利用可能な日本株",
@@ -94,7 +111,7 @@
"gm": "買う",
"jl": "記録",
"ky": "利用可能",
- "ye": "バランス",
+ "ye": "残高",
"sl": "量",
"qx": "キャンセル",
"qr": "確認する",
@@ -176,7 +193,7 @@
"hj44": "手数料",
"hj45": "新株予約",
"hj46": "オフライン配置",
- "hj47": "バランス",
+ "hj47": "残高",
"hj48": "利用可能残高",
"hj49": "総資産",
"hj50": "力強いフラットライン",
@@ -190,7 +207,7 @@
"hj58": "今すぐ購読して",
"hj59": "購読時間",
"hj60": "購読時間",
- "hj61": "オプション",
+ "hj61": "自選",
"hj62": "市場",
"hj63": "上海、深セン、北京",
"hj64": "科学技術イノベーション",
@@ -229,7 +246,7 @@
"hj97": "選択した内容が正常に削除されます。",
"hj98": "購入価格",
"hj99": "価格が条件を満たしたときに購入し",
- "hj101": "レバー",
+ "hj101": "レバレッジ",
"hj102": "ロットごとに保証金が必要となりますので",
"hj103": "利用可能残高",
"hj104": "利益を得る",
@@ -249,7 +266,7 @@
"hj118": "変動純損益",
"hj119": "始値",
"hj120": "現在の価格",
- "hj121": "近い位置",
+ "hj121": "決済",
"hj122": "現在ポジションはありませんが",
"hj123": "取引を開始し",
"hj124": "現在保留中の注文はありませんが",
@@ -269,7 +286,7 @@
"hj138": "まだ本名認証がされていませんので、ご注文前に必ず本名認証を行ってください。",
"hj139": "ポジションを閉じてもよろしいですか?",
"hj140": "取引時間内ではなく、ポジションを決済できませんでした。",
- "hj141": "損益率",
+ "hj141": "スプレッド損益",
"hj142": "インデックスアカウントを切り替え",
"hj143": "上海と深センのアカウントを切り替えます。",
"hj144": "パスワード変更",
@@ -277,12 +294,12 @@
"hj146": "確認",
"hj1461": "アプリをダウンロードする",
"hj147": "銀行カードを連携",
- "hj148": "サインアウト",
+ "hj148": "ログアウト",
"hj149": "ログアウトしてもよろしいですか?",
"hj150": "以前のパスワード",
"hj151": "新しいパスワード",
"hj152": "新しいパスワードを確認し",
- "hj153": "変更を確認し",
+ "hj153": "変更を確認",
"hj154": "新旧のパスワードを入力してください。",
"hj155": "新しいパスワードが一致しません。",
"hj156": "上海と深センの口座",
@@ -304,12 +321,12 @@
"hj170a": "充電方法",
"hj171a": "充電方法を選択してください。",
"hj171": "チャージ金額を入力してください。",
- "hj172": "補充して",
+ "hj172": "入金",
"hj173": "作業手順",
"hj174": "「コピー」をクリックして情報をコピーします。",
"hj175": "コピーを完了し、モバイル バンキングを開いて送金します。",
"hj176": "デポジットが期限内に確実に到着するように、入力した金額が提出されたリチャージ金額と一致していることを確認してください。",
- "hj177": "撤回する",
+ "hj177": "出金",
"hj178": "まず本名を確認してください。",
"hj179": "まず銀行カードをバインドしてください。",
"hj180": "正しい出金額を入力してください。",
@@ -388,7 +405,7 @@
"hj253": "当選チケットの枚数",
"hj254": "交渉成立",
"hj255": "取引はありませんが",
- "hj256": "補充して",
+ "hj256": "入金",
"hj257": "取引記録",
"hj258": "深い",
"hj259": "上海",
@@ -439,18 +456,18 @@
"單筆價格": "単品価格",
"马来西亚": "マレーシア",
"全部平仓": "すべてのポジションをクローズし",
- "浮動盈虧": "変動損益",
- "可用資產": "利用可能な資産",
- "累計盈虧": "累積損益",
+ "浮動盈虧": "含み損益",
+ "可用資產": "利用可能資産",
+ "累計盈虧": "総損益",
"凍結資產": "資産を凍結し",
"總手續費": "手数料総額",
- "盈虧": "利益と損失",
- "持倉價": "ポジション価格",
+ "盈虧": "損益",
+ "持倉價": "保有価格",
"訂單金額": "注文金額",
"開倉手續費": "出店料",
"止損價": "ストップロス価格",
"止盈價": "利益確定価格",
- "持倉時間": "ポジション保持時間",
+ "持倉時間": "保有時間",
"訂單編號": "注文番号",
"美股總資產": "米国株式の総資産",
"印股總資產": "インド株の総資産",
@@ -486,7 +503,7 @@
"請選擇銀行卡": "銀行カードを選択してください。",
"請選擇充值金額": "チャージ金額を選択してください。",
"買漲/買跌": "買い上げ/買い下げ",
- "倉位(股)": "ポジション(シェア)",
+ "倉位(股)": "保有株数",
"您確定一鍵平倉所有訂單嗎？": "ワンクリックですべての注文を閉じてもよろしいですか? ",
"打新日曆": "新しいカレンダーを作成する",
"立即登录": "ログイン",
@@ -584,7 +601,7 @@
"关于我们详情2": "社内の研究と知識管理体制に携わり、ダイナミックなビジネスのための革新的で画期的なソリューションを提供するグループの内部アプローチを促進します。ターンキー実行サポートとともに必要なもの。",
"关于我们详情3": "「Progress with Values」（価値を持って進む）という当社のスローガンは、あらゆるエコシステムが繁栄するための基本的な価値観によって推進される前進的なアプローチを反映しています。倫理、誠実さ、取引の透明性、タイムリーな納品、利害関係者の満足度は、当社が定義する価値体系の柱です。",
"hj620": "下限値",
- "hj621": "キャップ割引株",
+ "hj621": "大口取引",
"hj282": "お気に入り",
"hj301": "ログイン後、実際の取引/模擬取引を開始できます",
"hj302": "ログオン",
diff --git a/src/locales/zh.json b/src/locales/zh.json
index 72d2a58..3a8e1bb 100644
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -1,4 +1,21 @@
{
+ "确认密码":"确认密码",
+ "当前密码":"当前密码",
+ "密钥":"密钥",
+ "明细":"明细",
+ "提现卡":"提现卡",
+ "点差盈亏":"点差盈亏",
+ "主题切换":"主题切换",
+ "语言切换":"语言切换",
+ "账户信息":"账户信息",
+ "个人设置":"個人設定",
+ "我的关注":"我的关注",
+ "申购":"申购",
+ "功能指引":"功能指引",
+ "资金操作":"资金操作",
+ "引导":"引导",
+ "日経指数":"日経指数",
+ "智能日内":"智能日内",
"日股": "日股",
"日股資產": "日股資產",
"日股可用": "日股可用",
@@ -200,7 +217,7 @@
"配售时间": "配售时间",
"配售成功": "配售成功",
"hj60": "认缴时间",
- "hj61": "自选",
+ "hj61": "自選",
"hj62": "市场",
"hj63": "沪深京",
"hj64": "科创",
diff --git a/src/page/home/guide.vue b/src/page/home/guide.vue
new file mode 100644
index 0000000..567885b
--- /dev/null
+++ b/src/page/home/guide.vue
@@ -0,0 +1,115 @@
+<template>
+ <div class="pages">
+ <div class="pages_title">
+ <div class="pages_title_txt">{{$t('引导')}}</div>
+ </div>
+ <div class="pages_box">
+ <div class="pages_box_title">{{$t('资金操作')}}</div>
+ <div class="pages_box_box">
+ <div class="pages_box_box_box" @click="$router.push('/recharge')">{{$t('hj256')}}</div>
+ <div class="pages_box_box_box" @click="$router.push('/RechargeSure')">{{$t('hj177')}}</div>
+ </div>
+ <div class="pages_box_box_pm">{{$t('hj245')}}</div>
+ </div>
+ <div class="pages_box">
+ <div class="pages_box_title">{{$t('功能指引')}}</div>
+ <div class="pages_box_box">
+ <div class="pages_box_box_box" @click="$router.push('/smart_intraday')">{{$t('智能日内')}}</div>
+ <div class="pages_box_box_box" @click="$router.push('/trading-list?type=DZ')">{{$t('hj621')}}</div>
+ </div>
+ <div class="pages_box_box_pm" @click="$router.push('/favorites')">IPO{{$t('申购')}}</div>
+ </div>
+
+ <div class="pages_box">
+ <div class="pages_box_title">{{$t('我的关注')}}</div>
+ <div class="pages_box_box_pm" @click="$router.push('/trading-list?type=ZX')">{{$t('hj61')}}</div>
+ </div>
+ <div class="pages_box">
+ <div class="pages_box_title">{{$t('个人设置')}}</div>
+ <div class="pages_box_box">
+ <div class="pages_box_box_box" @click="$router.push('/RechargeSure')">{{$t('hj177')}}</div>
+ <div class="pages_box_box_box" @click="$router.push('/user')">{{$t('hj144')}}</div>
+ </div>
+ <div class="pages_box_box">
+ <div class="pages_box_box_box" @click="$router.push('/bankCard1')">{{$t('关于我们')}}</div>
+ <div class="pages_box_box_box" @click="clicklang">{{$t('语言切换')}}</div>
+ </div>
+ <div class="pages_box_box_pm">{{$t('hj148')}}</div>
+ </div>
+ <Language ref="language" @onChange="onChange" />
+ </div>
+</template>
+
+<script>
+// import tabsList from "./favorites/tabs";
+ import * as api from "@/axios/api";
+ import Language from "@/components/Language/index.vue";
+import headers from "@/page/login/components/header.vue";
+export default {
+ components: { headers,Language },
+ data() {
+ return {
+
+ };
+ },
+ mounted() {
+
+ },
+ methods: {
+ clicklang() {
+ this.$refs.language.settingDialog = true;
+ },
+ onClickLeft() {
+ this.$router.push("/home");
+ },
+ },
+};
+</script>
+
+<style scoped lang="less">
+ .pages_box_box_pm{
+ margin-top: 20px;
+ border: 1px solid #285F52;
+ color: #285F52;
+ font-size: 18px;
+ line-height: 50px;
+ height: 50px;
+ text-align: center;
+ }
+ .pages_box_box_box{
+ width: 48.5%;
+ border: 1px solid #285F52;
+ color: #285F52;
+ font-size: 18px;
+ line-height: 50px;
+ height: 50px;
+ text-align: center;
+ }
+ .pages_box_box{
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ margin-top: 20px;
+ }
+ .pages_box_title{
+ color: #6B7280;
+ }
+ .pages_box{
+ margin: 20px;
+ display: flex;
+ flex-direction: column;
+ font-size: 20px;
+ }
+ .pages_title_txt{
+ margin: 20px;
+ font-size: 25px;
+ color: #285F52;
+ }
+ .pages_title{
+ border-bottom: 1px solid #bebebe;
+ }
+ .pages{
+ background-color: #F8FAF9;
+
+ }
+</style>
diff --git a/src/page/home/home.vue b/src/page/home/home.vue
index 4ec18fa..cbea835 100644
--- a/src/page/home/home.vue
+++ b/src/page/home/home.vue
@@ -155,14 +155,14 @@
<div class="scroll-item_top_left">
{{ item.name }}
</div>
- <div class="scroll-item_top_right">{{item.code}}</div>
+ <div class="scroll-item_top_right">{{item.symbol}}</div>
</div>
- <div style="margin-bottom: 15px;text-align: center;color: #137D68;font-size: 12px;font-weight: bold;">{{ item.price }}</div>
- <div style="margin-bottom: 25px;text-align: center;color: #C8302F;font-size: 12px;font-weight: bold;">{{ item.z }}({{item.zfd}}%)</div>
+ <div style="margin-bottom: 15px;text-align: center;color: #137D68;font-size: 12px;font-weight: bold;">{{ item.last }}</div>
+ <div style="margin-bottom: 25px;text-align: center;color: #C8302F;font-size: 12px;font-weight: bold;">{{ item.chg }}({{item.chgPct}}%)</div>
</div>
</div>
<!-- <div class="fg"></div> -->
- <tabsList ref="tabsList" />
+ <!-- <tabsList ref="tabsList" /> -->
<!-- <div class="new-stock">
<div class="title">{{ $t("hj45") }}</div>
<div class="list">
@@ -189,9 +189,9 @@
</div>
- <div class="title-box">
+ <!-- <div class="title-box">
<div class="title">{{ $t("資訊") }}</div>
- </div>
+ </div> -->
<div class="news-tab">
<!-- <mt-navbar v-model="news">
<mt-tab-item
@@ -208,7 +208,6 @@
<mt-tab-container
v-model="news"
:swipeable="true"
- style="padding-top: 0.5rem"
>
<mt-tab-container-item
v-for="(items, index) in newListHeader"
@@ -216,7 +215,7 @@
:key="index"
>
<div class="news-content">
- <div
+ <div style="display: flex;align-items: normal;border-bottom:1px solid #cacaca;padding-bottom: 10px;margin-top:10px;justify-content: space-between;"
class=""
v-for="(item, inde) in items.data"
:key="inde"
@@ -229,19 +228,24 @@
})
"
>
- <div class="item-times">
- {{ item.showTime | gettime }}
- </div>
- <div
- class="titContent"
- style="
- -webkit-box-orient: vertical;
- font-size: 0.38rem;
- margin-top: 0.2rem;
- "
- >
- {{ item.title }}
- </div>
+ <div style="display: flex;
+ flex-direction: column;
+ justify-content: space-between;">
+ <div
+ class="titContent"
+ style="
+ -webkit-box-orient: vertical;
+ font-size: 0.38rem;
+ margin-top: 0.2rem;
+ margin-bottom: 20px;
+ "
+ >
+ {{ item.title }}
+ </div>
+ <div class="item-times">
+ {{ item.showTime | gettime }}
+ </div>
+ </div>
<div class="neitu"><img :src="item.imgurl" /></div>
</div>
</div>
@@ -351,36 +355,7 @@
artList: [],
onlineService: "123123",
- zslist:[
- {
- name:'日经指数',
- code:'N225',
- price:'349195',
- z:'31',
- bfb:'0.245'
- },
- {
- name:'日经指数',
- code:'N225',
- price:'349195',
- z:'31',
- bfb:'0.245'
- },
- {
- name:'日经指数',
- code:'N225',
- price:'349195',
- z:'31',
- bfb:'0.245'
- },
- {
- name:'日经指数',
- code:'N225',
- price:'349195',
- z:'31',
- bfb:'0.245'
- }
- ],
+ zslist:[],
isGoTo: false,
bannerList: [],
userInfo: []
@@ -440,6 +415,14 @@
}
},
methods: {
+ async getrglist() {
+ // 获取指数
+ let data = await api.getIndexData();
+ if (data.status === 0) {
+ this.zslist = data.data
+ } else {
+ }
+ },
closeclick() {
this.isshow = false;
},
@@ -624,6 +607,7 @@
async mounted() {
this.getUserInfo();
+ this.getrglist()
this.getInfoSite();
await this.getNewsList(1);
this.getArtList();
@@ -1239,6 +1223,7 @@
.news-content {
position: relative;
padding: 0.3rem;
+ padding-top:0px;
}
.item-out {
@@ -1272,15 +1257,19 @@
}
.neitu {
- width: 100%;
+ // width: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
border-radius: 0.05rem;
- margin-top: 0.3rem;
- margin-bottom: 0.8rem;
+ // margin-top: 0.3rem;
+ // margin-bottom: 0.8rem;
}
.neitu img {
- width: 100%;
- border-radius: 0.05rem;
+ width: 140px;
+ // height: 100%;
+ border-radius:10px;
}
.block-out {
diff --git a/src/page/home/newPage.vue b/src/page/home/newPage.vue
index 0387656..ee92d6a 100644
--- a/src/page/home/newPage.vue
+++ b/src/page/home/newPage.vue
@@ -1,9 +1,12 @@
<template>
<div :class="` ${$state.theme === 'red' ? 'red-theme' : 'black-theme'}`" class="new-page">
- <!-- <div class="head"> -->
-
- <!-- <view>{{ $t('hj238') }}</view> -->
- <!-- </div> -->
+ <van-nav-bar
+ :placeholder="true"
+ :safe-area-inset-top="true"
+ :title="$t('nwetitlea')"
+ left-arrow
+ @click-left="$router.go(-1)">
+ </van-nav-bar>
<div class="newsTop">
<div class="newsTitle">{{list.title}}</div>
<div class="newDetail-tits">{{ list.showTime| gettime}}</div>
diff --git a/src/page/home/smart_list.vue b/src/page/home/smart_list.vue
index d752bf2..14b1320 100644
--- a/src/page/home/smart_list.vue
+++ b/src/page/home/smart_list.vue
@@ -3,7 +3,7 @@
<van-nav-bar
:placeholder="true"
:safe-area-inset-top="true"
- :title="$t('nwetitlea')"
+ :title="$t('資訊')"
left-arrow
@click-left="$router.go(-1)">
</van-nav-bar>
diff --git a/src/page/list/trading-list.vue b/src/page/list/trading-list.vue
index 072b727..81a8334 100644
--- a/src/page/list/trading-list.vue
+++ b/src/page/list/trading-list.vue
@@ -22,6 +22,9 @@
<div class="right_search" @click="sousuo">{{ $t("Search") }}</div>
</div>
</div> -->
+ <div class="pages_title">
+ <div class="pages_title_txt">{{$t('hj225')}}</div>
+ </div>
<tabsList ref="tabsList" />
</div>
</template>
@@ -49,6 +52,14 @@
</script>
<style scoped lang="less">
+ .pages_title_txt{
+ margin: 20px;
+ font-size: 25px;
+ color: #285F52;
+ }
+ .pages_title{
+ border-bottom: 1px solid #bebebe;
+ }
.search {
height: 1rem;
display: flex;
diff --git a/src/page/list/tradingList/tabs.vue b/src/page/list/tradingList/tabs.vue
index 223425e..45aa834 100644
--- a/src/page/list/tradingList/tabs.vue
+++ b/src/page/list/tradingList/tabs.vue
@@ -53,6 +53,12 @@
components: { dataList },
mounted() {
this.active = this.$route.query.type || "JP";
+ if(this.active == 'DZ'){
+ this.typeindex = 2
+ }else if(this.active == 'ZX'){
+ // this.typeindex = 0
+ this.changetype('',0)
+ }
},
data() {
return {
diff --git a/src/page/login/login.vue b/src/page/login/login.vue
index c3484ec..d51926d 100644
--- a/src/page/login/login.vue
+++ b/src/page/login/login.vue
@@ -7,7 +7,7 @@
<div class="logins_content">
<div class="login_forms">
<div class="top_forms">
- <span style="margin-bottom: 20px;font-size: 16px;">{{ $t("手机号") }}</span>
+ <span style="margin-bottom: 20px;font-size: 16px;">{{ $t("hj27") }}</span>
<el-input style="margin-bottom: 20px;border-radius: 4px;border: 1px solid #ECE9F2;"
:placeholder="$t('hj9')"
:size="medium"
@@ -15,7 +15,7 @@
clearable
>
</el-input>
- <span style="margin-bottom: 5px;font-size: 16px;">{{ $t("密码") }}</span>
+ <span style="margin-bottom: 5px;font-size: 16px;">{{ $t("hj10") }}</span>
<el-input
style="margin-top: 0.46rem;border: 1px solid #ECE9F2;border-radius: 4px;"
show-password
diff --git a/src/page/newUser/index.vue b/src/page/newUser/index.vue
index e939c37..5b5c826 100644
--- a/src/page/newUser/index.vue
+++ b/src/page/newUser/index.vue
@@ -38,13 +38,13 @@
<img src="@/assets/img/shiminga.png"/>
<div style="margin-left: 5px;">{{$t('hj246')}}</div>
</div>
- <div class="sfrz_right">
+ <div class="sfrz_right" @click="$router.push('/authentications')">
{{userInfo.isActive==2?$t('hj203'):$t('hj204')}}
</div>
</div>
<div>
<div style="margin-top: 20px;color: #fff;border-radius: 4px;width: max-content;padding: 8px 16px;background-color: #185546;margin-left: 15px;margin-bottom: 20px;">
- 日元
+ {{$t('日股')}}
</div>
</div>
<div class="content-box">
@@ -129,19 +129,19 @@
<div class="content-list-box">
<div class="price">
<div class="price_box">
- <div class="price_box_title">总资产</div>
+ <div class="price_box_title">{{$t('hometips')}}</div>
<div class="price_box_txt">{{asstesAll}}</div>
</div>
<div class="price_box">
- <div class="price_box_title">冻结资金</div>
+ <div class="price_box_title">{{$t('日股冻结')}}</div>
<div class="price_box_txt">{{listAsstes[0].freezeMoney}}</div>
</div>
<div class="price_box">
- <div class="price_box_title">总获利</div>
+ <div class="price_box_title">{{$t('累計盈虧')}}</div>
<div class="price_box_txt">{{moneyList[0].cumulativeProfitAndLoss}}</div>
</div>
<div class="price_box">
- <div class="price_box_title">浮动获利</div>
+ <div class="price_box_title">{{$t('浮動盈虧')}}</div>
<div class="price_box_txt">{{moneyList[0].profitAndLoss}}</div>
</div>
</div>
@@ -287,32 +287,32 @@
btnlist:[
{
img:require('../../assets/img/chongzhi.svg'),
- txt:'充值',
+ txt:this.$t('hj172'),
url:'/recharge'
},
{
img:require('../../assets/img/tixian.svg'),
- txt:'提现',
+ txt:this.$t('hj177'),
url:'/RechargeSure'
},
{
img:require('../../assets/img/bank_card.svg'),
- txt:'银行卡',
+ txt:this.$t('hj247'),
url:'/bankCard1'
},
{
img:require('../../assets/img/mingxi.svg'),
- txt:'明细',
+ txt:this.$t('明细'),
url:'/Record'
},
{
img:require('../../assets/img/mykefu.svg'),
- txt:'客服',
+ txt:this.$t('kf'),
url:''
},
{
img:require('../../assets/img/userrz.svg'),
- txt:'认证',
+ txt:this.$t('hj203'),
url:'/authentications'
}
],
diff --git a/src/router/index.js b/src/router/index.js
index 4a09b7c..07652e7 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -86,6 +86,8 @@
import new_service from "@/page/home/new_service.vue";
import smart_intraday from "@/page/home/smart_intraday.vue";
import smart_list from "@/page/home/smart_list.vue";
+import guide from "@/page/home/guide.vue";
+
Vue.use(Router);
const routerPush = Router.prototype.push;
@@ -161,11 +163,10 @@
meta: {
// title: '详情',
title: i18n.t("hj238"),
+ requireAuth: false,
hasHeader: false,
- // hasHeader: true,
- // is_Show: true,
- is_Show: false,
- index: 2
+ index: 81,
+ show: true
},
component: NewPage
},
@@ -1118,6 +1119,18 @@
},
component: smart_list
},
+
+ {
+ path: "/guide",
+ name: "guide",
+ meta: {
+ itle: i18n.t("hj2"),
+ requireAuth: true,
+ hasHeader: false,
+ index: 65
+ },
+ component: guide
+ },
{
// 会匹配所有路径
path: "*",
--
Gitblit v1.9.3