Merge branch 'master' of http://git.ycjcjy.com/honghe/h5-draw-lots

src/router/index.js

@@ -5,7 +5,7 @@ import Router from 'vue-router'
 import Honghe from '../pages/Honghe.vue'
 import SaveShare from '../pages/SaveShare.vue'
 import { useModel } from '../store'
-import { getOpenId } from '../utils/wx'
+import { getUserInfo } from '../utils/wx'
 import { login } from '../services/person'
 import { setToken } from '../utils/token'
 
@@ -36,7 +36,7 @@ router.beforeEach((to, from, next) => {
 
   // 未登录
   if (!person.personId) {
-    getOpenId().then(openid => {
+    getUserInfo().then(openid => {
       login(openid).then(res => {
         const { user, token } = res;
         setPerson(user)

src/utils/wx.js

@@ -64,9 +64,9 @@ export function redirect () {
   const queryCode = getCode();
   localStorage.setItem('wxcode', queryCode)
 
-  if (!queryCode || queryCode === originCode) {
+  if (!queryCode || queryCode !== originCode) {
     const local = encodeURIComponent(location.origin + location.pathname)
-    const url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxd3bab568bc42d1de&redirect_uri=${local}&response_type=code&scope=snsapi_base&state=123#wechat_redirect`
+    const url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxd3bab568bc42d1de&redirect_uri=${local}&response_type=code&scope=snsapi_userinfo&state=123#wechat_redirect`
     window.location.href = url
   }
 }
@@ -85,3 +85,18 @@ export function getOpenId () {
 
   return request(`https://api.h5.njyunzhi.com/mp/openid?code=${encodeURIComponent(code)}`)
 }
+
+/**
+ * 获取 openid
+ * @returns 
+ */
+export function getUserInfo () {
+  if (process.env.NODE_ENV === 'development') return Promise.resolve({ openid: '123' });
+
+  const code = getCode()
+  if (!code) {
+    return Promise.reject("获取用户信息失败, 请刷新重试")
+  }
+
+  return request(`https://api.h5.njyunzhi.com/mp/userinfo?code=${encodeURIComponent(code)}`)
+}