From f2ef26bea6a230a75ecc4dd56a5ccaacf9117b03 Mon Sep 17 00:00:00 2001
From: zzzz <690498789@qq.com>
Date: Thu, 18 Apr 2024 14:25:24 +0800
Subject: [PATCH] fanyi
---
src/page/user/compontents/cash-list.vue | 11 +--
src/utils/allocation.js | 3
src/locales/zh.json | 3
src/components/foot.vue | 4
src/page/home/home.vue | 14 ++--
src/page/user/recharge-sure.vue | 22 +++---
src/locales/jp.json | 5 +
src/locales/cht.json | 5 +
src/locales/en.json | 5 +
src/locales/index.js | 24 ++++----
src/main.js | 2
src/page/newUser/index.vue | 32 ----------
src/axios/api.url.js | 4
src/locales/kor.json | 5 +
src/locales/hi.json | 7 +
src/page/kline/components/kLine.vue | 4
src/locales/th.json | 5 +
17 files changed, 73 insertions(+), 82 deletions(-)
diff --git a/src/axios/api.url.js b/src/axios/api.url.js
index c4e20dc..7feca77 100644
--- a/src/axios/api.url.js
+++ b/src/axios/api.url.js
@@ -7,9 +7,9 @@
// baseURL: '/',
// baseURL: 'http://www.jumptalk.net:8091',
// 0311
- baseURL: "https://api.3falcon.com/",
+ // baseURL: "https://api.3falcon.com/",
// 本地
- // baseURL: "http://192.168.0.102:8091/",
+ baseURL: "http://192.168.0.109:8091/",
util: {
image: "/util/image.html" // 图片上传
}
diff --git a/src/components/foot.vue b/src/components/foot.vue
index f62f049..bebf12b 100644
--- a/src/components/foot.vue
+++ b/src/components/foot.vue
@@ -65,7 +65,7 @@
</div> -->
<div
:class="touch == 4 ? 'footDemos' : 'footDemo'"
- @click="goRouter('/warehouse', 3)"
+ @click="goRouter('/warehouse', 4)"
>
<div class="footImgDeft">
<img
@@ -83,7 +83,7 @@
</div>
<div
:class="touch == 5 ? 'footDemos' : 'footDemo'"
- @click="goRouter('/user', 4)"
+ @click="goRouter('/user', 5)"
>
<div class="footImgDeft">
<img
diff --git a/src/locales/cht.json b/src/locales/cht.json
index 8bc2303..85072c4 100644
--- a/src/locales/cht.json
+++ b/src/locales/cht.json
@@ -539,5 +539,8 @@
"订单详情": "訂單詳情",
"港股總資產": "港股總資產",
"一鍵平倉": "一鍵平倉",
- "审核中": "取消充值"
+ "审核中": "取消充值",
+ "印股": "印股",
+ "印股冻结": "印股凍結",
+ "印度新闻": "印度新聞"
}
\ No newline at end of file
diff --git a/src/locales/en.json b/src/locales/en.json
index e83a87f..5105507 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -546,5 +546,8 @@
"订单详情": "Order details",
"港股總資產": "Hong Kong Stock Total Assets",
"审核中": "Cancel recharge",
- "一鍵平倉": "One click closing position"
+ "一鍵平倉": "One click closing position",
+ "印股": "Printing stocks",
+ "印股冻结": "Freezing of printing stocks",
+ "印度新闻": "Indian News"
}
\ No newline at end of file
diff --git a/src/locales/hi.json b/src/locales/hi.json
index 1eb293e..5bf303d 100644
--- a/src/locales/hi.json
+++ b/src/locales/hi.json
@@ -544,6 +544,9 @@
"港股冻结": "हांगकांग के स्टॉक जमे हुए",
"订单详情": "ऑर्डर का विवरण",
"港股總資產": "हांगकांग शेयरों की कुल संपत्ति",
- "审核中": "取消充值",
- "一鍵平倉": "一键平仓"
+ "审核中": "टॉप-अप रद्द करें",
+ "一鍵平倉": "एक क्लिक के साथ पोजीशन बंद करें",
+ "印股": "प्रिंटिंग स्टॉक",
+ "印股冻结": "प्रिंटिंग स्टॉक जमे हुए",
+ "印度新闻": "इंडिया न्यूज"
}
\ No newline at end of file
diff --git a/src/locales/index.js b/src/locales/index.js
index baf53dc..0c7a7c6 100644
--- a/src/locales/index.js
+++ b/src/locales/index.js
@@ -9,28 +9,28 @@
Vue.use(VueI18n);
-const DEFAULT_LANG = "zh-CN";
+const DEFAULT_LANG = "hi";
const LOCALE_KEY = "language";
const locales = {
en: {
- ...en,
+ ...en
},
hi: {
- ...india,
+ ...india
},
"zh-TW": {
- ...tw,
+ ...tw
},
th: {
- ...ty,
+ ...ty
},
ja: {
- ...ry,
+ ...ry
},
ko: {
- ...hy,
- },
+ ...hy
+ }
};
// en-us zh-cn
// let langLocale = getCookie(LOCALE_KEY) || 'en';
@@ -43,17 +43,17 @@
const i18n = new VueI18n({
locale: langLocale,
messages: locales,
- silentTranslationWarn: true,
+ silentTranslationWarn: true
});
const init = Vue.prototype._init;
-Vue.prototype._init = function (options) {
+Vue.prototype._init = function(options) {
init.call(this, {
i18n,
- ...options,
+ ...options
});
};
-export const setup = (lang) => {
+export const setup = lang => {
if (lang === undefined) {
// lang = window.localStorage.getItem(LOCALE_KEY);
// const language = getCookie(LOCALE_KEY);
diff --git a/src/locales/jp.json b/src/locales/jp.json
index b75d9f8..b9e5cc5 100644
--- a/src/locales/jp.json
+++ b/src/locales/jp.json
@@ -534,5 +534,8 @@
"订单详情": "注文の詳細",
"港股總資產": "香港株式総資産",
"审核中": "チャージ解除",
- "一鍵平倉": "ワンクリック平倉"
+ "一鍵平倉": "ワンクリック平倉",
+ "印股": "いんさつ株",
+ "印股冻结": "いんさつとうけつ",
+ "印度新闻": "インドニュース"
}
\ No newline at end of file
diff --git a/src/locales/kor.json b/src/locales/kor.json
index 705bdd2..6f6f348 100644
--- a/src/locales/kor.json
+++ b/src/locales/kor.json
@@ -534,5 +534,8 @@
"港股冻结": "홍콩 주식 동결",
"订单详情": "주문 상세 정보",
"港股總資產": "홍콩 주식 총자산",
- "审核中": "충전 취소"
+ "审核中": "충전 취소",
+ "印股": "인주",
+ "印股冻结": "인주가 동결되다",
+ "印度新闻": "인도 뉴스"
}
\ No newline at end of file
diff --git a/src/locales/th.json b/src/locales/th.json
index 558fb23..2c3d364 100644
--- a/src/locales/th.json
+++ b/src/locales/th.json
@@ -534,5 +534,8 @@
"订单详情": "รายละเอียดการสั่งซื้อ",
"港股總資產": "สินทรัพย์รวมของหุ้นฮ่องกง",
"审核中": "ยกเลิกการเติมเงิน",
- "一鍵平倉": "การปิดเพียงคลิกเดียว"
+ "一鍵平倉": "การปิดเพียงคลิกเดียว",
+ "印股": "หุ้นพิมพ์",
+ "印股冻结": "แช่แข็งหุ้นพิมพ์",
+ "印度新闻": "ข่าวอินเดีย"
}
\ No newline at end of file
diff --git a/src/locales/zh.json b/src/locales/zh.json
index 3cfa286..8e67706 100644
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -535,5 +535,6 @@
"港股總資產": "港股总资产",
"一鍵平倉": "一键平仓",
"印股": "印股",
- "印股冻结": "印股冻结"
+ "印股冻结": "印股冻结",
+ "印度新闻": "印度新闻"
}
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 002a374..3ab0041 100644
--- a/src/main.js
+++ b/src/main.js
@@ -41,6 +41,8 @@
import echarts from "echarts";
Vue.prototype.$echarts = echarts;
+Vue.prototype.$USD = allocation.$USD;
+Vue.prototype.$USDT = allocation.$USDT;
Vue.prototype.$moment = moment;
// import VueTouch from 'vue-touch'
Vue.use(Swipe);
diff --git a/src/page/home/home.vue b/src/page/home/home.vue
index 4c72742..e6e5974 100644
--- a/src/page/home/home.vue
+++ b/src/page/home/home.vue
@@ -267,17 +267,17 @@
// 新闻导航
newListHeader: [
{
- title: "美国新闻",
+ title: "印度新闻",
id: "tab_0",
data: [],
type: 1,
},
- {
- title: "马来西亚新闻",
- id: "tab_1",
- data: [],
- type: 2,
- },
+ // {
+ // title: "马来西亚新闻",
+ // id: "tab_1",
+ // data: [],
+ // type: 2,
+ // },
],
// 公告 icon 地址
diff --git a/src/page/kline/components/kLine.vue b/src/page/kline/components/kLine.vue
index a4e1e27..8ea56b0 100644
--- a/src/page/kline/components/kLine.vue
+++ b/src/page/kline/components/kLine.vue
@@ -130,7 +130,7 @@
var option = {
Type: "分钟走势图", // 创建图形类型
// Type:'分钟走势图横屏',
- Language: 1, // 英文 'EN' 简体中文:'CN' 繁体中文："TC"
+ Language: "EN", // 英文 'EN' 简体中文:'CN' 繁体中文："TC"
// 窗口指标
Windows: [
// { Index:"KDJ", Modify: false, Change: true, Close: true},
@@ -922,7 +922,7 @@
DefaultData.GetKLineOption = function () {
var option = {
Type: "历史K线图", // 创建图形类型
- Language: 1, // 英文 'EN' 简体中文:'CN' 繁体中文："TC"
+ Language: "EN", // 英文 'EN' 简体中文:'CN' 繁体中文："TC"
// 窗口指标
Windows: [
{ Index: "MA", Modify: true, Change: false, height: 20 },
diff --git a/src/page/newUser/index.vue b/src/page/newUser/index.vue
index 1f0e37b..793254d 100644
--- a/src/page/newUser/index.vue
+++ b/src/page/newUser/index.vue
@@ -73,16 +73,13 @@
>
</van-col>
<!-- transferIndex -->
- <van-col span="8" style="display: flex; justify-content: center">
+ <!-- <van-col span="8" style="display: flex; justify-content: center">
<van-button
@click="$router.push('/transferIndex')"
class="btn-two"
type="default"
>{{ $t("hj245") }}</van-button
>
- </van-col>
- <!-- <van-col span="6" style="display: flex; justify-content: center">
- <van-button class="btn-two" type="default">資金明細</van-button>
</van-col> -->
</van-row>
</div>
@@ -157,33 +154,6 @@
symbolCode: "INR",
symbol: "₹",
},
- // {
- // title: this.$t("美股資產"),
- // title3: this.$t("美股總資產"),
- // title1: this.$t("美股可用"),
- // title2: this.$t("美股冻结"),
- // accectType: "US",
- // symbol: "$",
- // symbolCode: "USD",
- // },
- // {
- // title: this.$t("馬股資產"),
- // title3: this.$t("馬股總資產"),
- // title1: this.$t("馬股可用"),
- // title2: this.$t("馬股冻结"),
- // accectType: "MAS",
- // symbol: "RM",
- // symbolCode: "MYR",
- // },
- // {
- // title: this.$t("港股资产"),
- // title3: this.$t("港股總資產"),
- // title1: this.$t("港股可用"),
- // title2: this.$t("港股冻结"),
- // accectType: "HK",
- // symbol: "HK$",
- // symbolCode: "HKD",
- // },
],
active: this.$t("印股資產"),
name: "",
diff --git a/src/page/user/compontents/cash-list.vue b/src/page/user/compontents/cash-list.vue
index cb76177..53f2a7a 100644
--- a/src/page/user/compontents/cash-list.vue
+++ b/src/page/user/compontents/cash-list.vue
@@ -14,7 +14,7 @@
<div class="order-info-box">
<div class="order-title">
<span class="main"> {{ $t("hjtxyhk") }} </span>
- <span class="payNumber">${{ item.withAmt }}</span>
+ <span class="payNumber">{{ $USD }}{{ item.withAmt }}</span>
<span class="red pull-right">
{{
item.withStatus == 1
@@ -46,11 +46,10 @@
</div>
<div class="order-info">
<p class="clearfix">
- <span class="col-xs-6"
- >{{ $t("hj44") }}:<b class="space"
- >${{ item.withFee }}</b
- ></span
- >
+ <span class="col-xs-6">
+ {{ $t("hj44") }}:
+ <b class="space"> {{ $USD }} {{ item.withFee }} </b>
+ </span>
<!-- <span class="col-xs-6">实际到账金额:<b class="space" style="font-size:0.26rem">{{item.withAmt - item.withFee}}</b>元</span> -->
</p>
<p class="clearfix">
diff --git a/src/page/user/recharge-sure.vue b/src/page/user/recharge-sure.vue
index fcb080c..95989a9 100644
--- a/src/page/user/recharge-sure.vue
+++ b/src/page/user/recharge-sure.vue
@@ -85,7 +85,7 @@
return {
value: 0,
- paymentSelectData: "US",
+ paymentSelectData: "IN",
show: false,
@@ -99,17 +99,17 @@
rechargeAccountData: {},
rechargeAccountActions: [
{
- name: this.$t("US"),
- key: "US",
+ name: this.$t("IN"),
+ key: "IN",
},
- {
- name: this.$t("MAS"),
- key: "MAS",
- },
- {
- name: this.$t("HK"),
- key: "HK",
- },
+ // {
+ // name: this.$t("MAS"),
+ // key: "MAS",
+ // },
+ // {
+ // name: this.$t("HK"),
+ // key: "HK",
+ // },
],
bankCard: {},
diff --git a/src/utils/allocation.js b/src/utils/allocation.js
index 27d85a0..996b86b 100644
--- a/src/utils/allocation.js
+++ b/src/utils/allocation.js
@@ -1 +1,2 @@
-export const $USD = "USD";
+export const $USD = "₹";
+export const $USDT = "INR";
--
Gitblit v1.9.3