Merge branch 'master' of http://git.ycjcjy.com/state_grid/training-wx

src/main.js

@@ -58,12 +58,15 @@ Vue.use(Icon);
 redirect()
 
 Login().then(e => {
-
-
   new Vue({
     router,
     store,
     render: h => h(App),
   }).$mount('#app')
+}).catch(e => {
+  console.error(e)
+  // alert('系统错误, 请刷新重试')
 
+  // 重试一次
+  redirect(true)
 })

src/util/initial.js

@@ -64,9 +64,9 @@ export function share (opt) {
 // Vue.use(Vuex)
 
 export function Login () {
-  console.log(store);
+  const code = process.env.NODE_ENV === 'development' ? '123' : getCode()
 
-  return UserLogin('123',).then(e => {
+  return UserLogin(code).then(e => {
     console.log(e);
     let userInfo = {
       token: e.token,
@@ -155,10 +155,13 @@ export function redirect (force) {
   if (process.env.NODE_ENV === 'development') return;
 
   const originCode = localStorage.getItem('wxcode');
+  const wxfirst = localStorage.getItem('wxfirst') === null;
   const queryCode = getCode();
+ 
   localStorage.setItem('wxcode', queryCode)
+  localStorage.setItem('wxfirst', 'not');
 
-  if (force || !queryCode || queryCode === originCode) {
+  if (force || wxfirst || !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_userinfo&state=123#wechat_redirect`