From d7a58eb17814af2a16ee13afaf93acda09745ed9 Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Wed, 22 Jul 2020 22:10:35 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/assets/js/common.js |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 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 138d0d1..5ffbfdb 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
@@ -282,7 +282,8 @@
     return theRequest;
 }
     /**
- * 自动将没权限的按钮隐藏
+     * 1.判断用户是否在登录状态
+ * 2.自动将没权限的按钮隐藏
  * 如果页面有列表,则在列表的 done事件内调用
  * 如果页面没有列表,则在页面所有js执行的最后调用此函数
  * 
@@ -290,7 +291,14 @@
  * 同时在控件上增加permissions="user-btn-import"这样的自定义属性 
  * 其中引号内是菜单管理--里面对应的资源的菜单path
  */
-function permissionsInput() {
+function permissionsInput(res,config) {
+    if(!strUtil.isEmpty(res)&&res.code==401){
+        config.removeToken();
+        layer.msg('登录过期', {icon: 2, time: 1500}, function () {
+            location.replace('/login.html');
+        }, 1000);
+        return;
+    }
     var needpPermissions = $(".permissions");
     var permissions = layui.sessionData('tempData')['permissions'];
     needpPermissions.each(function () {

--
Gitblit v1.8.0