From d4db050cceaa678e6f7c65435a1ac9c236a72777 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=9D=A8?= <1711467488@qq.com>
Date: Thu, 25 Jan 2018 20:03:59 +0800
Subject: [PATCH] no message

Former-commit-id: e286a71eca33b0cbd8d114906701f8c37ed2ce41
Former-commit-id: fac7c3582b5ce793db8c86579156b15dfee4faf5
Former-commit-id: 3abdc7ccbc4fed3d45949b9cc921beced6de46e0
---
 src/mock/login/index.js         | 18 ++++---
 src/pages/core/login/index.vue  | 87 ++++++---------------------------
 src/pages/core/login/style.scss | 59 ++++++++++++++++++++++
 3 files changed, 83 insertions(+), 81 deletions(-)
 create mode 100644 src/pages/core/login/style.scss

diff --git a/src/mock/login/index.js b/src/mock/login/index.js
index be3f1373..3611e222 100644
--- a/src/mock/login/index.js
+++ b/src/mock/login/index.js
@@ -3,19 +3,18 @@ import Mock from 'mockjs'
 const userDB = [
   {
     username: 'admin',
-    password: 'admin'
-  },
-  {
-    username: 'FairyEver',
-    password: '000000'
+    password: 'admin',
+    avatar: 'http://fairyever.qiniudn.com/d2-admin-user.jpg'
   },
   {
     username: 'user1',
-    password: '111111'
+    password: '111111',
+    avatar: 'http://fairyever.qiniudn.com/d2-admin-user-2.jpg'
   },
   {
     username: 'user2',
-    password: '222222'
+    password: '222222',
+    avatar: ''
   }
 ]
 
@@ -25,7 +24,10 @@ Mock.mock('/login', 'post', ({url, type, body}) => {
   if (user) {
     return {
       code: 0,
-      msg: '登陆成功'
+      msg: '登陆成功',
+      data: {
+        ...user
+      }
     }
   } else {
     return {
diff --git a/src/pages/core/login/index.vue b/src/pages/core/login/index.vue
index 461b2b0b..00b73850 100644
--- a/src/pages/core/login/index.vue
+++ b/src/pages/core/login/index.vue
@@ -2,9 +2,11 @@
   <div class="login-page">
     <div class="layer bg" id="login"></div>
     <div class="layer flex-center">
+      <!-- logo部分 -->
       <div class="logo-group">
         <img src="@/assets/image/logo/w500.png" alt="logo">
       </div>
+      <!-- 表单部分 -->
       <div class="form-group">
         <el-card>
           <el-form ref="loginForm" label-position="top" :rules="rules" :model="formLogin">
@@ -21,11 +23,12 @@
             <el-button @click="submit" type="primary" class="button-login">登陆</el-button>
           </el-form>
         </el-card>
-        <el-button type="info" class="button-help">
-          需要帮助
-          <i class="fa fa-question-circle"></i>
-        </el-button>
       </div>
+      <!-- 帮助按钮 -->
+      <el-button type="info" class="button-help">
+        需要帮助
+        <i class="fa fa-question-circle"></i>
+      </el-button>
     </div>
   </div>
 </template>
@@ -40,8 +43,8 @@ export default {
   data () {
     return {
       formLogin: {
-        username: '',
-        password: ''
+        username: 'admin',
+        password: 'admin'
       },
       rules: {
         username: [
@@ -62,6 +65,7 @@ export default {
     submit () {
       this.$refs.loginForm.validate((valid) => {
         if (valid) {
+          // 开始请求登录接口
           this.$http({
             method: 'post',
             url: '/login',
@@ -71,14 +75,9 @@ export default {
             }
           })
             .then (res => {
-              if (res.data.code === 0) {
-                this.$message.success(res.data.msg)
-                setTimeout(() => {
-                  this.$router.push('index')
-                }, 300);
-              } else {
-                this.$message.error(res.data.msg)
-              }
+              console.group('登录')
+              console.log(res)
+              console.groupEnd()
             })
         } else {
           return false
@@ -90,64 +89,6 @@ export default {
 </script>
 
 <style lang="scss">
-@import '~@/assets/style/public.scss';
-.login-page {
-  background-color: #EDF4FA;
-  height: 100%;
-  position: relative;
-  // 层
-  .layer {
-    position: absolute;
-    height: 100%;
-    width: 100%;
-    &.flex-center {
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      flex-direction: column;
-    }
-  }
-  // logo
-  .logo-group {
-    margin-top: -75px - 70px;
-    position: relative;
-    top: 75px;
-    img {
-      height: 140px;
-    }
-  }
-  // 登陆表单
-  .form-group {
-    width: 300px;
-    // 重新设置卡片阴影
-    .el-card {
-      box-shadow: 0 0 8px 0 rgba(232,237,250,.6), 0 2px 4px 0 rgba(232,237,250,.5);
-      .el-card__body {
-        padding-top: 70px;
-      }
-    }
-    // 登陆按钮
-    .button-login {
-      width: 100%;
-    }
-    // 输入框左边的图表区域缩窄
-    .el-input-group__prepend {
-      padding: 0px 14px;
-    }
-  }
-  // 帮助按钮
-  .button-help {
-    width: 100%;
-    margin-top: $margin;
-  }
-  // 背景
-  .bg {
-    canvas {
-      display: block;
-      margin: 0px;
-      padding: 0px;
-    }
-  }
-}
+@import './style.scss';
 </style>
 
diff --git a/src/pages/core/login/style.scss b/src/pages/core/login/style.scss
new file mode 100644
index 00000000..b0d9171f
--- /dev/null
+++ b/src/pages/core/login/style.scss
@@ -0,0 +1,59 @@
+@import '~@/assets/style/public.scss';
+.login-page {
+  background-color: #EDF4FA;
+  height: 100%;
+  position: relative;
+  // 层
+  .layer {
+    position: absolute;
+    height: 100%;
+    width: 100%;
+    &.flex-center {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      flex-direction: column;
+    }
+  }
+  // 背景
+  .bg {
+    canvas {
+      display: block;
+      margin: 0px;
+      padding: 0px;
+    }
+  }
+  // logo
+  .logo-group {
+    margin-top: -75px - 70px;
+    position: relative;
+    top: 75px;
+    img {
+      height: 140px;
+    }
+  }
+  // 登陆表单
+  .form-group {
+    width: 300px;
+    // 重新设置卡片阴影
+    .el-card {
+      box-shadow: 0 0 8px 0 rgba(232,237,250,.6), 0 2px 4px 0 rgba(232,237,250,.5);
+      .el-card__body {
+        padding-top: 70px;
+      }
+    }
+    // 登陆按钮
+    .button-login {
+      width: 100%;
+    }
+    // 输入框左边的图表区域缩窄
+    .el-input-group__prepend {
+      padding: 0px 14px;
+    }
+  }
+  // 帮助按钮
+  .button-help {
+    width: 300px;
+    margin-top: $margin;
+  }
+}
\ No newline at end of file