From 15fc59f3692874ca52affcc5f98c8c10bfb4706f Mon Sep 17 00:00:00 2001
From: Gaoxs <704041637@qq.com>
Date: Tue, 15 Sep 2020 11:22:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9app=E4=B8=8A=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=A0=8F=E5=B0=BA=E5=AF=B8=E8=BF=87=E5=B0=8F=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json     | 6 +++---
 utils/index.js | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pages.json b/pages.json
index 2bebce3..08295bb 100644
--- a/pages.json
+++ b/pages.json
@@ -431,9 +431,9 @@
 		"borderStyle": "black",
 		"backgroundColor": "#ffffff",
 		"height": "50px",
-		"fontSize": "8px",
-		"iconWidth": "16px",
-		"spacing": "-3px",
+		"fontSize": "10px",
+		"iconWidth": "24px",
+		"spacing": "3px",
 		"list": [{
 			"pagePath": "pages/home/index",
 			"iconPath": "static/icon-home.png",
diff --git a/utils/index.js b/utils/index.js
index 3de2e27..d7384e0 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -82,7 +82,7 @@ export function isType(arg, type) {
 }
 
 export function isWeixin() {
-	if (navigator && navigator.userAgent.toLowerCase().indexOf("micromessenger") !== -1) {
+	if (navigator && navigator.userAgent && navigator.userAgent.toLowerCase().indexOf("micromessenger") !== -1) {
 		return true
 	}
 	return false
@@ -608,7 +608,7 @@ export function routerPermissions(url, type) {
 			})
 			cookie.set('redirect', path)
 		})
-	// } else if (Vue.prototype.$deviceType == 'weixin') {
+		// } else if (Vue.prototype.$deviceType == 'weixin') {
 		// wechat().then(() => oAuth());
 		// if (!type) {
 		// 	push({