Merge branch 'dev' into alpha

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
   }