From deaf40ab05251a35ba8cf4337eec74929d48e403 Mon Sep 17 00:00:00 2001
From: oasis <suanbanren@foxmail.com>
Date: Thu, 6 Mar 2025 11:47:58 +0800
Subject: [PATCH] fix: taro default import error

---
 src/utils/get-system-info.ts | 20 ++++++++++----------
 src/utils/platform-taro.ts   |  8 ++++----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/utils/get-system-info.ts b/src/utils/get-system-info.ts
index fc811d9046..6012181c88 100644
--- a/src/utils/get-system-info.ts
+++ b/src/utils/get-system-info.ts
@@ -1,4 +1,10 @@
-import Taro from '@tarojs/taro'
+import Taro, {
+  canIUse,
+  getAppBaseInfo as taroGetAppBaseInfo,
+  getDeviceInfo as taroGetDeviceInfo,
+  getSystemInfoSync,
+  getWindowInfo as taroGetWindowInfo,
+} from '@tarojs/taro'
 
 interface IDeviceInfo
   extends Omit<Taro.getDeviceInfo.Result, 'deviceAbi' | 'CPUType'> {}
@@ -8,9 +14,7 @@ interface IDeviceInfo
  * @returns {IDeviceInfo} 设备基础信息
  */
 export const getDeviceInfo = (): IDeviceInfo => {
-  return Taro.canIUse('getDeviceInfo')
-    ? Taro.getDeviceInfo()
-    : Taro.getSystemInfoSync()
+  return canIUse('getDeviceInfo') ? taroGetDeviceInfo() : getSystemInfoSync()
 }
 
 /**
@@ -18,9 +22,7 @@ export const getDeviceInfo = (): IDeviceInfo => {
  * @returns {Taro.getWindowInfo.Result} 窗口信息
  */
 export const getWindowInfo = (): Taro.getWindowInfo.Result => {
-  return Taro.canIUse('getWindowInfo')
-    ? Taro.getWindowInfo()
-    : Taro.getSystemInfoSync()
+  return canIUse('getWindowInfo') ? taroGetWindowInfo() : getSystemInfoSync()
 }
 
 /**
@@ -28,7 +30,5 @@ export const getWindowInfo = (): Taro.getWindowInfo.Result => {
  * @returns {Taro.getAppBaseInfo.Result} 应用基础信息
  */
 export const getAppBaseInfo = (): Taro.getAppBaseInfo.Result => {
-  return Taro.canIUse('getAppBaseInfo')
-    ? Taro.getAppBaseInfo()
-    : Taro.getSystemInfoSync()
+  return canIUse('getAppBaseInfo') ? taroGetAppBaseInfo() : getSystemInfoSync()
 }
diff --git a/src/utils/platform-taro.ts b/src/utils/platform-taro.ts
index 659c69e744..02ff3e9072 100644
--- a/src/utils/platform-taro.ts
+++ b/src/utils/platform-taro.ts
@@ -1,14 +1,14 @@
-import Taro from '@tarojs/taro'
+import { getEnv } from '@tarojs/taro'
 
 export const harmony = () => {
   return ['harmony', 'harmonyhybrid', 'jdharmony'].includes(
-    Taro.getEnv().toLowerCase()
+    getEnv().toLowerCase()
   )
 }
 export const web = () => {
-  return ['web'].includes(Taro.getEnv().toLowerCase())
+  return ['web'].includes(getEnv().toLowerCase())
 }
 
 export const miniprogram = () => {
-  return ['mini'].includes(Taro.getEnv().toLowerCase())
+  return ['mini'].includes(getEnv().toLowerCase())
 }