From cdd2f3518e5c2b3ba87709b87b6b519875139e8b Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Fri, 24 Nov 2023 10:28:42 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A4=9A=E8=AF=AD=E8=A8=80=202023.11.23?=
 =?UTF-8?q?=E5=91=A8=E5=9B=9B--sws?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/iconfont/iconfont.vue |   4 +-
 lang/en.json                     |   4 +-
 lang/zh-Hans.json                | 266 +++++++++++++++----------------
 pages/login/login.vue            |  23 ++-
 4 files changed, 148 insertions(+), 149 deletions(-)

diff --git a/components/iconfont/iconfont.vue b/components/iconfont/iconfont.vue
index 2e38de22..4f6dd04f 100644
--- a/components/iconfont/iconfont.vue
+++ b/components/iconfont/iconfont.vue
@@ -30,8 +30,8 @@
 <style scoped>
     /* iconfont.css全局注册需要将src切换成绝对路径 */
     /* @/static/icon/ */
-    @import url('@/static/icon/iconfont.css');
-    /* @import url('https://at.alicdn.com/t/c/font_4227145_r2jv37yqfec.css'); */
+    /* @import url('@/static/icon/iconfont.css'); */
+    @import url('https://at.alicdn.com/t/c/font_4227145_r2jv37yqfec.css');
 
     .iconfont {
         display: inline-block;
diff --git a/lang/en.json b/lang/en.json
index a1c1fbb0..27c149cc 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -1,7 +1,7 @@
 {
 	"language": {
 		"zh-Hans": "Simplified Chinese",
-		"cht": "Traditional Chinese",
+		"zh-Hant": "Traditional Chinese",
 		"en": "United States",
 		"spa": "Spanish"
 	},
@@ -23,7 +23,7 @@
 			"1i4o86": "user",
 			"su75o5": "cancel",
 			"n2pv70": "Account",
-			"1p7843": "mobile phone",
+			"1p7843": "phone",
 			"p54kf1": "mailbox",
 			"3i05ly": "Temporarily closed login",
 			"nddg2x": "Read and agree",
diff --git a/lang/zh-Hans.json b/lang/zh-Hans.json
index 3c3adff8..c4792af2 100644
--- a/lang/zh-Hans.json
+++ b/lang/zh-Hans.json
@@ -1,134 +1,134 @@
 {
-	"language": {
-		"zh-Hans": "简体中文",
-		"zh-Hant": "繁体中文",
-		"en": "美国",
-		"spa": "西班牙语"
-	},
-	"common": {
-		"confirm": "确认",
-		"cancel": "取消"
-	},
-	"login": {
-		"login": {
-			"725312": "账号密码登录",
-			"tfl656": "确认绑定",
-			"483nho": "返回上一页",
-			"31r6p2": "手机验证码",
-			"p3kxy2": "获取手机号码一键登录",
-			"54l805": "绑定已有账号",
-			"q11t73": "注册账号并绑定",
-			"s51ed9": "已成功登录、请点击返回上一页",
-			"e77788": "登录帐号将自动绑定",
-			"1i4o86": "用户",
-			"su75o5": "取消",
-			"n2pv70": "账号",
-			"1p7843": "手机",
-			"p54kf1": "邮箱",
-			"3i05ly": "暂时关闭了登录",
-			"nddg2x": "阅读并同意",
-			"2v11we": "《服务协议》",
-			"l3r4vr": "与",
-			"myno2x": "《隐私权政策》",
-			"i1deai": "确认登录",
-			"t75ee8": "新用户注册",
-			"9d8gqi": "找回密码",
-			"tvl242": "使用授权自动登录",
-			"9q27d8": "其他登陆方式",
-			"t59dho": "暂时关闭了注册",
-			"hvunf8": "确认注册",
-			"zy8tc4": "立即登录",
-			"7z29x2": "确认提交",
-			"b347k4": "立即注册",
-			"836o8e": "确认登录授权，为您提供更优质的服务",
-			"pgyv78": "基础数据有误，如未自动加载则请手动点击加载！",
-			"6fe6ra": "加载基础数据",
-			"28k91h": "手机号码",
-			"t3951j": "验证码",
-			"qe8a37": "用户名/手机/邮箱",
-			"08fchn": "登录密码",
-			"db1rf4": "电子邮箱",
-			"6yfr9g": "用户名",
-			"d178m0": "手机/邮箱",
-			"9wx3ch": "设置登录密码",
-			"s665h5": "获取验证码",
-			"jw378f": "授权用户信息",
-			"np9177": "绑定手机",
-			"158yg2": "手机验证码登录",
-			"r329eu": "邮箱验证码登录",
-			"39hn6v": "账号密码注册",
-			"z13km0": "手机验证码注册",
-			"jc0w0o": "邮箱验证码注册",
-			"8tmyuc": "密码找回",
-			"5p23c6": "登录成功",
-			"btu2c1": "请先同意协议",
-			"no8ts6": "用于完善会员资料",
-			"3nmrg2": "授权失败",
-			"4c5n8o": "请填写手机号码",
-			"xak8g1": "请填写电子邮箱",
-			"ku05ty": "请填写手机或邮箱",
-			"7r5h37": "请输入有效验证码",
-			"24mvbh": "请填写账号",
-			"s36mk5": "发送中...",
-			"6881q7": "发送中",
-			"n24i5u": "剩余",
-			"4306xr": "秒",
-			"6gojnd": "网络开小差了哦~",
-			"01xmab": "请填写验证码",
-			"prqvf1": "授权id不能为空",
-			"4ci850": "处理中...",
-			"yvj88j": "请输入手机号码",
-			"yo6x3p": "请输入电子邮箱",
-			"n7vh75": "请输入账号",
-			"277w03": "请输入密码",
-			"cesl5d": "请输入验证码",
-			"c5wa4u": "登录中...",
-			"g30ew7": "注册中...",
-			"h0515x": "请输入手机或邮箱",
-			"wysg7k": "请设置密码",
-			"4wc3hr": "协议类型有误",
-			"x0nxxf": "协议url地址有误",
-			"05h35f": "加载中...",
-			"d9d11z": "是否确定切换多语言！"
-		}
-	},
-	"user-order-detail": {
-		"user-order-detail": {
-			"346376": "出货服务",
-			"7lp6gw": "查看位置",
-			"7f8p26": "商品信息",
-			"423rmr": "共",
-			"41ty94": "件 合计",
-			"xcj552": "元",
-			"7xtnjt": "未配置数据",
-			"7dikfm": "取货信息",
-			"o38952": "取货码：",
-			"0f26j2": "订单信息",
-			"ct34n5": "扩展数据",
-			"y9woor": "密钥信息",
-			"hpq62x": "取货码不存在、请联系管理员",
-			"io6p5k": "订单模式",
-			"n18sd2": "订单编号",
-			"yxwu8n": "订单状态",
-			"23qj7m": "支付状态",
-			"vg4jb1": "订单单价",
-			"2y7l13": "订单总价",
-			"6ub2j0": "优惠金额",
-			"8b18q8": "增加金额",
-			"516tlr": "支付金额",
-			"0e1sfs": "支付方式",
-			"12d445": "快递公司",
-			"2byl8l": "快递单号",
-			"2b5fc8": "用户留言",
-			"h2c78h": "创建时间",
-			"9vivhl": "确认时间",
-			"wn83rn": "支付时间",
-			"1674dc": "发货时间",
-			"0i938r": "收货时间",
-			"1jpv4n": "取消时间",
-			"8o2of3": "关闭时间",
-			"5k6k56": "参数有误",
-			"i876o3": "地址有误"
-		}
-	}
-}
\ No newline at end of file
+    "language": {
+        "zh-Hans": "简体中文",
+        "zh-Hant": "繁体中文",
+        "en": "美国",
+        "spa": "西班牙语"
+    },
+    "common": {
+        "confirm": "确认",
+        "cancel": "取消"
+    },
+    "login": {
+        "login": {
+            "725312": "账号密码登录",
+            "tfl656": "确认绑定",
+            "483nho": "返回上一页",
+            "31r6p2": "手机验证码",
+            "p3kxy2": "获取手机号码一键登录",
+            "54l805": "绑定已有账号",
+            "q11t73": "注册账号并绑定",
+            "s51ed9": "已成功登录、请点击返回上一页",
+            "e77788": "登录帐号将自动绑定",
+            "1i4o86": "用户",
+            "su75o5": "取消",
+            "n2pv70": "账号",
+            "1p7843": "手机",
+            "p54kf1": "邮箱",
+            "3i05ly": "暂时关闭了登录",
+            "nddg2x": "阅读并同意",
+            "2v11we": "《服务协议》",
+            "l3r4vr": "与",
+            "myno2x": "《隐私权政策》",
+            "i1deai": "确认登录",
+            "t75ee8": "新用户注册",
+            "9d8gqi": "找回密码",
+            "tvl242": "使用授权自动登录",
+            "9q27d8": "其他登陆方式",
+            "t59dho": "暂时关闭了注册",
+            "hvunf8": "确认注册",
+            "zy8tc4": "立即登录",
+            "7z29x2": "确认提交",
+            "b347k4": "立即注册",
+            "836o8e": "确认登录授权，为您提供更优质的服务",
+            "pgyv78": "基础数据有误，如未自动加载则请手动点击加载！",
+            "6fe6ra": "加载基础数据",
+            "28k91h": "手机号码",
+            "t3951j": "验证码",
+            "qe8a37": "用户名/手机/邮箱",
+            "08fchn": "登录密码",
+            "db1rf4": "电子邮箱",
+            "6yfr9g": "用户名",
+            "d178m0": "手机/邮箱",
+            "9wx3ch": "设置登录密码",
+            "s665h5": "获取验证码",
+            "jw378f": "授权用户信息",
+            "np9177": "绑定手机",
+            "158yg2": "手机验证码登录",
+            "r329eu": "邮箱验证码登录",
+            "39hn6v": "账号密码注册",
+            "z13km0": "手机验证码注册",
+            "jc0w0o": "邮箱验证码注册",
+            "8tmyuc": "密码找回",
+            "5p23c6": "登录成功",
+            "btu2c1": "请先同意协议",
+            "no8ts6": "用于完善会员资料",
+            "3nmrg2": "授权失败",
+            "4c5n8o": "请填写手机号码",
+            "xak8g1": "请填写电子邮箱",
+            "ku05ty": "请填写手机或邮箱",
+            "7r5h37": "请输入有效验证码",
+            "24mvbh": "请填写账号",
+            "s36mk5": "发送中...",
+            "6881q7": "发送中",
+            "n24i5u": "剩余",
+            "4306xr": "秒",
+            "6gojnd": "网络开小差了哦~",
+            "01xmab": "请填写验证码",
+            "prqvf1": "授权id不能为空",
+            "4ci850": "处理中...",
+            "yvj88j": "请输入手机号码",
+            "yo6x3p": "请输入电子邮箱",
+            "n7vh75": "请输入账号",
+            "277w03": "请输入密码",
+            "cesl5d": "请输入验证码",
+            "c5wa4u": "登录中...",
+            "g30ew7": "注册中...",
+            "h0515x": "请输入手机或邮箱",
+            "wysg7k": "请设置密码",
+            "4wc3hr": "协议类型有误",
+            "x0nxxf": "协议url地址有误",
+            "05h35f": "加载中...",
+            "d9d11z": "是否确定切换多语言！"
+        }
+    },
+    "user-order-detail": {
+        "user-order-detail": {
+            "346376": "出货服务",
+            "7lp6gw": "查看位置",
+            "7f8p26": "商品信息",
+            "423rmr": "共",
+            "41ty94": "件 合计",
+            "xcj552": "元",
+            "7xtnjt": "未配置数据",
+            "7dikfm": "取货信息",
+            "o38952": "取货码：",
+            "0f26j2": "订单信息",
+            "ct34n5": "扩展数据",
+            "y9woor": "密钥信息",
+            "hpq62x": "取货码不存在、请联系管理员",
+            "io6p5k": "订单模式",
+            "n18sd2": "订单编号",
+            "yxwu8n": "订单状态",
+            "23qj7m": "支付状态",
+            "vg4jb1": "订单单价",
+            "2y7l13": "订单总价",
+            "6ub2j0": "优惠金额",
+            "8b18q8": "增加金额",
+            "516tlr": "支付金额",
+            "0e1sfs": "支付方式",
+            "12d445": "快递公司",
+            "2byl8l": "快递单号",
+            "2b5fc8": "用户留言",
+            "h2c78h": "创建时间",
+            "9vivhl": "确认时间",
+            "wn83rn": "支付时间",
+            "1674dc": "发货时间",
+            "0i938r": "收货时间",
+            "1jpv4n": "取消时间",
+            "8o2of3": "关闭时间",
+            "5k6k56": "参数有误",
+            "i876o3": "地址有误"
+        }
+    }
+}
diff --git a/pages/login/login.vue b/pages/login/login.vue
index db7c991a..b006fe8e 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -139,7 +139,7 @@
                         <view class="margin-top-xxl oh flex-row jc-sb align-c">
                             <!-- 注册 -->
                             <view v-if="(home_user_reg_type || null) != null && home_user_reg_type.length > 0">
-                                <text class="cr-grey-9 padding-bottom-xs padding-horizontal-main" data-value="reg" @tap="opt_form_event">{{ $t('login.login.t75ee8') }}</text>
+                                <text class="cr-grey-9" data-value="reg" @tap="opt_form_event">{{ $t('login.login.t75ee8') }}</text>
                             </view>
                             <text class="cr-grey-9" data-value="forget" @tap="opt_form_event">{{ $t('login.login.9d8gqi') }}</text>
                         </view>
@@ -227,7 +227,7 @@
                         <view class="margin-top-xxl oh flex-row jc-sb align-c">
                             <!-- 登录 -->
                             <view v-if="(home_user_login_type || null) != null && home_user_login_type.length > 0" class="margin-bottom-xxxl tc">
-                                <text class="cr-grey-9 padding-bottom-xs padding-horizontal-main" data-value="login" @tap="opt_form_event">{{ $t('login.login.zy8tc4') }}</text>
+                                <text class="cr-grey-9" data-value="login" @tap="opt_form_event">{{ $t('login.login.zy8tc4') }}</text>
                             </view>
                         </view>
                         <view class="bottom-fixed padding-horizontal-main padding-bottom-main br-0">
@@ -255,11 +255,11 @@
                         <view class="margin-top-xxl oh flex-row jc-sb align-c">
                             <!-- 登录 -->
                             <view v-if="(home_user_login_type || null) != null && home_user_login_type.length > 0" class="tc">
-                                <text class="cr-grey-9 padding-bottom-xs padding-horizontal-main" data-value="login" @tap="opt_form_event">{{ $t('login.login.zy8tc4') }}</text>
+                                <text class="cr-grey-9" data-value="login" @tap="opt_form_event">{{ $t('login.login.zy8tc4') }}</text>
                             </view>
                             <!-- 注册 -->
                             <view v-if="(home_user_reg_type || null) != null && home_user_reg_type.length > 0" class="tc">
-                                <text class="cr-grey-9 padding-bottom-xs padding-horizontal-main" data-value="reg" @tap="opt_form_event">{{ $t('login.login.b347k4') }}</text>
+                                <text class="cr-grey-9" data-value="reg" @tap="opt_form_event">{{ $t('login.login.b347k4') }}</text>
                             </view>
                         </view>
                         <view class="bottom-fixed padding-horizontal-main padding-bottom-main br-0">
@@ -442,8 +442,6 @@
                 language_key: '',
                 // 实际提交的语言字段
                 language: '',
-                // 暂存的语言字段
-                language_name: '',
 
                 // 登陆方式
                 popup_login_status: false,
@@ -469,12 +467,10 @@
             this.setData({
                 params: params,
                 language_list: language_list,
+                language_key: language_key,
                 language: language_list[language_key],
             });
-            console.log(language_key);
-            console.log(this.language);
-            console.log(this.language_list);
-            console.log(language_list[language_key]);
+            console.log(uni.getLocale());
 
             // 上一个页面记录
             var page = app.globalData.prev_page();
@@ -1449,7 +1445,6 @@
             // 选择语言
             checked_language_event(e) {
                 this.setData({
-                    language_name: e.currentTarget.dataset.value,
                     language_key: e.currentTarget.dataset.key,
                 });
             },
@@ -1457,8 +1452,10 @@
             // 提交语言选择
             popup_sub_language_event() {
                 this.language_change(this.language_key);
+                var language_list = this.$t('language');
                 this.setData({
-                    language: this.language_name,
+                    language_list: language_list,
+                    language: language_list[this.language_key],
                     popup_language_status: false,
                 });
             },
@@ -1477,6 +1474,8 @@
                 } else {
                     uni.setLocale(key);
                     this.$i18n.locale = key;
+
+                    console.log(uni.getLocale());
                 }
             },