Handy_Cao преди 1 година
родител
ревизия
2137f8f890

+ 1 - 1
oem/tss/config/appconfig.json

@@ -3,7 +3,7 @@
   "appName": "TCE",
   "version": "1.0.12",
   "versionCode": "100012",
-  "apiUrl": "http://192.168.31.158:16240/cfg?key=dev_104",
+  "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
   "tradeChannel": "ws",
   "modules": [
     "register"

+ 1 - 0
oem/tss/locales/extras/en-US.json

@@ -16,6 +16,7 @@
     },
     "operation": {
         "transfer": "Reservation",
+        "close": "Reservation",
         "order": "Unsubscribe"
     },
     "account": {

+ 1 - 0
oem/tss/locales/extras/th-TH.json

@@ -16,6 +16,7 @@
     },
     "operation": {
         "transfer": "การจอง",
+        "close": "การจอง",
         "order": "ยกเลิกการจอง"
     },
     "account": {

+ 2 - 1
oem/tss/locales/extras/zh-CN.json

@@ -12,10 +12,11 @@
 {
     "app": {
         "name": "TCE",
-        "slogan": "泰国商品交易所现货预订平台"
+        "slogan": "泰国商品交易所\r\n现货预订平台"
     },
     "operation": {
         "transfer": "退订",
+        "close": "退订",
         "order": "预订"
     },
     "account": {

+ 2 - 1
oem/tss/locales/extras/zh-TW.json

@@ -12,10 +12,11 @@
 {
     "app": {
         "name": "TCE",
-        "slogan": "泰國商品交易所現貨預訂平臺"
+        "slogan": "泰國商品交易所\r\n現貨預訂平臺"
     },
     "operation": {
         "transfer": "退訂",
+        "close": "退訂",
         "order": "預訂"
     },
     "account": {

+ 62 - 0
src/packages/pc/views/auth/components/layout/index.vue

@@ -45,6 +45,17 @@ const version = meta.namedItem('revised')?.content ?? '0'
         <pre>{{ i18n.global.t('app.slogan') }}</pre>
       </div>
       <div class="right">
+        <el-dropdown @command="changeLuanguage">
+          {{ luanguage }}
+          <el-icon class="el-icon--right">
+            <arrow-down />
+          </el-icon>
+          <template #dropdown>
+            <el-dropdown-menu>
+            <el-dropdown-item  v-for="item in dataList" :key="item.langcode" :command="item.langcode">{{ item.langname }}</el-dropdown-item>
+          </el-dropdown-menu>
+          </template>
+        </el-dropdown>
         <div class="right-logo">
           <img :src="'./logo/logo-horizontal.png'" />
         </div>
@@ -53,6 +64,7 @@ const version = meta.namedItem('revised')?.content ?? '0'
           <slot></slot>
         </div>
       </div>
+      
     </div>
     <div class="sign-layout__footer">
       <span>v1.0.{{ version }}</span>
@@ -61,7 +73,14 @@ const version = meta.namedItem('revised')?.content ?? '0'
 </template>
 
 <script lang="ts" setup>
+import { computed } from 'vue'
 import { i18n } from '@/stores'
+import { useRequest } from '@/hooks/request'
+import { getI18nConfigs } from '@/services/api/common'
+import { localData } from '@/stores/storage'
+
+import service from '@/services'
+import eventBus from '@/services/bus'
 
 defineProps({
   title: {
@@ -72,6 +91,49 @@ defineProps({
 
 const meta = document.getElementsByTagName('meta')
 const version = meta.namedItem('revised')?.content ?? '0'
+
+const { dataList, run } = useRequest(getI18nConfigs, {
+  manual: true
+})
+
+const luanguage = computed(() => {
+    switch (i18n.global.locale) {
+        case 'zh-CN':
+            return '简体中文'
+        case 'en-US':
+            return 'English'
+        case 'zh-TW':
+            return '繁體中文'
+        default:
+            return 'ภาษาไทย'
+    }
+})
+
+const changeLuanguage = (e: string) => {
+  switch (e) {
+    case 'zh-CN':
+        i18n.global.locale = 'zh-CN'
+        break;
+    case 'en':
+        i18n.global.locale = 'en-US'
+        break;
+    case 'zh-TW':
+        i18n.global.locale ='zh-TW'
+        break;
+    default:
+        i18n.global.locale = 'th'
+        break;
+    }
+    /// 设置语言
+    localData.setValue('appLanguage', i18n.global.locale)
+    /// 重新登出
+    eventBus.$emit('LogoutNotify')
+}
+
+service.onReady().then(() => {
+  run()
+})
+
 </script>
 
 <style lang="less">

+ 15 - 17
src/packages/pc/views/footer/capital/statement/index.vue

@@ -59,20 +59,8 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
 <template>
     <app-table :data="tableList" v-model:columns="tableColumns" :loading="loading">
         <!-- 操作类型 -->
-        <template #operatetypename="{ value }" v-if="i18n.global.locale === 'zh-CN'">
-            {{ value }}
-        </template>
-         <!-- 操作类型 -->
-         <template #operatetypename_tw="{ value }" v-if="i18n.global.locale === 'zh-TW'">
-            {{ value }}
-        </template>
-        <!-- 操作类型 -->
-        <template #operatetypenameen="{ value }" v-if="i18n.global.locale === 'en-US'">
-            {{ value }}
-        </template>
-        <!-- 操作类型 -->
-        <template #operatetypenameth="{ value }" v-if="i18n.global.locale === 'th'">
-            {{ value }}
+        <template #operatetypename="{ row }" v-if="i18n.global.locale === 'zh-CN'">
+            {{ operatetypename(row) }}
         </template>
         <!-- 委托时间 -->
         <template #createtime="{ value }">
@@ -101,12 +89,22 @@ const { loading } = useRequest(queryAmountLog, {
 
 const { t } = i18n.global
 
+const operatetypename = (row: Model.AmountLogRsp) => {
+    switch (i18n.global.locale) {
+        case "zh-CN":
+            return row.operatetypename
+        case "zh-TW":
+            return row.operatetypename_tw
+            case "en-US":
+            return row.operatetypenameen
+        default:
+            return row.operatetypenameth
+    }
+}
+
 const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'accountid', label: 'banksign.capital.accountid' },
     { field: 'operatetypename', label: 'banksign.capital.operatetypename' },
-    { field: 'operatetypename_tw', label: 'banksign.capital.operatetypename' },
-    { field: 'operatetypenameen', label: 'banksign.capital.operatetypename' },
-    { field: 'operatetypenameth', label: 'banksign.capital.operatetypename' },
     { field: 'amount', label: 'banksign.capital.amount' },
     { field: 'createtime', label: 'banksign.capital.createtime' }
 ])