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

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

@@ -692,8 +692,8 @@ public class TsfDisplayService {
 	public Collection<Filter> getCategoryFilterList(Collection<Filter> filterList, String filterGb) {
 		Collection<Filter> resultList = new ArrayList<Filter>();
 		int idx = 0;
-		String maxPrice = null;
-		String minPrice = null;
+		String maxPrice = "0";
+		String minPrice = "0";
 		for (Filter filter : filterList) {
 			if(!"".equals(filter.getFilterCd()) && !filter.getFilterCd().equals(null)){
 				if(filter.getFilterGb().equals("PRICE")){

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

@@ -187,7 +187,7 @@ public class TsfCallcenterController extends TsfBaseController {
 
 		if (device.isMobile() || device.isTablet()) { // 모바일이면
 			// 문의유형
-			mav.addObject("counselClsfList", rendererService.getCommonCodeList("G059", "Y", new String[] {"G596"}));
+			mav.addObject("counselClsfList", rendererService.getCommonCodeList("G059", "Y"));
 		}
 
 		mav.setViewName(super.getDeviceViewName("callcenter/OneToOneQnaForm"));

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

@@ -10,7 +10,7 @@
 			<a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MYPAGE);" class="btn-my">Mypage</a>
 			<a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MAIN);" class="btn-home">Home</a>
 			<a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_WISHLIST);" class="btn-wish">Wish</a>
-			<a href="javascript:void(0);" class="btn-history">History</a>
+			<a href="javascript:void(0);" onclick="hstr()" class="btn-history">History</a>
 		</div>
 			<!-- 
 				<span class="txt-balloon" id="tutorial_mycloset" style=""> 툴팁예제</span>
@@ -154,6 +154,33 @@
 			</div>
 		</div>
 	</aside>
+	
+			
+<!-- 210623_ 추가 : 최근본상품 -->
+<div id="hstrFull">
+	<div class="fullHead">
+		<h1 id="htopTitle" >최근 본 상품</h1>
+		<a href="javascript:hstr_cls();" class="hstr_cls">close</a>
+	</div>
+	<div class="fullBody">
+		<div class="inner">
+
+			<div class="list_content">  <!-- 데이터 없을시 클래스 nodata 추가 -->
+				<div class="count_wrap">
+					<div>
+						<p><span id="quickMenuTodayCount">0</span>개의 상품</p>
+					</div>
+				</div>
+				<div class="itemsGrp" id="quickMenuTodayGoods"> <!-- itemsGrp rank hot deal -->
+					
+				</div>
+			</div>
+		</div>
+
+	</div>
+</div>
+<!-- // 210623_ 추가 : 최근본상품 -->
+	
 
 <script th:inline="javascript">
 /*<![CDATA[*/
@@ -167,12 +194,22 @@
 		return false;
 	}
 	
+	function hstr() { // 210623_ 추가 : 최근본상품 열고 닫기
+		$("#hstrFull").addClass('on');
+		return false;
+	}
+	function hstr_cls() {
+		$("#hstrFull").removeClass('on');
+		return false;
+	}
+	
 	$(document).on('click','.hasCate a',function(e){
 		$(this).next('.depthCate').slideToggle(300);
 		$(this).toggleClass('on');
 		return false;
 	});
 	
+	
 	// 퀵메뉴카테고리
 	let fnGetQuickMenuCategory = function(cate1) {
 		let tag = '';
@@ -221,6 +258,40 @@
 			});
 	}
 	
