Commit 14760409 authored by 郝聪敏's avatar 郝聪敏

Merge branch 'feature/resceive_token' into 'master'

fix: 接收token参数

See merge request !232
parents 9987ae41 9558d1ac
...@@ -37,7 +37,7 @@ const router = new VueRouter({ ...@@ -37,7 +37,7 @@ const router = new VueRouter({
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
const urlParams = parseSearch(window.location.href); const urlParams = parseSearch(window.location.href);
setTitle(to.meta.title, to.path, to.query); setTitle(to.meta.title, to.path, to.query);
if (isXyqb) getAuthInfo(urlParams.vccToken); if (isXyqb) getAuthInfo(urlParams.vccToken || urlParams.token);
if (isWeixinBrower) { if (isWeixinBrower) {
getWxOpenId(urlParams.code); getWxOpenId(urlParams.code);
getShareInfo(to); getShareInfo(to);
......
...@@ -78,6 +78,7 @@ ...@@ -78,6 +78,7 @@
</div> </div>
</div> </div>
<cr-button <cr-button
@click="drawLottery"
:class="[{ 'Av-body-right_winning': status === 'HAS_WINNING' }, 'Av-body-right']" :class="[{ 'Av-body-right_winning': status === 'HAS_WINNING' }, 'Av-body-right']"
> >
{{ voteButtonText }} {{ voteButtonText }}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment