Merge branch 'dev' into alpha

src/platforms/app-plus/service/api/device/system.js

@@ -47,6 +47,12 @@ export function getAppBaseInfo () {
     appId, appName, appVersion, appVersionCode
   } = systemInfo
 
+  const appLanguage = uni
+    ? uni.getLocale
+      ? uni.getLocale()
+      : hostLanguage
+    : hostLanguage
+
   return {
     SDKVersion: '',
     hostSDKVersion: '',
@@ -55,7 +61,7 @@ export function getAppBaseInfo () {
     appName,
     appVersion,
     appVersionCode,
-    appLanguage: uni.getLocale(),
+    appLanguage,
     version: plus.runtime.innerVersion,
     language: hostLanguage,
     theme: '',

src/platforms/h5/service/api/device/get-system-info.js

@@ -46,6 +46,12 @@ export function getAppBaseInfo () {
     language
   } = browserInfo
 
+  const appLanguage = uni
+    ? uni.getLocale
+      ? uni.getLocale()
+      : language
+    : language
+
   return {
     SDKVersion: '',
     hostSDKVersion: '',
@@ -62,7 +68,7 @@ export function getAppBaseInfo () {
     appName: __uniConfig.appName,
     appVersion: __uniConfig.appVersion,
     appVersionCode: __uniConfig.appVersionCode,
-    appLanguage: uni.getLocale(),
+    appLanguage,
     version: __uniConfig.appVersion
   }
 }