Merge remote-tracking branch 'origin/release-201821-wangcz' into release-201821-wangcz

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ReleaseProductByBatchServiceImpl.java

@@ -329,12 +329,14 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
                 success = releaseProductByBatchDao.getCountPublisherUuAndBatchAndReleaseCode(userUU, batch, ReleaseStatus.success.value());
             }
 		}
-		String publish = publishByBatch(batch, isPcb);
+		if (!isAPerson && !isPcb) {
+			String publish = publishByBatch(batch, isPcb);
+			modelMap.put("publish", publish);
+		}
 		modelMap.put("total", total);
 		modelMap.put("success", success);
 		modelMap.put("failure", failure);
 		modelMap.put("filter", filter);
-		modelMap.put("publish", publish);
 		return modelMap;
 	}
 

src/main/webapp/WEB-INF/views/normal/activity.html

@@ -33,7 +33,9 @@
 <!-- 消息提示框 End -->
 <!-- Loading Start -->
 <div id="loading" class="loading">
-    <i></i>
+    <div class="wrap">
+        <div class="outer"></div>
+    </div>
 </div>
 <!-- Loading End -->
 <!-- 最顶部站点导航 -->

src/main/webapp/WEB-INF/views/normal/admin.html

@@ -64,7 +64,9 @@
 	<!-- 消息提示框 End -->
 	<!-- Loading Start -->
 	<div id="loading" class="loading">
-		<i></i>
+		<div class="wrap">
+			<div class="outer"></div>
+		</div>
 	</div>
 	<!-- Loading End -->
 </body>

src/main/webapp/WEB-INF/views/normal/adminWithNav.html

@@ -287,7 +287,9 @@
 	<!-- 消息提示框 End -->
 	<!-- Loading Start -->
 	<div id="loading" class="loading">
-		<i></i>
+		<div class="wrap">
+			<div class="outer"></div>
+		</div>
 	</div>
 	<!-- Loading End -->
 

src/main/webapp/WEB-INF/views/normal/commonSearch.html

@@ -22,7 +22,9 @@
 	<!-- 消息提示框 End -->
 	<!-- Loading Start -->
 	<div id="loading" class="loading">
-		<i></i>
+		<div class="wrap">
+			<div class="outer"></div>
+		</div>
 	</div>
 	<!-- Loading End -->
 

src/main/webapp/WEB-INF/views/normal/erp/vendor_center.html

@@ -28,7 +28,9 @@
 	<!-- 消息提示框 End -->
 	<!-- Loading Start -->
 	<div id="loading" class="loading">
-		<i></i>
+		<div class="wrap">
+			<div class="outer"></div>
+		</div>
 	</div>
 	<!-- Loading End -->
 

src/main/webapp/WEB-INF/views/normal/help.html

@@ -57,7 +57,9 @@
 	
 	<!-- Loading Start -->
 	<div id="loading" class="loading">
-		<i></i>
+		<div class="wrap">
+			<div class="outer"></div>
+		</div>
 	</div>
 	<!-- Loading End -->
 	

src/main/webapp/WEB-INF/views/normal/index.html

@@ -23,7 +23,9 @@
 	<!-- 消息提示框 End -->
 	<!-- Loading Start -->
 	<div id="loading" class="loading">
-		<i></i>
+		<div class="wrap">
+			<div class="outer"></div>
+		</div>
 	</div>
 	<!-- Loading End -->
 

src/main/webapp/WEB-INF/views/normal/news.html

@@ -32,7 +32,9 @@
 <!-- 消息提示框 End -->
 <!-- Loading Start -->
 <div id="loading" class="loading">
-	<i></i>
+	<div class="wrap">
+		<div class="outer"></div>
+	</div>
 </div>
 <!-- Loading End -->
 <!-- 最顶部站点导航 -->

src/main/webapp/WEB-INF/views/normal/product.html

@@ -33,7 +33,9 @@
 	<!-- 消息提示框 End -->
 	<!-- Loading Start -->
 	<div id="loading" class="loading">
-		<i></i>
+		<div class="wrap">
+			<div class="outer"></div>
+		</div>
 	</div>
 	<!-- Loading End -->
 	<!-- 最顶部站点导航 -->

src/main/webapp/WEB-INF/views/normal/products.html

@@ -24,7 +24,9 @@
 	<!-- 消息提示框 End -->
 	<!-- Loading Start -->
 	<div id="loading" class="loading">
-		<i></i>
+		<div class="wrap">
+			<div class="outer"></div>
+		</div>
 	</div>
 	<!-- Loading End -->
 	

src/main/webapp/WEB-INF/views/normal/provider_list.html

@@ -24,7 +24,9 @@
 	<!-- 消息提示框 End -->
 	<!-- Loading Start -->
 	<div id="loading" class="loading">
-		<i></i>
+		<div class="wrap">
+			<div class="outer"></div>
+		</div>
 	</div>
 	<!-- Loading End -->
 

src/main/webapp/WEB-INF/views/normal/sso.html

@@ -35,7 +35,9 @@
 	<!-- 消息提示框 End -->
 	<!-- Loading Start -->
 	<div id="loading" class="loading">
-		<i></i>
+		<div class="wrap">
+			<div class="outer"></div>
+		</div>
 	</div>
 	<!-- Loading End -->
 	<header>

src/main/webapp/WEB-INF/views/normal/store_close.html

@@ -24,7 +24,9 @@
 	<!-- 消息提示框 End -->
 	<!-- Loading Start -->
 	<div id="loading" class="loading">
-		<i></i>
+		<div class="wrap">
+			<div class="outer"></div>
+		</div>
 	</div>
 	<!-- Loading End -->
 

src/main/webapp/WEB-INF/views/normal/store_default.html

@@ -24,7 +24,9 @@
 	<!-- 消息提示框 End -->
 	<!-- Loading Start -->
 	<div id="loading" class="loading">
-		<i></i>
+		<div class="wrap">
+			<div class="outer"></div>
+		</div>
 	</div>
 	<!-- Loading End -->
 

src/main/webapp/WEB-INF/views/normal/store_none.html

@@ -24,7 +24,9 @@
 	<!-- 消息提示框 End -->
 	<!-- Loading Start -->
 	<div id="loading" class="loading">
-		<i></i>
+		<div class="wrap">
+			<div class="outer"></div>
+		</div>
 	</div>
 	<!-- Loading End -->