From a795fa7b14f6cb93eb6b5c2a8da425ed8ca6625d Mon Sep 17 00:00:00 2001
From: "Adam.Gong" <admin@xiuyetang.com>
Date: Wed, 6 May 2020 21:14:56 +0800
Subject: [PATCH] auto commit the code by alias command

---
 .gitignore                             |  1 +
 package.json                           |  6 ++++--
 src/App.vue                            |  1 +
 src/api/user.js                        |  3 +++
 src/layout/components/AppMain.vue      |  3 +++
 src/layout/components/Navbar.vue       | 16 +++++++++++-----
 src/layout/components/Sidebar/Logo.vue |  2 +-
 src/main.js                            |  3 ++-
 src/router/index.js                    |  8 +++++---
 src/settings.js                        |  6 +++---
 src/utils/request.js                   | 25 +++++++++++++++++++------
 src/views/dashboard/index.vue          |  7 +++++--
 src/views/login/index.vue              |  2 +-
 13 files changed, 59 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9ad28d2..02b0dcc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ tests/**/coverage/
 *.ntvs*
 *.njsproj
 *.sln
+yarn.lock
\ No newline at end of file
diff --git a/package.json b/package.json
index 4e6dc90..59b13ec 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
-  "name": "vue-admin-template",
+  "name": "yp-plan",
   "version": "4.2.1",
   "description": "A vue admin template with Element UI & axios & iconfont & permission control & lint",
