From 30b66d0839bf1768738ae82e81aac7023554901b Mon Sep 17 00:00:00 2001
From: zzzz <690498789@qq.com>
Date: Wed, 10 Apr 2024 21:32:29 +0800
Subject: [PATCH] 1
---
src/page/user/Warehouse.vue | 10 ++++------
src/locales/india.js | 1 -
src/locales/en.js | 3 +--
src/locales/tw.js | 4 +---
src/page/trading/buy.vue | 12 +++---------
src/locales/zh.js | 2 +-
src/locales/hanyu.js | 2 +-
src/locales/riyu.js | 2 +-
src/locales/taiyu.js | 2 +-
9 files changed, 13 insertions(+), 25 deletions(-)
diff --git a/src/locales/en.js b/src/locales/en.js
index c4e0d57..07731f5 100644
--- a/src/locales/en.js
+++ b/src/locales/en.js
@@ -265,7 +265,6 @@
"You have not verified KYC yet, please verify KYC before placing an order",
hj139: "Are you sure you want to close the position",
hj140: "Failed to close the position, not within the trading hours",
- hj141: "Profit and loss",
hj142: "Switch index account",
hj143: "Switch Shanghai and Shenzhen accounts",
hj144: "Change password",
@@ -701,7 +700,7 @@
"You have not authenticated your real name yet. Please authenticate your real name first before placing an order.",
hj139: "Are you sure you want to close your position?",
hj140: "Failed to close position, not within trading hours",
- hj141: "profit and loss",
+ hj141: "Profit and loss ratio",
hj142: "Switch index account",
hj143: "Switch between Shanghai and Shenzhen accounts",
hj144: "change Password",
diff --git a/src/locales/hanyu.js b/src/locales/hanyu.js
index 8f3c9de..6b66e8d 100644
--- a/src/locales/hanyu.js
+++ b/src/locales/hanyu.js
@@ -264,7 +264,7 @@
"아직 실명인증이 완료되지 않았습니다. 주문 전 실명 인증을 먼저 해주시기 바랍니다",
hj139: "정말로 포지션을 종료하시겠습니까?",
hj140: "거래 시간 내에 포지션을 청산하지 못했습니다",
- hj141: "이익과 손실",
+ hj141: "손익률",
hj142: "인덱스 계정 전환",
hj143: "상하이 계정과 선전 계정 간 전환",
hj144: "비밀번호 변경",
diff --git a/src/locales/india.js b/src/locales/india.js
index f8e86b3..de3486d 100644
--- a/src/locales/india.js
+++ b/src/locales/india.js
@@ -692,7 +692,6 @@
"आपने अभी तक अपना वास्तविक नाम प्रमाणित नहीं किया है। ऑर्डर देने से पहले कृपया अपना वास्तविक नाम प्रमाणित करें।",
hj139: "क्या आप वाकई अपनी स्थिति बंद करना चाहते हैं?",
hj140: "ट्रेडिंग घंटों के भीतर स्थिति बंद करने में विफल",
- hj141: "लाभ और हानि",
hj142: "सूचकांक खाता स्विच करें",
hj143: "शंघाई और शेन्ज़ेन खातों के बीच स्विच करें",
hj144: "पासवर्ड बदलें",
diff --git a/src/locales/riyu.js b/src/locales/riyu.js
index cede38d..212194d 100644
--- a/src/locales/riyu.js
+++ b/src/locales/riyu.js
@@ -264,7 +264,7 @@
" まだ本名認証がされていませんので、ご注文前に必ず本名認証を行ってください。",
hj139: " ポジションを閉じてもよろしいですか?",
hj140: " 取引時間内ではなく、ポジションを決済できませんでした。",
- hj141: " 利益と損失",
+ hj141: "損益率",
hj142: " インデックスアカウントを切り替え",
hj143: " 上海と深センのアカウントを切り替えます。",
hj144: " パスワードを変更する",
diff --git a/src/locales/taiyu.js b/src/locales/taiyu.js
index 06809f7..b40cd2b 100644
--- a/src/locales/taiyu.js
+++ b/src/locales/taiyu.js
@@ -264,7 +264,7 @@
"คุณยังไม่ได้ยืนยันชื่อจริงของคุณ โปรดตรวจสอบชื่อจริงของคุณก่อนทำการสั่งซื้อ",
hj139: "คุณแน่ใจหรือไม่ว่าต้องการปิดตำแหน่งของคุณ?",
hj140: "ไม่สามารถปิดตำแหน่งได้ ไม่ใช่ภายในชั่วโมงการซื้อขาย",
- hj141: "กำไรและขาดทุน",
+ hj141: "อัตรากำไรและขาดทุน",
hj142: "สลับบัญชีดัชนี",
hj143: "สลับระหว่างบัญชีเซี่ยงไฮ้และเซินเจิ้น",
hj144: "เปลี่ยนรหัสผ่าน",
diff --git a/src/locales/tw.js b/src/locales/tw.js
index e908c34..a887ade 100644
--- a/src/locales/tw.js
+++ b/src/locales/tw.js
@@ -404,8 +404,7 @@
hj140: "平倉失敗，不在交易時段內",
- hj141: "盈虧",
-
+ hj141: "盈虧率",
hj142: "切換指數帳戶",
hj143: "切換滬深帳戶",
@@ -934,7 +933,6 @@
hj138: "您還未實名認證,請先實名認證了再下單",
hj139: "您確定要平倉嗎",
hj140: "平倉失敗，不在交易時段",
- hj141: "盈虧",
hj142: "切換指數帳戶",
hj143: "切換滬深帳戶",
hj144: "修改密碼",
diff --git a/src/locales/zh.js b/src/locales/zh.js
index e80408c..c3edc37 100644
--- a/src/locales/zh.js
+++ b/src/locales/zh.js
@@ -262,7 +262,7 @@
hj138: "您还未实名认证,请先实名认证了再下单",
hj139: "您确定要平仓吗",
hj140: "平仓失败，不在交易时段内",
- hj141: "盈亏",
+ hj141: "盈亏率",
hj142: "切换指数账户",
hj143: "切换沪深账户",
hj144: "修改密码",
diff --git a/src/page/trading/buy.vue b/src/page/trading/buy.vue
index be3bbaf..87bb0a8 100644
--- a/src/page/trading/buy.vue
+++ b/src/page/trading/buy.vue
@@ -465,7 +465,7 @@
elAlertType: "success",
});
this.getUserInfo();
- this.$router.push("/warehouse?index=1");
+ this.$router.push("/warehouse?index=1&buyType=" + this.bayType);
} else {
this.$store.commit("elAlertShow", {
elAlertShow: true,
@@ -543,13 +543,7 @@
} else {
buyType = 0;
}
- if (this.bayType == "US") {
- this.$router.push("/warehouse?index=1&buyType=" + buyType);
- } else if (this.bayType == "MAS") {
- this.$router.push("/warehouse?index=0&buyType=" + buyType);
- } else {
- this.$router.push("/warehouse");
- }
+ this.$router.push("/warehouse?index=1&buyType=" + this.bayType);
} else {
if (data.msg.indexOf("不在交易时段内") > -1) {
this.$store.commit("elAlertShow", {
@@ -576,7 +570,7 @@
elAlertType: "success",
});
this.getUserInfo();
- this.$router.push("/warehouse?index=0");
+ this.$router.push("/warehouse?index=1&buyType=" + this.bayType);
} else {
this.$store.commit("elAlertShow", {
elAlertShow: true,
diff --git a/src/page/user/Warehouse.vue b/src/page/user/Warehouse.vue
index b813cdf..7811cf7 100644
--- a/src/page/user/Warehouse.vue
+++ b/src/page/user/Warehouse.vue
@@ -94,13 +94,11 @@
this.getMoneys();
},
mounted() {
- if (this.$route.query.index == "0") {
- let arr = this.tabsArr.filter((item) => item.name == 4)[0];
+ if (this.$route.query.buyType) {
+ let arr = this.tabsArr.filter(
+ (item) => item.laber == this.$route.query.buyType
+ )[0];
this.onClick(arr);
- } else if (this.$route.query.index == "1") {
- let arr = this.tabsArr.filter((item) => item.name == 2)[0];
- this.onClick(arr);
- } else {
}
},
methods: {
--
Gitblit v1.9.3