Handy_Cao 1 year ago
parent
commit
8176c81b1d

+ 1 - 1
src/packages/mobile/components/modules/hqchart/candlestick/index.vue

@@ -179,7 +179,7 @@ const changeIndex = (index: number) => {
 }
 }
 
 
 const onReady = (chart: unknown) => {
 const onReady = (chart: unknown) => {
-    if (goods.value?.trademode === 99) {
+    if (goods.value?.trademode === 99 || goods.value?.trademode === 10) {
         const windowsIndex = createWindowsIndex('MACD')
         const windowsIndex = createWindowsIndex('MACD')
         chartOption.Windows.push(windowsIndex)
         chartOption.Windows.push(windowsIndex)
     } else {
     } else {

+ 2 - 1
src/packages/mobile/components/modules/hqchart/timeline/index.vue

@@ -32,6 +32,7 @@ const chartInstance = shallowRef() // 图表实例
 
 
 // 是否掉期模式
 // 是否掉期模式
 const isTradeMode99 = computed(() => goods.value?.trademode === 99)
 const isTradeMode99 = computed(() => goods.value?.trademode === 99)
+const isTradeMode10 = computed(() => goods.value?.trademode === 10)
 
 
 const classNames = computed(() => {
 const classNames = computed(() => {
     const result = ['app-timeline']
     const result = ['app-timeline']
@@ -93,7 +94,7 @@ const chartOption = {
                     { Text: '价:' + handleNumberValue(Close.toFixed(decimalplace)), Color: paint.GetColor(Open, YClose || Open) },
                     { Text: '价:' + handleNumberValue(Close.toFixed(decimalplace)), Color: paint.GetColor(Open, YClose || Open) },
                     { Text: '幅:' + Increase.toFixed(2) + '%', Color: paint.GetColor(Increase, 0) }
                     { Text: '幅:' + Increase.toFixed(2) + '%', Color: paint.GetColor(Increase, 0) }
                 ]
                 ]
-                if (!isTradeMode99.value) {
+                if (!isTradeMode99.value && !isTradeMode10.value) {
                     AryText.push(
                     AryText.push(
                         { Text: '量:' + changeUnit(Vol), Color: paint.VolColor },
                         { Text: '量:' + changeUnit(Vol), Color: paint.VolColor },
                         { Text: '额:' + changeUnit(Amount), Color: paint.AmountColor }
                         { Text: '额:' + changeUnit(Amount), Color: paint.AmountColor }

+ 3 - 1
src/packages/mobile/views/mine/setting/Index.vue

@@ -35,6 +35,7 @@ import { i18n } from '@/stores'
 import { Locale } from 'vant'
 import { Locale } from 'vant'
 import { localData } from '@/stores/storage'
 import { localData } from '@/stores/storage'
 import enUS from 'vant/es/locale/lang/en-US'
 import enUS from 'vant/es/locale/lang/en-US'
+import enCN from 'vant/es/locale/lang/zh-CN'
 
 
 defineProps({
 defineProps({
     i18nEnabled: {
     i18nEnabled: {
@@ -50,10 +51,11 @@ defineProps({
 const changeLuanguage = () => {
 const changeLuanguage = () => {
     if (i18n.global.locale === 'zh-CN') {
     if (i18n.global.locale === 'zh-CN') {
         i18n.global.locale = 'en-US'
         i18n.global.locale = 'en-US'
+        Locale.use(i18n.global.locale, enUS)
     } else {
     } else {
         i18n.global.locale = 'zh-CN'
         i18n.global.locale = 'zh-CN'
+        Locale.use(i18n.global.locale, enCN)
     }
     }
-    Locale.use(i18n.global.locale, enUS)
     /// 设置语言
     /// 设置语言
     localData.setValue('appLanguage', i18n.global.locale)
     localData.setValue('appLanguage', i18n.global.locale)
 }
 }

+ 1 - 1
src/packages/pc/components/base/table/index.vue

@@ -29,7 +29,7 @@
         <el-table-column type="index" :label="t('common.orderindex')" align="center" :width="80" v-if="showIndex" />
         <el-table-column type="index" :label="t('common.orderindex')" align="center" :width="80" v-if="showIndex" />
         <!-- 数据列 -->
         <!-- 数据列 -->
         <template v-for="(item, index) in columns" :key="index">
         <template v-for="(item, index) in columns" :key="index">
-          <el-table-column :align="item.align ?? 'center'" :min-width="120" :width="item.width" :label="t(item.label)"
+          <el-table-column :align="item.align ?? 'center'" :min-width="120" :width="item.width" :label="item.label"
             :prop="item.field" :fixed="item.fixed || false" :sortable="item.sortable"
             :prop="item.field" :fixed="item.fixed || false" :sortable="item.sortable"
             :show-overflow-tooltip="item.field !== 'operate'" v-if="item.show ?? true">
             :show-overflow-tooltip="item.field !== 'operate'" v-if="item.show ?? true">
             <template #default="{ row, $index }">
             <template #default="{ row, $index }">