bill недель назад: 3
Родитель
Сommit
82d2580b23
4 измененных файлов с 21 добавлено и 11 удалено
  1. 9 4
      src/api/instance.ts
  2. 8 2
      src/components/materials/index.vue
  3. 1 2
      src/lang/index.ts
  4. 3 3
      src/layout/edit/scene-select.vue

+ 9 - 4
src/api/instance.ts

@@ -10,7 +10,7 @@ import { ui18n } from "@/lang";
 const instance = axiosFactory();
 
 export const {
-  axios, 
+  axios,
   addUnsetTokenURLS,
   delUnsetTokenURLS,
   addReqErrorHandler,
@@ -50,7 +50,7 @@ addReqErrorHandler((err) => {
 });
 
 addResErrorHandler((response, data) => {
-  console.log('hahah')
+  console.log("hahah");
   if (response && response.status !== 200) {
     Message.error(response.statusText);
   } else if (data) {
@@ -66,7 +66,12 @@ addResErrorHandler((response, data) => {
       // })
       // throw msg
     } else {
-      Message.error(msg || ui18n.t('sys.serviceErr'));
+      const umsg = msg
+        ? ui18n.te(`sys.${msg}`)
+          ? ui18n.t(`sys.${msg}`)
+          : msg
+        : ui18n.t("sys.serviceErr");
+      Message.error(umsg);
     }
   }
 });
@@ -85,6 +90,6 @@ addHook({
 });
 
 setDefaultURI(baseURL);
-const token = params.token || localStorage.getItem('token')
+const token = params.token || localStorage.getItem("token");
 token && setToken(token);
 export default axios;

+ 8 - 2
src/components/materials/index.vue

@@ -92,7 +92,13 @@
               }}
             </template>
             <template v-if="column.key === 'group'">
-              <span class="group-str">{{ record.group }}</span>
+              <span class="group-str">
+                {{
+                  ui18n.te(`sys.${record.group}`)
+                    ? ui18n.t(`sys.${record.group}`)
+                    : record.group
+                }}
+              </span>
             </template>
             <template v-else-if="column.key === 'action'">
               <span v-if="record.useType !== 'animation'">
@@ -130,7 +136,7 @@ import {
 } from "@/api/material";
 import Message from "bill/components/message/message.vue";
 import { Dialog } from "bill/expose-common";
-import { ui18n } from "@/lang";
+import { ui18n, lang } from "@/lang";
 
 const props = defineProps<{
   uploadFormat?: string[];

+ 1 - 2
src/lang/index.ts

@@ -13,7 +13,6 @@ export enum langNameEum {
   ja = 'ja',
   kr = 'kr'
 }
-console.log('en', JSON.stringify(zh))
 
 export const langNameDescs = {
   [langNameEum.zh]: '中文',
@@ -76,9 +75,9 @@ export const langs = {
   [langNameEum.ja]: ja,
   [langNameEum.kr]: kr,
 }
-console.error(langKey, langs)
 export const lang = langs[langKey] as typeof zh
 
+console.error(lang)
 i18n.global.setLocaleMessage(langNameEum.zh, zh)
 i18n.global.setLocaleMessage(langNameEum.en, en)
 i18n.global.setLocaleMessage(langNameEum.ja, ja)

+ 3 - 3
src/layout/edit/scene-select.vue

@@ -23,7 +23,7 @@
           style="width: 244px"
         />
       </div>
-      <div class="table-layout" v-if="origin.length">
+      <div class="table-layout">
         <Tabs v-model:activeKey="type">
           <TabPane v-for="current in types" :key="current" :tab="current">
             <Table
@@ -45,13 +45,13 @@
           </TabPane>
         </Tabs>
       </div>
-      <div style="padding: 1px" v-else>
+      <!-- <div style="padding: 1px" v-else>
         <Empty
           :description="keyword.length ? $t('sys.unSearchData') : $t('sys.undata')"
           :image="Empty.PRESENTED_IMAGE_SIMPLE"
           className="ant-empty ant-empty-normal"
         />
-      </div>
+      </div> -->
     </div>
   </Modal>