몰메인 수정

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

@@ -126,6 +126,9 @@ public class TsfDisplayController extends TsfBaseController {
 			contents.setPreview(paramMap.get("preview"));
 			contents.setViewDt(paramMap.get("viewDt"));
 			contents.setCateNo(Integer.parseInt(mainCateNo));
+			if(contentsLoc.equals("SGNB001") || contentsLoc.equals("SGNB002") || contentsLoc.equals("STAB001") || contentsLoc.equals("SMM003") || contentsLoc.equals("SMM004") || contentsLoc.equals("SMM006") ){
+				contents.setMaxRow(1);
+			}
 
 			Cate4Srch cate4Srch = new Cate4Srch();
 			cate4Srch.setContentsLoc(contentsLoc);
@@ -289,6 +292,9 @@ public class TsfDisplayController extends TsfBaseController {
 			contents.setViewDt(paramMap.get("viewDt"));
 			contents.setCateNo(Integer.parseInt(mainCateNo));
 			contents.setBrandGroupNo((brandMain.getBrandGroupNo()).toString());
+			if(contentsLoc.equals("SBM005")|| contentsLoc.equals("SBM007")|| contentsLoc.equals("SBM008")|| contentsLoc.equals("SBM009")|| contentsLoc.equals("SBM010")|| contentsLoc.equals("SBM011")|| contentsLoc.equals("SBM013")|| contentsLoc.equals("SBM017")|| contentsLoc.equals("SBM018")|| contentsLoc.equals("SBM019")){
+				contents.setMaxRow(1);
+			}
 
 			Cate4Srch cate4Srch = new Cate4Srch();
 			cate4Srch.setContentsLoc(contentsLoc);

src/main/java/com/style24/persistence/domain/searchengine/SearchEngine.java

@@ -76,6 +76,7 @@ public class SearchEngine implements Serializable {
 	private String sizes;			// 사이즈들(,로 연결된 문자열. 사이즈코드:품절여부, ...)
 	private String benefits;		// 혜택들(,로 연결된 문자열. 혜택구분:혜택명, ...)
 	private String likeIt;			// 좋아요(위시리스트에담긴상품)
+	private String mainColorCd;		// 메인컬러
 
 //	private String adminIp;			// 검색엔진IP
 //	private String adminPort;		// 검색엔진포트

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

@@ -259,6 +259,7 @@
 		            </otherwise>
 		        </choose>
 		       ) A
+		ORDER BY DISP_ORD
 		<if test="maxRow != null and maxRow > 0">
 		LIMIT #{maxRow}
 		</if>

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

@@ -55,11 +55,11 @@
 							</ul>
 						</div>
 					</div>
-					<div class="list_defult">
+					<div class="list_defult" style="display:none;">
 						<div>
 							<p>선택하신 조건에 맞는 상품이 없습니다.<br>필터를 변경해 보세요.</p>
 						</div>
-						<button type="button" class="btn btn_default"><span>선택한 필터 초기화</span></button>
+						<button type="button" class="btn btn_default" onclick="fnMobFilterReset();"><span>선택한 필터 초기화</span></button>
 					</div>
 
 					<div id="infiniteContainer">
@@ -84,7 +84,7 @@
 				<div class="filter_top">
 					<div class="tt">필터</div>
 					<div>
-						<button class="fillter_reset"><span>초기화</span></button>
+						<button class="fillter_reset" onclick="fnMobFilterReset();"><span>초기화</span></button>
 						<button class="close">닫기</button>
 					</div>
 				</div>
@@ -595,6 +595,34 @@
 
 		});
 