+	// 최근 본 상품
+	let fnGetRecentlyGoods = function() {
+		$.getJSON('/goods/recently/list', function(result, status) {
+			if (status == 'success') {
+				$('#quickMenuTodayGoods').html('');
+				
+				$('#quickMenuTodayCount').html(result.length);
+				let tag = '';
+				if (result.length > 0) {
+					$.each(result, function (idx, item) {
+						tag += '<div class="item_prod">\n';
+						tag += '	<div class="item_state">\n';
+						tag += '		<button type="button" class="itemLike">관심상품 추가</button>\n';
+						tag += '		<a href="javascript:void(0);" onclick="cfnGoToGoodsDetail(\''+item.goodsCd+'\',\'\',\'IN22_01\')" class="itemLink">\n';
+						tag += '			<div class="itemPic">\n';
+						tag += '				<img class="vLHTC pd_img" src="' + _uploadGoodsUrl + '/' + item.sysImgNm + '" alt="">\n';
+						tag += '			</div>\n';
+						tag += '		</a>\n';
+						tag += '	</div>\n';
+						tag += '</div>\n';
+					})
+					
+				}else {
+					tag += '<div class="no_item">';
+					tag += '	최근 본 상품이 없습니다.';
+					tag += '</div>';
+					
+				}
+				$('#quickMenuTodayGoods').html(tag);
+				
+			}
+		});
+	}
+	
 	// 팝업
 	let fnGetPopup = function(){
 		let data = {viewPage : [[${viewPage}]]
@@ -349,6 +420,9 @@
 		// 퀵메뉴탭 조회
 		fnCreateQuickMenuTab();
 		
+		// 최근 본 상품 조회
+		fnGetRecentlyGoods();
+		
 		// 팝업조회
 		fnGetPopup();
 		

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

@@ -32,10 +32,10 @@
 			</h1>
 			<div class="button_wrap">
 				<button class="search" onclick="cfnSearchLayer();">
-					<img src="/images/mo/ico_btn_search_w.png" alt="검색">
+					<img src="/images/mo/ico_btn_search.png" alt="검색">
 				</button>
 				<button class="store" onclick="cfnGoToPage(_PAGE_CART);">
-					<img src="/images/mo/ico_btn_store_w.png" alt="쇼핑백">
+					<img src="/images/mo/ico_btn_store.png" alt="쇼핑백">
 					<span id="spanGnbCartCnt" style="display: none;"></span>
 				</button>
 			</div>

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

@@ -1213,58 +1213,144 @@
 
 			}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 + ' ';
+					let cate2 = item.cate2List;
+					$.each(cate2, function(idx2, item2){
+						if(item2.cate2No == cate2No){
+							$.each(item2.cate3List, function(idx3,item3){
+								if(item3.cate3No == cate3No){
+									tag += '<a href="javascript:void(0);" class="daps1" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + item2.cate1No + ' ,' + item2.cate2No + ',' + item3.cate3No + ' ';
 									if(formalGb=='G009_20'){
-										leafTag += ' ,\''+formalGb+'\'';
+										tag += ' ,\'\',\'\',\''+formalGb+'\'';
 									}
-									leafTag += ');">'+item5.cate5Nm+'</a>';
-								});
-								$('#leafCateList').append(leafTag);
-							}
+									tag += ' )">'+item3.cate3Nm+'</a>';
+									tag += '<ul class="daps2">\n';
+									tag += '<li>';
+									tag += '<a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + item2.cate1No + ' ,' + item2.cate2No + ',' + item3.cate3No + ' ';
+									if(formalGb=='G009_20'){
+										tag += ' ,\'\',\'\',\''+formalGb+'\'';
+									}
+									tag += ' )">전체</a>';
+									tag += '</li>\n';
+									$.each(item3.cate4List, function(idx4, item4){
+										if(item4.cate4No == cate4No){
+											if(idx<1) {
+												$("#htopTitle").append(fnDisplayTitle(item4.cate4Nm));
+											}
+											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>';
+											if(item4.cate5List != null && item4.cate5List.length > 0){
+												$.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);
+										}
+										tag += '<li ';
+										if(item4.cate4No == cate4No){
+											tag += ' class="on"';
+										}
+										tag += '>\n';
+										tag += '<a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + item4.cate1No + ', ' + item4.cate2No + ', ' + item4.cate3No + ', ' + item4.cate4No + ' ';
+										if(formalGb=='G009_20'){
+											leafTag += ' ,\'\',\''+formalGb+'\'';
+										}
+										tag += ' );">'+item4.cate4Nm+'</a></li>';
+									});
+								}
+							});
 						}
 					});
+					tag += '</ul>\n';
 				});
+				$("#cateDepth").append(tag);
 			}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));
