Merge remote-tracking branch 'origin/develop' into xodud1202

src/main/java/com/style24/front/biz/dao/TsfDisplayDao.java

@@ -246,4 +246,14 @@ public interface TsfDisplayDao {
 	 * @since 2021. 7. 2
 	 */
 	Collection<SearchKeyword> getSearchKeywordList(SearchKeyword searchKeyword);
+
+	/**
+	 * 스플래시 이미지 가져오기
+	 * @param siteCd - 사이트코드
+	 * @return
+	 * @author gagamel
+	 * @since 2021. 7. 5
+	 */
+	String getSplashImage();
+
 }

src/main/java/com/style24/front/biz/service/TsfDisplayService.java

@@ -3,6 +3,18 @@ package com.style24.front.biz.service;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Service;
+
+import com.style24.core.biz.service.TscEnvsetService;
+import com.style24.core.support.env.TscConstants;
+import com.style24.front.biz.dao.TsfDisplayDao;
+import com.style24.front.biz.dao.TsfGoodsDao;
+import com.style24.front.support.env.TsfConstants;
+import com.style24.front.support.security.session.TsfSession;
 import com.style24.persistence.domain.BrandGroup;
 import com.style24.persistence.domain.Cate1;
 import com.style24.persistence.domain.Cate2;
@@ -18,23 +30,13 @@ import com.style24.persistence.domain.Login;
 import com.style24.persistence.domain.MainLayout;
 import com.style24.persistence.domain.Popup;
 import com.style24.persistence.domain.SearchKeyword;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.stereotype.Service;
-
-import com.style24.core.biz.service.TscEnvsetService;
-import com.style24.core.support.env.TscConstants;
-import com.style24.front.biz.dao.TsfDisplayDao;
-import com.style24.front.biz.dao.TsfGoodsDao;
-import com.style24.front.support.env.TsfConstants;
-import com.style24.front.support.security.session.TsfSession;
 import com.style24.persistence.domain.searchengine.Filter;
 import com.style24.persistence.domain.searchengine.SearchEngine;
 
 import lombok.extern.slf4j.Slf4j;
 
 import com.gagaframework.web.parameter.GagaMap;
+import com.gagaframework.web.util.GagaFileUtil;
 
 /**
  * 전시 Service
@@ -55,6 +57,9 @@ public class TsfDisplayService {
 	@Autowired
 	private TsfGoodsDao goodsDao;
 
+	@Autowired
+	private Environment env;
+
 	/**
 	 * GNB 브랜드그룹 목록
 	 * @param contents - 컨텐츠 정보
@@ -557,15 +562,15 @@ public class TsfDisplayService {
 				data.setBannerList(displayDao.getContentsBannerList(data));
 			}
 			goodsList = (goodsDao.getContentsCategoryGoodsList(tempContents));
-			if("SMM007".equals(data.getContentsLoc())){
+			if ("SMM007".equals(data.getContentsLoc())) {
 				int maxrow = 3;
-				if(goodsList == null || goodsList.size() < 3){
+				if (goodsList == null || goodsList.size() < 3) {
 					Cate4Srch cate = new Cate4Srch();
 					cate.setSiteCd(TscConstants.Site.STYLE24.value());
 					cate.setCateGb(TsfConstants.CateGb.BYITEM.value());
 					cate.setFrontGb(data.getFrontGb());
 					cate.setBrandGroupNo(Integer.parseInt(data.getBrandGroupNo()));
-					cate.setMaxRow(maxrow-goodsList.size());
+					cate.setMaxRow(maxrow - goodsList.size());
 					goodsList.addAll(goodsDao.getContentsCategoryNewGoodsList(cate));
 				}
 			}
@@ -696,15 +701,15 @@ public class TsfDisplayService {
 		String maxPrice = "0";
 		String minPrice = "0";
 		for (Filter filter : filterList) {
-			if(!"".equals(filter.getFilterCd()) && !filter.getFilterCd().equals(null)){
-				if(filter.getFilterGb().equals("PRICE")){
-					if(idx==0){
+			if (!"".equals(filter.getFilterCd()) && !filter.getFilterCd().equals(null)) {
+				if (filter.getFilterGb().equals("PRICE")) {
+					if (idx == 0) {
 						minPrice = filter.getFilterCd();
-					}else{
+					} else {
 						maxPrice = filter.getFilterCd();
 					}
 					idx++;
-				}else{
+				} else {
 					if (filter.getFilterGb().equals(filterGb)) {
 						if ("BENEFIT".equals(filterGb)) {
 							if (!filter.getFilterCd().equals("40")) {
@@ -718,26 +723,26 @@ public class TsfDisplayService {
 			}
 		}
 
-		if(filterGb.equals("PRICE")){
+		if (filterGb.equals("PRICE")) {
 			int sliceVal = (Integer.parseInt(maxPrice) - Integer.parseInt(minPrice)) / 5;
-			int tempPrice = 0 ;
+			int tempPrice = 0;
 			Filter temp = new Filter();
 			Collection<Filter> priceList = new ArrayList<Filter>();
-			for(int i=0; i<6; i++){
+			for (int i = 0; i < 6; i++) {
 				tempPrice = 0;
 				temp = new Filter();
 				temp.setFilterGb("PRICE");
-				if(i==0){
+				if (i == 0) {
 //					tempPrice = (int)Math.floor((Integer.parseInt(minPrice)) / 1000) * 1000 ;
 					tempPrice = (int)Math.floor((Integer.parseInt(minPrice)));
 					temp.setFilterCd(String.valueOf(tempPrice));
 					temp.setFilterNm(String.valueOf(tempPrice));
-				}else if(i==5){
+				} else if (i == 5) {
 					tempPrice = (int)Math.floor((Integer.parseInt(maxPrice)));
 					temp.setFilterCd(String.valueOf(tempPrice));
 					temp.setFilterNm(String.valueOf(tempPrice));
-				}else{
-					tempPrice = (int)Math.floor((Integer.parseInt(minPrice) + sliceVal * i) / 1000) * 1000 ;
+				} else {
+					tempPrice = (int)Math.floor((Integer.parseInt(minPrice) + sliceVal * i) / 1000) * 1000;
 					temp.setFilterCd(String.valueOf(tempPrice));
 					temp.setFilterNm(String.valueOf(tempPrice));
 				}
@@ -854,4 +859,21 @@ public class TsfDisplayService {
 	public Collection<SearchKeyword> getSearchKeywordList(SearchKeyword searchKeyword) {
 		return displayDao.getSearchKeywordList(searchKeyword);
 	}
+
+	/**
+	 * 스플래시 이미지 가져오기
+	 * @param siteCd - 사이트코드
+	 * @return
+	 * @author gagamel
+	 * @since 2021. 7. 5
+	 */
+	@Cacheable(value = "splashimg")
+	public String getSplashImageUrl() {
+		String splashImg = displayDao.getSplashImage();
+		if (StringUtils.isBlank(splashImg)) {
+			return "";
+		}
+		return "http:" + GagaFileUtil.getConcatenationPath(env.getProperty("upload.image.view"), "splashimg", splashImg);
+	}
+
 }

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

