bin2107 пре 5 година
родитељ
комит
8d0ca0b695

+ 3 - 1
src/main/java/com/style24/front/biz/web/TsfDisplayController.java

@@ -7,6 +7,7 @@ import java.util.HashMap;
 
 import javax.servlet.http.HttpServletResponse;
 
+import com.style24.front.support.security.session.TsfSession;
 import com.style24.persistence.domain.BrandGroup;
 import com.style24.persistence.domain.Cate4Srch;
 import com.style24.persistence.domain.Contents;
@@ -127,12 +128,13 @@ public class TsfDisplayController extends TsfBaseController {
 			if(contentsLoc.equals("SMM006")){
 				Social social = new Social();
 				social.setSiteCd("G000_10");
-				social.setFrontGb("P");
+				social.setFrontGb(TsfSession.getFrontGb());
 				mainLayout.setSocialInfo(socialService.getSocialForGoods(social));
 			}
 
 			mainLayoutList.add(mainLayout);
 		}
+
 		//log.info("mainLayoutList::{}", mainLayoutList);
 		mav.addObject("mainLayoutList", mainLayoutList);
 		mav.setViewName(super.getDeviceViewName("display/MallMainForm"));

+ 39 - 38
src/main/webapp/WEB-INF/views/web/display/MallMainFormWeb.html

@@ -180,7 +180,7 @@
 								<div class="bar_bg"></div>
 							</div>
 							<th:block th:each="socialData, socialStat : ${mainLayoutData.socialInfo}">
-								<form name="socailForm">
+								<form name="socailForm" id="socailForm">
 									<input type="hidden" name="targetTime" th:value="${socialData.socialEddt}">
 								</form>
 							</th:block>
@@ -197,42 +197,6 @@
 									</div>
 								</div>
 							</div>
-							<script>
-
-								/* 핫딜 countDown */
-								var target_date = new Date().getTime() + (1000*3600*8); // set the countdown date
-								var days, hours, minutes, seconds; // variables for time units
-
-								var countdown = document.getElementById("tiles"); // get tag element
-
-								getCountdown();
-
-								setInterval(function () { getCountdown(); }, 1000);
-
-								function getCountdown(){
-
-									// find the amount of "seconds" between now and target
-									var current_date = new Date().getTime();
-									var seconds_left = (target_date - current_date) / 1000;
-
-
-									seconds_left = seconds_left % 86400;
-
-									hours = pad( parseInt(seconds_left / 3600) );
-									seconds_left = seconds_left % 3600;
-
-									minutes = pad( parseInt(seconds_left / 60) );
-									seconds = pad( parseInt( seconds_left % 60 ) );
-
-									// format countdown string + set tag value
-									countdown.innerHTML = "<span>" + hours + "</span><span>" + minutes + "</span><span>" + seconds + "</span>";
-								}
-
-								function pad(n) {
-									return (n < 10 ? '0' : '') + n;
-								}
-								/* countDown */
-							</script>
 						</div>
 						<div class="cont_body">
 							<div class="swiper-container post-deal">
@@ -320,7 +284,44 @@
 /*<![CDATA[*/
 
 var mainLayoutList = [[${mainLayoutList}]];
-console.log('mainLayoutList::'+mainLayoutList);
+
+var targetTime = $("#socailForm").find("input[name=targetTime]").val();
+if(targetTime != null && targetTime != ''){
+	/* 핫딜 countDown */
+	var endTime = new Date(targetTime); // 남은시간 지정
+	endTime = (Date.parse(endTime) / 1000);
+
+	var countdown = document.getElementById("tiles"); // get tag element
+
+	getCountdown();
+
+	setInterval(function () { getCountdown(); }, 1000);
+
+	function getCountdown(){
+		// find the amount of "seconds" between now and target
+		var now = new Date();
+		now = (Date.parse(now) / 1000);
+
+		var timeLeft = endTime - now;
+
+		var days = Math.floor(timeLeft / 86400);
+		var hours = Math.floor((timeLeft - (days * 86400)) / 3600);
+		var minutes = Math.floor((timeLeft - (days * 86400) - (hours * 3600 )) / 60);
+		var seconds = Math.floor((timeLeft - (days * 86400) - (hours * 3600) - (minutes * 60)));
+
+		if (hours < '10') { hours = '0' + hours; }
+		if (minutes < '10') { minutes = '0' + minutes; }
+		if (seconds < '10') { seconds = '0' + seconds; }
+
+		// format countdown string + set tag value
+		countdown.innerHTML = "<span>" + hours + "</span><span>" + minutes + "</span><span>" + seconds + "</span>";
+	}
+
+	function pad(n) {
+		return (n < 10 ? '0' : '') + n;
+	}
+}
+
 // 컨텐츠 호출
 $(document).ready( function() {
 	$("#header").load("head.html");