diff --git a/src/platforms/app-plus/service/api/device/system.js b/src/platforms/app-plus/service/api/device/system.js index 03d5103f94c0e3dfb1a3f5f7ec7ce2a7457d9fa0..1bab8b480d8e8000ba5f7dac57bd21fa825b9afb 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 }