+					let cate2 = item.cate2List;
+					$.each(cate2, function (idx2,item2){
+						if(item2.cate2No == cate2No){
+							tag += '<a href="javascript:void(0);" class="daps1" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + item2.cate1No + ' ,' + item2.cate2No + ' ';
+							if(formalGb=='G009_20'){
+								tag += ' ,\'\',\'\',\'\',\''+formalGb+'\'';
 							}
-							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 + ' ';
+							tag += ' )">'+item2.cate2Nm+'</a>';
+							tag += '<ul class="daps2">\n';
+							tag += '<li>';
+							tag += '<a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + item2.cate1No + ' ,' + item2.cate2No + ' ';
+							if(formalGb=='G009_20'){
+								tag += ' ,\'\',\'\',\'\',\''+formalGb+'\'';
+							}
+							tag += ' )">전체</a>';
+							tag += '</li>\n';
+							$.each(item2.cate3List, function (idx3, item3){
+								if(idx<1) {
+									tag += '<li';
+									if(item3.cate3No == cate3No){
+										tag += ' class="on"';
+									}
+									tag += '><a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + item2.cate1No + ', ' + item2.cate2No + ', ' + item3.cate3No + ' ';
 									if(formalGb=='G009_20'){
-										leafTag += ' ,\'\',\''+formalGb+'\'';
+										tag += ' ,\'\',\'\',\''+formalGb+'\'';
 									}
-									leafTag += ');">'+item4.cate4Nm+'</a>';
-								});
-								$('#leafCateList').append(leafTag);
+									tag += ');">'+item3.cate3Nm+'</a></li>';
+								}
+							});
+						}
+					});
+
+					$.each(cate2, function (idx2,item2){
+						let leafTag = '';
+						if(item2.cate2No == cate2No){
+							leafTag += '<a href="javascript:void(0);" class="on" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + item2.cate1No + ', ' + item2.cate2No + ', ' + cate3No + ' ';
+							if(formalGb=='G009_20'){
+								leafTag += ' ,\'\',\'\',\''+formalGb+'\'';
 							}
+							leafTag += ');">전체</a>';
+							$.each(item2.cate3List, function(idx3, item3){
+								if(item3.cate3No == cate3No){
+									if(idx<1) {
+										$("#htopTitle").append(fnDisplayTitle(item3.cate3Nm));
+									}
+									if(item3.cate4List != null && item3.cate4List.length > 0){
+										$.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);
+									}
+								}
+							});
+							$('#leafCateList').append(leafTag);
 						}
 					});
+					tag += '</ul>\n';
 				});
