反馈页面提交

src/i18n/index.ts

@@ -1,5 +1,6 @@
 import { createI18n } from 'vue-i18n';
-
+import { Locale } from 'vant';
+import enUS from 'vant/lib/locale/lang/en-US';
 export function loadLang() {
   const modules: Record<string, any> = import.meta.glob('./lang/*.ts', { eager: true });
   const langs: Record<string, any> = {};
@@ -14,6 +15,7 @@ let current = window.navigator.language || window.navigator.userLanguage || null
 if (current && !/^zh/.test(current)) {
   console.log('自动获取浏览器语言:' + current);
   current = 'en-us';
+  Locale.use('en-US', enUS);
 } else {
   current = 'zh-cn';
 }

src/views/feedback/index.vue

@@ -87,32 +87,45 @@
       mccountries: data.province ? `${data.province}/${data.city}` : '',
       countries: data.province ? [data.province, data.city] : [],
     };
-    console.log('getDefaultAddress', addres.value);
     let industryRes = await getAllByTypeId(1);
-    columns.industryOptionId = industryRes.data.map((ele) => {
-      return {
-        text: locale.value == 'en-us' ? ele.nameEn : ele.nameCn,
-        label: locale.value == 'en-us' ? ele.nameEn : ele.nameCn,
-        value: ele.id,
-      };
+    let industryOptionId = [];
+    industryRes.data.map((ele) => {
+      let value = locale.value == 'en-us' ? ele.nameEn : ele.nameCn;
+      if (value) {
+        industryOptionId.push({
+          text: value,
+          label: value,
+          value: ele.id,
+        });
+      }
     });
+    columns.industryOptionId = industryOptionId;
+    let hardwareOptionId = [];
     let hardwareRes = await getAllByTypeId(2);
-    columns.hardwareOptionId = hardwareRes.data.map((ele) => {
-      return {
-        text: locale.value == 'en-us' ? ele.nameEn : ele.nameCn,
-        label: locale.value == 'en-us' ? ele.nameEn : ele.nameCn,
-        value: ele.id,
-      };
+    hardwareRes.data.map((ele) => {
+      let value = locale.value == 'en-us' ? ele.nameEn : ele.nameCn;
+      if (value) {
+        hardwareOptionId.push({
+          text: value,
+          label: value,
+          value: ele.id,
+        });
+      }
     });
+    columns.hardwareOptionId = hardwareOptionId;
+    let softwareOptionId = [];
     let softwareRes = await getAllByTypeId(3);
-    columns.softwareOptionId = softwareRes.data.map((ele) => {
-      return {
-        text: locale.value == 'en-us' ? ele.nameEn : ele.nameCn,
-        label: locale.value == 'en-us' ? ele.nameEn : ele.nameCn,
-        value: ele.id,
-      };
+    softwareRes.data.map((ele) => {
+      let value = locale.value == 'en-us' ? ele.nameEn : ele.nameCn;
+      if (value) {
+        softwareOptionId.push({
+          text: value,
+          label: value,
+          value: ele.id,
+        });
+      }
     });
-    let country = await getAllByTypeId(3);
+    columns.softwareOptionId = softwareOptionId;
   });
 </script>