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

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

@@ -650,7 +650,7 @@ public class TsfDisplayController extends TsfBaseController {
 			cate1.setBrandGroupNo(params.getBrandGroupNo() == null ? 0 : params.getBrandGroupNo());
 			cate1.setFrontGb(TsfSession.getFrontGb());
 			cate1.setSiteCd(TscConstants.Site.STYLE24.value());
-			cate1.setKeyword(" ");
+			cate1.setKeyword("TBJ");
 			cate1.setCateGb("G032_101");
 			cate1.setCate1No(params.getCate1No());
 			mav.addObject("cateList", diquest.getCategoryList(cate1));
@@ -773,7 +773,7 @@ public class TsfDisplayController extends TsfBaseController {
 
 		String syncYn = commonService.getSearchEngineSyncYn();
 		if (syncYn.equals("Y")) { // 검색엔진을 통한 상품리스트 조회
-			params.setKeyword(" ");
+			params.setKeyword("TBJ");
 			GoodsListResponse response = diquest.getGoodsList(params);
 			pageable.setTotalCount(response.getTotalCount());
 			dataList = response.getResponse();

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

@@ -67,11 +67,13 @@
 								<p class="desc">
 									<input type="hidden" name="brandNote" th:value="${ContentsData.subText1}"/>
 								</p>
-								<div class="btn_group_flex">
-									<div>
-										<a th:href="${ContentsData.strVar1}" th:target="${ContentsData.contentsType=='SELF'?'_self':'_blank'}" class="btn btn_default">브랜드 사이트<span></span></a>
+								<th:block th:if="${ContentsData.strVar1!=null && ContentsData.strVar1!='' && ContentsData.strVar1!='#' }">
+									<div class="btn_group_flex">
+										<div>
+											<a th:href="${ContentsData.strVar1}" th:target="${ContentsData.contentsType=='SELF'?'_self':'_blank'}" class="btn btn_default">브랜드 사이트<span></span></a>
+										</div>
 									</div>
-								</div>
+								</th:block>
 							</div>
 						</div>
 					</th:block>

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

@@ -419,9 +419,10 @@
 			}
 
 			// TOP 동일 카테고리
-			fnCreateDepthList();
+			// fnCreateDepthList();
+			fnGetSameDepthList();
 			// 상단노출 하위 카테고리
-			fnCreateCategoryList();
+			// fnCreateCategoryList();
 
 			if ($('#sizeLi1').find('label').length == 0) $('#sizeLi1').hide();
 			if ($('#sizeLi2').find('label').length == 0) $('#sizeLi2').hide();
@@ -966,7 +967,13 @@
 
 			var ithrCd = '';
 			var contentLoc = '';
-			if (result.dataList != null && result.dataList.length > 0) {
+			let dataListLen = 0;
+			if(result.dataList != null){
+				dataListLen = result.dataList.length-1;
+			}
+
+			// result.dataList != null && result.dataList.length > 0
+			if (dataListLen > 0) {
 				$('.list_content .list_defult').hide();
 				//$('.list_content .count_wrap').show();
 				var goodsUrl = [[${@environment.getProperty('upload.goods.view')}]];
@@ -1173,6 +1180,149 @@
 			$('#cateDepth').append(tag);
 		}
 
+		var fnGetSameDepthList = function (){
+			var brandGroupNo = [[${cateInfo.brandGroupNo}]];
+			var cateGb =  [[${cateInfo.cateGb}]];
+			var formalGb = [[${cateInfo.formalGb}]];
+			let cate1No = [[${cateInfo.cate1No}]];
+			let cate2No = [[${cateInfo.cate2No}]];
+			let cate3No = [[${cateInfo.cate3No}]];
+			let cate4No = [[${cateInfo.cate4No}]];
+			let cate5No = [[${cateInfo.cate5No}]];
+			let cateList = [[${cateList}]];
+			let allCateList = [[${allCateList}]];
+			let tag = '';
+			let html = '';
+
+			if(!gagajf.isNull(cate5No)){
+
+			}else if(!gagajf.isNull(cate4No)){
+				$.each(cateList, function(idx,item){
+					$.each(item.cate4List, function (idx4,item4){
+						if(item4.cate4No == cate4No){
+							if(idx<1) {
+								$("#htopTitle").append(fnDisplayTitle(item4.cate4Nm));
+							}
+							if(item4.cate5List != null && item4.cate5List.length > 0){
+								let leafTag = '';
+								leafTag += '<a href="javascript:void(0);" class="on" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + item4.cate1No + ', ' + item4.cate2No + ', ' + item4.cate3No + ', ' + item4.cate4No + ' ';
+								if(formalGb=='G009_20'){
+									leafTag += ' ,\'\',\''+formalGb+'\'';
+								}
+								leafTag += ');">전체</a>';
+								$.each(item4.cate5List, function (idx5, item5){
+									leafTag += '<a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + [[${cateInfo.cateGb}]] + '\', ' + item5.cate1No + ' , ' + item5.cate2No + ', ' + item5.cate3No + ' , ' + item5.cate4No + ' , ' + item5.cate5No + ' ';
+									if(formalGb=='G009_20'){
+										leafTag += ' ,\''+formalGb+'\'';
+									}
+									leafTag += ');">'+item5.cate5Nm+'</a>';
+								});
+								$('#leafCateList').append(leafTag);
+							}
+						}
+					});
+				});
+			}else if(!gagajf.isNull(cate3No)){
+				$.each(cateList, function(idx,item){
+					$.each(item.cate3List, function (idx3,item3){
+						if(item3.cate3No == cate3No){
+							if(idx<1) {
+								$("#htopTitle").append(fnDisplayTitle(item3.cate3Nm));
+							}
+							if(item3.cate4List != null && item3.cate4List.length > 0){
+								let leafTag = '';
+								leafTag += '<a href="javascript:void(0);" class="on" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + item3.cate1No + ', ' + item3.cate2No + ', ' + item3.cate3No + ' ';
+								if(formalGb=='G009_20'){
+									leafTag += ' ,\'\',\'\',\''+formalGb+'\'';
+								}
+								leafTag += ');">전체</a>';
+								$.each(item3.cate4List, function (idx4, item4){
+									leafTag += '<a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + [[${cateInfo.cateGb}]] + '\', ' + item4.cate1No + ' , ' + item4.cate2No + ', ' + item4.cate3No + ' , ' + item4.cate4No + ' ';
+									if(formalGb=='G009_20'){
+										leafTag += ' ,\'\',\''+formalGb+'\'';
+									}
+									leafTag += ');">'+item4.cate4Nm+'</a>';
+								});
+								$('#leafCateList').append(leafTag);
+							}
+						}
+					});
+				});
+			}else if(!gagajf.isNull(cate2No)){
+				$.each(cateList, function(idx,item){
+					$.each(item.cate2List, function (idx2,item2){
+						if(item2.cate2No == cate2No){
+							if(idx<1) {
+								$("#htopTitle").append(fnDisplayTitle(item2.cate2Nm));
+							}
+							if(item2.cate3List != null && item2.cate3List.length > 0){
+								let leafTag = '';
+								leafTag += '<a href="javascript:void(0);" class="on" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + item2.cate1No + ', ' + item2.cate2No + ' ';
+								if(formalGb=='G009_20'){
+									leafTag += ' ,\'\',\'\',\'\',\''+formalGb+'\'';
+								}
+								leafTag += ');">전체</a>';
+								$.each(item2.cate3List, function (idx3, item3){
+									leafTag += '<a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + [[${cateInfo.cateGb}]] + '\', ' + item3.cate1No + ' , ' + item3.cate2No + ', ' + item3.cate3No + ' ';
+									if(formalGb=='G009_20'){
+										leafTag += ' ,\'\',\'\',\''+formalGb+'\'';
+									}
+									leafTag += ');">'+item3.cate3Nm+'</a>';
+								});
+								$('#leafCateList').append(leafTag);
+							}
+						}
+						if(idx<1) {
+							tag += '<li><a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + item2.cate1No + ', ' + item2.cate2No + ' ';
+							if(formalGb=='G009_20'){
+								tag += ' ,\'\',\'\',\'\',\''+formalGb+'\'';
+							}
+							tag += ');">'+item2.cate2Nm+'</a></li>';
+						}
+
+					});
+				});
+				$("#cateDepth").append(tag);
+			}else{
+				$.each(cateList, function(idx,item){
+					$.each(allCateList, function (allIdx, allItem){
+						if(item.cate1No==allItem.cate1No){
+							if(idx<1) {
+								$("#htopTitle").append(fnDisplayTitle(item.cate1Nm));
+							}
+						}
+						if(idx<1) {
+							tag += '<li><a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + allItem.cate1No + ' ';
+							if(formalGb=='G009_20'){
+								tag += ' ,\'\',\'\',\'\',\'\',\''+formalGb+'\'';
+							}
+							tag += ');">'+allItem.cate1Nm+'</a></li>';
+						}
+					});
+
+					if(item.cate2List != null && item.cate2List.length > 0){
+						let leafTag = '';
+						leafTag += '<a href="javascript:void(0);" class="on" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\', \'\' ';
+						if(formalGb=='G009_20'){
+							leafTag += ' ,\'\',\'\',\'\',\'\',\''+formalGb+'\'';
+						}
+						leafTag += ');">전체</a>';
+						$.each(item.cate2List, function (idx, item){
+							leafTag += '<a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + [[${cateInfo.cateGb}]] + '\', ' + item.cate1No + ' , ' + item.cate2No + ' ';
+							if(formalGb=='G009_20'){
+								leafTag += ' ,\'\',\'\',\'\',\''+formalGb+'\'';
+							}
+							leafTag += ');">'+item.cate2Nm+'</a>';
+						});
+						$('#leafCateList').append(leafTag);
+					}
+				});
+				$("#cateDepth").append(tag);
+			}
+
+
+		}
+
 	</script>
 
 	<script>

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

@@ -1036,6 +1036,21 @@
 	}
 	/*]]>*/
 </script>
+
+	<!-- //2021.06.18 검색화면 로그스크립트 삽입 -->
+	<script type="text/javascript">
+		window._eglqueue = window._eglqueue || [];
+		_eglqueue.push(['setVar', 'cuid', eglqueueCuid]);
+		_eglqueue.push(['setVar', 'searchTerm', [[${params.keyword}]]]);
+		_eglqueue.push(['setVar', 'userId', hCustId]); // optional
+		_eglqueue.push(['track', 'search']);
+		(function (s, x) {
+			s = document.createElement('script'); s.type = 'text/javascript';
+			s.async = true; s.defer = true; s.src = (('https:' == document.location.protocol) ? 'https' : 'http') + '://logger.eigene.io/js/logger.min.js';
+			x = document.getElementsByTagName('script')[0]; x.parentNode.insertBefore(s, x);
+		})();
+	</script>
+	<!-- //2021.06.18 검색화면 로그스크립트 삽입 -->
 </th:block>
 </body>
 </html>

src/main/webapp/WEB-INF/views/mob/mypage/MypageCancelFormMob.html

@@ -405,7 +405,7 @@ var fnCancel = function() {
 		if (result.cancelYn == 'Y') {
 			// 취소 처리
 			gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
-				cfnGoToPage(_PAGE_MYPAGE_ORDER_LIST);
+				cfnGoToPage(_PAGE_MYPAGE_CRE_LIST);
 			}, true);
 		} else {
 			mcxDialog.alert('이미 배송처리 되어 취소 처리에 실패 하였습니다.');

src/main/webapp/WEB-INF/views/mob/mypage/MypageCreExchangeDetailFormMob.html

@@ -139,7 +139,7 @@
 						</div>
 						<th:block th:if="${exchangeDtl.chgStat == 'G685_21' or (exchangeDtl.chgGb == 'G680_40' and exchangeDtl.chgStat == 'G685_32')}">
 							<div class="goods_txt">
-								<p class="cf_txt cf_desc" th:text="|${exchangeDtl.addPayCost}원 결제 후 교환 가능합니다.|"></p>
+								<p class="cf_txt cf_desc" th:text="|${#numbers.formatInteger(exchangeDtl.addPayCost, 1, 'COMMA')}원 결제 후 교환 가능합니다.|"></p>
 							</div>
 						</th:block>
 						<th:block th:if="${exchangeDtl.chgStat == 'G685_20'}">

src/main/webapp/WEB-INF/views/mob/mypage/MypageCreListInfoMob.html

@@ -181,7 +181,7 @@
 						<!-- 결제대기(교환) -->
 						<th:block th:if="${cre.chgStat == 'G685_21' or (cre.chgGb == 'G680_40' and cre.chgStat == 'G685_32')}">
 							<div class="goods_txt">
-								<p class="cf_txt cf_desc" th:text="|${#numbers.formatInteger(cre.addPayCost, 1, 'COMMA')} 원 결제 후 교환 가능합니다.|"></p>
+								<p class="cf_txt cf_desc" th:text="|${#numbers.formatInteger(cre.addPayCost, 1, 'COMMA')}원 결제 후 교환 가능합니다.|"></p>
 							</div>
 						</th:block>
 						<!-- //결제대기(교환) -->

src/main/webapp/WEB-INF/views/mob/mypage/MypageCreReturnDetailFormMob.html

@@ -107,7 +107,7 @@
 							</div>
 						</div>
 						<div class="goods_txt">
-							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_51' or (returnDtl.chgGb == 'G680_30' and returnDtl.chgStat == 'G685_32')}" th:text="|${returnDtl.addPayCost}원 결제 후 반품 가능합니다.|"></p>
+							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_51' or (returnDtl.chgGb == 'G680_30' and returnDtl.chgStat == 'G685_32')}" th:text="|${#numbers.formatInteger(returnDtl.addPayCost, 1, 'COMMA')}원 결제 후 반품 가능합니다.|"></p>
 							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_50'}">반품 신청이 접수 되었습니다.<br> 신속하게 처리하여 드리겠습니다.</p>
 							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_30'}">고객님이 요청하신 회수지로 상품을 회수 중에 있습니다.</p>
 							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_31' and returnDtl.chgGb == 'G680_30'}">고객님이 반품하신 상품을 검수 중에 있습니다.</p>

src/main/webapp/WEB-INF/views/mob/mypage/MypageOrderDetailFormMob.html

@@ -84,25 +84,27 @@
 											<div class="name" th:text="${ordDtl.goodsNm}"></div>
 										</div>
 										<div class="od_opt">
-											<div class="option">
-												<!-- 세트상품 -->
-												<th:block th:if="${ordDtl.goodsType == 'G056_S'}">
-													<th:block th:each="option, status : ${ordDtl.colorNmArr}">
+											<!-- 세트상품 -->
+											<th:block th:if="${ordDtl.goodsType == 'G056_S'}">
+												<th:block th:each="option, status : ${ordDtl.colorNmArr}">
+													<div class="option">
 														<em th:text="${ordDtl.itemNmArr[status.index]}"></em>
 														<em th:text="${option}"></em>
 														<em th:text="${ordDtl.optCd2Arr[status.index]}"></em>
-													</th:block>
+													</div>
 												</th:block>
-												<!-- //세트상품 -->
-												<!-- 일반상품 -->
-												<th:block th:unless="${ordDtl.goodsType == 'G056_S'}">
-													<th:block th:each="option, status : ${ordDtl.colorNmArr}">
+											</th:block>
+											<!-- //세트상품 -->
+											<!-- 일반상품 -->
+											<th:block th:unless="${ordDtl.goodsType == 'G056_S'}">
+												<th:block th:each="option, status : ${ordDtl.colorNmArr}">
+													<div class="option">
 														<em th:text="${ordDtl.colorNm}"></em>
 														<em th:text="${ordDtl.optCd2}"></em>
-													</th:block>
+													</div>
 												</th:block>
-												<!-- //일반상품 -->
-											</div>
+											</th:block>
+											<!-- //일반상품 -->
 										</div>
 										<div class="od_calc">
 											<p class="point"><span th:text="${#numbers.formatInteger(ordDtl.savePntAmt, 1, 'COMMA')}"></span>P 적립예정</p>
@@ -952,7 +954,7 @@
 					if (cancelYn == 'Y') {
 						// 전체취소 처리
 						gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
-							cfnGoToPage(_PAGE_MYPAGE_ORDER_LIST);
+							cfnGoToPage(_PAGE_MYPAGE_CRE_LIST);
 						}, true);
 					} else {
 						mcxDialog.alert('이미 배송처리 되어 전체취소 처리에 실패 하였습니다.');

src/main/webapp/WEB-INF/views/mob/mypage/MypageReturnFormMob.html

@@ -326,6 +326,7 @@
 				</div>
 				<div class="required_group" id="addDeliveryFee" style="display:none">
 					<p>배송비 <span class="c_primary" id="addPayCost">0원</span> 추가 결제가 필요합니다.</p>
+					<input type="hidden" name="addPayCost"/>
 				</div>
 				<div class="btn_group btn_group_flex">
 					<div><button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_MYPAGE_ORDER_LIST);"><span>취소</span></button></div>

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberCancelFormMob.html

