From d7ff1382ef31c308df39b01c094ed3d46a62972c Mon Sep 17 00:00:00 2001
From: johnniang <johnniang@riseup.net>
Date: Thu, 21 Mar 2019 15:31:53 +0800
Subject: [PATCH] Import nprogress style

---
 src/main.js          |  6 ++----
 src/utils/service.js |  7 +++----
 src/utils/util.js    | 12 ++++++------
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/main.js b/src/main.js
index 839529d6..54219a35 100644
--- a/src/main.js
+++ b/src/main.js
@@ -3,9 +3,7 @@ import Vue from 'vue'
 import App from './App.vue'
 import router from './router'
 import store from './store/'
-import {
-  VueAxios
-} from '@/utils/request' // axios 不建议引入到 Vue 原型链上
+import { VueAxios } from '@/utils/request' // axios 不建议引入到 Vue 原型链上
 
 import './core/use'
 import bootstrap from './core/bootstrap'
@@ -19,7 +17,7 @@ Vue.use(VueAxios, router)
 new Vue({
   router,
   store,
-  created () {
+  created() {
     bootstrap()
   },
   render: h => h(App)
diff --git a/src/utils/service.js b/src/utils/service.js
index b23b2e82..7eebbe4d 100644
--- a/src/utils/service.js
+++ b/src/utils/service.js
@@ -1,12 +1,11 @@
 import axios from 'axios'
 import NProgress from 'nprogress'
 import Vue from 'vue'
+import 'nprogress/nprogress.css'
 
 const service = axios.create({
-  baseURL:
-    process.env.NODE_ENV === 'production'
-      ? 'https://ryanc.cc/'
-      : 'http://localhost:8090'
+  baseURL: process.env.NODE_ENV === 'production' ? 'https://ryanc.cc/' : 'http://localhost:8090',
+  timeout: 5000
 })
 
 service.interceptors.request.use(
diff --git a/src/utils/util.js b/src/utils/util.js
index 7b929e9c..70fed515 100644
--- a/src/utils/util.js
+++ b/src/utils/util.js
@@ -1,19 +1,19 @@
-export function timeFix () {
+export function timeFix() {
   const time = new Date()
   const hour = time.getHours()
-  return hour < 9 ? '早上好' : (hour <= 11 ? '上午好' : (hour <= 13 ? '中午好' : (hour < 20 ? '下午好' : '晚上好')))
+  return hour < 9 ? '早上好' : hour <= 11 ? '上午好' : hour <= 13 ? '中午好' : hour < 20 ? '下午好' : '晚上好'
 }
 
-export function welcome () {
+export function welcome() {
   const arr = ['休息一会儿吧', '准备吃什么呢?', '要不要打一把 DOTA', '我猜你可能累了']
-  const index = Math.floor((Math.random() * arr.length))
+  const index = Math.floor(Math.random() * arr.length)
   return arr[index]
 }
 
 /**
  * 触发 window.resize
  */
-export function triggerWindowResizeEvent () {
+export function triggerWindowResizeEvent() {
   const event = document.createEvent('HTMLEvents')
   event.initEvent('resize', true, true)
   event.eventType = 'message'
@@ -25,7 +25,7 @@ export function triggerWindowResizeEvent () {
  * @param id parent element id or class
  * @param timeout
  */
-export function removeLoadingAnimate (id = '', timeout = 1500) {
+export function removeLoadingAnimate(id = '', timeout = 1500) {
   if (id === '') {
     return
   }