From db5dc87df183ce07722891e395a065bf63e093df Mon Sep 17 00:00:00 2001
From: wyl86 <ylw86@qq.com>
Date: Tue, 18 Jun 2024 17:20:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?docs(utils):=20=E5=88=A0=E9=99=A4=E6=9C=AA?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=9A=84=E6=B3=A8=E9=87=8A=E6=8C=87=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

删除未使用的 '@ts-expect-error' 注释指令
---
 src/utils/index.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/utils/index.ts b/src/utils/index.ts
index 14ef106..715c123 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -1,4 +1,3 @@
-// @ts-expect-error import json file
 import { pages, subPackages, tabBar } from '@/pages.json'
 
 /** 判断当前页面是否是tabbar页  */

From c970e7bee176d250c795f8147b5ef2e394b29f2a Mon Sep 17 00:00:00 2001
From: wyl86 <ylw86@qq.com>
Date: Wed, 19 Jun 2024 12:11:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(i18n):=20=E4=BF=AE=E5=A4=8D=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=9B=BD=E9=99=85=E5=8C=96?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复微信小程序 tabbar 的 text 和导航栏标题的国际化问题
---
 src/App.vue              | 17 +++++++++++++++++
 src/pages/about/i18n.vue | 10 ++++++++++
 2 files changed, 27 insertions(+)

diff --git a/src/App.vue b/src/App.vue
index d0dface..e260e54 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,8 +1,25 @@
 <script setup lang="ts">
 import { onLaunch, onShow, onHide } from '@dcloudio/uni-app'
+import { useI18n } from 'vue-i18n'
+import { tabBar } from '@/pages.json'
 
 onLaunch(() => {
   console.log('App Launch')
+  // #ifdef MP-WEIXIN
+  const setTabbarText = () => {
+    const { t } = useI18n()
+    const tabbarTexts = tabBar.list.map((item) => item.text.replace(/(^%|%$)/g, ''))
+    tabbarTexts.forEach((transKey: string, index: number) => {
+      uni.setTabBarItem({
+        index,
+        text: t(transKey),
+      })
+    })
+  }
+  // fix 微信小程序需要手动调用 api 设置一次国际化tabbar text。
+  setTabbarText()
+  uni.onLocaleChange(setTabbarText)
+  // #endif
 })
 onShow(() => {
   console.log('App Show')
diff --git a/src/pages/about/i18n.vue b/src/pages/about/i18n.vue
index 9722fa3..de3790f 100644
--- a/src/pages/about/i18n.vue
+++ b/src/pages/about/i18n.vue
@@ -47,6 +47,16 @@
 <script lang="ts" setup>
 import i18n, { formatI18n, formatString, translate } from '@/locale/index'
 import { testI18n } from '@/utils/i18n'
+import { useI18n } from 'vue-i18n'
+
+const { t } = useI18n()
+
+onLoad(() => {
+  // #ifdef MP-WEIXIN
+  // fix 微信小程序需要手动调用 api 设置一次国际化标题。
+  uni.setNavigationBarTitle({ title: t('app.name') })
+  // #endif
+})
 
 const current = ref(uni.getLocale())
 const user = { name: '张三', detail: { height: 178, weight: '75kg' } }