From 183f436c553b641770fdb2352452192c97009a84 Mon Sep 17 00:00:00 2001
From: 克 刘 <4345453@qq.com>
Date: Mon, 01 Mar 2021 16:41:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/assets/js/common.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/assets/js/common.js b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/assets/js/common.js
index e1908dc..8c93db6 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/assets/js/common.js
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/assets/js/common.js
@@ -297,7 +297,7 @@
             layer.msg('登录过期', {icon: 2, time: 1500}, function () {
                 location.replace('/login.html');
             }, 5000);
-        }else if(msg.includes("Invalid access token")){
+        }else if(res.msg.includes("Invalid access token")){
             layer.msg('您的账号在其他地方登陆,请重新登录或修改密码', {icon: 2, time: 1500}, function () {
                 location.replace('/login.html');
             }, 5000);

--
Gitblit v1.8.0