@@ -1,6 +1,5 @@
 package com.style24.front.biz.web;
 
-import com.gagaframework.web.parameter.GagaMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -16,12 +15,14 @@ import com.style24.core.biz.service.TscKakaotalkService;
 import com.style24.core.support.env.TscConstants;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.front.biz.service.TsfCustomerService;
+import com.style24.front.biz.service.TsfDisplayService;
 import com.style24.front.support.controller.TsfBaseController;
 import com.style24.front.support.security.session.TsfSession;
 import com.style24.persistence.domain.Customer;
 
 import lombok.extern.slf4j.Slf4j;
 
+import com.gagaframework.web.parameter.GagaMap;
 import com.gagaframework.web.rest.server.GagaResponse;
 
 /**
@@ -47,6 +48,9 @@ public class TsfAppController extends TsfBaseController {
 	@Autowired
 	private TscKakaotalkService kakaoService;
 
+	@Autowired
+	private TsfDisplayService displayService;
+
 	/**
 	 * 앱 설정 화면
 	 *
@@ -147,7 +151,7 @@ public class TsfAppController extends TsfBaseController {
 	@GetMapping("/splash/image/url")
 	@ResponseBody
 	public String getSplashImageUrl() {
-		return envsetService.getSplashImageUrl(TscConstants.Site.STYLE24.value());
+		return displayService.getSplashImageUrl();
 	}
 
 	/**

src/main/java/com/style24/persistence/mybatis/shop/TsfDisplay.xml

@@ -1254,4 +1254,15 @@
 		LIMIT 1
 	</select>
 	
+	<!-- 스플래시이미지 -->
+	<select id="getSplashImage" resultType="String">
+		/* TsfDisplay.getSplashImage */
+		SELECT SPLASH_IMG
+		FROM   TB_SPLASH_IMG SI
+		WHERE  NOW() BETWEEN DISP_STDT AND DISP_EDDT
+		AND    DISP_YN = 'Y'
+		ORDER  BY SPLASH_IMG_SQ DESC
+		LIMIT 1
+	</select>
+	
 </mapper>

src/main/webapp/WEB-INF/views/mob/common/fragments/GnbMob.html

@@ -92,6 +92,20 @@
 	
 <script th:inline="javascript">
 /*<![CDATA[*/
+	// 현재 클릭 GNB Class On 처리
+	let fnSetGtabSq = function (){
+		const url = new URL(document.location.href);
+		// URLSearchParams 객체
+		const urlParams = url.searchParams;
+		let gnbId = urlParams.get('gnbId');
+
+		// gtabId = gtabSq;
+		if(gagajf.isNull(gnbId)){
+			gnbId = "Home";
+		}
+		$("#gnbLi"+gnbId).addClass("on");
+	}
+
 	let fnClickGnbTab = function(gtabSq) {
 		gagajf.setCookie("st24ck_gnb_tab", gtabSq, 1);
 	}
@@ -105,20 +119,26 @@
 		$('#ulGnbTab').html('');
 		
 		let tag = '';
-		let ckBrandGnbTabSq = gagajf.getCookie("st24ck_brand_gnb_tab");
+		var gnbId = '?gnbId=';
+		// let ckBrandGnbTabSq = gagajf.getCookie("st24ck_brand_gnb_tab");
 		// tag += '<ul>\n';
