Merge pull request #5229 from dcloudio/fix-mpweixin-getSystemInfo

fix(mp-weixin): 修复微信小程序上的 getSystemInfo 警告
dcloudio · Dec 2, 2024 · 342b74c · 342b74c
2 parents 602e22e + b9cccba
commit 342b74c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/packages/uni-api/src/service/base/upx2px.ts b/packages/uni-api/src/service/base/upx2px.ts
@@ -16,7 +16,13 @@ let baseWidth = 375
 let includeWidth = 750
 
 function checkDeviceWidth() {
-  const { platform, pixelRatio, windowWidth } = getBaseSystemInfo()
+  const { windowWidth, pixelRatio, platform } =
+    __PLATFORM__ === 'mp-weixin'
+      ? Object.assign({}, wx.getWindowInfo(), {
+          platform: wx.getDeviceInfo().platform,
+        })
+      : getBaseSystemInfo()
+
   deviceWidth = windowWidth as number
   deviceDPR = pixelRatio as number
   isIOS = (platform as string) === 'ios'

diff --git a/packages/uni-mp-core/src/api/locale.ts b/packages/uni-mp-core/src/api/locale.ts
@@ -7,7 +7,9 @@ export const getLocale: typeof uni.getLocale = () => {
   if (app && app.$vm) {
     return app.$vm.$locale
   }
-  return normalizeLocale(__GLOBAL__.getSystemInfoSync().language) || LOCALE_EN
+  return __PLATFORM__ === 'mp-weixin'
+    ? normalizeLocale(__GLOBAL__.getAppBaseInfo().language) || LOCALE_EN
+    : normalizeLocale(__GLOBAL__.getSystemInfoSync().language) || LOCALE_EN
 }
 
 export const setLocale: typeof uni.setLocale = (locale) => {

diff --git a/packages/uni-mp-core/src/runtime/app.ts b/packages/uni-mp-core/src/runtime/app.ts
@@ -170,7 +170,9 @@ export function initAppLifecycle(
 
 function initLocale(appVm: ComponentPublicInstance) {
   const locale = ref<string>(
-    normalizeLocale(__GLOBAL__.getSystemInfoSync().language) || LOCALE_EN
+    __PLATFORM__ === 'mp-weixin'
+      ? normalizeLocale(__GLOBAL__.getAppBaseInfo().language) || LOCALE_EN
+      : normalizeLocale(__GLOBAL__.getSystemInfoSync().language) || LOCALE_EN
   )
   Object.defineProperty(appVm, '$locale', {
     get() {