6 anni fa · c3a59824e9
--- a/src/main/java/com/izouma/awesomeadmin/service/impl/UserOrderServiceImpl.java
+++ b/src/main/java/com/izouma/awesomeadmin/service/impl/UserOrderServiceImpl.java
@@ -1741,6 +1741,12 @@ public class UserOrderServiceImpl implements UserOrderService {
 
				                     resultOrder.setFailAlbum(orderAlbum.getFailNum());
			
 
				                 }
			
 
				 
			
 
				+                if (userOrder.getAlbumStatus() == AppConstant.OrderAlbumStatus.FINISH) {
			
 
				+                    resultOrder.setNeedAlbum(0);
			
 
				+                    resultOrder.setTotalAlbum(0);
			
 
				+                    resultOrder.setFailAlbum(0);
			
 
				+                }
			
 
				+
			
 
				 
			
 
				             }
			
 
				 
			
--- a/src/main/webapp/WEB-INF/html/admin.html
+++ b/src/main/webapp/WEB-INF/html/admin.html
@@ -1 +1 @@
 
				-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.80cb3fa497e32f10a3907ec3acaaf110.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.37bddfdc5e9d863d0773.js></script><script type=text/javascript src=/static/js/vendor.bb9d33d099910f04d2dc.js></script><script type=text/javascript src=/static/js/admin.e4e7ac5331573a5400cb.js></script></body></html>
			
 
				+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.80cb3fa497e32f10a3907ec3acaaf110.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.c7988c9a8f40e891235e.js></script><script type=text/javascript src=/static/js/vendor.bb9d33d099910f04d2dc.js></script><script type=text/javascript src=/static/js/admin.e4e7ac5331573a5400cb.js></script></body></html>
			
--- a/src/main/webapp/WEB-INF/html/index.html
+++ b/src/main/webapp/WEB-INF/html/index.html
@@ -10,7 +10,7 @@
 
				         * {
			
 
				             padding: 0;
			
 
				             margin: 0
			
 
				-        }</style><link href=/static/css/index.62bef0cb5b216cfdc54ff8a22428e08a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.37bddfdc5e9d863d0773.js></script><script type=text/javascript src=/static/js/vendor.bb9d33d099910f04d2dc.js></script><script type=text/javascript src=/static/js/index.2da1c30335415142d74f.js></script></body><script>var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
			
 
				+        }</style><link href=/static/css/index.3cd5a3530ba142a49bcf4a41d035a7fc.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.c7988c9a8f40e891235e.js></script><script type=text/javascript src=/static/js/vendor.bb9d33d099910f04d2dc.js></script><script type=text/javascript src=/static/js/index.a3c535fde96b23194d6b.js></script></body><script>var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
			
 
				     var isIE = userAgent.indexOf("compatible") > -1 && userAgent.indexOf("MSIE") > -1; //判断是否IE<11浏览器
			
 
				     var isEdge = userAgent.indexOf("Edge") > -1 && !isIE; //判断是否IE的Edge浏览器
			
 
				     var isIE11 = userAgent.indexOf('Trident') > -1 && userAgent.indexOf("rv:11.0") > -1;
			
--- a/src/main/webapp/WEB-INF/html/loginAdmin.html
+++ b/src/main/webapp/WEB-INF/html/loginAdmin.html
@@ -1 +1 @@
 
				-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><link href=/static/css/loginAdmin.39f9b620c942cbdba0e3f23640ac4990.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.37bddfdc5e9d863d0773.js></script><script type=text/javascript src=/static/js/vendor.bb9d33d099910f04d2dc.js></script><script type=text/javascript src=/static/js/loginAdmin.9f3fcd1656128e06ce1a.js></script></body></html>
			
 
				+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><link href=/static/css/loginAdmin.39f9b620c942cbdba0e3f23640ac4990.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.c7988c9a8f40e891235e.js></script><script type=text/javascript src=/static/js/vendor.bb9d33d099910f04d2dc.js></script><script type=text/javascript src=/static/js/loginAdmin.9f3fcd1656128e06ce1a.js></script></body></html>
			
--- a/src/main/webapp/static/css/index.3cd5a3530ba142a49bcf4a41d035a7fc.css
+++ b/src/main/webapp/static/css/index.3cd5a3530ba142a49bcf4a41d035a7fc.css
--- a/src/main/webapp/static/js/18.8b912e73442ff58c2fef.js
+++ b/src/main/webapp/static/js/18.8b912e73442ff58c2fef.js
--- a/src/main/webapp/static/js/19.a7610a1576b8de21cc73.js
+++ b/src/main/webapp/static/js/19.a7610a1576b8de21cc73.js
--- a/src/main/webapp/static/js/21.fd96b86c71c3d506e699.js
+++ b/src/main/webapp/static/js/21.fd96b86c71c3d506e699.js
--- a/src/main/webapp/static/js/22.ed6d853cb442c9ab0402.js
+++ b/src/main/webapp/static/js/22.ed6d853cb442c9ab0402.js
--- a/src/main/webapp/static/js/22.fef351903ff209229118.js
+++ b/src/main/webapp/static/js/22.fef351903ff209229118.js
--- a/src/main/webapp/static/js/index.a3c535fde96b23194d6b.js
+++ b/src/main/webapp/static/js/index.a3c535fde96b23194d6b.js
--- a/src/main/webapp/static/js/manifest.c7988c9a8f40e891235e.js
+++ b/src/main/webapp/static/js/manifest.c7988c9a8f40e891235e.js