-		tag += '	<li class="'+(gagajf.isNull(ckBrandGnbTabSq) ? "on" : "")+'"><a href="javascript:void(0);" onclick="cfnGoToBrandMain(' + [[${brandGroupInfo?.brandGroupNo}]] + ');fnClickBrandGnbTab(\'\');" class="on">홈</a></li>\n';
-		tag += '	<li><a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + [[${brandGroupInfo?.brandGroupNo}]] + ',\'' + [[${brandGroupInfo?.cateGb}]] + '\');" class="on">상품</a></li>\n';
+		tag += '	<li id="gnbLiHome"><a href="javascript:void(0);" onclick="cfnGoToBrandMain(' + [[${brandGroupInfo?.brandGroupNo}]] + ' , \'\');" class="on">홈</a></li>\n';
+		tag += '	<li id="gnbLi100"><a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + [[${brandGroupInfo?.brandGroupNo}]] + ',\'' + [[${brandGroupInfo?.cateGb}]] + '\',\'\',\'\',\'\',\'\',\'\',\'\',100);" class="on">상품</a></li>\n';
 		
 		$.getJSON('/display/brand/gnb/tab/list?brandGroupNo=' + [[${brandGroupInfo?.brandGroupNo}]]
 			, function(result, status) {
 				if (status == 'success') {
 					if (result.length > 0) {
 						$.each(result, function(idx, item) {
+							if(item.linkUrl.indexOf('?') < -1){
+								gnbId = '?gnbId=';
+							}else{
+								gnbId = '&gnbId=';
+							}
 							if (item.contentsType == 'L') { // 컨텐츠유형:링크
-								tag += '<li class="'+ (ckBrandGnbTabSq == item.gtabSq ? "on" : "") +'"><a href="' + item.linkUrl + '" onclick="fnClickBrandGnbTab(' + item.gtabSq + ');">' + item.gtabNm + '</a></li>\n';
+								tag += '<li id="gnbLi' + item.gtabSq + '"><a href="' + item.linkUrl + gnbId + item.gtabSq + '" >' + item.gtabNm + '</a></li>\n';
 							}else{
-								tag += '<li class="'+ (ckBrandGnbTabSq == item.gtabSq ? "on" : "") +'"><a href="' + item.linkUrl + '" onclick="fnClickBrandGnbTab(' + item.gtabSq + ');">' + item.gtabNm + '</a></li>\n';
+								tag += '<li id="gnbLi' + item.gtabSq + '"><a href="' + item.linkUrl + gnbId + item.gtabSq + '" >' + item.gtabNm + '</a></li>\n';
 							}
 						});
 					}
@@ -127,29 +147,38 @@
 				$('#ulGnbTab').html(tag);
 			});
 		// tag += '</ul>\n';
+		setTimeout(function() {
+			fnSetGtabSq();
+		}, 3000);
 	}
 	
 	// GNB탭 생성
 	let fnCreateGnbTab = function() {
+		var gnbId = '?gnbId=';
 		$.getJSON('/display/gnb/tab/list'
 			, function(result, status) {
 				if (status == 'success') {
 					if (result.length > 0) {
 						$('#ulGnbTab').html('');
 						
-						let ckGnbTabSq = gagajf.getCookie("st24ck_gnb_tab");
+						// let ckGnbTabSq = gagajf.getCookie("st24ck_gnb_tab");
 						
 						let tag = '';
-						tag += '<li class="' + (gagajf.isNull(ckGnbTabSq) ? "on" : "") + '"><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MAIN); fnClickGnbTab(\'\');">홈</a></li>\n';
-						tag += '<li class="' + (ckGnbTabSq == 100 ? "on" : "") + '"><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_ALL_BRAND); fnClickGnbTab(100);">브랜드</a></li>\n';
+						tag += '<li id="gnbLiHome"><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MAIN,\'\',\'\');">홈</a></li>\n';
+						tag += '<li id="gnbLi100"><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_ALL_BRAND);">브랜드</a></li>\n';
 						
 						$.each(result, function(idx, item) {
 							if (item.contentsType == 'C') { // 컨텐츠유형: 카테고리
-								tag += '<li class="' + (ckGnbTabSq == item.gtabSq ? "on" : "") + '"><a href="javascript:void(0);" onclick="cfnGoToCategoryMain(\'G032_101\',' + item.cate1No + '); fnClickGnbTab(' + item.gtabSq + ');">' + item.gtabNm + '</a></li>\n';
+								tag += '<li id="gnbLi' + item.gtabSq + '"><a href="javascript:void(0);" onclick="cfnGoToCategoryMain(\'G032_101\',' + item.cate1No + ',\'\',' + item.gtabSq + ');">' + item.gtabNm + '</a></li>\n';
 							} else if (item.contentsType == 'O') { // 컨텐츠유형: 아울렛
-								tag += '<li class="' + (ckGnbTabSq == item.gtabSq ? "on" : "") + '"><a href="javascript:void(0);" onclick="cfnGoToOutletMain(\'G032_103\'); fnClickGnbTab(' + item.gtabSq + ');">' + item.gtabNm + '</a></li>\n';
+								tag += '<li id="gnbLi' + item.gtabSq + '"><a href="javascript:void(0);" onclick="cfnGoToOutletMain(\'G032_103\',' + item.gtabSq + ');">' + item.gtabNm + '</a></li>\n';
 							} else { // 컨텐츠유형: 링크
-								tag += '<li class="' + (ckGnbTabSq == item.gtabSq ? "on" : "") + '"><a href="' + item.linkUrl + '" onclick="fnClickGnbTab(' + item.gtabSq + ');">' + item.gtabNm + '</a></li>\n';
+								if(item.linkUrl.indexOf('?') < -1){
+									gnbId = '?gnbId=';
+								}else{
+									gnbId = '&gnbId=';
+								}
+								tag += '<li id="gnbLi' + item.gtabSq + '"><a href="' + item.linkUrl + gnbId + item.gtabSq + '">' + item.gtabNm + '</a></li>\n';
 							}
 						});
 						
@@ -157,6 +186,9 @@
 					}
 				}
 			});
+		setTimeout(function() {
+			fnSetGtabSq();
+		}, 3000);
 	}
 	
 	// GNB탭 > 브랜드 생성
@@ -230,6 +262,7 @@
 
 		// 띠배너 조회
 		fnCreateTopMobBanner();
+		// var para = document.location.href.split("?");
 	});
 /*]]>*/
 </script>

src/main/webapp/WEB-INF/views/mob/planning/PlanningMainFormMob.html

@@ -24,12 +24,18 @@
 		<section class="content dp_exhibition">
 			<div class="inner wide">
 				<div class="category_nav">
-					<ul>
+					<ul th:if="${brandGroupInfo==null}">
 						<li><button type="button" th:class="${cateNo == null ? 'active' : ''}" onclick="cfnGoToPage(_PAGE_PLANNING_MAIN);">전체</button></li>
 						<th:block th:each="oneData, stat : ${cateList}">
 						<li><button type="button" th:class="${oneData.cateNo == cateNo ? 'active' : '' }" th:onclick="|cfnGoToPage(_PAGE_PLANNING_MAIN + '?cateNo=${oneData.cateNo}');|">[[${oneData.cateNm}]]</button></li>
 						</th:block>
 					</ul>
+					<ul th:unless="${brandGroupInfo==null}">
+						<li><button type="button" th:class="${cateNo == null ? 'active' : ''}" th:onclick="|cfnGoToPage(_PAGE_PLANNING_MAIN + '?brandGroupNo=${brandGroupInfo.brandGroupNo}');|">전체</button></li>
+						<th:block th:each="oneData, stat : ${cateList}">
+							<li><button type="button" th:class="${oneData.cateNo == cateNo ? 'active' : '' }" th:onclick="|cfnGoToPage(_PAGE_PLANNING_MAIN + '?cateNo=${oneData.cateNo}'+ '&brandGroupNo=${brandGroupInfo.brandGroupNo}');|">[[${oneData.cateNm}]]</button></li>
+						</th:block>
+					</ul>
 				</div>
 			</div>
 			<div class="inner">
@@ -43,7 +49,8 @@
                           <div>
                               <p>등록된 기획전이 없습니다.</p>
                           </div>
