update

src/layout/login/loginMain.vue

@@ -7,11 +7,11 @@
           <el-tab-pane label="登录" name="first">
             <el-col :span="24">
               <el-form ref="form" :model="form" label-width="80px">
-                <el-form-item label="用户类别">
+                <!-- <el-form-item label="用户类别">
                   <el-radio v-model="form.role" label="1">管理员</el-radio>
                   <el-radio v-model="form.role" label="2">个人</el-radio>
                   <el-radio v-model="form.role" label="3">企业管理员</el-radio>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="手机号">
                   <el-input v-model="form.phone" placeholder="请输入手机号" :minlength="11" :maxlength="11"></el-input>
                 </el-form-item>

src/store/login.js

@@ -5,7 +5,8 @@ import { Notification } from 'element-ui';
 const jwt = require('jsonwebtoken');
 Vue.use(Vuex);
 const api = {
-  interface: `/api/market/user/login`,
+  interface: `/api/auth/login`,
+  getUser: `/api/auth/token`,
   updatePassword: '/api/user/pwd_edit',
 };
 const state = () => ({});
@@ -31,7 +32,7 @@ const actions = {
       commit('setUser', token, { root: true });
     };
     if (res.errcode == '0') {
-      setUser(res.data, commit);
+      setUser(res.data.key, commit);
       // Notification({
       //   title: '登录成功',
       //   message: `欢迎,${user.user_name}`,
@@ -50,6 +51,17 @@ const actions = {
       }
     }
   },
+  async toGetUser({ commit }, payload) {
+    let key = localStorage.getItem('token');
+    if (!key) {
+      console.log('游客身份');
+    }
+    let res = await this.$axios.$post(api.getUser, { key: key });
+    if (this.$checkRes(res)) {
+      let user = jwt.decode(res.data);
+      commit('setUser', user);
+    }
+  },
   async update({ commit }, payload) {
     let res = await this.$axios.$post(`${api.updatePassword}`, { data: payload });
     return res;

src/store/user/mutations.js

@@ -1,30 +1,31 @@
 const jwt = require('jsonwebtoken');
 export const setUser = (state, payload) => {
-  let res = true;
-  //登陆时
-  if (payload) {
-    state.token = payload;
-  } else {
-    //已经登陆,切换路由时取出用户信息放在总store中
-    let token = localStorage.getItem('token');
-    if (token && token !== 'guest') {
-      state.user = jwt.decode(token);
-    } else if (token && token == 'guest') {
-      let user = localStorage.getItem('user');
-      state.user = JSON.parse(user);
-    } else {
-      let timestamp = new Date().getTime();
-      let user = {
-        // id: `guest${timestamp}`,
-        name: `游客${timestamp}`,
-      };
-      state.user = user;
-      localStorage.setItem('token', 'guest');
-      localStorage.setItem('user', JSON.stringify(user));
-      console.warn('游客身份');
-    }
-  }
-  return res;
+  state.user = payload;
+  // let res = true;
+  // //登陆时
+  // if (payload) {
+  //   state.token = payload;
+  // } else {
+  //   //已经登陆,切换路由时取出用户信息放在总store中
+  //   let token = localStorage.getItem('token');
+  //   if (token && token !== 'guest') {
+  //     state.user = jwt.decode(token);
+  //   } else if (token && token == 'guest') {
+  //     let user = localStorage.getItem('user');
+  //     state.user = JSON.parse(user);
+  //   } else {
+  //     let timestamp = new Date().getTime();
+  //     let user = {
+  //       // id: `guest${timestamp}`,
+  //       name: `游客${timestamp}`,
+  //     };
+  //     state.user = user;
+  //     localStorage.setItem('token', 'guest');
+  //     localStorage.setItem('user', JSON.stringify(user));
+  //     console.warn('游客身份');
+  //   }
+  // }
+  // return res;
 };
 
 export const deleteUser = (state, payload) => {

src/views/login.vue

@@ -56,6 +56,9 @@ export default {
     pageTitle() {
       return `${this.$route.meta.title}`;
     },
+    redirect_uri() {
+      return `${this.$route.query.redirect_uri}`;
+    },
   },
   metaInfo() {
     return { title: this.$route.meta.title };

vue.config.js

@@ -1,4 +1,5 @@
 const path = require('path');
+const common = path.resolve(__dirname, '../common');
 module.exports = {
   publicPath: process.env.NODE_ENV === 'development' ? '/' : process.env.VUE_APP_ROUTER,
   // outputDir: process.env.VUE_APP_ROUTER,
@@ -10,6 +11,7 @@ module.exports = {
           '@': path.resolve(__dirname, './src'),
           '@c': path.resolve(__dirname, './src/components'),
           '@a': path.resolve(__dirname, './src/assets'),
+          '@common': common,
         },
       },
     });
@@ -18,55 +20,8 @@ module.exports = {
     port: '8100',
     //api地址前缀
     proxy: {
-      '/weixin': {
-        target: 'http://smart.cc-lotus.info',
-        changeOrigin: true,
-        ws: true,
-      },
-      '/files': {
-        target: 'http://free.liaoningdoupo.com',
-      },
-      '/api/setting': {
-        target: 'http://free.liaoningdoupo.com', //http://free.liaoningdoupo.com
-        changeOrigin: true,
-        ws: true,
-      },
-      '/api/affairs': {
-        target: 'http://free.liaoningdoupo.com',
-        changeOrigin: true,
-        ws: true,
-      },
-      '/api/policy': {
-        target: 'http://free.liaoningdoupo.com',
-        changeOrigin: true,
-        ws: true,
-      },
-      '/api/record': {
-        target: 'http://free.liaoningdoupo.com',
-        changeOrigin: true,
-        ws: true,
-      },
-      '/api/serve': {
-        target: 'http://free.liaoningdoupo.com',
-        changeOrigin: true,
-        ws: true,
-        // pathRewrite: { '^/api/affairs': '/api' },
-      },
-      '/api/talent': {
-        target: 'http://free.liaoningdoupo.com',
-        changeOrigin: true,
-        ws: true,
-        // pathRewrite: { '^/api/affairs': '/api' },
-      },
-      '/api/market': {
-        target: 'http://free.liaoningdoupo.com',
-        changeOrigin: true,
-        ws: true,
-        // pathRewrite: { '^/api/affairs': '/api' },
-      },
-      '/api': {
+      '/api/auth': {
         target: 'http://free.liaoningdoupo.com',
-        // target: 'http://10.16.10.72:9004',
         changeOrigin: true,
         ws: true,
         // pathRewrite: { '^/api/affairs': '/api' },