-  "author": "Pan <panfree23@gmail.com>",
+  "author": "XYT==admin@xiuyetang.com",
   "license": "MIT",
   "scripts": {
     "dev": "vue-cli-service serve",
@@ -16,11 +16,13 @@
   },
   "dependencies": {
     "axios": "0.18.1",
+    "echarts": "^4.7.0",
     "element-ui": "2.13.0",
     "js-cookie": "2.2.0",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "path-to-regexp": "2.4.0",
+    "plop": "^2.6.0",
     "vue": "2.6.10",
     "vue-router": "3.0.6",
     "vuex": "3.1.0"
diff --git a/src/App.vue b/src/App.vue
index ec9032c..c38fbaa 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -2,6 +2,7 @@
   <div id="app">
     <router-view />
   </div>
+  
 </template>
 
 <script>
diff --git a/src/api/user.js b/src/api/user.js
index 8ff4389..66868be 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -1,6 +1,7 @@
 import request from '@/utils/request'
 
 export function login(data) {
+  console.log('login....', data)
   return request({
     url: '/vue-admin-template/user/login',
     method: 'post',
@@ -9,6 +10,7 @@ export function login(data) {
 }
 
 export function getInfo(token) {
+  console.log('getInfo....', token)
   return request({
     url: '/vue-admin-template/user/info',
     method: 'get',
@@ -17,6 +19,7 @@ export function getInfo(token) {
 }
 
 export function logout() {
+  console.log('logout....')
   return request({
     url: '/vue-admin-template/user/logout',
     method: 'post'
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index f6a3286..293827f 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -10,6 +10,9 @@
 export default {
   name: 'AppMain',
   computed: {
+    // key() {
+    //     return this.$route.name !== undefined? this.$route.name + +new Date(): this.$route + +new Date()
+    // }
     key() {
       return this.$route.path
     }
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 0ca5cf6..f770e29 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -5,6 +5,7 @@
     <breadcrumb class="breadcrumb-container" />
 
     <div class="right-menu">
+      语言设置
       <el-dropdown class="avatar-container" trigger="click">
         <div class="avatar-wrapper">
           <img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">
@@ -16,14 +17,19 @@
               Home
             </el-dropdown-item>
           </router-link>
-          <a target="_blank" href="https://github.com/PanJiaChen/vue-admin-template/">
+          <router-link to="/seting">
+            <el-dropdown-item>
+              个人设置
+            </el-dropdown-item>
+          </router-link>
+          <!-- <a target="_blank" href="https://github.com/PanJiaChen/vue-admin-template/">
             <el-dropdown-item>Github</el-dropdown-item>
-          </a>
-          <a target="_blank" href="https://panjiachen.github.io/vue-element-admin-site/#/">
+          </a> -->
+          <!-- <a target="_blank" href="https://panjiachen.github.io/vue-element-admin-site/#/">
             <el-dropdown-item>Docs</el-dropdown-item>
-          </a>
+          </a> -->
           <el-dropdown-item divided @click.native="logout">
-            <span style="display:block;">Log Out</span>
+            <span style="display:block;">退出系统</span>
           </el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 040fab6..8626ec4 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -24,7 +24,7 @@ export default {
   },
   data() {
     return {
-      title: 'Vue Admin Template',
+      title: '鱼皮出海',
       logo: 'https://wpimg.wallstcn.com/69a1c46c-eb1c-4b46-8bd4-e9e686ef5251.png'
     }
   }
diff --git a/src/main.js b/src/main.js
index 01cba2f..9e91667 100644
--- a/src/main.js
+++ b/src/main.js
@@ -5,6 +5,7 @@ import 'normalize.css/normalize.css' // A modern alternative to CSS resets
 import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 import locale from 'element-ui/lib/locale/lang/en' // lang i18n
+// import local_zh from 'element-ui/lib/locale/lang/zh-CN' // 在node_module里面
 
 import '@/styles/index.scss' // global css
 
@@ -31,7 +32,7 @@ if (process.env.NODE_ENV === 'production') {
 // set ElementUI lang to EN
 Vue.use(ElementUI, { locale })
 // 如果想要中文版 element-ui，按如下方式声明
-// Vue.use(ElementUI)
+// Vue.use(ElementUI, {local_zh})
 
 Vue.config.productionTip = false
 
diff --git a/src/router/index.js b/src/router/index.js
index b572aac..1fb0c30 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -51,7 +51,7 @@ export const constantRoutes = [
       path: 'dashboard',
       name: 'Dashboard',
       component: () => import('@/views/dashboard/index'),
-      meta: { title: 'Dashboard', icon: 'dashboard' }
+      meta: { title: '标题-------dashboard', icon: 'dashboard' }
     }]
   },
 
@@ -164,9 +164,11 @@ export const asyncRoutes = [
       }
     ]
   },
-
   // 404 page must be placed at the end !!!
-  { path: '*', redirect: '/404', hidden: true }
+  {
+    path: '*',
+    redirect: '/404'
+  }
 ]
 
 const createRouter = () => new Router({
diff --git a/src/settings.js b/src/settings.js
index ae3c494..1f54b34 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -1,16 +1,16 @@
 module.exports = {
 
-  title: 'Vue Admin Template',
+  title: '鱼皮出海',
 
   /**
    * @type {boolean} true | false
    * @description Whether fix the header
    */
-  fixedHeader: false,
+  fixedHeader: true,
 
   /**
    * @type {boolean} true | false
    * @description Whether show the logo in sidebar
    */
-  sidebarLogo: false
+  sidebarLogo:true
 }
diff --git a/src/utils/request.js b/src/utils/request.js
index 2fb95ac..52a10f2 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -4,6 +4,7 @@ import store from '@/store'
 import { getToken } from '@/utils/auth'
 
 // create an axios instance
+// 创建axios实例
 const service = axios.create({
   baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
   // withCredentials: true, // send cookies when cross-domain requests
@@ -11,11 +12,13 @@ const service = axios.create({
 })
 
 // request interceptor
+// request拦截器
 service.interceptors.request.use(
   config => {
     // do something before request is sent
-
+    console.log('do something before request is sent')
     if (store.getters.token) {
+      console.log('[X-Token] is a custom headers key')
       // let each request carry token
       // ['X-Token'] is a custom headers key
       // please modify it according to the actual situation
@@ -24,6 +27,7 @@ service.interceptors.request.use(
     return config
   },
   error => {
+    console.log('do something with request error')
     // do something with request error
     console.log(error) // for debug
     return Promise.reject(error)
@@ -31,6 +35,7 @@ service.interceptors.request.use(
 )
 
 // response interceptor
+// respone拦截器
 service.interceptors.response.use(
   /**
    * If you want to get http information such as headers or status
@@ -44,7 +49,11 @@ service.interceptors.response.use(
    */
   response => {
     const res = response.data
-
+    /**
+    * 下面的注释为通过response自定义code来标示请求状态，当code返回如下情况为权限有问题，登出并返回到登录页
+    * 如通过xmlhttprequest 状态码标识 逻辑可写在下面error中
+    */
+    console.log('if the custom code is not 20000, it is judged as an error.')
     // if the custom code is not 20000, it is judged as an error.
     if (res.code !== 20000) {
       Message({
@@ -54,15 +63,19 @@ service.interceptors.response.use(
       })
 
       // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
+      // 50008:非法的token; 50012:其他客户端登录了;  50014:Token 过期了;
       if (res.code === 50008 || res.code === 50012 || res.code === 50014) {
         // to re-login
-        MessageBox.confirm('You have been logged out, you can cancel to stay on this page, or log in again', 'Confirm logout', {
-          confirmButtonText: 'Re-Login',
-          cancelButtonText: 'Cancel',
+        // MessageBox.confirm('You have been logged out, you can cancel to stay on this page, or log in again', 'Confirm logout', {
+        MessageBox.confirm('你已被登出，可以取消继续留在该页面，或者重新登录', '确定登出', {
+          // confirmButtonText: 'Re-Login',
+          confirmButtonText: '重新登录',
+          // cancelButtonText: 'Cancel',
+          cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
           store.dispatch('user/resetToken').then(() => {
-            location.reload()
+            location.reload()// 为了重新实例化vue-router对象 避免bug
           })
         })
       }
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 77ae59a..068e003 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -1,12 +1,15 @@
 <template>
   <div class="dashboard-container">
-    <div class="dashboard-text">name: {{ name }}</div>
-    <div class="dashboard-text">roles: <span v-for="role in roles" :key="role">{{ role }}</span></div>
+    <div class="dashboard-text">用户名: {{ name }}</div>
+    <div class="dashboard-text">角色： <span v-for="role in roles" :key="role">{{ role }}</span></div>
   </div>
 </template>
 
+
+
 <script>
 import { mapGetters } from 'vuex'
+import ElementUI from 'element-ui'
 
 export default {
   name: 'Dashboard',
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 1db2464..4dd1753 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -40,7 +40,7 @@
           <svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" />
         </span>
       </el-form-item>
-
+      <!-- <el-button :loading="loading" type="primary" style="width:100%;margin-bottom:30px;" @click.native.prevent="handleLogin">reg</el-button> -->
       <el-button :loading="loading" type="primary" style="width:100%;margin-bottom:30px;" @click.native.prevent="handleLogin">Login</el-button>
 
       <div class="tips">
-- 
2.0.0