-                         <button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_MAIN);"><span>홈으로 가기</span></button>
+                         <button type="button" class="btn btn_default" th:if="${brandGroupInfo==null}" onclick="cfnGoToPage(_PAGE_MAIN);"><span>홈으로 가기</span></button>
+						 <button type="button" class="btn btn_default" th:unless="${brandGroupInfo==null}" th:onclick="cfnGoToBrandMain([[${brandGroupInfo.brandGroupNo}]]);"><span th:text="${brandGroupInfo.brandGroupNm+' 홈으로 가기'}"></span></button>
                      </div>
 					<div class="list_item" style="display: none;" id="divPlanningList">
 					</div>
@@ -58,7 +65,13 @@
 	let fnGetPlanningList = function(cateNo,brandGroupNo) {
 		let actionUrl = '/planning/main/list';
 		if (!gagajf.isNull(cateNo)) actionUrl += '?cateNo=' + cateNo;
-		if (!gagajf.isNull(brandGroupNo)) actionUrl += '?brandGroupNo=' + brandGroupNo;
+		if (!gagajf.isNull(brandGroupNo)){
+			if (!gagajf.isNull(cateNo)){
+				actionUrl += '&brandGroupNo=' + brandGroupNo;
+			}else{
+				actionUrl += '?brandGroupNo=' + brandGroupNo;
+			}
+		}
 		
 		$.getJSON(actionUrl
 			, function(result, status) {
@@ -71,7 +84,11 @@
 						$.each(result, function(idx, item) {
 							let tag = '<div>\n';
 							tag += '	<div class="visual">\n';
-							tag += '   <a href="javascript:void(0);" onclick="cfnGoToPlanDetail(\'' + item.planSq + '\')">';
+							if(!gagajf.isNull(brandGroupNo)){
+								tag += '   <a href="javascript:void(0);" onclick="cfnGoToPlanDetail(\'' + item.planSq + '\',\'' + brandGroupNo + '\')">';
+							}else{
+								tag += '   <a href="javascript:void(0);" onclick="cfnGoToPlanDetail(\'' + item.planSq + '\')">';
+							}
 							if (item.newYn == 'Y') {
 								tag += '		<div class="shape ranker"><span>NEW</span></div>\n';
 							}

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

@@ -625,7 +625,6 @@
 				gagaInfiniteScroll.draw(htm);
 				//fnImgOnoff();
 			}else{
-				console.log('11');
 				if(totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
 					if($("#searchGoodsForm input[name=pageNo]").val()==1){
 						// 필터 값으로 조회 데이터 없을때

src/main/webapp/WEB-INF/views/web/planning/PlanningMainFormWeb.html

@@ -23,7 +23,9 @@
 	<div id="container" class="container dp">
 		<div class="breadcrumb"> 
 			<ul>
-				<li class="bread_home"><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MAIN);">홈</a></li>
+				<li class="bread_home" th:if="${brandGroupInfo==null}"><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MAIN);">홈</a></li>
+				<li class="bread_home" th:unless="${brandGroupInfo==null}"><a href="javascript:void(0);" th:onclick="cfnGoToBrandMain([[${brandGroupInfo.brandGroupNo}]]);">홈</a></li>
+				<li class="bread_home" th:unless="${brandGroupInfo==null}" th:text="${brandGroupInfo.brandGroupNm}"></li>
 				<li class="bread_2depth">기획전</li>
 			</ul> 
 		</div>
@@ -38,8 +40,10 @@
 					<div class="taps">
 						<div>
 							<ul>
-								<li th:class="${cateNo == null ? 'active' : ''}"><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_PLANNING_MAIN);">전체</a></li>
-								<li th:each="oneData, stat : ${cateList}" th:class="${oneData.cateNo == cateNo ? 'active' : '' }" ><a href="javascript:void(0);" th:onclick="|cfnGoToPage(_PAGE_PLANNING_MAIN + '?cateNo=${oneData.cateNo}');|">[[${oneData.cateNm}]]</a></li>
+								<li th:if="${brandGroupInfo==null}" th:class="${cateNo == null ? 'active' : ''}"><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_PLANNING_MAIN);">전체</a></li>
+								<li th:unless="${brandGroupInfo==null}" th:class="${cateNo == null ? 'active' : ''}"><a href="javascript:void(0);" th:onclick="|cfnGoToPage(_PAGE_PLANNING_MAIN + '?brandGroupNo=${brandGroupInfo.brandGroupNo}');|">전체</a></li>
+								<li th:if="${brandGroupInfo==null}" th:each="oneData, stat : ${cateList}" th:class="${oneData.cateNo == cateNo ? 'active' : '' }" ><a href="javascript:void(0);" th:onclick="|cfnGoToPage(_PAGE_PLANNING_MAIN + '?cateNo=${oneData.cateNo}');|">[[${oneData.cateNm}]]</a></li>
+								<li th:unless="${brandGroupInfo==null}" th:each="oneData, stat : ${cateList}" th:class="${oneData.cateNo == cateNo ? 'active' : '' }" ><a href="javascript:void(0);" th:onclick="|cfnGoToPage(_PAGE_PLANNING_MAIN + '?cateNo=${oneData.cateNo}' + '&brandGroupNo=${brandGroupInfo.brandGroupNo}');|">[[${oneData.cateNm}]]</a></li>
 							</ul>
 						</div>
 					</div>
@@ -54,7 +58,8 @@
 								<p>등록된 기획전이 없습니다.</p>
 							</div>
 							<div class="btn_box">
-								<button class="btn btn_default" onclick="cfnGoToPage(_PAGE_MAIN);"><span>메인으로 가기</span></button>
+								<button class="btn btn_default" th:if="${brandGroupInfo==null}" onclick="cfnGoToPage(_PAGE_MAIN);"><span>메인으로 가기</span></button>
+								<button class="btn btn_default" th:unless="${brandGroupInfo==null}" th:onclick="cfnGoToBrandMain([[${brandGroupInfo.brandGroupNo}]]);"><span th:text="${brandGroupInfo.brandGroupNm+' 홈으로 가기'}"></span></button>
 							</div>
 						</div>
 					</div> 
@@ -116,7 +121,13 @@
 	let fnGetPlanningList = function(cateNo,brandGroupNo) {
 		let actionUrl = '/planning/main/list';
 		if (!gagajf.isNull(cateNo)) actionUrl += '?cateNo=' + cateNo;
-		if (!gagajf.isNull(brandGroupNo)) actionUrl += '?brandGroupNo=' + brandGroupNo;
+		if (!gagajf.isNull(brandGroupNo)){
+			if (!gagajf.isNull(cateNo)){
+				actionUrl += '&brandGroupNo=' + brandGroupNo;
+			}else{
+				actionUrl += '?brandGroupNo=' + brandGroupNo;
+			}
+		}
 		
 		$.getJSON(actionUrl	, function(result, status) {
 				if (status == 'success') {
@@ -133,7 +144,11 @@
 						$.each(result, function(idx, item) {
 						    tag += '  <div class="exhi_item">\n';
 						    tag += '       <div class="exhi_item_img">\n';
-						    tag += '           <a href= "javascript:void(0);" onclick="cfnGoToPlanDetail(\'' + item.planSq + '\')">\n';
+						    if(!gagajf.isNull(brandGroupNo)){
+								tag += '           <a href= "javascript:void(0);" onclick="cfnGoToPlanDetail(\'' + item.planSq + '\',\'' + brandGroupNo + '\')">\n';
+							}else{
+								tag += '           <a href= "javascript:void(0);" onclick="cfnGoToPlanDetail(\'' + item.planSq + '\')">\n';
+							}
                             if (item.newYn == 'Y') {
 						    	tag += '				<div class="shape ranker"><span>NEW</span></div>\n';
 						    }

src/main/webapp/biz/goods.js

@@ -797,9 +797,9 @@ var fnSortingChange = function (obj, sortingType, stat, appGb){
 	console.log('here sort');
 	fnCategoryGoodsInfiniteScrollInit();
 	if(stat != 'back'){
-		if($("#searchGoodsForm input[name=sortingType]").val()==sortingType){
-			return;
-		}
+		// if($("#searchGoodsForm input[name=sortingType]").val()==sortingType){
+		// 	return;
+		// }
 	}
 
 	if(appGb != 'Mob'){

src/main/webapp/biz/search.js

@@ -439,9 +439,9 @@ var fnDeleteFilter = function (obj, gubun, staus, sizeGb){
 var fnSortingChange = function (obj, sortingType, stat, appGb){
 	fnCategoryGoodsInfiniteScrollInit();
 	if(stat != 'back'){
-		if($("#searchGoodsForm input[name=sortingType]").val()==sortingType){
-			return;
-		}
+		// if($("#searchGoodsForm input[name=sortingType]").val()==sortingType){
+		// 	return;
+		// }
 	}
 
 	if(appGb != 'Mob'){

src/main/webapp/ux/mo/css/common_m.css

@@ -5,65 +5,65 @@
     font-family: 'Noto Sans KR';
     font-style: normal;
     font-weight: 100;
-    src: url("/ux/fonts/NotoSansKR-Thin.otf") format('opentype');
+    src: url("//image.istyle24.com/Style24/ux//fonts/NotoSansKR-Thin.otf") format('opentype');
   }
   @font-face {
     font-family: 'Noto Sans KR';
     font-style: normal;
     font-weight: 200;
-    src: url("/ux/fonts/NotoSansKR-Light.otf") format('opentype');
+    src: url("//image.istyle24.com/Style24/ux//fonts/NotoSansKR-Light.otf") format('opentype');
   }
   @font-face {
      font-family: 'Noto Sans KR';
      font-style: normal;
      font-weight: 300;
-     src: url("/ux/fonts/NotoSansKR-Regular.otf") format('opentype');
+     src: url("//image.istyle24.com/Style24/ux//fonts/NotoSansKR-Regular.otf") format('opentype');
    }
   @font-face {
      font-family: 'Noto Sans KR';
      font-style: normal;
      font-weight: 500;
-     src: url("/ux/fonts/NotoSansKR-Medium.otf") format('opentype');
+     src: url("//image.istyle24.com/Style24/ux//fonts/NotoSansKR-Medium.otf") format('opentype');
    }
   @font-face {
      font-family: 'Noto Sans KR';
      font-style: normal;
      font-weight: 600;
-     src:  url("/ux/fonts/NotoSansKR-Bold.otf") format('opentype');
+     src:  url("//image.istyle24.com/Style24/ux//fonts/NotoSansKR-Bold.otf") format('opentype');
    }
   @font-face {
     font-family: 'Noto Sans KR';
     font-style: normal;
     font-weight: 900;
-    src: url("/ux/fonts/NotoSansKR-Black.otf") format('opentype');
+    src: url("//image.istyle24.com/Style24/ux//fonts/NotoSansKR-Black.otf") format('opentype');
   } 
  
 /* lato */
 @font-face {
     font-family: 'LATO';
     src: 
-    url("/ux/fonts/Lato-Light.eot") format('eot'), url("/ux/fonts/Lato-Light.woff") format('woff'), url("/ux/fonts/Lato-Light.ttf") format('ttf');
+    url("//image.istyle24.com/Style24/ux//fonts/Lato-Light.eot") format('eot'), url("//image.istyle24.com/Style24/ux//fonts/Lato-Light.woff") format('woff'), url("//image.istyle24.com/Style24/ux//fonts/Lato-Light.ttf") format('ttf');
     font-weight: 200;
     font-style: normal;
 }
 @font-face {
     font-family: 'LATO';
     src: 
-    url("/ux/fonts/Lato-Regular.eot") format('eot'), url("/ux/fonts/Lato-Regular.woff") format('woff'), url("/ux/fonts/Lato-Regular.ttf") format('ttf');
+    url("//image.istyle24.com/Style24/ux//fonts/Lato-Regular.eot") format('eot'), url("//image.istyle24.com/Style24/ux//fonts/Lato-Regular.woff") format('woff'), url("//image.istyle24.com/Style24/ux//fonts/Lato-Regular.ttf") format('ttf');
     font-weight: 300;
     font-style: normal;
 }
 @font-face {
     font-family: 'LATO';
     src: 
-    url("/ux/fonts/Lato-Medium.eot") format('eot'), url("/ux/fonts/Lato-Medium.woff") format('woff'), url("/ux/fonts/Lato-Medium.ttf") format('ttf');
+    url("//image.istyle24.com/Style24/ux//fonts/Lato-Medium.eot") format('eot'), url("//image.istyle24.com/Style24/ux//fonts/Lato-Medium.woff") format('woff'), url("//image.istyle24.com/Style24/ux//fonts/Lato-Medium.ttf") format('ttf');
     font-weight: 500;
     font-style: normal;
 }
 @font-face {
     font-family: 'LATO';
     src: 
-    url("/ux/fonts/Lato-Semibold.eot") format('eot'), url("/ux/fonts/Lato-Semibold.woff") format('woff'), url("/ux/fonts/Lato-Semibold.ttf") format('ttf');
+    url("//image.istyle24.com/Style24/ux//fonts/Lato-Semibold.eot") format('eot'), url("//image.istyle24.com/Style24/ux//fonts/Lato-Semibold.woff") format('woff'), url("//image.istyle24.com/Style24/ux//fonts/Lato-Semibold.ttf") format('ttf');
     font-weight: 600;
     font-style: normal;
 }
@@ -232,7 +232,7 @@ select,
 /* form style (hyangah_0223_수정중 - input[type="text"] padding 수정) */
 input,  textarea {font-size:1.2rem; font-family:'Noto Sans KR', 'LATO', sans-serif; color:#666666; vertical-align:middle;}
 select{font-size:1.2rem; font-family:'Noto Sans KR', 'LATO', sans-serif; color:#666666; vertical-align:middle;}
-input[type="text"], input[type="password"] {padding:0 1.5rem; border:0.1rem solid #dddddd;box-sizing: border-box; -webkit-appearance: none; -webkit-border-radius: 0;}
+input[type="text"], input[type="password"] {padding:0 1.5rem; border:0.1rem solid #dddddd;box-sizing: border-box; -webkit-appearance: none; -webkit-border-radius: 0;} 
 input[type="text"]:focus, input[type="password"]:focus,
 input[type="text"].active, input[type="password"].active {border-color: #aaaaaa;} 
 input[type="text"]:disabled, input[type="password"]:disabled, input[type="select"]:disabled,

src/main/webapp/ux/mo/css/layout_m.css

@@ -807,7 +807,7 @@
 
 
 /* 플롯팅 메뉴 > 구매하기 */
-.product_floormenu{position:fixed; bottom:0; left:0; width:100%; /*height:5.8rem; line-height:5.8rem;*/ z-index:30;}
+.product_floormenu{position:fixed; bottom:0; left:0; width:100%; /*height:5.8rem; line-height:5.8rem;*/ z-index:100;}
 .product_floormenu > div{float:left; color:#fff; text-align:center;}
 .product_floormenu > div:nth-child(1){width:37%;}
 .product_floormenu > div:nth-child(2){width:63%; background-color:#fd4802;}

src/main/webapp/ux/mo/css/style24_m.css

@@ -505,6 +505,7 @@ main.container .inner h2[data-style~="unusual"] {font-size:2.0rem;top: 0;positio
 .ps.ptn table th, .ps.ptn table td {text-align: center;padding: 1.6rem 0;}
 .ps.ptn table th {font-size: 1.3rem; font-weight: 500; line-height:1.3rem;}
 .ps.ptn table td {font-size: 1.2rem; font-weight: 300; line-height: 1.2rem;}
+#policies_privacypop .pop_cont {overflow:hidden;}
 .hookGrp{margin-top: 1.333rem;}
 .hookGrp .hook_list{border: 0.1rem solid #f5f5f5;padding: 1.333rem;}
 .hookGrp .hook_list ul{}
@@ -1701,7 +1702,7 @@ main.my .my_wishlist .inner:last-child {padding-bottom: 0;}
 .my .my_wishlist .monthly_wish_wrap:first-child {margin-top:0}
 .my .my_wishlist .monthly_wish_wrap .itemsGrp {margin:0 -1.25%;}
 .my .my_wishlist .monthly_wish_wrap .itemsGrp:after {content:''; display: block; clear:both;}
-.my .my_wishlist .monthly_wish_wrap .itemsGrp .item_prod {width:50%; /*height:60rem;*/ padding:0 1.25%; float:left;}
+.my .my_wishlist .monthly_wish_wrap .itemsGrp .item_prod {width:50%; height: 42rem; padding:0 1.25%; margin-bottom: 1.5rem; float:left;}
 .my .my_wishlist .monthly_wish_wrap .itemsGrp .item_prod:nth-child(2n) {margin-right: 0;float: right;}
 .my .my_wishlist .monthly_wish_wrap .itemsGrp .item_prod .item_state {padding-bottom:4rem}
 .my .my_wishlist .monthly_wish_wrap .date {display:block; position:relative; width:100%; margin-bottom:1.8rem; text-align: center;}

src/main/webapp/ux/mo/js/common_m.js

@@ -438,6 +438,19 @@ $(document).ready(function () {
                 }
                 lastScrollTop = commonSt;
             }
+
+            //210701_ 추가 : 전시 리스트 일정 스크롤 이동시, 분류 고정.
+            if($(".dp .dp_list .list_content").length){
+                var winScrollTop= $(window).scrollTop();
+                var dpListTop = $(".dp .dp_list .list_content").offset().top - 55;
+                if (winScrollTop > dpListTop){
+                    $('.dp .count_wrap').addClass('fixed');
+                    $('.dp .dp_list .list_content').css({'paddingTop':'5.6rem'});
+                } else {
+                    $('.dp .count_wrap').removeClass('fixed');
+                    $('.dp .dp_list .list_content').css({'paddingTop':'0'});
+                }
+            }
         })
         //210525_초기화 시 top:0 이동
         window.onload = function() {

src/main/webapp/ux/pc/css/font.css

@@ -4,94 +4,94 @@
     font-family: 'Noto Sans KR';
     font-style: normal;
     font-weight: 100;
-    src: url("/ux/fonts/NotoSansKR-Thin.woff2") format('woff2');
-    src: url("/ux/fonts/NotoSansKR-Thin.woff") format('woff');
-    src: url("/ux/fonts/NotoSansKR-Thin.otf") format('opentype');
+    src: url("//image.istyle24.com/Style24/ux//fonts/NotoSansKR-Thin.woff2") format('woff2');
+    src: url("//image.istyle24.com/Style24/ux//fonts/NotoSansKR-Thin.woff") format('woff');
+    src: url("//image.istyle24.com/Style24/ux//fonts/NotoSansKR-Thin.otf") format('opentype');
 }
   @font-face {
     font-family: 'Noto Sans KR';
     font-style: normal;
     font-weight: 200;
-    src: url("/ux/fonts/NotoSansKR-Light.woff2") format('woff2');
-    src: url("/ux/fonts/NotoSansKR-Light.woff") format('woff');
-    src: url("/ux/fonts/NotoSansKR-Light.otf") format('opentype');
+    src: url("//image.istyle24.com/Style24/ux//fonts/NotoSansKR-Light.woff2") format('woff2');
+    src: url("//image.istyle24.com/Style24/ux//fonts/NotoSansKR-Light.woff") format('woff');
+    src: url("//image.istyle24.com/Style24/ux//fonts/NotoSansKR-Light.otf") format('opentype');
   }
   @font-face {
      font-family: 'Noto Sans KR';
      font-style: normal;
      font-weight: 300;
-     src: url("/ux/fonts/NotoSansKR-Regular.woff2") format('woff2');
-     src: url("/ux/fonts/NotoSansKR-Regular.woff") format('woff');
-     src: url("/ux/fonts/NotoSansKR-Regular.otf") format('opentype');
+     src: url("//image.istyle24.com/Style24/ux//fonts/NotoSansKR-Regular.woff2") format('woff2');
+     src: url("//image.istyle24.com/Style24/ux//fonts/NotoSansKR-Regular.woff") format('woff');
+     src: url("//image.istyle24.com/Style24/ux//fonts/NotoSansKR-Regular.otf") format('opentype');
    }
   @font-face {
      font-family: 'Noto Sans KR';
      font-style: normal;
      font-weight: 500;
-     src: url("/ux/fonts/NotoSansKR-Medium.woff2") format('woff2');
-     src: url("/ux/fonts/NotoSansKR-Medium.woff") format('woff');
-     src: url("/ux/fonts/NotoSansKR-Medium.otf") format('opentype');
+     src: url("//image.istyle24.com/Style24/ux//fonts/NotoSansKR-Medium.woff2") format('woff2');
+     src: url("//image.istyle24.com/Style24/ux//fonts/NotoSansKR-Medium.woff") format('woff');
+     src: url("//image.istyle24.com/Style24/ux//fonts/NotoSansKR-Medium.otf") format('opentype');
    }
   @font-face {
      font-family: 'Noto Sans KR';
      font-style: normal;
      font-weight: 600;
-     src:  url("/ux/fonts/NotoSansKR-Bold.woff2") format('woff2');
-     src:  url("/ux/fonts/NotoSansKR-Bold.woff") format('woff');
-     src:  url("/ux/fonts/NotoSansKR-Bold.otf") format('opentype');
+     src:  url("//image.istyle24.com/Style24/ux//fonts/NotoSansKR-Bold.woff2") format('woff2');
+     src:  url("//image.istyle24.com/Style24/ux//fonts/NotoSansKR-Bold.woff") format('woff');
+     src:  url("//image.istyle24.com/Style24/ux//fonts/NotoSansKR-Bold.otf") format('opentype');
    }
   @font-face {
     font-family: 'Noto Sans KR';
     font-style: normal;
     font-weight: 900;
-    src: url("/ux/fonts/NotoSansKR-Black.woff2") format('woff2');
-    src: url("/ux/fonts/NotoSansKR-Black.woff") format('woff');
-    src: url("/ux/fonts/NotoSansKR-Black.otf") format('opentype');
+    src: url("//image.istyle24.com/Style24/ux//fonts/NotoSansKR-Black.woff2") format('woff2');
+    src: url("//image.istyle24.com/Style24/ux//fonts/NotoSansKR-Black.woff") format('woff');
+    src: url("//image.istyle24.com/Style24/ux//fonts/NotoSansKR-Black.otf") format('opentype');
   } 
  
 /* lato */
 @font-face {
     font-family: 'LATO';
     src: 
-    url("/ux/fonts/Lato-Light.eot") format('eot'),
-    url("/ux/fonts/Lato-Light.woff") format('woff'),
-    url("/ux/fonts/Lato-Light.ttf") format('ttf');
+    url("//image.istyle24.com/Style24/ux//fonts/Lato-Light.eot") format('eot'),
+    url("//image.istyle24.com/Style24/ux//fonts/Lato-Light.woff") format('woff'),
+    url("//image.istyle24.com/Style24/ux//fonts/Lato-Light.ttf") format('ttf');
     font-weight: 200;
     font-style: normal;
 }
 @font-face {
     font-family: 'LATO';
     src: 
-    url("/ux/fonts/Lato-Regular.eot") format('eot'),
-    url("/ux/fonts/Lato-Regular.woff") format('woff'),
-    url("/ux/fonts/Lato-Regular.ttf") format('ttf');
+    url("//image.istyle24.com/Style24/ux//fonts/Lato-Regular.eot") format('eot'),
+    url("//image.istyle24.com/Style24/ux//fonts/Lato-Regular.woff") format('woff'),
+    url("//image.istyle24.com/Style24/ux//fonts/Lato-Regular.ttf") format('ttf');
     font-weight: 300;
     font-style: normal;
 }
 @font-face {
     font-family: 'LATO';
     src: 
-    url("/ux/fonts/Lato-Medium.eot") format('eot'),
-    url("/ux/fonts/Lato-Medium.woff") format('woff'),
-    url("/ux/fonts/Lato-Medium.ttf") format('ttf');
+    url("//image.istyle24.com/Style24/ux//fonts/Lato-Medium.eot") format('eot'),
+    url("//image.istyle24.com/Style24/ux//fonts/Lato-Medium.woff") format('woff'),
+    url("//image.istyle24.com/Style24/ux//fonts/Lato-Medium.ttf") format('ttf');
     font-weight: 500;
     font-style: normal;
 }
 @font-face {
     font-family: 'LATO';
     src: 
-    url("/ux/fonts/Lato-Semibold.eot") format('eot'),
-    url("/ux/fonts/Lato-Semibold.woff") format('woff'),
-    url("/ux/fonts/Lato-Semibold.ttf") format('ttf');
+    url("//image.istyle24.com/Style24/ux//fonts/Lato-Semibold.eot") format('eot'),
+    url("//image.istyle24.com/Style24/ux//fonts/Lato-Semibold.woff") format('woff'),
+    url("//image.istyle24.com/Style24/ux//fonts/Lato-Semibold.ttf") format('ttf');
     font-weight: 600;
     font-style: normal;
 }
 @font-face {
     font-family: 'LATO';
     src: 
-    url("/ux/fonts/Lato-Bold.eot") format('eot'),
-    url("/ux/fonts/Lato-Bold.woff") format('woff'),
-    url("/ux/fonts/Lato-Bold.ttf") format('ttf');
+    url("//image.istyle24.com/Style24/ux//fonts/Lato-Bold.eot") format('eot'),
+    url("//image.istyle24.com/Style24/ux//fonts/Lato-Bold.woff") format('woff'),
+    url("//image.istyle24.com/Style24/ux//fonts/Lato-Bold.ttf") format('ttf');
     font-weight: 700;
     font-style: normal;
 }

src/main/webapp/ux/pc/css/layout.css

@@ -394,8 +394,8 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 #quick_menu .shopingbag .itemsGrp .item_prod .itemLike {z-index: 99;}
 #quick_menu .shopingbag .itemsGrp .item_prod .itemPic {position: absolute; top: 0; left: 0; margin-bottom: 0; width: 120px; padding-top: 180px;}
 #quick_menu .shopingbag .itemsGrp .item_prod .itemPic .shape {z-index: 89;}
-/* #quick_menu .shopingbag .itemsGrp .item_prod .itemPic::after {background: #f9f9f9; opacity:1; z-index: 87;}
- #quick_menu .shopingbag .itemsGrp .item_prod .itemPic .pd_img {z-index: 88;}
+/* #quick_menu .shopingbag .itemsGrp .item_prod .itemPic::after {background: #f9f9f9; opacity:1; z-index: 87;} 
+ #quick_menu .shopingbag .itemsGrp .item_prod .itemPic .pd_img {z-index: 88;} 
  #quick_menu .shopingbag .itemsGrp .item_state.soldout .itemPic:before {content:'SOLD OUT'; position: absolute; top: 50%; left: 50%; font-size: 20px; color:#fff; background: rgba(0,0,0,.5); width: 100%; height: 100%; transform:translate(-50%, -50%); line-height: 420px; z-index: 1; text-align: center;} */
 #quick_menu .shopingbag .itemsGrp .item_prod .itemBrand {margin:0px 0 15px; font-size: 12px; line-height:14px; font-weight: 300;}
 #quick_menu .shopingbag .itemsGrp .item_prod .itemComment {font-size: 12px;margin-left: 0;}

src/main/webapp/ux/style24_link.js

@@ -138,10 +138,11 @@ const _PAGE_LOOKBOOK_DETAIL = _frontUrl + "/display/lookbook/detail/form";		//
  * @author : gagamel
  * @since  : 2020/02/21
  */
-var cfnGoToPage = function(page, ithrCd) {
+var cfnGoToPage = function(page, ithrCd , gnbId) {
 	if (!gagajf.isNull(page)) {
 		var params = page;
 		if (ithrCd) params += "&ithrCd=" + ithrCd;
+		if (gnbId) params += "&gnbId=" + gnbId;
 		document.location.href = params;
 	}
 }
@@ -1215,9 +1216,10 @@ function cfnPutWishList(a) {
  * @since  : 2021/03/22
  * @author : gagamel
  */
-var cfnGoToCategoryMain = function(cateGb, cate1No, brandGroupNo) {
+var cfnGoToCategoryMain = function(cateGb, cate1No, brandGroupNo, gnbId) {
 	var params = '?cateGb=' + cateGb + '&cate1No=' + cate1No;
 	if (typeof (brandGroupNo) != 'undefined') params += '&brandGroupNo=' + brandGroupNo;
+	if (typeof (gnbId) != 'undefined') params += '&gnbId=' + gnbId;
 	cfnGoToPage(_PAGE_CATE_MAIN + params);
 }
 
@@ -1233,8 +1235,9 @@ var cfnGoToCategoryMain = function(cateGb, cate1No, brandGroupNo) {
  * @since  : 2021/04/20
  * @author : bin2107
  */
-var cfnGoToOutletMain = function(cateGb) {
+var cfnGoToOutletMain = function(cateGb , gnbId) {
 	var params = '?cateGb=' + cateGb;
+	if (typeof (gnbId) != 'undefined') params += '&gnbId=' + gnbId;
 	cfnGoToPage(_PAGE_OUTLET_MAIN + params);
 }
 
@@ -1256,7 +1259,7 @@ var cfnGoToOutletMain = function(cateGb) {
  * @since  : 2021/03/22
  * @author : gagamel
  */
-var cfnGoToGoodsList = function(brandGroupNo, cateGb, cate1No, cate2No, cate3No, cate4No, cate5No, formalGb) {
+var cfnGoToGoodsList = function(brandGroupNo, cateGb, cate1No, cate2No, cate3No, cate4No, cate5No, formalGb, gnbId) {
 	var params = '?brandGroupNo=' + brandGroupNo + '&cateGb=' + cateGb;
 	if (typeof (cate1No) != 'undefined') params += '&cate1No=' + cate1No;
 	if (typeof (cate2No) != 'undefined') params += '&cate2No=' + cate2No;
@@ -1264,6 +1267,7 @@ var cfnGoToGoodsList = function(brandGroupNo, cateGb, cate1No, cate2No, cate3No,
 	if (typeof (cate4No) != 'undefined') params += '&cate4No=' + cate4No;
 	if (typeof (cate5No) != 'undefined') params += '&cate5No=' + cate5No;
 	if (typeof (formalGb) != 'undefined') params += '&formalGb=' + formalGb;
+	if (typeof (gnbId) != 'undefined') params += '&gnbId=' + gnbId;
 	cfnGoToPage(_PAGE_CATE_GOODS_LIST + params);
 }
 
@@ -1278,8 +1282,9 @@ var cfnGoToGoodsList = function(brandGroupNo, cateGb, cate1No, cate2No, cate3No,
  * @since  : 2021/03/16
  * @author : gagamel
  */
-var cfnGoToBrandMain = function(brandGroupNo) {
+var cfnGoToBrandMain = function(brandGroupNo, gnbId) {
 	var params = '?brandGroupNo=' + brandGroupNo;
+	if (typeof (gnbId) != 'undefined') params += '&gnbId=' + gnbId;
 	cfnGoToPage(_PAGE_BRAND_MAIN + params);
 }