From dd78f3af82bb2a321cfa38ac47c9f616adc70460 Mon Sep 17 00:00:00 2001 From: yige Date: Tue, 21 Jul 2020 23:47:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BE=AE=E4=BF=A1=E7=99=BB?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/post/_id.vue | 76 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 70 insertions(+), 6 deletions(-) diff --git a/pages/post/_id.vue b/pages/post/_id.vue index 9bc110e..53614b6 100644 --- a/pages/post/_id.vue +++ b/pages/post/_id.vue @@ -51,8 +51,9 @@ span.reply(@click="check(i.comment_ID, 2)" v-else-if="visitorInfo.manage") 设为垃圾评论 p(v-if="!comments.length", style="color: #cecece; text-align: center; margin-top: 40px") 暂无内容 .comment-default-commit - .login(v-if="!visitorToken", @click="login") - img(src="https://cdn.wyr.me/imgs/GitHub-Login.png") + .login(v-if="!visitorToken") + img(class="login-img", src="https://cdn.wyr.me/imgs/GitHub-Login.png", @click="login('github')", style="margin-left: -140px;") + img(class="login-img", src="https://cdn.wyr.me/visitor-files/2020-07-21/1595344271134Weixin-Login.png", @click="login('weixin')") #editor .comment-toolbar .comment-no-userinfo(v-if="!visitorToken") 尚未登陆 @@ -64,7 +65,8 @@ .comment-btn(@click="commentCommit('editor')") 发布 .comment-reply-commit(id="comment-reply-commit", v-show="replyID") .login(v-show="!visitorToken", @click="login") - img(src="https://cdn.wyr.me/imgs/GitHub-Login.png") + img(class="login-img", src="https://cdn.wyr.me/imgs/GitHub-Login.png", @click="login('github')", style="margin-left: -140px;") + img(class="login-img", src="https://cdn.wyr.me/visitor-files/2020-07-21/1595344271134Weixin-Login.png", @click="login('weixin')") #editor-reply .comment-toolbar .comment-no-userinfo(v-if="!visitorToken") 尚未登陆 @@ -595,8 +597,65 @@ export default { window.localStorage.removeItem('visitorToken') this.visitorToken = null }, - login () { - 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') + getCode (uuid, last) { + // $.ajax({ + // type: "GET", + // url: "https://weixin.openapi.site/check?uuid=" + uuid + (last ? '&last=' + last : ''), + // dataType: "json", + // cache: !1, + // timeout: 6e4, + // success: function (data) { + // if (data.status === 405) { + // $('#code').text('登陆成功,code = ' + data.result.code) + // } else if (data.status === 404) { + // $('#code').text(data.msg.title + ', ' + data.msg.content) + // getCode(uuid, data.result.wxErrCode) + // } else if (data.status === 403) { + // $('#code').text(data.msg.title + ', ' + data.msg.content) + // getCode(uuid, data.result.wxErrCode) + // } else if (data.status === 500) { + // getUUID() + // } else { + // setTimeout(function () { + // getCode(uuid) + // }, 2000) + // } + // }, + // error: function () { + // setTimeout(function () { + // getCode(uuid) + // }, 2000) + // } + // }) + }, + async login (type) { + if (type === 'github') { + 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') + } else if (type === 'weixin') { + const { data } = await this.$axios.get('https://weixin.openapi.site/img?appid=wx2d1d6aa2f86768d7&redirect_uri=https://wyr.me') + + if (data.status === 1) { + const uuid = data.result.wxUUID + // $('#qrcode').attr('src', data.result.imgData) + // getCode(uuid) + console.log(uuid) + } else { + this.$toasted.show('获取微信登录所需参数错误,请暂时换用其它登录方式或重试。', { + position: 'top-center', + duration: 5000 + }) + } + + this.$toasted.show('敬请期待,请先使用Github登录', { + position: 'top-center', + duration: 5000 + }) + } else { + this.$toasted.show('敬请期待', { + position: 'top-center', + duration: 5000 + }) + } }, setCommentMap () { const comments = this.comments @@ -879,7 +938,12 @@ export default { user-select none img - margin-top 70px + margin 70px 20px 0 20px + z-index 100 + position absolute + + .login-img:hover + filter contrast(50%) .login:hover background-color #fff