Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.front into develop

src/main/java/com/style24/front/biz/web/TsfDisplayController.java

@@ -364,7 +364,7 @@ public class TsfDisplayController extends TsfBaseController {
 	@GetMapping("/lookbook/main/form")
 	public ModelAndView lookbookMain(Lookbook lookbook) {
 		ModelAndView mav = new ModelAndView(super.getDeviceViewName("display/LookbookMainForm"));
-
+		mav.addObject("lbInfo", lookbook);
 		return mav;
 	}
 

src/main/webapp/WEB-INF/views/web/display/LookbookMainFormWeb.html

@@ -23,6 +23,7 @@
 		<div class="breadcrumb">
 			<ul>
 				<li class="bread_home"><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MAIN);">홈</a></li>
+				<li class="bread_home" id="brandLi" style="display: none;"></li>
 				<li class="bread_2depth">룩북</li>
 			</ul>
 		</div>
@@ -78,9 +79,13 @@
 
 <script th:inline="javascript">
 /*<![CDATA[*/
-	let fnGetLookbookList = function (brandGroupNo){
-		let actionUrl = '/display/lookbook/main/list';
-		if (!gagajf.isNull(brandGroupNo)) actionUrl += '?multiBrandCd=' + brandGroupNo;
+	var lookbookGb = [[${lbInfo.lookbookGb}]];
+	var brandCd = [[${lbInfo.brandCd}]];
+	var navBrandNm = "";
+
+	let fnGetLookbookList = function (lookbookGb, brandGroupNo){
+		let actionUrl = '/display/lookbook/main/list?lookbookGb='+lookbookGb;
+		if (!gagajf.isNull(brandGroupNo)) actionUrl += '&multiBrandCd=' + brandGroupNo;
 
 		$.getJSON(actionUrl
 			, function (result, status){
@@ -120,6 +125,8 @@
 							tag2 += '		</div>';
 							tag2 += '	</a>';
 							tag2 += '</li>';
+							navBrandNm = item.brandNm;
+							$("#brandLi").text(navBrandNm);
 						});
 						tag2 += '</ul>';
 
@@ -144,12 +151,17 @@
 			multiBrandCd.push($(this).val());
 		});
 
-		fnGetLookbookList(multiBrandCd);
+		fnGetLookbookList(lookbookGb,multiBrandCd);
 	}
 
 	$(document).ready(function() {
 		//$("#container .wrap .content .cont_body .event_list .event_top .ui_row .count").find('span').text(totalCnt.addComma());
-		fnGetLookbookList();
+		fnGetLookbookList(lookbookGb,brandCd);
+
+		if(lookbookGb=='BL'){
+			$("#brandBox").hide();
+			$("#brandLi").show();
+		}
 	});
 
 /*]]>*/

src/main/webapp/ux/style24_link.js

@@ -1046,12 +1046,12 @@ var cfnGoToPlanDetail = function (planSq) {
  * <pre>
  *        cfnGoToLookbookList();
  * </pre>
- * @param  : brandGroupNo - 브랜드그룹번호
+ * @param  : brandGroupNo - 브랜드그룹번호 , lookbookGb - 룩북(L) or 브랜드룩북(BL)
  * @since  : 2021/04/06
  * @author : bin2107
  */
-var cfnGoToLookbookList = function (brandGroupNo) {
-	var params = '';
+var cfnGoToLookbookList = function (lookbookGb, brandGroupNo) {
+	var params = '?lookbookGb='+lookbookGb;
 	if (typeof (brandGroupNo) != 'undefined') params += '?brandCd=' + brandGroupNo;
 
 	cfnGoToPage(_PAGE_LOOKBOOK_MAIN + params);
@@ -1068,8 +1068,8 @@ var cfnGoToLookbookList = function (brandGroupNo) {
  * @since  : 2021/04/06
  * @author : bin2107
  */
-var cfnGoToLookbookDetail = function (lookbookSq, brandGroupNo) {
-	var params = '?lookbookSq=' + lookbookSq;
+var cfnGoToLookbookDetail = function (lookbookGb, lookbookSq, brandGroupNo) {
+	var params = '?lookbookGb='+lookbookGb+'lookbookSq=' + lookbookSq;
 	if (typeof (brandGroupNo) != 'undefined') params += '&brandCd=' + brandGroupNo;
 
 	cfnGoToPage(_PAGE_LOOKBOOK_DETAIL + params);