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({