+				$("#cateDepth").append(tag);
 			}else if(!gagajf.isNull(cate2No)){
 				$.each(cateList, function(idx,item){
+					tag += '<a href="javascript:void(0);" class="daps1" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + item.cate1No + ' ';
+					if(formalGb=='G009_20'){
+						tag += ' ,\'\',\'\',\'\',\'\',\''+formalGb+'\'';
+					}
+					tag += ' )">'+item.cate1Nm+'</a>';
+					tag += '<ul class="daps2">\n';
+					tag += '<li>';
+					tag += '<a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + item.cate1No + ' ';
+					if(formalGb=='G009_20'){
+						tag += ' ,\'\',\'\',\'\',\'\',\''+formalGb+'\'';
+					}
+					tag += ' )">전체</a>';
+					tag += '</li>\n';
 					$.each(item.cate2List, function (idx2,item2){
 						if(item2.cate2No == cate2No){
 							if(idx<1) {
@@ -1288,7 +1374,11 @@
 							}
 						}
 						if(idx<1) {
-							tag += '<li><a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + item2.cate1No + ', ' + item2.cate2No + ' ';
+							tag += '<li';
+							if(item2.cate2No == cate2No){
+								tag += ' class="on"';
+							}
+							tag += '><a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + item2.cate1No + ', ' + item2.cate2No + ' ';
 							if(formalGb=='G009_20'){
 								tag += ' ,\'\',\'\',\'\',\''+formalGb+'\'';
 							}
@@ -1296,6 +1386,7 @@
 						}
 
 					});
+					tag += '</ul>\n';
 				});
 				$("#cateDepth").append(tag);
 			}else{
@@ -1307,7 +1398,11 @@
 							}
 						}
 						if(idx<1) {
-							tag += '<li><a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + allItem.cate1No + ' ';
+							tag += '<li';
+							if(item.cate1No==allItem.cate1No){
+							tag += ' class="on"';
+							}
+							tag += '><a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + allItem.cate1No + ' ';
 							if(formalGb=='G009_20'){
 								tag += ' ,\'\',\'\',\'\',\'\',\''+formalGb+'\'';
 							}

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

@@ -207,12 +207,12 @@
 		tag +='		</div>\n';
 		tag +='		<div class="modal-body">\n';
 		tag +='			<div class="itemsGrp rowtype">\n';
-		tag +='				<div class="item_prod ';
+		tag +='				<div class="item_prod">\n';
+		tag +='					<div class="item_state';
 		if(obj9 == 'Y'){
-			tag += ' sold_out';
+			tag += ' soldout';
 		}
 		tag +='">\n';
-		tag +='					<div class="item_state">\n';
 		tag +='						<a href="javascript:void(0);" onclick="cfnGoToGoodsDetail(\''+obj7+'\',\'\',\'\')" class="itemLink">\n';
 		tag +='							<div class="itemPic">\n';
 		tag +='								<img class="vLHTC pd_img" src="'+goodsImgUrl+'/'+obj1+'?RS=260" alt="">\n';

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

@@ -218,7 +218,7 @@
 										<dt>배송비</dt>
 										<dd>
 											<div>
-												<span th:text="${#numbers.formatInteger(oneData.rfDeliveryFee, 1, 'COMMA')}"></span>원
+												<span th:text="${#numbers.formatInteger((oneData.rfDeliveryFee + oneData.rfDelvCpnAmt), 1, 'COMMA')}"></span>원
 											</div>
 										</dd>
 									</div>

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

@@ -208,7 +208,7 @@
 										<dt>배송비</dt>
 										<dd>
 											<div>
-												<span th:text="${#numbers.formatInteger(oneData.rfDeliveryFee, 1, 'COMMA')}"></span>원
+												<span th:text="${#numbers.formatInteger((oneData.rfDeliveryFee + oneData.rfDelvCpnAmt), 1, 'COMMA')}"></span>원
 											</div>
 										</dd>
 									</div>

src/main/webapp/WEB-INF/views/web/callcenter/NoticeFormWeb.html

@@ -120,7 +120,7 @@
 				tag += '	</div>\n';
 				tag += '	<div class="fold_cont" style="display: none;">\n';
 				tag += '		<div class="fold_detail">\n';
-				tag += '			<div>' + item.noticeContent + '</div>\n';
+				tag += '			<div>' + item.noticeContent.replace(/\n/g,'<br/>') + '</div>\n';
 				tag += '		</div>\n';
 				tag += '	</div>\n';
 				tag += '</li>\n';

src/main/webapp/WEB-INF/views/web/common/fragments/FooterWeb.html

@@ -985,7 +985,7 @@
 							$.each(result, function (idx, item) {
 								tag += '		<div class="item_prod">\n';
 								tag += '			<div class="item_state">\n';
-								tag += '				<a href="javascript:void(0);" onclick="cfnGoToGoodsDetail(\'' + item.goodsCd + '\', \'\', \'\', \'\');" class=" itemLink">\n';
+								tag += '				<a href="javascript:void(0);" onclick="cfnGoToGoodsDetail(\''+item.goodsCd+'\',\'\',\'IN22_01\')" class=" itemLink">\n';
 								tag += '					<div class="itemPic">\n';
 								tag += '						<img class="vLHTC pd_img" src="' + _uploadGoodsUrl + '/' + item.sysImgNm + '" alt="이미지설명"/>\n';
 								tag += '					</div>\n';

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

@@ -207,7 +207,7 @@
 											</div>
 											<div class="include_item">
 												<dt>배송비</dt>
-												<dd><em th:text="${#numbers.formatInteger(oneData.rfDeliveryFee, 1, 'COMMA')}"></em>원</dd>
+												<dd><em th:text="${#numbers.formatInteger((oneData.rfDeliveryFee + oneData.rfDelvCpnAmt), 1, 'COMMA')}"></em>원</dd>
 											</div>
 											<div class="include_item">
 												<dt>할인 금액 차감</dt>

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

@@ -205,7 +205,7 @@
 											</div>
 											<div class="include_item">
 												<dt>배송비</dt>
-												<dd><em th:text="${#numbers.formatInteger(oneData.rfDeliveryFee, 1, 'COMMA')}"></em>원</dd>
+												<dd><em th:text="${#numbers.formatInteger((oneData.rfDeliveryFee + oneData.rfDelvCpnAmt), 1, 'COMMA')}"></em>원</dd>
 											</div>
 											<div class="include_item">
 												<dt>할인 금액 차감</dt>

src/main/webapp/biz/goods.js

@@ -255,8 +255,8 @@ var fnCreateGoodsList = function(result, ithrCd, contentLoc, goodsUrl, lastPage,
 					tag += '<iframe id="pdThumbVideo" class="pd_mov" src="' + _kollusMediaUrl + '/' + videoUrl + '?enable_initialize_focus=false&autoplay&mute&controls_activation=none" allow="fullscreen" allowFullScreen></iframe>';
 				}
 			}
-			// tag += '		<img class=" vLHTC pd_img" src="' + item.sysImgNm + '" data-img="' + item.sysImgNm2 + '" onerror="noneImg(this)">';
-			tag += '		<img class=" vLHTC pd_img" src="' + goodsUrl + '/' + item.sysImgNm + '" data-img="' + goodsUrl + '/' + item.sysImgNm2 + '" onerror="noneImg(this)">';
+			tag += '		<img class=" vLHTC pd_img" src="' + item.sysImgNm + '" data-img="' + item.sysImgNm2 + '" onerror="noneImg(this)">';
+			// tag += '		<img class=" vLHTC pd_img" src="' + goodsUrl + '/' + item.sysImgNm + '" data-img="' + goodsUrl + '/' + item.sysImgNm2 + '" onerror="noneImg(this)">';
 			if (!gagajf.isNull(item.sizes) && item.selfGoodsYn == 'Y') {
 				var sizeArr = item.sizes.split(",");
 				var minSize;