add mock，未完待续

Author: zhongzhenlong

build/webpack.base.conf.js

@@ -49,7 +49,8 @@ module.exports = {
           resolve('src'),
           resolve('test'),
           resolve('/node_modules/.1.4.8@element-ui/src'),
-          resolve('/node_modules/.1.4.8@element-ui/packages')
+          resolve('/node_modules/.1.4.8@element-ui/packages'),
+          resolve('/node_modules/.4.3.0@vuex-router-sync')
         ]
       },
       {

src/pages/layout/header.vue

@@ -33,7 +33,7 @@
           <el-dropdown-menu style="padding: 0px">
             <div>
               <div class="header-pic">
-                <img :src='userInfo.avatar' class="img-circle" alt="User Image">
+                <img :src='userInfo.avatar' class="img-circle" alt="User Image" >
                 <p>{{userInfo.name}}</p>
               </div>
               <div class="pull-left">
@@ -252,10 +252,14 @@
 
   }
   .main-header.closeLogo .navbar{
-    margin-left: 0px;
+    margin-left: 44px;
   }
 
   .main-header.closeLogo .logo{
+    width: 44px;
+    padding: 0 8px;
+  }
+  .main-header.closeLogo .logo .logo-lg b{
     display: none;
   }
   .main-header.closeLogo .sidebar-toggle {

src/pages/login.vue

@@ -2,17 +2,19 @@
   <el-row>
     <el-col :span="12" :offset="6">
       <div class="login">
+      <el-row slot="body" :gutter="0" >
+      <el-col :span="24" :xs="24" :sm="16" :md="16" :lg="16">
         <div class="login-form">
           <div class="card-block">
-            <h1>Vue-Admin-Login</h1>
+            <h1>Vue-Admin</h1>
             <p class="text-muted">任意用户名/密码登录</p>
             <div class="input-group m-b-1">
               <span class="input-group-addon"><i class="fa fa-user"></i></span>
-              <input type="text" class="form-control" placeholder="Username" v-model="form.username">
+              <input type="text" class="form-control" placeholder="user name" v-model="form.username">
             </div>
             <div class="input-group m-b-2">
               <span class="input-group-addon"><i class="fa fa-lock"></i></span>
-              <input type="password" class="form-control" placeholder="Password" v-model="form.password"
+              <input type="password" class="form-control" placeholder="password" v-model="form.password"
                      @keyup.enter="login">
             </div>
             <div class="row">
@@ -27,13 +29,17 @@
             </div>
           </div>
         </div>
+        </el-col>
+      <el-col :span="24" :xs="24" :sm="8" :md="8" :lg="8">
         <div class="login-register">
           <div class="card-block">
             <h2>注册</h2>
             <p>平台暂时只支持使用公司邮箱注册.</p>
             <el-button type="info" class="btn btn-primary active m-t-1"> 马上注册</el-button>
           </div>
         </div>
+        </el-col>
+        </el-row>
       </div>
     </el-col>
   </el-row>
@@ -95,6 +101,7 @@
     margin-left: auto !important;
     display: table;
     table-layout: fixed;
+    background-color: #20a8d8;
   }
 
   .login .el-button {
@@ -107,14 +114,14 @@
 
   .login .login-form {
     background-color: #FFFFFF;
-    display: inline-block;
-    width: 60%;
-    display: table-cell;
+    width: 100%;
+    height: 100%;
+    display: block;
 
   }
 
   .login .login-form .card-block {
-    margin: 35px;
+    padding: 35px;
   }
 
   .login .login-form .card-block p {
@@ -177,18 +184,16 @@
     position: relative;
     z-index: 2;
     float: left;
-    width: 100%;
     margin-bottom: 0;
   }
 
   .form-control {
-    width: 100%;
+    width: 90%;
     padding: .5rem .75rem;
-    font-size: .875rem;
+    font-size: 1.5rem;
     line-height: 1.75rem;
     color: #607d8b;
-    background-color: #fff;
-    background-image: none;
+    background: #fff none;
     background-clip: padding-box;
     border: 1px solid rgba(0, 0, 0, .15);
     transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
@@ -200,15 +205,16 @@
   }
 
   .login .login-register {
-    display: table-cell;
+    width: 100%;
+    height: 100%;
+    display: block;
     background-color: #20a8d8;
-    width: 40%;
     color: #fff;
   }
 
   .login .login-register .card-block {
     text-align: center !important;
-    margin: 30px;
+    padding: 30px;
   }
 
   .login .login-register .card-block p {

src/pages/sys/user.vue

@@ -24,10 +24,11 @@
         style="width: 100%"
         v-loading="listLoading"
         @selection-change="handleSelectionChange">
+        <!--checkbox 适当加宽，否则IE下面有省略号 https://github.com/ElemeFE/element/issues/1563-->
         <el-table-column
           prop="id"
           type="selection"
-          width="45">
+          width="50">
         </el-table-column>
         <el-table-column
           label="照片" width="76">