From 8ab770e9dee0c0771213e0cf4b4e3aeccbbcc1d3 Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Mon, 11 Dec 2017 13:39:58 +0800
Subject: [PATCH] lint:format code

---
 src/utils/index.js                     | 102 ++++++++++++-------------
 src/utils/request.js                   |   2 +-
 src/views/layout/components/Navbar.vue |   2 +-
 3 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/src/utils/index.js b/src/utils/index.js
index c233580..9657c9c 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -2,57 +2,57 @@
  * Created by jiachenpan on 16/11/18.
  */
 
- export function parseTime(time, cFormat) {
-   if (arguments.length === 0) {
-     return null
-   }
-   const format = cFormat || '{y}-{m}-{d} {h}:{i}:{s}'
-   let date
-   if (typeof time === 'object') {
-     date = time
-   } else {
-     if (('' + time).length === 10) time = parseInt(time) * 1000
-     date = new Date(time)
-   }
-   const formatObj = {
-     y: date.getFullYear(),
-     m: date.getMonth() + 1,
-     d: date.getDate(),
-     h: date.getHours(),
-     i: date.getMinutes(),
-     s: date.getSeconds(),
-     a: date.getDay()
-   }
-   const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
-     let value = formatObj[key]
-     if (key === 'a') return ['一', '二', '三', '四', '五', '六', '日'][value - 1]
-     if (result.length > 0 && value < 10) {
-       value = '0' + value
-     }
-     return value || 0
-   })
-   return time_str
- }
+export function parseTime(time, cFormat) {
+  if (arguments.length === 0) {
+    return null
+  }
+  const format = cFormat || '{y}-{m}-{d} {h}:{i}:{s}'
+  let date
+  if (typeof time === 'object') {
+    date = time
+  } else {
+    if (('' + time).length === 10) time = parseInt(time) * 1000
+    date = new Date(time)
+  }
+  const formatObj = {
+    y: date.getFullYear(),
+    m: date.getMonth() + 1,
+    d: date.getDate(),
+    h: date.getHours(),
+    i: date.getMinutes(),
+    s: date.getSeconds(),
+    a: date.getDay()
+  }
+  const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
+    let value = formatObj[key]
+    if (key === 'a') return ['一', '二', '三', '四', '五', '六', '日'][value - 1]
+    if (result.length > 0 && value < 10) {
+      value = '0' + value
+    }
+    return value || 0
+  })
+  return time_str
+}
 
- export function formatTime(time, option) {
-   time = +time * 1000
-   const d = new Date(time)
-   const now = Date.now()
+export function formatTime(time, option) {
+  time = +time * 1000
+  const d = new Date(time)
+  const now = Date.now()
 
-   const diff = (now - d) / 1000
+  const diff = (now - d) / 1000
 
-   if (diff < 30) {
-     return '刚刚'
-   } else if (diff < 3600) { // less 1 hour
-     return Math.ceil(diff / 60) + '分钟前'
-   } else if (diff < 3600 * 24) {
-     return Math.ceil(diff / 3600) + '小时前'
-   } else if (diff < 3600 * 24 * 2) {
-     return '1天前'
-   }
-   if (option) {
-     return parseTime(time, option)
-   } else {
-     return d.getMonth() + 1 + '月' + d.getDate() + '日' + d.getHours() + '时' + d.getMinutes() + '分'
-   }
- }
+  if (diff < 30) {
+    return '刚刚'
+  } else if (diff < 3600) { // less 1 hour
+    return Math.ceil(diff / 60) + '分钟前'
+  } else if (diff < 3600 * 24) {
+    return Math.ceil(diff / 3600) + '小时前'
+  } else if (diff < 3600 * 24 * 2) {
+    return '1天前'
+  }
+  if (option) {
+    return parseTime(time, option)
+  } else {
+    return d.getMonth() + 1 + '月' + d.getDate() + '日' + d.getHours() + '时' + d.getMinutes() + '分'
+  }
+}
diff --git a/src/utils/request.js b/src/utils/request.js
index 710dc7a..755b6d6 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -6,7 +6,7 @@ import { getToken } from '@/utils/auth'
 // 创建axios实例
 const service = axios.create({
   baseURL: process.env.BASE_API, // api的base_url
-  timeout: 15000                  // 请求超时时间
+  timeout: 15000 // 请求超时时间
 })
 
 // request拦截器
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
index c00b011..eb36b1a 100644
--- a/src/views/layout/components/Navbar.vue
+++ b/src/views/layout/components/Navbar.vue
@@ -43,7 +43,7 @@ export default {
     },
     logout() {
       this.$store.dispatch('LogOut').then(() => {
-        location.reload()  // 为了重新实例化vue-router对象 避免bug
+        location.reload() // 为了重新实例化vue-router对象 避免bug
       })
     }
   }