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

packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js

@@ -390,17 +390,18 @@ module.exports = function (pagesJson, userManifestJson) {
     } else if (isNVueEntryPage) {
       // 非纯 nvue 项目首页为 nvue 页面
       manifestJson.plus.launchwebview.id = '2'
+      manifestJson.plus.launchwebview.render = 'always'
     }
     // 带 tab
     if (pagesJson.tabBar && pagesJson.tabBar.list && pagesJson.tabBar.list.length) {
       const tabBar = manifestJson.plus.tabBar = Object.assign({}, pagesJson.tabBar)
       const borderStyles = {
-        black: 'rgba(0,0,0,0.8)',
-        white: 'rgba(255,255,255,0.8)'
+        black: 'rgba(0,0,0,0.4)',
+        white: 'rgba(255,255,255,0.4)'
       }
       let borderStyle = tabBar.borderStyle
       if (!borderStyle) {
-        borderStyle = borderStyles.black
+        borderStyle = 'black'
       }
       if (borderStyle in borderStyles) {
         tabBar.borderStyle = borderStyles[borderStyle]

src/platforms/app-plus/service/api/ui/tab-bar.js

@@ -43,12 +43,27 @@ export function setTabBarStyle ({
       errMsg: 'setTabBarStyle:fail not TabBar page'
     }
   }
-  tabBar.setTabBarStyle({
-    color,
-    selectedColor,
-    backgroundColor,
-    borderStyle: borderStyle === 'white' ? '#ffffff' : '#c6c6c6'
-  })
+  const style = {}
+  const borderStyles = {
+    black: 'rgba(0,0,0,0.4)',
+    white: 'rgba(255,255,255,0.4)'
+  }
+  if (color) {
+    style.color = color
+  }
+  if (selectedColor) {
+    style.selectedColor = selectedColor
+  }
+  if (backgroundColor) {
+    style.backgroundColor = backgroundColor
+  }
+  if (borderStyle in borderStyles) {
+    borderStyle = borderStyles[borderStyle]
+  }
+  if (borderStyle) {
+    style.borderStyle = borderStyle
+  }
+  tabBar.setTabBarStyle(style)
   return {
     errMsg: 'setTabBarStyle:ok'
   }

src/platforms/app-plus/service/framework/tab-bar.js

@@ -50,17 +50,19 @@ function setTabBarBadge (type, index, text) {
  * 动态设置 tabBar 某一项的内容
  */
 function setTabBarItem (index, text, iconPath, selectedIconPath) {
-  const item = {}
+  const item = {
+    index
+  }
+  if (text !== undefined) {
+    item.text = text
+  }
   if (iconPath) {
     item.iconPath = getRealPath(iconPath)
   }
   if (selectedIconPath) {
     item.selectedIconPath = getRealPath(selectedIconPath)
   }
-  tabBar && tabBar.setTabBarItem(Object.assign({
-    index,
-    text
-  }, item))
+  tabBar && tabBar.setTabBarItem(item)
 }
 /**
  * 动态设置 tabBar 的整体样式