From c4330d8dbaf0ab27199b01093cde59e8ac151a69 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Tue, 16 Jan 2024 18:50:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                             |  6 +++---
 lang/en.json                        | 18 +++++++++---------
 pages/goods-detail/goods-detail.vue |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/App.vue b/App.vue
index 4d1770e8..4480139d 100644
--- a/App.vue
+++ b/App.vue
@@ -301,8 +301,8 @@
                     fr: 'fra',
                     es: 'spa',
                 };
-                var lang = this.get_language_value();
-                if ((lang_list[lang] || null) == null) {
+                var lang = lang_list[this.get_language_value()] || null;
+                if (lang == null) {
                     lang = 'zh';
                 }
                 // 拼接标识
@@ -2188,7 +2188,7 @@
                     temp_network[page]['timer'] = setInterval(function () {
                         uni.getNetworkType({
                             success: function (res) {
-                                if (res.networkType != 'none') {
+                                if (res.networkType != 'none' && (temp_network[page] || null) != null) {
                                     // 已初始化则清除定时任务
                                     if ((temp_network[page]['timer'] || null) != null) {
                                         clearInterval(temp_network[page]['timer']);
diff --git a/lang/en.json b/lang/en.json
index cf08f837..69e4f790 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -10,16 +10,16 @@
         "category":"Category",
         "cart":"Cart",
         "my":"My",
-        "confirm": "confirm",
-        "cancel": "cancel",
+        "confirm": "Confirm",
+        "cancel": "Cancel",
         "not_yet": "Not yet",
-        "save": "preserve",
+        "save": "Preserve",
 		"add": "Add",
         "del": "Delete",
         "edit": "Edit",
-        "more": "more",
+        "more": "More",
         "more_null": "",
-        "search": "search",
+        "search": "Search",
         "num": "quantity",
         "order": "order form",
         "service": "service",
@@ -28,8 +28,8 @@
         "confirm_sub": "Confirm submission",
         "clear": "empty",
         "all": "All",
-        "share": "share",
-        "return": "return",
+        "share": "Share",
+        "return": "Return",
         "processing_in_text": "Processing",
         "loading_in_text": "Loading",
         "upload_in_text": "Uploading",
@@ -337,10 +337,10 @@
             "775ppk": "Limited time flash sale",
             "35f378": "Suspend sales",
             "6brk57": "Please select a specification",
-            "dco1sc": "favor",
+            "dco1sc": "Favor",
             "bogx42": "price",
             "3kdgjl": "Sales price",
-            "by7052": "already",
+            "by7052": "Already",
             "tq1976": "URL event is empty",
             "98v424": "Store data is incorrect",
             "721e2h": "Event not processed（"
diff --git a/pages/goods-detail/goods-detail.vue b/pages/goods-detail/goods-detail.vue
index 6c92c55d..7ba73910 100644
--- a/pages/goods-detail/goods-detail.vue
+++ b/pages/goods-detail/goods-detail.vue
@@ -903,7 +903,7 @@
                                 nav_more_list: data.nav_more_list || [],
                                 goods_content_app: goods.content_app || [],
                                 nav_favor_button_info: {
-                                    text: (goods.is_favor == 1 ? this.$t('goods-detail.goods-detail.by7052') : '') + this.$t('goods-detail.goods-detail.dco1sc'),
+                                    text: (goods.is_favor == 1 ? this.$t('goods-detail.goods-detail.by7052')+ ' ' : '') + this.$t('goods-detail.goods-detail.dco1sc'),
                                     status: goods.is_favor,
                                 },
                                 buy_button: data.buy_button || null,