@@ -404,7 +404,7 @@ var fnCancel = function() {
 		if (result.cancelYn == 'Y') {
 			// 취소 처리
 			gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
-				cfnGoToPage(_PAGE_NOMEMBER_ORDER_LIST);
+				cfnGoToPage(_PAGE_NOMEMBER_CRE_LIST);
 			}, true);
 		} else {
 			mcxDialog.alert('이미 배송처리 되어 취소 처리에 실패 하였습니다.');

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberCreExchangeDetailFormMob.html

@@ -124,7 +124,7 @@
 						</div>
 						<th:block th:if="${exchangeDtl.chgStat == 'G685_21' or (exchangeDtl.chgGb == 'G680_40' and exchangeDtl.chgStat == 'G685_32')}">
 							<div class="goods_txt">
-								<p class="cf_txt cf_desc" th:text="|${exchangeDtl.addPayCost}원 결제 후 교환 가능합니다.|"></p>
+								<p class="cf_txt cf_desc" th:text="|${#numbers.formatInteger(exchangeDtl.addPayCost, 1, 'COMMA')}원 결제 후 교환 가능합니다.|"></p>
 							</div>
 						</th:block>
 						<th:block th:if="${exchangeDtl.chgStat == 'G685_20'}">

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberCreListInfoMob.html

@@ -171,7 +171,7 @@
 						<!-- 결제대기(교환) -->
 						<th:block th:if="${cre.chgStat == 'G685_21' or (cre.chgGb == 'G680_40' and cre.chgStat == 'G685_32')}">
 							<div class="goods_txt">
-								<p class="cf_txt cf_desc" th:text="|${#numbers.formatInteger(cre.addPayCost, 1, 'COMMA')} 원 결제 후 교환 가능합니다.|"></p>
+								<p class="cf_txt cf_desc" th:text="|${#numbers.formatInteger(cre.addPayCost, 1, 'COMMA')}원 결제 후 교환 가능합니다.|"></p>
 							</div>
 						</th:block>
 						<!-- //결제대기(교환) -->

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberCreReturnDetailFormMob.html

@@ -97,7 +97,7 @@
 							</div>
 						</div>
 						<div class="goods_txt">
-							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_51' or (returnDtl.chgGb == 'G680_30' and returnDtl.chgStat == 'G685_32')}" th:text="|${returnDtl.addPayCost}원 결제 후 반품 가능합니다.|"></p>
+							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_51' or (returnDtl.chgGb == 'G680_30' and returnDtl.chgStat == 'G685_32')}" th:text="|${#numbers.formatInteger(returnDtl.addPayCost, 1, 'COMMA')}원 결제 후 반품 가능합니다.|"></p>
 							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_50'}">반품 신청이 접수 되었습니다.<br> 신속하게 처리하여 드리겠습니다.</p>
 							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_30'}">고객님이 요청하신 회수지로 상품을 회수 중에 있습니다.</p>
 							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_31' and returnDtl.chgGb == 'G680_30'}">고객님이 반품하신 상품을 검수 중에 있습니다.</p>

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberExchangeFormMob.html

@@ -320,7 +320,7 @@
 			</div>
 			<div class="popup_con">
 				<div class="button_list clear">
-					<button type="button" qty=0 onclick="fnChangeExchangeQty(this);">
+					<button type="button" class="on" qty=0 onclick="fnChangeExchangeQty(this);">
 						<span>수량 0개</span>
 					</button>
 					<th:block th:each="num : ${#numbers.sequence(1, exchange.ordCanChgQty)}">

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberOrderDetailFormMob.html

@@ -70,24 +70,26 @@
 											<div class="name" th:text="${ordDtl.goodsNm}"></div>
 										</div>
 										<div class="od_opt">
-											<div class="option">
-												<!-- 세트상품 -->
-												<th:block th:if="${ordDtl.goodsType == 'G056_S'}">
-													<th:block th:each="option, status : ${ordDtl.colorNmArr}">
+											<!-- 세트상품 -->
+											<th:block th:if="${ordDtl.goodsType == 'G056_S'}">
+												<th:block th:each="option, status : ${ordDtl.colorNmArr}">
+													<div class="option">
 														<em th:text="${option}"></em>
 														<em th:text="${ordDtl.optCd2Arr[status.index]}"></em>
-													</th:block>
+													</div>
 												</th:block>
-												<!-- //세트상품 -->
-												<!-- 일반상품 -->
-												<th:block th:unless="${ordDtl.goodsType == 'G056_S'}">
-													<th:block th:each="option, status : ${ordDtl.colorNmArr}">
+											</th:block>
+											<!-- //세트상품 -->
+											<!-- 일반상품 -->
+											<th:block th:unless="${ordDtl.goodsType == 'G056_S'}">
+												<th:block th:each="option, status : ${ordDtl.colorNmArr}">
+													<div class="option">
 														<em th:text="${ordDtl.colorNm}"></em>
 														<em th:text="${ordDtl.optCd2}"></em>
-													</th:block>
+													</div>
 												</th:block>
-												<!-- //일반상품 -->
-											</div>
+											</th:block>
+											<!-- //일반상품 -->
 										</div>
 										<div class="od_calc">
 											<p class="sale_price" th:if="${(ordDtl.ordAmt - ordDtl.cnclRtnAmt) > (ordDtl.realOrdAmt + ordDtl.pntDcAmt + ordDtl.gfcdUseAmt)}">
@@ -728,7 +730,7 @@
 					if (cancelYn == 'Y') {
 						// 전체취소 처리
 						gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
-							cfnGoToPage(_PAGE_MYPAGE_ORDER_LIST);
+							cfnGoToPage(_PAGE_MYPAGE_CRE_LIST);
 						}, true);
 					} else {
 						mcxDialog.alert('이미 배송처리 되어 전체취소 처리에 실패 하였습니다.');

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberReturnFormMob.html

@@ -325,6 +325,7 @@
 				</div>
 				<div class="required_group" id="addDeliveryFee" style="display:none">
 					<p>배송비 <span class="c_primary" id="addPayCost">0원</span> 추가 결제가 필요합니다.</p>
+					<input type="hidden" name="addPayCost"/>
 				</div>
 				<div class="btn_group btn_group_flex">
 					<div><button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_NOMEMBER_ORDER_LIST);"><span>취소</span></button></div>

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

