Merge remote-tracking branch 'origin/master'

Author: lmxdawn

src/store/modules/admin.js

@@ -64,6 +64,9 @@ const actions = {
  return new Promise((resolve, reject) => {
  userInfo()
  .then(response => {
+ if (response.code === 2) {
+ reject("登录失效");
+ }
  const data = response.data || {};
  commit(types.RECEIVE_ADMIN_NAME, data.username);
  commit(types.RECEIVE_ADMIN_AVATAR, data.avatar);

src/views/home/index.vue

@@ -371,10 +371,6 @@ export default {
  background-color: #fff;
 }
 
-.header .el-dropdown {
- @include fxied-center;
-}
-
 .logo {
  display: block;
  width: 100%;
@@ -404,13 +400,10 @@ export default {
 }
 
 .header-right {
- position: absolute;
- top: 0;
- right: 5px;
  display: flex;
- width: 80px;
  height: 100%;
  margin-left: 10px;
+ float: right;
  .el-dropdown {
  display: flex;
  cursor: pointer;
@@ -468,6 +461,11 @@ export default {
 /*}*/
 
 @media screen and (max-width: 768px) {
+ .main {
+ overflow-y: scroll !important;
+ -webkit-overflow-scrolling: touch;
+ }
+
  .slide-hide.slide-in-left {
  -webkit-transform: translate3d(64px, 0, 0) !important;
  transform: translate3d(64px, 0, 0) !important;