From 0566808861c8ab40ac59b1584dcdaffb2376ae43 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Tue, 2 Aug 2022 17:06:11 +0800
Subject: [PATCH] add comments

---
 public/index.html         |  2 +-
 src/i18n/index.js         |  3 ++-
 src/router/index.js       |  1 +
 src/utils/index.js        |  2 +-
 src/views/main-navbar.vue |  4 ++--
 src/views/pages/login.vue | 20 ++++++++++----------
 6 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/public/index.html b/public/index.html
index 71f176a..53f0c2b 100644
--- a/public/index.html
+++ b/public/index.html
@@ -30,7 +30,7 @@
   <!-- 开发环境 -->
   <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
     <script>
-    window.SITE_CONFIG['apiURL'] = 'http://localhost:8080/renren-admin';
+    window.SITE_CONFIG['apiURL'] = 'http://192.168.1.65:8080/yd-monitor';
     </script>
   <% } %>
   <!-- 集成测试环境 -->
diff --git a/src/i18n/index.js b/src/i18n/index.js
index 1ea81ad..eb668d6 100644
--- a/src/i18n/index.js
+++ b/src/i18n/index.js
@@ -15,6 +15,7 @@ export const messages = {
 }
 
 export default new VueI18n({
-  locale: Cookies.get('language') || 'zh-CN',
+  // locale: Cookies.get('language') || 'zh-CN',
+  locale: 'zh-CN', // 先默认中文
   messages
 })
diff --git a/src/router/index.js b/src/router/index.js
index 5c4c2a2..7f34f42 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -72,6 +72,7 @@ const router = new Router({
 })
 
 router.beforeEach((to, from, next) => {
+  console.log('[*] === router beforeEach: ', to, from)
   // 添加动态(菜单)路由
   // 已添加或者当前路由为页面路由, 可直接访问
   if (window.SITE_CONFIG['dynamicMenuRoutesHasAdded'] || fnCurrentRouteIsPageRoute(to, pageRoutes)) {
diff --git a/src/utils/index.js b/src/utils/index.js
index bf8bb9b..50decdf 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -73,7 +73,7 @@ export function getIconList () {
 }
 
 /**
- * 树形数据转换
+ * 树形数据转换，把扁平的数据，转换为树形结构的数据
  * @param {*} data
  * @param {*} id
  * @param {*} pid
diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue
index 83e1cb0..f07cb75 100644
--- a/src/views/main-navbar.vue
+++ b/src/views/main-navbar.vue
@@ -89,8 +89,8 @@ export default {
         cancelButtonText: this.$t('cancel'),
         type: 'warning'
       }).then(() => {
-        this.$http.post('/logout').then(({ data: res }) => {
-          if (res.code !== 0) {
+        this.$http.post('/doLogout').then(({ data: res }) => {
+          if (res.code !== 200) {
             return this.$message.error(res.msg)
           }
           clearLoginInfo()
diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue
index 814999b..2def271 100644
--- a/src/views/pages/login.vue
+++ b/src/views/pages/login.vue
@@ -22,7 +22,7 @@
                 </span>
               </el-input>
             </el-form-item>
-            <el-form-item prop="captcha">
+            <!-- <el-form-item prop="captcha">
               <el-row :gutter="20">
                 <el-col :span="14">
                   <el-input v-model="dataForm.captcha" :placeholder="$t('login.captcha')">
@@ -35,7 +35,7 @@
                   <img :src="captchaPath" @click="getCaptcha()">
                 </el-col>
               </el-row>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item>
               <el-button type="primary" @click="dataFormSubmitHandle()" class="w-percent-100">{{ $t('login.title') }}</el-button>
             </el-form-item>
@@ -55,7 +55,7 @@
 <script>
 import Cookies from 'js-cookie'
 import debounce from 'lodash/debounce'
-import { getUUID } from '@/utils'
+// import { getUUID } from '@/utils'
 export default {
   data () {
     return {
@@ -64,7 +64,7 @@ export default {
         username: 'admin',
         password: 'admin',
         uuid: '',
-        captcha: ''
+        // captcha: ''
       }
     }
   },
@@ -77,14 +77,14 @@ export default {
         password: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        captcha: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ]
+        // captcha: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ]
       }
     }
   },
   created () {
-    this.getCaptcha()
+    // this.getCaptcha()
   },
   methods: {
     // 获取验证码
@@ -99,8 +99,8 @@ export default {
           return false
         }
         this.$http.post('/login', this.dataForm).then(({ data: res }) => {
-          if (res.code !== 0) {
-            this.getCaptcha()
+          if (res.code !== 200) {
+            // this.getCaptcha()
             return this.$message.error(res.msg)
           }
           Cookies.set('token', res.data.token)