@@ -39,7 +39,7 @@
 							<div class="event_top">
 								<div class="ui_row">
 									<div class="count">
-										<span id="lookbookTotCnt"></span>개의 이벤트
+										<span id="lookbookTotCnt"></span>개의 룩북
 									</div>
 									<div class="ui_col_12">
 										<div class="btn_group">

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

@@ -73,8 +73,10 @@
 							<div class="cont_body clear">
 								<div class="brand_tit">
 									<p th:text="${contentsTitle}"></p>
-									<a th:if="${ContentsData.contentsType=='SELF'}" th:href="${ContentsData.strVar1}" target="_self">브랜드 사이트</a>
-									<a th:unless="${ContentsData.contentsType=='SELF'}" th:href="${ContentsData.strVar1}" target="_blank">브랜드 사이트</a>
+									<th:block th:if="${ContentsData.strVar1!=null && ContentsData.strVar1!='' && ContentsData.strVar1!='#' }">
+										<a th:if="${ContentsData.contentsType=='SELF'}" th:href="${ContentsData.strVar1}" target="_self">브랜드 사이트</a>
+										<a th:unless="${ContentsData.contentsType=='SELF'}" th:href="${ContentsData.strVar1}" target="_blank">브랜드 사이트</a>
+									</th:block>
 								</div>
 								<div class="brand_desc" id="brandDesc">
 									<p class="cate">
