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

src/main/webapp/WEB-INF/views/mob/display/CategoryGoodsListFormMob.html

@@ -1696,12 +1696,6 @@
 				let tag = '';
 				if(brandGroupNo > 0 ){
 					$("#htopTitle").text('전체');
-					var titleTag = '';
-					titleTag += '<button class="btn_gnbs" title="서브타이틀 메뉴 열기/닫기">\n';
-					titleTag += '	<span><i></i></span>\n';
-					titleTag += '</button>\n';
-					$("#htopTitle").append(titleTag);
-
 					tag += '<ul class="daps2">\n';
 					tag += '<li>';
 					tag += '<a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',\'\'';
@@ -1715,12 +1709,6 @@
 				}
 				if(formalGb == 'G009_20'){
 					$("#htopTitle").text('아울렛');
-					var titleTag = '';
-					titleTag += '<button class="btn_gnbs" title="서브타이틀 메뉴 열기/닫기">\n';
-					titleTag += '	<span><i></i></span>\n';
-					titleTag += '</button>\n';
-					$("#htopTitle").append(titleTag);
-
 					tag += '<ul class="daps2">\n';
 					tag += '<li>';
 					tag += '<a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',\'\'';

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

@@ -23,8 +23,8 @@
 			<ul>
                 <li class="bread_home"><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MAIN);">홈</a></li>
 				<li class="bread_2depth" th:if="${brandGroupInfo!=null and brandGroupInfo.brandGroupNo!=null}"><a href="javascript:void(0);" th:onclick="cfnGoToBrandMain([[${brandGroupInfo.brandGroupNo}]]);" th:text="${brandGroupInfo.brandGroupNm}"></a></li>
-				<li class="bread_2depth" th:if="${planInfo.planGb == 'P'}" ><a href="javascript:void(0);"onclick="cfnGoToPage(_PAGE_PLANNING_MAIN);">기획전</a></li>
-				<li class="bread_2depth" th:if="${planInfo.planGb == 'E'}" ><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_EVENT_MAIN);">이벤트/혜택</a></li>
+				<li class="bread_2depth" th:if="${brandGroupInfo==null and planInfo.planGb == 'P'}" ><a href="javascript:void(0);"onclick="cfnGoToPage(_PAGE_PLANNING_MAIN);">기획전</a></li>
+				<li class="bread_2depth" th:if="${brandGroupInfo==null and planInfo.planGb == 'E'}" ><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_EVENT_MAIN);">이벤트/혜택</a></li>
 				<li class="bread_2depth" th:if="${brandGroupInfo!=null and brandGroupInfo.brandGroupNo!=null and planInfo.planGb == 'P'}" ><a th:href="${'/planning/main/form?brandGroupNo='+brandGroupInfo.brandGroupNo}">기획전</a></li>
 				<li class="bread_2depth" th:text="${planInfo.planNm}"></li>
 			</ul>