提交 32ac98bd authored 作者: lihuihui's avatar lihuihui

Merge branch 'master' of https://gitlab.ezijing.com/ezijing/x-learn

# Conflicts: # src/router/routes.js
......@@ -33,6 +33,6 @@ module.exports = {
},
ProvidePlugin: {},
others: {
WECHAT_REDIRECT_URL: 'https://passport2.ezijing.com'
loginUrl: 'https://login2.ezijing.com/xlearn/login/index'
}
}
......@@ -14,6 +14,6 @@ module.exports = {
},
ProvidePlugin: {},
others: {
WECHAT_REDIRECT_URL: 'https://passport.ezijing.com'