+		// 필터 초기화
+		var fnMobFilterReset = function (){
+			$(".list_defult").hide();
+			$("#searchGoodsForm input:hidden[name=brandGroupArr]").remove();
+			$("#searchGoodsForm input:hidden[name=sizeArr]").remove();
+			$("#searchGoodsForm input:hidden[name=dcRateFrom]").remove();
+			$("#searchGoodsForm input:hidden[name=dcRateTo]").remove();
+			$("#searchGoodsForm input:hidden[name=priceFrom]").remove();
+			$("#searchGoodsForm input:hidden[name=priceTo]").remove();
+			$("#searchGoodsForm input:hidden[name=ageArr]").remove();
+			$("#searchGoodsForm input:hidden[name=seasonArr]").remove();
+			$("#searchGoodsForm input:hidden[name=colorArr]").remove();
+			$("#searchGoodsForm input:hidden[name=benefitArr]").remove();
+			$("#unisex").prop('checked',false);
+			$("#unisex").attr('onclick','fnFilterOption(this,\'on\');');
+			$("#searchGoodsForm input:hidden[name=unisex]").remove();
+			$("#newGoods").prop('checked',true);
+			$("#newGoods").attr('onclick','fnFilterOption(this,\'on\');');
+			$('.allFilter .chkFilter').find('input[type=checkbox]').each(function (idx){
+				$(this).prop('checked',false);
+			});
+			$('.allFilter .chkFilter .daps1').find('span').each(function (idx){
+				$(this).remove();
+			});
+			fnCategoryGoodsInfiniteScrollInit();
+			fnGoodsListSearch();
+		}
+
 		// TOP 카테고리 노출
 		var fnCreateDepthList = function (){
 			let cateList = [[${cateList}]];

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

@@ -234,7 +234,7 @@
 										<p>선택하신 조건에 맞는 상품이 없습니다.<br>필터를 변경해 보세요.</p>
 									</div>
 									<div class="ui_row">
-										<button type="button" class="btn btn_default btn_md"><span>선택한 필터 초기화</span></button>
+										<button type="button" class="btn btn_default btn_md" onclick="fnFilterReset();"><span>선택한 필터 초기화</span></button>
 									</div>
 								</div>
 								<div class="count_wrap">
@@ -441,17 +441,32 @@
 			fnFilterSlider('dcrate' , custom_values02[min].replace('%',''), custom_values02[max].replace('%',''));
 		}
 
