stjdydayou преди 4 години
родител
ревизия
2d07272de1
променени са 5 файла, в които са добавени 19 реда и са изтрити 20 реда
  1. 2 2
      src/layout/components/Navbar.vue
  2. 2 2
      src/layout/components/Sidebar/index.vue
  3. 6 6
      src/utils/request.js
  4. 1 1
      src/utils/validate.js
  5. 8 9
      src/views/login/index.vue

+ 2 - 2
src/layout/components/Navbar.vue

@@ -6,13 +6,13 @@
       @toggleClick="toggleSideBar"
     />
 
-    <breadcrumb class="breadcrumb-container"/>
+    <breadcrumb class="breadcrumb-container" />
 
     <div class="right-menu">
       <el-dropdown class="right-container" trigger="click">
         <a>
           {{ oauthInfo && oauthInfo.nickName }}
-          <i class="el-icon-caret-bottom"/>
+          <i class="el-icon-caret-bottom" />
         </a>
 
         <el-dropdown-menu slot="dropdown" class="user-dropdown">

+ 2 - 2
src/layout/components/Sidebar/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div :class="{'has-logo':showLogo}">
-    <logo v-if="showLogo" :collapse="isCollapse"/>
+    <logo v-if="showLogo" :collapse="isCollapse" />
     <el-scrollbar wrap-class="scrollbar-wrapper">
       <el-menu
         :default-active="activeMenu"
@@ -12,7 +12,7 @@
         :collapse-transition="false"
         mode="vertical"
       >
-        <sidebar-item v-for="route in routes" :key="route.path" :item="route" :base-path="route.path"/>
+        <sidebar-item v-for="route in routes" :key="route.path" :item="route" :base-path="route.path" />
       </el-menu>
     </el-scrollbar>
   </div>

+ 6 - 6
src/utils/request.js

@@ -10,12 +10,12 @@ const service = axios.create({
 
 service.interceptors.request.use(
   config => {
-    const accessToken = localStorage.getItem('x-access-token') || '';
+    const accessToken = localStorage.getItem('x-access-token') || ''
     if (accessToken) {
       config.headers['x-access-token'] = accessToken
     }
-    config.headers['Content-Type'] = 'application/json;charset=UTF-8';
-    config.headers['x-from-source'] = 'manager-admin-web';
+    config.headers['Content-Type'] = 'application/json;charset=UTF-8'
+    config.headers['x-from-source'] = 'manager-admin-web'
     return config
   },
   error => {
@@ -28,7 +28,7 @@ service.interceptors.request.use(
 service.interceptors.response.use(
   response => {
     const res = response.data
-    console.log(res);
+    console.log(res)
 
     // if the custom code is not 20000, it is judged as an error.
     if (['SUCCESS', 'MESSAGE_SUCCESS'].indexOf(res.code) > -1) {
@@ -39,9 +39,9 @@ service.interceptors.response.use(
           duration: 5 * 1000
         })
       }
-      return res.data || {};
+      return res.data || {}
     } else if (res.code === 'NO_LOGIN') {
-      history.push('/oauth/login');
+      history.push('/oauth/login')
     } else {
       Message({
         message: res.message,

+ 1 - 1
src/utils/validate.js

@@ -8,4 +8,4 @@
  */
 export function isExternal(path) {
   return /^(https?:|mailto:|tel:)/.test(path)
-}
+}

+ 8 - 9
src/views/login/index.vue

@@ -12,7 +12,7 @@
       </div>
 
       <el-form-item prop="username">
-        <span class="svg-container el-icon-user-solid"></span>
+        <span class="svg-container el-icon-user-solid" />
 
         <el-input
           ref="username"
@@ -25,7 +25,7 @@
       </el-form-item>
 
       <el-form-item prop="password">
-        <span class="svg-container el-icon-lock"></span>
+        <span class="svg-container el-icon-lock" />
         <el-input
           :key="passwordType"
           ref="password"
@@ -44,7 +44,7 @@
       </el-form-item>
 
       <el-form-item prop="password">
-        <span class="svg-container el-icon-warning"></span>
+        <span class="svg-container el-icon-warning" />
 
         <el-input
           ref="captcha"
@@ -58,7 +58,7 @@
           class="show-pwd"
           style="height: 38px"
           @click="refreshCaptcha"
-        />
+        >
       </el-form-item>
 
       <el-button
@@ -67,8 +67,7 @@
         style="width: 100%; margin-bottom: 30px"
         @click.native.prevent="handleLogin"
       >立即登录
-      </el-button
-      >
+      </el-button>
     </el-form>
   </div>
 </template>
@@ -92,9 +91,6 @@ export default {
       captcha: ''
     }
   },
-  created() {
-    this.refreshCaptcha()
-  },
   watch: {
     $route: {
       handler: function(route) {
@@ -103,6 +99,9 @@ export default {
       immediate: true
     }
   },
+  created() {
+    this.refreshCaptcha()
+  },
   methods: {
     refreshCaptcha() {
       getCaptcha().then((v) => {