Home Explore Help
Sign In
style24
/
style24.front
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

브랜드 메인에서 이벤트링크 기획전 클릭시 로직 수정

bin2107 5 years ago
parent
74f1f9647d
commit
ac3037aba2
5 changed files with 64 additions and 8 deletions
Unified View Show Diff Stats
  1. 8 2
      src/main/java/com/style24/front/biz/web/TsfPlanningController.java
  2. 48 0
      src/main/webapp/WEB-INF/views/web/common/layout/PlanningLayoutWeb.html
  3. 2 1
      src/main/webapp/WEB-INF/views/web/display/BestMainFormWeb.html
  4. 1 1
      src/main/webapp/WEB-INF/views/web/planning/PlanningDetailFormWeb.html
  5. 5 4
      src/main/webapp/ux/style24_link.js

+ 8 - 2
src/main/java/com/style24/front/biz/web/TsfPlanningController.java
View File 

@@ -5,6 +5,7 @@ import java.util.Collection;
 
 import java.util.Map;
 
 import java.util.Map;
 
 
 
 import com.style24.front.biz.service.TsfCustomerService;
 
 import com.style24.front.biz.service.TsfCustomerService;
 
+import com.style24.front.biz.service.TsfDisplayService;
 
 import org.apache.commons.lang3.StringUtils;
 
 import org.apache.commons.lang3.StringUtils;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.mobile.device.Device;
 
 import org.springframework.mobile.device.Device;
 
@@ -69,6 +70,9 @@ public class TsfPlanningController extends TsfBaseController {
 
 	@Autowired
 
 	@Autowired
 
 	private TsfCustomerService customerService;
 
 	private TsfCustomerService customerService;
 
 
 
+	@Autowired
 
+	private TsfDisplayService displayService;
 
+
 
 	/**
 
 	/**
 
 	 * 기획전 메인 화면
 
 	 * 기획전 메인 화면
 
 	 * @param cateNo - 카테고리번호
 
 	 * @param cateNo - 카테고리번호
 
@@ -226,8 +230,10 @@ public class TsfPlanningController extends TsfBaseController {
 
 			mav.setViewName(super.getDeviceViewName("planning/PlanningEventAttendForm"));
 
 			mav.setViewName(super.getDeviceViewName("planning/PlanningEventAttendForm"));
 
 			return mav;
 
 			return mav;
 
 		}
 
 		}
 
-		
-		
+
 
+		// 브랜드그룹 정보 : 브랜드메인 링크에 설정된 기획전으로 들어올때 GNB 변경때문에 사용
 
+		mav.addObject("brandGroupInfo", displayService.getGnbBrandGroup(plan.getBrandGroupNo()));
 
+
 
 		mav.setViewName(super.getDeviceViewName("planning/PlanningDetailForm"));
 
 		mav.setViewName(super.getDeviceViewName("planning/PlanningDetailForm"));
 
 		return mav;
 
 		return mav;
 
 	}
 
 	}

+ 48 - 0
src/main/webapp/WEB-INF/views/web/common/layout/PlanningLayoutWeb.html
View File 

@@ -0,0 +1,48 @@
 
+<!DOCTYPE html>
 
+<html lang="ko"
 
+	xmlns:th="http://www.thymeleaf.org"
 
+	xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
 
+
 
+<head th:replace="~{web/common/fragments/HeadWeb :: head}"></head>
 
+
 
+<body>
 
+
 
+<div class="skipComment">
 
+	<a href="#content">본문 바로가기</a>
 
+	<a href="#gnb">주메뉴 바로가기</a>
 
+	<a href="#footer">하단메뉴 바로가기</a>
 
+</div>
 
+	
+<th:block th:replace="~{web/common/fragments/VariablesWeb :: variables}"></th:block>
 
+
 
+
 
+<!-- GNB -->
 
+<th:block th:if="${brandGroupInfo == null }">
 
+	<header id="header" th:replace="~{web/common/fragments/GnbWeb :: gnb}"></header>
 
+</th:block>
 
+<th:block th:if="${brandGroupInfo != null }">
 
+	<header id="header" th:replace="~{web/common/fragments/BrandGnbWeb :: gnb}"></header>
 
+</th:block>
 
+
 
+
 
+<!--// GNB -->
 
+
 
+<!-- CONTENT AREA -->
 
+<th:block layout:fragment="content"></th:block>
 
+<!-- // CONTENT AREA -->
 
+
 
+<!-- Footer -->
 
+<footer id="footer" th:replace="~{web/common/fragments/FooterWeb :: footer}"></footer>
 
+
 
+<th:block th:replace="~{web/common/fragments/ScriptsWeb :: scripts}"></th:block>
 
+
 
+<script th:inline="javascript">
 
+/*<![CDATA[*/
 
+	$(document).ready(function() {
 
+		$("#container").css('backgroundColor','#fff');
 
+	});
 
+/*]]>*/
 
+</script>
 
+
 
+</body>
 
+</html>

+ 2 - 1
src/main/webapp/WEB-INF/views/web/display/BestMainFormWeb.html
View File 

@@ -255,7 +255,7 @@
 
 					</div>
 
 					</div>
 
 				</div>
 
 				</div>
 
 			</div>
 
 			</div>
 
-			<div class="last_page">
 
+			<div class="last_page" id="divLastPage" style="display: none;">
 
 				<span>마지막 페이지입니다.</span>
 
 				<span>마지막 페이지입니다.</span>
 
 			</div>
 
 			</div>
 
 		</div>
 
 		</div>
 
@@ -331,6 +331,7 @@
 
 			if($("#bestGoodsForm input[name=pageNo]").val()==1){
 
 			if($("#bestGoodsForm input[name=pageNo]").val()==1){
 
 				$('#listBox').html('<li class="none">상품정보가 존재하지 않습니다.</li>');
 
 				$('#listBox').html('<li class="none">상품정보가 존재하지 않습니다.</li>');
 
 			}
 
 			}
 
+			$("#divLastPage").show();
 
 			gagaInfiniteScroll.draw('not');
 
 			gagaInfiniteScroll.draw('not');
 
 		}
 
 		}
 
 	}
 
 	}

