From 0eee75ed4099e38ffc9c34906dcf90cdae0b1da4 Mon Sep 17 00:00:00 2001
From: DCloud_LXH <283700113@qq.com>
Date: Fri, 27 May 2022 17:15:36 +0800
Subject: [PATCH] =?UTF-8?q?fix(app):=20=E5=85=BC=E5=AE=B9=20osName?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/platforms/app-plus/service/api/device/system.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/platforms/app-plus/service/api/device/system.js b/src/platforms/app-plus/service/api/device/system.js
index 03d5103f9..1bab8b480 100644
--- a/src/platforms/app-plus/service/api/device/system.js
+++ b/src/platforms/app-plus/service/api/device/system.js
@@ -23,6 +23,7 @@ export function getDeviceInfo () {
   } = systemInfo
 
   const brand = deviceBrand.toLowerCase()
+  const _osName = osName.toLowerCase()
 
   return {
     deviceBrand: brand,
@@ -33,8 +34,8 @@ export function getDeviceInfo () {
     deviceType,
     brand,
     model: deviceModel,
-    system: `${osName === 'ios' ? 'iOS' : 'Android'} ${osVersion}`,
-    platform: osName
+    system: `${_osName === 'ios' ? 'iOS' : 'Android'} ${osVersion}`,
+    platform: _osName
   }
 }
 
@@ -81,6 +82,7 @@ export function getSystemInfo () {
   _initSystemInfo = true
 
   const { osName, osLanguage, osVersion } = systemInfo
+  const _osName = osName.toLowerCase()
   const osLanguageSplit = osLanguage.split('-')
   const osLanguageSplitLast = osLanguageSplit[osLanguageSplit.length - 1]
   const _osLanguage = `${osLanguageSplit[0]}${osLanguageSplitLast ? '-' + osLanguageSplitLast : ''}`
@@ -90,11 +92,12 @@ export function getSystemInfo () {
     fontSizeSetting: appBaseInfo.hostFontSizeSetting,
     uniCompileVersion: __uniConfig.compilerVersion,
     uniRuntimeVersion: __uniConfig.compilerVersion,
-    osLanguage: _osLanguage
+    osLanguage: _osLanguage,
+    osName: _osName
   }
 
-  if (osName === 'ios') {
-    extraData.romName = osName
+  if (_osName === 'ios') {
+    extraData.romName = _osName
     extraData.romVersion = osVersion
   }
 
-- 
GitLab