From 933f0f6895b6493b6ae60c6a293e78551416ad4e Mon Sep 17 00:00:00 2001
From: jhzh <1628036192@qq.com>
Date: Wed, 04 Sep 2024 22:23:33 +0800
Subject: [PATCH] 1
---
src/i18n/index.js | 2
src/page/language/index.vue | 4 +-
src/components/trade-order-area/index.vue | 67 ++++++++++++++++++++++-----------
3 files changed, 48 insertions(+), 25 deletions(-)
diff --git a/src/components/trade-order-area/index.vue b/src/components/trade-order-area/index.vue
index db47a5d..eba20ab 100644
--- a/src/components/trade-order-area/index.vue
+++ b/src/components/trade-order-area/index.vue
@@ -17,30 +17,52 @@
</p>
</div>
- <div class="mt-22 mb-22 box-show" style="position: relative">
- <div
- class="flex justify-between items-center w-full h-70"
- @click="selectBtn"
- >
- <!-- <img src="@/assets/image/public/warn.png" alt="warn-icon" class="w-25 h-25 pl-20"/> -->
- <div class="pl-16 textColor" style="width: 80%">{{ title }}</div>
- <img
- src="@/assets/image/public/grey-select.png"
- alt="select-icon"
- class="w-22 h-11 pr-20"
- />
- </div>
- <div class="option-box" v-if="isShow">
- <div
- class="font-30"
- v-for="item in selectData"
- :key="item.type"
- @click="selectItem(item)"
+ <template v-if="selectIndex == 1">
+ <!-- <div class="flex items-center h-66 rounded-lg text-grey"> -->
+ <!-- <p
+ class="font-28 flex-1 flex items-center justify-center h-66 long"
+ :class="currentType == 'long' ? 'long' : ''"
+ @click="changeTab('long')"
>
- {{ item.title }}
+ {{ $t("开多") }}
+ </p> -->
+ <!-- <p
+ class="font-28 flex-1 ml-20 flex items-center justify-center h-66 short"
+ :class="currentType == 'short' ? 'short' : ''"
+ @click="changeTab('short')"
+ >
+ {{ $t("开空") }}
+ </p> -->
+ <!-- </div> -->
+ <div class="mt-30 mb-30" style="position: relative">
+ <div
+ class="box-show flex justify-between items-center w-full h-76 rounded-lg textColor"
+ @click="selectBtn"
+ >
+ <img
+ src="../../assets/image/public/warn.png"
+ alt="warn-icon"
+ class="w-25 h-25 pl-20"
+ />
+ <div class="text-center" style="width: 80%">{{ title }}</div>
+ <img
+ src="../../assets/image/public/grey-select.png"
+ alt="select-icon"
+ class="w-22 h-11 pr-20"
+ />
+ </div>
+ <div class="option-box" v-show="isShow">
+ <div
+ class="font-30"
+ v-for="item in selectData"
+ :key="item.type"
+ @click="selectItem(item)"
+ >
+ {{ item.title }}
+ </div>
</div>
</div>
- </div>
+ </template>
<div class="h-70 lh-70 box-show mb-25 flex justify-center px-16 textColor2">
<input
placeholder=""
@@ -256,6 +278,7 @@
return {
options: config.sliderOptions,
value: 0,
+ selectIndex:1,
isShow: false,
title: this.$t("市价委托"),
selectData: [],
@@ -288,6 +311,7 @@
this.form.volume = "";
},
exchangeVal(val) {
+ this.form.price = this.price;
this.percentageVal = val;
if (!this.isTotal) {
if (this.currentType == "open") {
@@ -609,7 +633,6 @@
right: 0;
top: 90px;
width: 100%;
- z-index: 3;
@include themify() {
background: themed("grey_bg");
diff --git a/src/i18n/index.js b/src/i18n/index.js
index 55892a3..8fdc0c2 100644
--- a/src/i18n/index.js
+++ b/src/i18n/index.js
@@ -27,7 +27,7 @@
Vue.use(VueI18n);
// 获取当前语言(初始化时localStorage里没有存语言,默认为浏览器当前的语言)
-const lang = getStorage("lang") || "zh-CN";
+const lang = getStorage("lang") || "en";
//const lang = 'zh-CN'
// 组合element ui 和 项目自身的文案文件
diff --git a/src/page/language/index.vue b/src/page/language/index.vue
index 4cf71d3..bfdca2a 100644
--- a/src/page/language/index.vue
+++ b/src/page/language/index.vue
@@ -30,11 +30,11 @@
// { title: 'عرب', key: 'ar', image: require('../../assets/image/lang/alb.png') }, //阿拉伯语
{ title: 'Tiếng Việt', key: 'vi', image: require('../../assets/image/lang/vi.png') },//越南语
{ title: 'Italiano', key: 'it', image: require('../../assets/image/lang/Italy.png') }, //意大利语
- { title: '繁体中文', key: 'zh-TW', image: require('../../assets/image/lang/hongkong.png') },
+ // { title: '繁体中文', key: 'zh-TW', image: require('../../assets/image/lang/hongkong.png') },
{ title: 'Nederlands', key: 'af', image: require('../../assets/image/lang/af.png') },//荷兰
{ title: 'España', key: 'es', image: require('../../assets/image/lang/es.png') },//西班牙
{ title: 'Sverige', key: 'sv', image: require('../../assets/image/lang/sv.png') },//瑞典
- { title: '简体中文', key: 'zh-CN', image: require('../../assets/image/lang/zh-CN.png') },
+ // { title: '简体中文', key: 'zh-CN', image: require('../../assets/image/lang/zh-CN.png') },
]
}
},
--
Gitblit v1.9.3