diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 37a89514..e128179a 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -11,16 +11,11 @@ - - - - - - - - - - + + + + + @@ -68,34 +63,42 @@ - - + + - - + + - - - - - - - - - - - - - + + + + + - + + + + + + + + + + + + + + + + + - + @@ -107,131 +110,76 @@ - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - - - - + + + + - - + + - - + + - - - - + + - - + + - - + + - - - - + + + + + + + + + + + + + - - + + - - + + - - - - - - - - - - - - - - - - - + + @@ -311,12 +259,9 @@ @@ -2383,7 +2331,7 @@ - + 1524125534890 @@ -2449,7 +2397,7 @@ - @@ -2569,38 +2517,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2753,20 +2669,6 @@ - - - - - - - - - - - - - - @@ -2830,17 +2732,6 @@ - - - - - - - - - - - @@ -2881,28 +2772,6 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -2929,7 +2798,7 @@ - + @@ -2954,7 +2823,7 @@ - + @@ -2967,7 +2836,7 @@ - + @@ -2978,22 +2847,9 @@ - - - - - - - - - - - - - - + @@ -3017,9 +2873,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -3030,14 +3003,6 @@ - - - - - - - - diff --git a/xmall-manager-web/src/main/webapp/WEB-INF/jsp/content-banner-list.jsp b/xmall-manager-web/src/main/webapp/WEB-INF/jsp/content-banner-list.jsp index f6be0036..52b4cbc7 100644 --- a/xmall-manager-web/src/main/webapp/WEB-INF/jsp/content-banner-list.jsp +++ b/xmall-manager-web/src/main/webapp/WEB-INF/jsp/content-banner-list.jsp @@ -359,6 +359,7 @@ layer.close(index); if(data.success!=true){ layer.alert(data.message,{title: '错误信息',icon: 2}); + return; } layer.msg('已删除!',{icon:1,time:1000}); refresh(); diff --git a/xmall-manager-web/src/main/webapp/WEB-INF/jsp/content-index-list.jsp b/xmall-manager-web/src/main/webapp/WEB-INF/jsp/content-index-list.jsp index 55def2f9..712c27e3 100644 --- a/xmall-manager-web/src/main/webapp/WEB-INF/jsp/content-index-list.jsp +++ b/xmall-manager-web/src/main/webapp/WEB-INF/jsp/content-index-list.jsp @@ -351,6 +351,7 @@ layer.close(index); if(data.success!=true){ layer.alert(data.message,{title: '错误信息',icon: 2}); + return; } layer.msg('已删除!',{icon:1,time:1000}); refresh(); diff --git a/xmall-manager-web/src/main/webapp/WEB-INF/jsp/content-other-list.jsp b/xmall-manager-web/src/main/webapp/WEB-INF/jsp/content-other-list.jsp index ccc3d1a3..96bfe044 100644 --- a/xmall-manager-web/src/main/webapp/WEB-INF/jsp/content-other-list.jsp +++ b/xmall-manager-web/src/main/webapp/WEB-INF/jsp/content-other-list.jsp @@ -349,6 +349,7 @@ layer.close(index); if(data.success!=true){ layer.alert(data.message,{title: '错误信息',icon: 2}); + return; } layer.msg('已删除!',{icon:1,time:1000}); refresh(); diff --git a/xmall-manager-web/src/main/webapp/WEB-INF/jsp/order-list.jsp b/xmall-manager-web/src/main/webapp/WEB-INF/jsp/order-list.jsp index f55531a4..202ceb04 100644 --- a/xmall-manager-web/src/main/webapp/WEB-INF/jsp/order-list.jsp +++ b/xmall-manager-web/src/main/webapp/WEB-INF/jsp/order-list.jsp @@ -234,6 +234,7 @@ layer.close(index); if(data.success!=true){ layer.alert(data.message,{title: '错误信息',icon: 2}); + return; } layer.msg('已删除!',{icon:1,time:1000}); orderCount(); diff --git a/xmall-manager-web/src/main/webapp/WEB-INF/jsp/system-log.jsp b/xmall-manager-web/src/main/webapp/WEB-INF/jsp/system-log.jsp index 5242afb9..05131d02 100644 --- a/xmall-manager-web/src/main/webapp/WEB-INF/jsp/system-log.jsp +++ b/xmall-manager-web/src/main/webapp/WEB-INF/jsp/system-log.jsp @@ -209,6 +209,7 @@ layer.close(index); if(data.success!=true){ layer.alert(data.message,{title: '错误信息',icon: 2}); + return; } layer.msg('已删除!',{icon:1,time:1000}); logCount();