+		// 필터 초기화
 		var fnFilterReset = function (){
-			document.location.href = currUrl;
-			// $("#searchGoodsForm input:hidden[name=brandSearch]").remove();
-			// $("#searchGoodsForm input:hidden[name=sizeSearch]").remove();
-			// $("#searchGoodsForm input:hidden[name=priceRow]").remove();
-			// $("#searchGoodsForm input:hidden[name=priceHigh]").remove();
-			// $("#searchGoodsForm input:hidden[name=dcrateRow]").remove();
-			// $("#searchGoodsForm input:hidden[name=dcrateHigh]").remove();
-			// $("#searchGoodsForm input:hidden[name=seasonSearch]").remove();
-			// $("#searchGoodsForm input:hidden[name=colorSearch]").remove();
-			// $("#searchGoodsForm input:hidden[name=benefitSearch]").remove();
+			//document.location.href = currUrl;
+			$("#searchGoodsForm input:hidden[name=brandGroupArr]").remove();
+			$("#searchGoodsForm input:hidden[name=sizeArr]").remove();
+			$("#searchGoodsForm input:hidden[name=dcRateFrom]").remove();
+			$("#searchGoodsForm input:hidden[name=dcRateTo]").remove();
+			$("#searchGoodsForm input:hidden[name=priceFrom]").remove();
+			$("#searchGoodsForm input:hidden[name=priceTo]").remove();
+			$("#searchGoodsForm input:hidden[name=ageArr]").remove();
+			$("#searchGoodsForm input:hidden[name=seasonArr]").remove();
+			$("#searchGoodsForm input:hidden[name=colorArr]").remove();
+			$("#searchGoodsForm input:hidden[name=benefitArr]").remove();
+			$("#unisex").prop('checked',false);
+			$("#unisex").attr('onclick','fnFilterOption(this,\'on\');');
+			$("#searchGoodsForm input:hidden[name=unisex]").remove();
+			$("#newGoods").prop('checked',true);
+			$("#newGoods").attr('onclick','fnFilterOption(this,\'on\');');
+			fnFilterSliderMove(0,5);
+			fnDcRateFilterSliderMove(0,10);
+			$('.filter_content .sort').find('input[type=checkbox]').each(function (idx){
+				$(this).prop('checked',false);
+			});
+			$("#filterData").html('');
+			fnCategoryGoodsInfiniteScrollInit();
+			fnGoodsListSearch();
 		}
 
 		var fnGoodsListSearch = function (){

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

@@ -122,7 +122,8 @@
 			<div class="content br_lookbook_view cont_others" th:if="${otherLookbookList}">
 				<div class="cont_head">
 					<h3 class="subH1 t_c mb40">다른 룩북 보기</h3>
-					<button onclick="cfnGoToLookbookList();"><span>전체보기</span></button>
+					<button th:if="${lookbookInfo.lookbookGb=='BL'}" th:onclick="cfnGoToLookbookList([[${lookbookInfo.lookbookGb}]],[[${lookbookInfo.brandCd}]])"><span>전체보기</span></button>
+					<button th:if="${lookbookInfo.lookbookGb=='L'}" th:onclick="cfnGoToLookbookList([[${lookbookInfo.lookbookGb}]])"><span>전체보기</span></button>
 				</div>
 				<div class="cont_body">
 					<div class="area_slider">

src/main/webapp/biz/goods.js

@@ -202,7 +202,7 @@ var fnCreateGoodsList = function(result, ithrCd, contentLoc, goodsUrl, lastPage,
 		}
 		tag += ' "';
 		tag += ' onClick="cfnPutWishList(this);" goodsCd=\''+item.goodsCd+'\', ithrCd=\'\', contentsLoc=\'\', planDtlSq=\'\'>관심상품 추가</button>';
-		tag += '<a href="javascript:void(0);" class="itemLink" onclick="cfnGoToGoodsDetail(\''+item.goodsCd+'\');">';
+		tag += '<a href="javascript:void(0);" class="itemLink" onclick="cfnGoToGoodsDetail(\''+item.goodsCd+'\',\''+item.mainColorCd+'\');">';
 		tag += '			<div class="itemPic">';
 		if(!gagajf.isNull(item.videos)){
 			var videoArr = item.videos.split(",");
@@ -511,6 +511,24 @@ var fnFilterSliderMove = function (min, max){
 	$inputTo.prop("value",max);
 }
 
+var fnDcRateFilterSliderMove = function (min, max){
+	var $range = $(".dp .js-range-slider02, .sch_result .js-range-slider02");
+	var $inputFrom = $("#dcrate_input_from");
+	var $inputTo = $("#dcrate_input_to");
+	var instance;
+
+	instance = $range.data("ionRangeSlider");
+	instance.update({
+		from: min
+	});
+	$inputFrom.val(min);
+
+	instance.update({
+		to: max
+	});
+	$inputTo.prop("value",max);
+}
+
 var fnFilterSlider = function (gubun, min, max){
 	let tag = '';
 	let oriMin = '';

src/main/webapp/ux/style24_link.js

@@ -1238,7 +1238,7 @@ var cfnGoToPollDetail = function (planSq) {
  */
 var cfnGoToLookbookList = function (lookbookGb, brandGroupNo) {
 	var params = '?lookbookGb='+lookbookGb;
-	if (typeof (brandGroupNo) != 'undefined') params += '&brandCd=' + brandGroupNo;
+	if (typeof (brandGroupNo) != 'undefined') params += '&brandGroupNo=' + brandGroupNo;
 
 	cfnGoToPage(_PAGE_LOOKBOOK_MAIN + params);
 }