@@ -148,7 +150,7 @@
 															<input type="hidden" name="bannerDesc" th:value="${ContentsData.strTitle1}">
 														</p>
 														<!--<p>아우터 + 이너 단독세일</p>-->
-														<button type="button" class="btn">VIEW MORE</button>
+<!--														<button type="button" class="btn">VIEW MORE</button>-->
 													</div>
 													<img alt="BLUE-a" class=" vLHTC pd_img" th:src="${@environment.getProperty('domain.image')+ContentsData.imgPath1}">
 												</div>
@@ -257,6 +259,7 @@
 									<div class="swiper-slide">
 										<div class="item_prod sUiXc">
 											<div class="item_state">
+												<button type="button" class="itemLike" th:classappend="${goodsData.likeIt == 'likeit'}? 'likeit' : ''"  onclick="cfnPutWishList(this);" th:attr="goodsCd=${goodsData.goodsCd}, ithrCd='', contentsLoc=${contentsLoc}, planDtlSq=''">관심상품 추가</button>
 												<a href="javascript:void(0);" class="itemLink" th:onclick="cfnGoToGoodsDetail([[${goodsData.goodsCd}]], '', '', 'SBM009');">
 													<div class="itemPic">
 														<th:block th:each="option,idx:${goodsData.videos}" th:with="videoArr=${#strings.arraySplit(idx.current,':')}">
