From c6370f4cbe77fd5cba29aa23244bb4db341bfd44 Mon Sep 17 00:00:00 2001
From: linju <8432241+linjuDcloud@user.noreply.gitee.com>
Date: Thu, 15 Apr 2021 16:00:07 +0800
Subject: [PATCH] 123

---
 baseapp.config.json                           | 33 ++++++++++++++++++-
 common/appInit.js                             |  6 ++--
 .../uni-quick-login/uni-quick-login.vue       |  3 +-
 3 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/baseapp.config.json b/baseapp.config.json
index ac1fdca..a7da680 100644
--- a/baseapp.config.json
+++ b/baseapp.config.json
@@ -4,5 +4,36 @@
 			"/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 b24b168..4350c81 100644
--- a/common/appInit.js
+++ b/common/appInit.js
@@ -5,10 +5,10 @@ export default function() {
 	initAppVersion();
 
 	// 检查更新
-	 checkUpdate();
+	checkUpdate();
 
 	//自定义路由拦截
-	// setRouter()
+	setRouter()
 	
 	//提示网络变化
 	eventListenerNetwork()
@@ -36,7 +36,7 @@ function initAppVersion() {
 }
 
 //用于拦截路由
-import baseappConfig from '@/baseapp.config.json';
+const baseappConfig = require('@/baseapp.config.json')
 const {"router":{needLogin}} = baseappConfig //需要登陆的页面
 function setRouter() {
 	let before_action = e => {
diff --git a/uni_modules/uni-quick-login/components/uni-quick-login/uni-quick-login.vue b/uni_modules/uni-quick-login/components/uni-quick-login/uni-quick-login.vue
index ab97276..75acacf 100644
--- a/uni_modules/uni-quick-login/components/uni-quick-login/uni-quick-login.vue
+++ b/uni_modules/uni-quick-login/components/uni-quick-login/uni-quick-login.vue
@@ -45,8 +45,7 @@
 						"text": "微博登录",
 						"logo": "../../static/login/img/sinaweibo.png",
 						"isChecked":false //暂未提供该登陆方式的接口示例
-					},
-					
+					}
 				},
 				providerList: [],
 				oauthServices:[],
-- 
GitLab