Merge branch 'feat-getSystemInfo-brand' into dev

6f5af7d8 · qiang · 66f1eb7e · 62cd363c · 6f5af7d8 · 6f5af7d8
隐藏空白更改
内联并排

Showing with 3 addition and 3 deletion

docs/api/system/info.md docs/api/system/info.md +2 -2

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

未找到文件。
--- a/docs/api/system/info.md
+++ b/docs/api/system/info.md
@@ -13,7 +13,7 @@

 |参数|说明|平台差异说明|
 |:-|:-|:-|
-|brand|手机品牌|微信小程序、百度小程序、头条小程序、QQ小程序|
+|brand|手机品牌|5+App、微信小程序、百度小程序、头条小程序、QQ小程序|
 |model|手机型号||
 |pixelRatio|设备像素比||
 |screenWidth|屏幕宽度||
@@ -91,7 +91,7 @@ uni.getSystemInfo({

 |参数|说明|平台差异说明|
 |:-|:-|:-|
-|brand|手机品牌|微信小程序、百度小程序、头条小程序、QQ小程序|
+|brand|手机品牌|5+App、微信小程序、百度小程序、头条小程序、QQ小程序|
 |model|手机型号||
 |pixelRatio|设备像素比||
 |screenWidth|屏幕宽度||

--- a/src/platforms/app-plus/service/api/device/system.js
+++ b/src/platforms/app-plus/service/api/device/system.js
@@ -63,7 +63,7 @@ export function getSystemInfo () {

  return {
    errMsg: 'getSystemInfo:ok',
-    brand: '',
+    brand: plus.device.vendor,
    model: plus.device.model,
    pixelRatio: plus.screen.scale,
    screenWidth,