@@ -264,7 +267,6 @@
 															<iframe th:unless="${videoArr[0]=='Y'}" id="pdThumbVideo" class="pd_mov" th:src="${kollusMediaUrl+'/'+videoArr[1]+'?enable_initialize_focus=false&autoplay&mute&controls_activation=none'}" allow="fullscreen" allowFullScreen></iframe>
 														</th:block>
 														<img alt="BLACK-a" class=" vLHTC pd_img" th:src="${@environment.getProperty('upload.goods.view') + '/' + goodsData.sysImgNm}" onerror="noneImg(this)">
-														<button type="button" class="itemLike" th:classappend="${goodsData.likeIt == 'likeit'}? 'likeit' : ''"  onclick="cfnPutWishList(this);" th:attr="goodsCd=${goodsData.goodsCd}, ithrCd='', contentsLoc=${contentsLoc}, planDtlSq=''">관심상품 추가</button>
 													</div>
 													<p class=" itemBrand" th:text="${goodsData.brandGroupNm}">BRAND NAME</p>
 													<div class=" itemName" th:text="${goodsData.goodsFullNm}">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>

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

@@ -1100,6 +1100,21 @@
 
 	</script>
 
+	<!-- //2021.06.18 검색화면 로그스크립트 삽입 -->
+	<script type="text/javascript">
+		window._eglqueue = window._eglqueue || [];
+		_eglqueue.push(['setVar', 'cuid', eglqueueCuid]);
+		_eglqueue.push(['setVar', 'searchTerm', [[${params.keyword}]]]);
+		_eglqueue.push(['setVar', 'userId', hCustId]); // optional
+		_eglqueue.push(['track', 'search']);
+		(function (s, x) {
+			s = document.createElement('script'); s.type = 'text/javascript';
+			s.async = true; s.defer = true; s.src = (('https:' == document.location.protocol) ? 'https' : 'http') + '://logger.eigene.io/js/logger.min.js';
+			x = document.getElementsByTagName('script')[0]; x.parentNode.insertBefore(s, x);
+		})();
+	</script>
+	<!-- //2021.06.18 검색화면 로그스크립트 삽입 -->
+
 </th:block>
 
 </body>

