mirror/yapi
2
0
Fork 0
mirror of https://github.com/YMFE/yapi.git synced 2025-03-07 14:16:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 解决header冲突

Browse Source
This commit is contained in:
qitmac000249 2017-08-11 10:36:00 +08:00
parent a4bebf74cd
commit a366506a7c
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/components/Header/Header.js
View File

@ -89,14 +89,8 @@ ToolUser.propTypes={
@connect( @connect(
(state) => { (state) => {
return{ return{
<<<<<<< HEAD
avatar: state.login.avatar,
user: state.login.userName,
uid: state.login.uid,
=======
user: state.user.userName, user: state.user.userName,
uid: state.user.uid, uid: state.user.uid,
>>>>>>> 8c04198eb2dd2e6ddae9b815cc9a21b6436d8c76
msg: null, msg: null,
login:state.user.isLogin login:state.user.isLogin
} }

1
server/controllers/base.js
View File

@ -19,7 +19,6 @@ class baseController {
async init(ctx) { async init(ctx) {
this.$user = null; this.$user = null;
console.log(111111)
let ignoreRouter = [ let ignoreRouter = [
'/user/login_by_token', '/user/login_by_token',
'/user/login', '/user/login',

11
server_dist/controllers/base.js
View File

@ -66,23 +66,22 @@ var baseController = function () {
switch (_context.prev = _context.next) { switch (_context.prev = _context.next) {
case 0: case 0:
this.$user = null; this.$user = null;
console.log(111111);
ignoreRouter = ['/user/login_by_token', '/user/login', '/user/reg', '/user/status', '/user/logout']; ignoreRouter = ['/user/login_by_token', '/user/login', '/user/reg', '/user/status', '/user/logout'];
if (!(ignoreRouter.indexOf(ctx.path) > -1)) { if (!(ignoreRouter.indexOf(ctx.path) > -1)) {
_context.next = 7; _context.next = 6;
break; break;
} }
this.$auth = true; this.$auth = true;
_context.next = 9; _context.next = 8;
break; break;
case 7: case 6:
_context.next = 9; _context.next = 8;
return this.checkLogin(ctx); return this.checkLogin(ctx);
case 9: case 8:
case 'end': case 'end':
return _context.stop(); return _context.stop();
} }