diff --git a/baseapp.config.json b/baseapp.config.json index a7da680d6f592499b99a90399a2071b3a1fb2f69..45313a9da3238d3ee90bfb9b9deaef74431edab0 100644 --- a/baseapp.config.json +++ b/baseapp.config.json @@ -3,37 +3,5 @@ "needLogin":[ "/pages/grid/grid" ] - }, - "login":{ - "weixin": { - "text": "微信登陆", - "logo": "../../static/login/img/weixin.png", - "isChecked":true - }, - "apple": { - "text": "苹果登陆", - "logo": "../../static/login/img/apple.png", - "isChecked":true - }, - "univerify": { - "text": "一键登陆", - "logo": "../../static/login/img/univerify.png", - "isChecked":true - }, - "qq": { - "text": "QQ登陆", - "logo": "../../static/login/img/qq.png", - "isChecked":false //暂未提供该登陆方式的接口示例 - }, - "xiaomi": { - "text": "小米登陆", - "logo": "../../static/login/img/qq.png", - "isChecked":false //暂未提供该登陆方式的接口示例 - }, - "sinaweibo": { - "text": "微博登录", - "logo": "../../static/login/img/sinaweibo.png", - "isChecked":false //暂未提供该登陆方式的接口示例 - } } } \ No newline at end of file diff --git a/common/appInit.js b/common/appInit.js index 4350c813961e48806f54d663b400f670c42d07a5..babd0fc4dbe26aec329e52f9402ce8abe24d2b43 100644 --- a/common/appInit.js +++ b/common/appInit.js @@ -36,7 +36,8 @@ function initAppVersion() { } //用于拦截路由 -const baseappConfig = require('@/baseapp.config.json') +import baseappConfig from '@/baseapp.config.json'; +console.log('baseappConfig',baseappConfig); const {"router":{needLogin}} = baseappConfig //需要登陆的页面 function setRouter() { let before_action = e => {