src/main/webapp/WEB-INF/views/web/mypage/MypageCancelFormWeb.html

@@ -309,7 +309,7 @@
 			if (result.cancelYn == 'Y') {
 				// 취소 처리
 				gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
-					cfnGoToPage(_PAGE_MYPAGE_ORDER_LIST);
+					cfnGoToPage(_PAGE_MYPAGE_CRE_LIST);
 				}, true);
 			} else {
 				mcxDialog.alert('이미 배송처리 되어 취소 처리에 실패 하였습니다.');

src/main/webapp/WEB-INF/views/web/mypage/MypageOrderDetailFormWeb.html

@@ -593,7 +593,7 @@
 					if (cancelYn == 'Y') {
 						// 전체취소 처리
 						gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
-							cfnGoToPage(_PAGE_MYPAGE_ORDER_LIST);
+							cfnGoToPage(_PAGE_MYPAGE_CRE_LIST);
 						}, true);
 					} else {
 						mcxDialog.alert('이미 배송처리 되어 전체취소 처리에 실패 하였습니다.');

src/main/webapp/WEB-INF/views/web/mypage/NoMemberCancelFormWeb.html

@@ -307,7 +307,7 @@
 			if (result.cancelYn == 'Y') {
 				// 취소 처리
 				gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
-					cfnGoToPage(_PAGE_NOMEMBER_ORDER_LIST);
+					cfnGoToPage(_PAGE_NOMEMBER_CRE_LIST);
 				}, true);
 			} else {
 				mcxDialog.alert('이미 배송처리 되어 취소 처리에 실패 하였습니다.');

src/main/webapp/WEB-INF/views/web/mypage/NoMemberOrderDetailFormWeb.html

@@ -95,7 +95,7 @@
 												</div>
 												<div class="button_box">
 													<!-- 주문취소 버튼(입금대기, 결제완료, 상품준비중, 출고처지정, 배송준비중) -->
-													<th:block th:if="${ordDtl.payStat != 'G016_10' && (ordDtl.ordDtlStat == 'G013_10' or ordDtl.ordDtlStat == 'G013_20' or ordDtl.ordDtlStat == 'G013_30' or ordDtl.ordDtlStat == 'G013_35' or ordDtl.ordDtlStat == 'G013_40')}">
+													<th:block th:if="${ordDtl.payStat != 'G016_10' && (ordDtl.ordDtlStat == 'G013_10' or ordDtl.ordDtlStat == 'G013_20' or ordDtl.ordDtlStat == 'G013_30' or ordDtl.ordDtlStat == 'G013_35')}">
 														<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, delvFeeCd=${ordDtl.delvFeeCd}, ordCanChgQty=${ordDtl.ordCanChgQty}" onclick="fnCreateChange(this, 'cancel', 'noMember');"><span>주문 취소</span></button></p>
 													</th:block>
 													
@@ -444,7 +444,7 @@
 					if (cancelYn == 'Y') {
 						// 전체취소 처리
 						gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
-							cfnGoToPage(_PAGE_MYPAGE_ORDER_LIST);
+							cfnGoToPage(_PAGE_MYPAGE_CRE_LIST);
 						}, true);
 					} else {
 						mcxDialog.alert('이미 배송처리 되어 전체취소 처리에 실패 하였습니다.');

src/main/webapp/WEB-INF/views/web/mypage/NoMemberOrderListFormWeb.html

@@ -402,7 +402,7 @@
 
 					// 버튼 처리
 					// 주문취소 버튼(입금대기, 결제완료, 상품준비중, 출고처지정, 배송준비중)
-					if (ordDtl.payStat != 'G016_10' && (ordDtl.ordDtlStat == 'G013_10' || ordDtl.ordDtlStat == 'G013_20' || ordDtl.ordDtlStat == 'G013_30' || ordDtl.ordDtlStat == 'G013_35' || ordDtl.ordDtlStat == 'G013_40')) {
+					if (ordDtl.payStat != 'G016_10' && (ordDtl.ordDtlStat == 'G013_10' || ordDtl.ordDtlStat == 'G013_20' || ordDtl.ordDtlStat == 'G013_30' || ordDtl.ordDtlStat == 'G013_35')) {
 						tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" ordCanChgQty="' + ordDtl.ordCanChgQty + '" delvFeeCd="' + ordDtl.delvFeeCd + '" onclick="fnCreateChange(this, \'cancel\', \'noMember\');"><span>주문 취소</span></button></p>\n';
 					}