Merge branch 'dev' of github.com:dcloudio/uni-app into dev

ylw657284133 · May 30, 2019 · 363c916 · 363c916
2 parents f54e1d6 + 488441f
commit 363c916
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/src/platforms/mp-alipay/service/api/protocols.js b/src/platforms/mp-alipay/service/api/protocols.js
@@ -14,14 +14,6 @@ const todos = [
   'startAccelerometer',
   'startCompass',
   'addPhoneContact',
-  'setTabBarItem',
-  'setTabBarStyle',
-  'hideTabBar',
-  'showTabBar',
-  'setTabBarBadge',
-  'removeTabBarBadge',
-  'showTabBarRedDot',
-  'hideTabBarRedDot',
   'setBackgroundColor',
   'setBackgroundTextStyle',
   'createIntersectionObserver',
@@ -46,7 +38,15 @@ const todos = [
 
 // 存在兼容性的 API 列表
 const canIUses = [
-  'startPullDownRefresh'
+  'startPullDownRefresh',
+  'setTabBarItem',
+  'setTabBarStyle',
+  'hideTabBar',
+  'showTabBar',
+  'setTabBarBadge',
+  'removeTabBarBadge',
+  'showTabBarRedDot',
+  'hideTabBarRedDot'
 ]
 
 function _handleNetworkInfo (result) {
@@ -372,4 +372,4 @@ export {
   protocols,
   todos,
   canIUses
-}
+}