Merge branch 'feat-getSystemInfo-brand' into dev

fsinbad · Sep 2, 2019 · 6f5af7d · 6f5af7d
2 parents 66f1eb7 + 62cd363
commit 6f5af7d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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|屏幕宽度||

diff --git 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,