From b461e5b7d450b4b54dbff3056a8388b0e0f8798a Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 22 Jul 2018 20:34:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A7=E5=B0=8F=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: b9dc56014aa05a7edf69c53efca3e21e26648234 [formerly e14ba58ac1d4dc8fa9f99360a64f4a4e0896b3b1] [formerly b9dc56014aa05a7edf69c53efca3e21e26648234 [formerly e14ba58ac1d4dc8fa9f99360a64f4a4e0896b3b1] [formerly b9dc56014aa05a7edf69c53efca3e21e26648234 [formerly e14ba58ac1d4dc8fa9f99360a64f4a4e0896b3b1] [formerly e14ba58ac1d4dc8fa9f99360a64f4a4e0896b3b1 [formerly dbd30bc4c64b70f631c8cc2bd8f596c5919eb789 [formerly 1a2283954ae0ff58db32db51375c4aae736a4266]]]]]
Former-commit-id: 35b98156e98fc2a5b1afcc95a659164a3ff66489
Former-commit-id: 7e0586998f72896dfcd0fd5fa8940ae6bf587fe5
Former-commit-id: 054fe4fa97cfdb96e740865e7139f640e7f60549 [formerly adf81c26c8003ffe9bc2acc09297fe346ae95265]
Former-commit-id: 41cacfded1401975dfa43fb8bf7437b6c4fb9f30
Former-commit-id: 85c7be1c2c9198489da1f03c49da2983fa13adb3
Former-commit-id: 3f40faa14c34c730aad52462a1bea33f727ba763
Former-commit-id: f8e47c6d56be0db8627d881fef67bb897395e31d
Former-commit-id: d4f1780a9cd61f2f55646e8633cb65d0ba3995db
---
 src/libs/util.js                            | 18 +++++++++---------
 src/pages/login/page.vue                    |  2 +-
 src/store/modules/d2admin.js.REMOVED.git-id |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/libs/util.js b/src/libs/util.js
index d94bcfd1..c58d66f0 100644
--- a/src/libs/util.js
+++ b/src/libs/util.js
@@ -9,8 +9,8 @@ let util = {}
 
 /**
  * @description 存储 uuid 到 cookie
- * @param {string} value uuid value
- * @param {object} setting cookie setting
+ * @param {String} value uuid value
+ * @param {Object} setting cookie setting
  */
 util.uuidSet = function (value = '', setting = {}) {
   let cookieSetting = {
@@ -36,8 +36,8 @@ util.uuidRemove = function () {
 
 /**
  * @description 存储 token 到 cookie
- * @param {string} value token value
- * @param {object} setting cookie setting
+ * @param {String} value token value
+ * @param {Object} setting cookie setting
  */
 util.tokenSet = function (value = '', setting = {}) {
   let cookieSetting = {
@@ -63,7 +63,7 @@ util.tokenRemove = function () {
 
 /**
  * @description 更新标题
- * @param {string} title 标题
+ * @param {String} title 标题
  */
 util.title = function (titleText) {
   window.document.title = `${process.env.VUE_APP_TITLE}${titleText ? ` | ${titleText}` : ''}`
@@ -79,7 +79,7 @@ util.ua = function () {
 /**
  * @description 判断是否在其内
  * @param {*} ele element
- * @param {array} targetArr array
+ * @param {Array} targetArr array
  */
 util.isOneOf = function (ele, targetArr) {
   if (targetArr.indexOf(ele) >= 0) {
@@ -91,8 +91,8 @@ util.isOneOf = function (ele, targetArr) {
 
 /**
  * @description 打印一个 “胶囊” 样式的信息
- * @param {string} title title text
- * @param {string} info info text
+ * @param {String} title title text
+ * @param {String} info info text
  */
 util.logCapsule = function (title, info) {
   console.log(
@@ -105,7 +105,7 @@ util.logCapsule = function (title, info) {
 
 /**
  * @description 检查版本更新
- * @param {object} vm vue
+ * @param {Object} vm vue
  */
 util.checkUpdate = function (vm) {
   axios.get('https://api.github.com/repos/FairyEver/d2-admin/releases/latest')
diff --git a/src/pages/login/page.vue b/src/pages/login/page.vue
index 9ad2e195..3c9c3d77 100644
--- a/src/pages/login/page.vue
+++ b/src/pages/login/page.vue
@@ -110,7 +110,7 @@ export default {
     ]),
     /**
      * @description 接收选择一个用户快速登陆的事件
-     * @param {object} user 用户信息
+     * @param {Object} user 用户信息
      */
     handleUserBtnClick (user) {
       this.formLogin.username = user.username
diff --git a/src/store/modules/d2admin.js.REMOVED.git-id b/src/store/modules/d2admin.js.REMOVED.git-id
index 374fe2b7..2e6a974e 100644
--- a/src/store/modules/d2admin.js.REMOVED.git-id
+++ b/src/store/modules/d2admin.js.REMOVED.git-id
@@ -1 +1 @@
-37e7e9944cffb10558313e68774d41f91ba60d16
\ No newline at end of file
+480b7ed3b175008cdc94b4d8c421aebf908f4f21
\ No newline at end of file