fix(SPA): 修复在 hash 模式下无法微信登录的问题

slimkit · Jan 31, 2019 · 5b5281c · 5b5281c
1 parent ecba261
commit 5b5281c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/resources/spa/src/page/wechat/WechatSignin.vue b/resources/spa/src/page/wechat/WechatSignin.vue
@@ -79,7 +79,7 @@ export default {
       let accessToken = this.$lstore.getData('H5_WECHAT_MP_ASTOKEN')
 
       if (!accessToken || !openId) {
-        const { data } = await this.$http.get(`socialite/getAccess/${code}`, { validateStatus: s => s === 200 })
+        const { data } = await this.$http.get(`/socialite/getAccess/${code}`, { validateStatus: s => s === 200 })
         const { access_token: newAccessToken, openid: newOpenId } = data
         accessToken = newAccessToken
         openId = newOpenId

diff --git a/resources/spa/src/util/wechat.js b/resources/spa/src/util/wechat.js
@@ -1,7 +1,9 @@
 import api from '@/api/api'
 
 export const signinByWechat = () => {
-  const redirectUrl = window.location.origin + process.env.BASE_URL + 'wechat/'
+  let redirectUrl = window.location.origin + process.env.BASE_URL
+  if (process.env.VUE_APP_ROUTER_MODE === 'hash') redirectUrl += '#/'
+  redirectUrl += 'wechat/'
   api
     .post(
       'socialite/getOriginUrl',