From cfdf967764dc6747a7b414b33fb993aeede1294d Mon Sep 17 00:00:00 2001
From: dcc <dcc@163.com>
Date: Thu, 13 Jun 2024 14:53:26 +0800
Subject: [PATCH] 交割合约改成期权合约
---
src/views/market/market.vue | 2
.gitignore | 22 +++++++++++
dist.zip | 0
src/i18n/de/jiaoyi.js | 3 +
src/utils/http.js | 2
src/i18n/de/user.js | 1
src/i18n/it/jiaoyi.js | 3 +
src/i18n/kor/user.js | 1
src/i18n/fra/jiaoyi.js | 3 +
src/i18n/cht/user.js | 1
src/i18n/vie/jiaoyi.js | 3 +
src/i18n/zh/user.js | 1
src/i18n/en/user.js | 1
src/config/index.js | 2
src/i18n/it/user.js | 1
src/i18n/jp/jiaoyi.js | 3 +
src/i18n/th/user.js | 1
vite.config.js | 2
src/views/login/register.vue | 3 +
src/i18n/th/jiaoyi.js | 3 +
src/i18n/cht/jiaoyi.js | 1
src/i18n/vie/user.js | 1
src/components/layout/commonHeader.vue | 4 +-
src/i18n/fra/user.js | 1
src/i18n/kor/jiaoyi.js | 3 +
src/components/constract/DeliveryContract/createOrder.vue | 2
src/i18n/en/jiaoyi.js | 1
src/i18n/jp/user.js | 1
src/i18n/zh/jiaoyi.js | 1
src/views/wallet/components/account.vue | 2
30 files changed, 59 insertions(+), 16 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1f8602b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,22 @@
+.DS_Store
+node_modules
+/dist
+
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw*
+package-lock.json
diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..284dd44
--- /dev/null
+++ b/dist.zip
Binary files differ
diff --git a/src/components/constract/DeliveryContract/createOrder.vue b/src/components/constract/DeliveryContract/createOrder.vue
index 4d211b5..704f7ae 100644
--- a/src/components/constract/DeliveryContract/createOrder.vue
+++ b/src/components/constract/DeliveryContract/createOrder.vue
@@ -3,7 +3,7 @@
<div>
<div class="place-order-inner-common" style="width: 1043px">
<div class="order-top-box">
- <div>{{ $t("message.jiaoyi.jiaogeheyue") }}</div>
+ <div>{{ $t("message.jiaoyi['期权合约']") }}</div>
<div class="but-box">
<div
class="buy-but but"
diff --git a/src/components/layout/commonHeader.vue b/src/components/layout/commonHeader.vue
index 46024f2..4ea7f6a 100644
--- a/src/components/layout/commonHeader.vue
+++ b/src/components/layout/commonHeader.vue
@@ -97,7 +97,7 @@
iconPath: getImages("headIcon/left-menu/delivery-icon.png"),
urlPath,
urlQuery: { timestamp: Date.now(), RouterName: "delivery" },
- title: "jiaogeheyue",
+ title: "期权合约",
desc: "jiaogeheyue_1",
},
];
@@ -142,7 +142,7 @@
url: `/coin/constract/btc?timestamp=${Date.now()}&RouterName=sustainable`,
},
{
- title: "jiaogeheyue", //交割合约
+ title: "期权合约", //交割合约
url: `/coin/constract/btc?timestamp=${Date.now()}&RouterName=delivery`,
},
// {
diff --git a/src/config/index.js b/src/config/index.js
index e1078fb..3fabe7d 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -9,7 +9,7 @@
// let BASE_URL = "";
// let WS_URL = "";
//综合盘
-let env_url = "app.usdtone.com";
+let env_url = "www.coinzne.com";
let pro_url = "galaxyhkvip.top";
let ENV_DEV = "https://" + env_url + "/"; // dev
let ENV_PRO = "https://" + pro_url + "/";
diff --git a/src/i18n/cht/jiaoyi.js b/src/i18n/cht/jiaoyi.js
index fa8947b..31f2f46 100644
--- a/src/i18n/cht/jiaoyi.js
+++ b/src/i18n/cht/jiaoyi.js
@@ -116,4 +116,5 @@
kaicangchenggong: "開倉成功",
heyuezongzican: "合約總資產",
suocang: "鎖倉",
+ '期权合约': '選擇權合約',
};
diff --git a/src/i18n/cht/user.js b/src/i18n/cht/user.js
index 1456eae..1f691a5 100644
--- a/src/i18n/cht/user.js
+++ b/src/i18n/cht/user.js
@@ -557,4 +557,5 @@
yuanyin: "原因",
zongchongzhi: "總充值",
xianhuojiaoyishouye: "現貨交易",
+ '期权合约': '選擇權合約',
};
diff --git a/src/i18n/de/jiaoyi.js b/src/i18n/de/jiaoyi.js
index 02af8e1..cf71059 100644
--- a/src/i18n/de/jiaoyi.js
+++ b/src/i18n/de/jiaoyi.js
@@ -113,5 +113,6 @@
"jiazaizhong": "Laden",
"kaicangchenggong": "Die Stelle wurde erfolgreich ausgeschrieben",
"heyuezongzican": "Summe Vertragsvermögen",
- "suocang": "Garage"
+ "suocang": "Garage",
+ '期权合约': 'Optionsvertrag',
}
\ No newline at end of file
diff --git a/src/i18n/de/user.js b/src/i18n/de/user.js
index 01683a2..5d857d3 100644
--- a/src/i18n/de/user.js
+++ b/src/i18n/de/user.js
@@ -537,4 +537,5 @@
"yuanyin": "verursachen",
"zongchongzhi": "Gesamte Aufladung",
"xianhuojiaoyishouye": "Spot-Handel",
+ '期权合约': 'Optionsvertrag',
}
\ No newline at end of file
diff --git a/src/i18n/en/jiaoyi.js b/src/i18n/en/jiaoyi.js
index 64620a7..826adfc 100644
--- a/src/i18n/en/jiaoyi.js
+++ b/src/i18n/en/jiaoyi.js
@@ -116,4 +116,5 @@
kaicangchenggong: "Open position successfully",
heyuezongzican: "Total Contract Assets",
suocang: "Lock",
+ '期权合约': 'Options Contracts',
};
diff --git a/src/i18n/en/user.js b/src/i18n/en/user.js
index 3f63b16..5bd6cc9 100644
--- a/src/i18n/en/user.js
+++ b/src/i18n/en/user.js
@@ -573,4 +573,5 @@
yuanyin: "reason",
zongchongzhi: "Total recharge",
xianhuojiaoyishouye: "Spot",
+ '期权合约': 'Options Contracts',
};
diff --git a/src/i18n/fra/jiaoyi.js b/src/i18n/fra/jiaoyi.js
index 03881c2..4e6b9af 100644
--- a/src/i18n/fra/jiaoyi.js
+++ b/src/i18n/fra/jiaoyi.js
@@ -113,5 +113,6 @@
"jiazaizhong": "Chargement",
"kaicangchenggong": "Le poste a été ouvert avec succès",
"heyuezongzican": "Total de l’actif contractuel",
- "suocang": "Huis clos"
+ "suocang": "Huis clos",
+ '期权合约': "contrat d'options",
}
diff --git a/src/i18n/fra/user.js b/src/i18n/fra/user.js
index 7e4e365..d93fdf9 100644
--- a/src/i18n/fra/user.js
+++ b/src/i18n/fra/user.js
@@ -537,4 +537,5 @@
"yuanyin": "cause",
"zongchongzhi": "Recharge totale",
"xianhuojiaoyishouye": "Trading au comptant",
+ '期权合约': "contrat d'options",
}
\ No newline at end of file
diff --git a/src/i18n/it/jiaoyi.js b/src/i18n/it/jiaoyi.js
index 7b75014..2fac890 100644
--- a/src/i18n/it/jiaoyi.js
+++ b/src/i18n/it/jiaoyi.js
@@ -113,5 +113,6 @@
"jiazaizhong": "Caricamento",
"kaicangchenggong": "La posizione è stata aperta con successo",
"heyuezongzican": "Totale attività contrattuale",
- "suocang": "Lontano da casa"
+ "suocang": "Lontano da casa",
+ '期权合约': 'contratto di opzione',
}
\ No newline at end of file
diff --git a/src/i18n/it/user.js b/src/i18n/it/user.js
index fb01c93..93c8f1a 100644
--- a/src/i18n/it/user.js
+++ b/src/i18n/it/user.js
@@ -537,4 +537,5 @@
"yuanyin": "causa",
"zongchongzhi": "Ricarica totale",
"xianhuojiaoyishouye": "Trading a pronti",
+ '期权合约': 'contratto di opzione',
}
\ No newline at end of file
diff --git a/src/i18n/jp/jiaoyi.js b/src/i18n/jp/jiaoyi.js
index dffca43..7dcb2b5 100644
--- a/src/i18n/jp/jiaoyi.js
+++ b/src/i18n/jp/jiaoyi.js
@@ -113,5 +113,6 @@
"jiazaizhong": "積載",
"kaicangchenggong": "ポジションは正常に開かれました",
"heyuezongzican": "契約資産総額",
- "suocang": "ロックアップ"
+ "suocang": "ロックアップ",
+ '期权合约': 'オプション契約',
}
diff --git a/src/i18n/jp/user.js b/src/i18n/jp/user.js
index bba80a0..0fd7195 100644
--- a/src/i18n/jp/user.js
+++ b/src/i18n/jp/user.js
@@ -537,4 +537,5 @@
"yuanyin": "原因",
"zongchongzhi": "合計チャージ",
"xianhuojiaoyishouye": "現物取引",
+ '期权合约': 'オプション契約',
}
\ No newline at end of file
diff --git a/src/i18n/kor/jiaoyi.js b/src/i18n/kor/jiaoyi.js
index ef1adff..49fe849 100644
--- a/src/i18n/kor/jiaoyi.js
+++ b/src/i18n/kor/jiaoyi.js
@@ -113,5 +113,6 @@
"jiazaizhong": "로드",
"kaicangchenggong": "포지션이 성공적으로 열렸습니다.",
"heyuezongzican": "총 계약 자산",
- "suocang": "락업(Lock-up)"
+ "suocang": "락업(Lock-up)",
+ '期权合约': '옵션 계약',
}
\ No newline at end of file
diff --git a/src/i18n/kor/user.js b/src/i18n/kor/user.js
index b8a2335..2de8d37 100644
--- a/src/i18n/kor/user.js
+++ b/src/i18n/kor/user.js
@@ -537,4 +537,5 @@
"yuanyin": "원인",
"zongchongzhi": "총 충전",
"xianhuojiaoyishouye": "현물 거래",
+ '期权合约': '옵션 계약',
}
\ No newline at end of file
diff --git a/src/i18n/th/jiaoyi.js b/src/i18n/th/jiaoyi.js
index 93a3add..c56b081 100644
--- a/src/i18n/th/jiaoyi.js
+++ b/src/i18n/th/jiaoyi.js
@@ -113,5 +113,6 @@
"jiazaizhong": "การโหลด",
"kaicangchenggong": "เปิดตําแหน่งเรียบร้อยแล้ว",
"heyuezongzican": "สินทรัพย์ตามสัญญารวม",
- "suocang": "ล็อคอัพ"
+ "suocang": "ล็อคอัพ",
+ '期权合约': 'สัญญาทางเลือก',
}
\ No newline at end of file
diff --git a/src/i18n/th/user.js b/src/i18n/th/user.js
index d925961..a19e0b3 100644
--- a/src/i18n/th/user.js
+++ b/src/i18n/th/user.js
@@ -537,4 +537,5 @@
"yuanyin": "สาเหตุ",
"zongchongzhi": "เติมเงินทั้งหมด",
"xianhuojiaoyishouye": "การเทรดสปอต",
+ '期权合约': 'สัญญาทางเลือก',
}
\ No newline at end of file
diff --git a/src/i18n/vie/jiaoyi.js b/src/i18n/vie/jiaoyi.js
index df0ede4..808443f 100644
--- a/src/i18n/vie/jiaoyi.js
+++ b/src/i18n/vie/jiaoyi.js
@@ -113,5 +113,6 @@
"jiazaizhong": "Tải",
"kaicangchenggong": "Vị thế đã được mở thành công",
"heyuezongzican": "Tổng tài sản hợp đồng",
- "suocang": "Khóa"
+ "suocang": "Khóa",
+ '期权合约': 'hợp đồng quyền chọn',
}
\ No newline at end of file
diff --git a/src/i18n/vie/user.js b/src/i18n/vie/user.js
index 9c044b0..192f7fb 100644
--- a/src/i18n/vie/user.js
+++ b/src/i18n/vie/user.js
@@ -537,4 +537,5 @@
"yuanyin": "nguyên nhân",
"zongchongzhi": "Tổng số tiền nạp",
"xianhuojiaoyishouye": "Giao dịch giao ngay",
+ '期权合约': 'hợp đồng quyền chọn',
}
\ No newline at end of file
diff --git a/src/i18n/zh/jiaoyi.js b/src/i18n/zh/jiaoyi.js
index 33734af..7ceab0d 100644
--- a/src/i18n/zh/jiaoyi.js
+++ b/src/i18n/zh/jiaoyi.js
@@ -116,4 +116,5 @@
kaicangchenggong: "开仓成功",
heyuezongzican: "合约总资产",
suocang: "锁仓",
+ '期权合约': '期权合约',
};
diff --git a/src/i18n/zh/user.js b/src/i18n/zh/user.js
index d3fc8ea..ba6a7d3 100644
--- a/src/i18n/zh/user.js
+++ b/src/i18n/zh/user.js
@@ -557,4 +557,5 @@
yuanyin: "原因",
zongchongzhi: "总充值",
xianhuojiaoyishouye: "现货交易",
+ '期权合约': '期权合约',
};
diff --git a/src/utils/http.js b/src/utils/http.js
index 2b15a74..b7a17fe 100644
--- a/src/utils/http.js
+++ b/src/utils/http.js
@@ -19,7 +19,7 @@
var lang = JSON.parse(localStorage.getItem("lang"));
axios.defaults.timeout = 15000;
// axios.defaults.baseURL = URL.BASE_URL;
-axios.defaults.baseURL = 'https://app.usdtone.com';
+axios.defaults.baseURL = 'https://www.coinzne.com';
axios.interceptors.request.use(
(config) => {
const token = getStorage("spToken");
diff --git a/src/views/login/register.vue b/src/views/login/register.vue
index 8c1c85e..2ea2923 100644
--- a/src/views/login/register.vue
+++ b/src/views/login/register.vue
@@ -183,7 +183,8 @@
const countryCodeStore = useCountryCodeStore();
const userStore = useUserStore();
const { t } = useI18n();
-const funcArr = [t("shoujihao"), t("youxiang"), t("zhanghao")];
+// const funcArr = [t("shoujihao"), t("youxiang"), t("zhanghao")];
+const funcArr = [ t("youxiang"), t("zhanghao")];
const register = ref({
username: "",
password: "",
diff --git a/src/views/market/market.vue b/src/views/market/market.vue
index e54d431..a1c2dbd 100644
--- a/src/views/market/market.vue
+++ b/src/views/market/market.vue
@@ -687,7 +687,7 @@
},
{
id: 4,
- name: this.$t("message.user.jiaogeheyue"),
+ name: this.$t("message.jiaoyi['期权合约']"),
type: "forex",
},
],
diff --git a/src/views/wallet/components/account.vue b/src/views/wallet/components/account.vue
index 10a70cf..1af1cda 100644
--- a/src/views/wallet/components/account.vue
+++ b/src/views/wallet/components/account.vue
@@ -42,7 +42,7 @@
:class="heYueType == 1 ? 'tabActive' : ''"
@click="ChooseHeYueType(1)"
>
- {{ $t("message.home.jiaogeheyue") }}
+ {{ $t("message.jiaoyi['期权合约']") }}
</div>
<!-- <div-->
<!-- v-if="pageType !== 'forex'"-->
diff --git a/vite.config.js b/vite.config.js
index e5ab206..f720cae 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -57,7 +57,7 @@
host: '0.0.0.0',
proxy: {
"/wap/api": {
- target: "https://app.usdtone.com",
+ target: "https://www.coinzne.com",
changeOrigin: true,
secure: false
},
--
Gitblit v1.9.3