From ecb2c3d3873009c62b001bf613eea3b112b4514f Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Fri, 27 Sep 2019 21:25:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=20tabBar=20borderStyl?=
 =?UTF-8?q?e=20=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lib/platforms/app-plus/index.js           | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js b/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js
index eaa787d0..d5e51d9c 100644
--- a/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js
+++ b/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js
@@ -363,25 +363,18 @@ module.exports = function (pagesJson, userManifestJson) {
           path: appJson.pages[0]
         }
       })
-      // 纯 nvue 带 tab
-      if (pagesJson.tabBar && pagesJson.tabBar.list && pagesJson.tabBar.list.length) {
-        const tabBar = manifestJson.plus.tabBar = Object.assign({}, pagesJson.tabBar)
-        tabBar.height = `${parseFloat(tabBar.height) || TABBAR_HEIGHT}px`
-        // 首页是 tabBar 页面
-        const item = tabBar.list.find(page => page.pagePath === appJson.pages[0])
-        if (item) {
-          tabBar.child = ['lauchwebview']
-          tabBar.selected = tabBar.list.indexOf(item)
-        }
-      }
-    } else if (pagesJson.tabBar && pagesJson.tabBar.list && pagesJson.tabBar.list.length) {
+    }
+    // 带 tab
+    if (pagesJson.tabBar && pagesJson.tabBar.list && pagesJson.tabBar.list.length) {
       const tabBar = manifestJson.plus.tabBar = Object.assign({}, pagesJson.tabBar)
+      tabBar.borderStyle = tabBar.borderStyle === 'white' ? '#ffffff' : '#c6c6c6'
       tabBar.height = `${parseFloat(tabBar.height) || TABBAR_HEIGHT}px`
-      if (isNVueEntryPage) {
+      // 非纯 nvue 项目首页为 nvue 页面
+      if (!process.env.UNI_USING_NATIVE && isNVueEntryPage) {
         manifestJson.plus.launchwebview.id = '2'
       } else {
         // 首页是 tabBar 页面
-        const item = tabBar.list.find(page => page.pagePath === entryPagePath)
+        const item = tabBar.list.find(page => page.pagePath === (process.env.UNI_USING_NATIVE ? appJson.pages[0] : entryPagePath))
         if (item) {
           tabBar.child = ['lauchwebview']
           tabBar.selected = tabBar.list.indexOf(item)
-- 
GitLab