From 21762369f2a08e72373c95449c1944e687ff7cfd Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Fri, 5 Jul 2024 10:08:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                   | 17 ++++-------------
 {lang => locale}/en.json  |  2 +-
 {lang => locale}/index.js |  4 ++--
 {lang => locale}/zh.json  |  2 +-
 main.js                   |  2 +-
 5 files changed, 9 insertions(+), 18 deletions(-)
 rename {lang => locale}/en.json (99%)
 rename {lang => locale}/index.js (83%)
 rename {lang => locale}/zh.json (99%)

diff --git a/App.vue b/App.vue
index 955dccfc..e64e40e7 100644
--- a/App.vue
+++ b/App.vue
@@ -1,7 +1,7 @@
 <script>
     import base64 from './common/js/lib/base64.js';
     // 多语言引入并初始化
-    import i18n from './lang/index';
+    import i18n from './locale/index';
     export default {
         globalData: {
             data: {
@@ -46,7 +46,7 @@
                 // 增加或者减少语言时
                 // 1.新增一个对象，按照当前格式新增
                 // 2.去lang里面各个文件去新增语言翻译
-                default_language: 'zh-Hans',
+                default_language: 'zh',
 
                 // tabbar页面
                 tabbar_pages: ['/pages/index/index', '/pages/goods-category/goods-category', '/pages/cart/cart', '/pages/user/user'],
@@ -322,17 +322,8 @@
                 var user_location = this.choice_user_location_init();
                 var user_location_params = (user_location || null) != null && (user_location.status || 0) == 1 ? '&user_lng=' + user_location.lng + '&user_lat=' + user_location.lat : '';
                 // 当前语言
-                var lang_list = {
-                    'zh-Hans': 'zh',
-                    'zh-Hant': 'cht',
-                    en: 'en',
-                    fr: 'fra',
-                    es: 'spa',
-                };
-                var lang = lang_list[this.get_language_value()] || null;
-                if (lang == null) {
-                    lang = 'zh';
-                }
+                var lang = this.get_language_value();
+
                 // 拼接标识
                 var join = url.indexOf('?') == -1 ? '?' : '&';
                 return url + join + 'system_type=' + this.data.system_type + '&application=app&application_client_type=' + client_value + '&token=' + token + '&uuid=' + uuid + referrer_params + user_location_params + '&lang=' + lang;
diff --git a/lang/en.json b/locale/en.json
similarity index 99%
rename from lang/en.json
rename to locale/en.json
index f7d9f71f..c82df9cf 100644
--- a/lang/en.json
+++ b/locale/en.json
@@ -1,6 +1,6 @@
 {
 	"language": {
-		"zh-Hans": "Simplified Chinese",
+		"zh": "Simplified Chinese",
 		"en": "English"
 	},
 	"common": {
diff --git a/lang/index.js b/locale/index.js
similarity index 83%
rename from lang/index.js
rename to locale/index.js
index 2536cddf..7b1392a8 100644
--- a/lang/index.js
+++ b/locale/index.js
@@ -1,14 +1,14 @@
 import VueI18n from 'vue-i18n';
 import Vue from 'vue';
 
-import zhHans from './zh.json';
+import zh from './zh.json';
 import en from './en.json';
 
 let i18nConfig = {
     locale: uni.getLocale(),
     silentTranslationWarn: true,
     messages: {
-        "zh-Hans": zhHans,
+        "zh": zh,
         "en": en
     }
 }
diff --git a/lang/zh.json b/locale/zh.json
similarity index 99%
rename from lang/zh.json
rename to locale/zh.json
index 349258af..dba884a3 100644
--- a/lang/zh.json
+++ b/locale/zh.json
@@ -1,6 +1,6 @@
 {
 	"language": {
-		"zh-Hans": "简体中文",
+		"zh": "简体中文",
 		"en": "英语"
 	},
 	"common": {
diff --git a/main.js b/main.js
index 56179181..2524f76a 100644
--- a/main.js
+++ b/main.js
@@ -6,7 +6,7 @@ import base from './common/js/common/base';
 import share from './common/js/common/share';
 
 // 多语言引入并初始化
-import i18n from './lang/index'
+import i18n from './locale/index'
 
 // 全局icon组件
 import iconfont from './components/iconfont/iconfont.vue'