diff --git a/pages/auth.vue b/pages/auth.vue index 2310228..d131b06 100644 --- a/pages/auth.vue +++ b/pages/auth.vue @@ -13,20 +13,20 @@ export default { async mounted () { const code = this.$route.query.code - if (!code) { this.notice = '
非法访问,缺少授权参数"code"。
非法访问,缺少授权参数"code"。 授权失败,请再试一次。 授权失败,请关闭页面从登陆入口再试一次。
返回首页' }
+ if (!code) { this.notice = '
返回首页'; this.$finishLoad(); return }
- const { data } = await this.$axios.post('/visitor/user/auth', {
+ const { data } = await this.$axios.post('http://127.0.0.1:65534/visitor/user/auth', {
type: 'github',
code
})
if (data.status !== 1) {
- this.notice = '
返回首页'
+ this.notice = '
返回首页'
+ this.$finishLoad()
+ return
}
- console.log(data)
-
- window.opener.localStorage.visitorToken = data.token
+ window.opener.localStorage.visitorToken = data.result
window.opener.authSuccess(data)
window.close()
diff --git a/pages/post/_id.vue b/pages/post/_id.vue
index 6f2b438..2b89678 100644
--- a/pages/post/_id.vue
+++ b/pages/post/_id.vue
@@ -437,12 +437,7 @@ export default {
}
},
login () {
- const newWindow = window.open('https://github.com/login/oauth/authorize?client_id=ce1673a37333e47e482d&redirect_uri=https://www.wyr.me/auth', 'Github授权', 'scrollbars=yes,resizable=yes,status=no,location=yes,toolbar=no,menubar=no,width=800,height=600,left=0,top=0')
-
- newWindow.onload = function () {
- // newWindow.location
- // newWindow.close()
- }
+ window.open('https://github.com/login/oauth/authorize?client_id=ce1673a37333e47e482d&redirect_uri=https://www.wyr.me/auth', 'Github授权', 'scrollbars=yes,resizable=yes,status=no,location=yes,toolbar=no,menubar=no,width=800,height=600,left=0,top=0')
}
},
head () {