+ 1 - 1
src/main/webapp/WEB-INF/views/web/planning/PlanningDetailFormWeb.html
View File 

@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
 <html lang="ko" xmlns:th="http://www.thymeleaf.org"
 
 <html lang="ko" xmlns:th="http://www.thymeleaf.org"
 
 	xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
 
 	xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
 
-	layout:decorator="web/common/layout/DefaultLayoutWeb">
 
+	layout:decorator="web/common/layout/PlanningLayoutWeb">
 
 <!--
 
 <!--
 
  *******************************************************************************
 
  *******************************************************************************
 
  * @source  : PlanningDetailFormWeb.html
 
  * @source  : PlanningDetailFormWeb.html

+ 5 - 4
src/main/webapp/ux/style24_link.js
View File 

@@ -1061,9 +1061,10 @@ var cfnGoToBrandMain = function(brandGroupNo) {
 
  * @since  : 2021/03/29
 
  * @since  : 2021/03/29
 
  * @author : sowon
 
  * @author : sowon
 
  */
 
  */
 
-var cfnGoToPlanDetail = function (planSq) {
 
-
 
-    cfnGoToPage(_PAGE_PLANNING_DETAIL + '?planSq=' + planSq);
 
+var cfnGoToPlanDetail = function (planSq , brandGroupNo) {
 
+	var params = '?planSq='+planSq;
 
+	if (typeof (brandGroupNo) != 'undefined') params += '&brandGroupNo=' + brandGroupNo;
 
+    cfnGoToPage(_PAGE_PLANNING_DETAIL + params);
 
 }
 
 }
 
 
 
 /**
 
 /**
 
@@ -1079,7 +1080,7 @@ var cfnGoToPlanDetail = function (planSq) {
 
  */
 
  */
 
 var cfnGoToLookbookList = function (lookbookGb, brandGroupNo) {
 
 var cfnGoToLookbookList = function (lookbookGb, brandGroupNo) {
 
 	var params = '?lookbookGb='+lookbookGb;
 
 	var params = '?lookbookGb='+lookbookGb;
 
-	if (typeof (brandGroupNo) != 'undefined') params += '?brandCd=' + brandGroupNo;
 
+	if (typeof (brandGroupNo) != 'undefined') params += '&brandCd=' + brandGroupNo;
 
 
 
 	cfnGoToPage(_PAGE_LOOKBOOK_MAIN + params);
 
 	cfnGoToPage(_PAGE_LOOKBOOK_MAIN + params);
 
 }
 
 }