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

src/main/resources/config/application-style.yml

@@ -110,5 +110,5 @@ naverPay:
 # 검색엔진(NHN다이퀘스트)
 search:
     engine:
-        diquest.ip: 133.186.171.33
-        diquest.port: 44555
+        diquest.ip: 172.30.89.120
+        diquest.port: 5555

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

@@ -901,6 +901,58 @@
 
 		// 카테고리 그리기
 		let fnGetSearchCategoryList = function (cate1){
+			let tag = '';
+			if(cate1 != null){
+				tag += '<li>\n';
+				tag += '	<a href="javascript:void(0);" onclick="fnSetCateTest(this, \'off\', \''+cate1.cate1No+'\');" cateFullNm="'+cate1.cate1Nm+'" data-open="N" data-depth="1" data1="'+cate1.cate1No+'">'+cate1.cate1Nm+'</a>';
+				if(cate1.leafYn == 'N' && cate1.cate2List.length > 0){
+					tag += '<div class="sub_cate">\n';
+					tag += '	<ul>\n';
+					$.each(cate1.cate2List, function (idx2,cate2){
+						tag += '<li><a href="javascript:void(0);" onclick="fnSetCateTest(this, \'off\', \''+cate1.cate1No+'\',\''+cate2.cate2No+'\');" cateFullNm="'+cate1.cate1Nm+'>'+cate2.cate2Nm+'" data-open="N" data-depth="2" data1="'+cate1.cate1No+'" data2="'+cate2.cate2No+'">'+cate2.cate2Nm+'</a>\n';
+						if(cate2.leafYn == 'N' && cate2.cate3List.length > 0){
+							tag += '<div class="sub_cate">\n';
+							tag += '	<ul>\n';
+							$.each(cate2.cate3List, function (idx3,cate3){
+								tag += '<li><a href="javascript:void(0);" onclick="fnSetCateTest(this, \'off\', \''+cate1.cate1No+'\',\''+cate2.cate2No+'\',\''+cate3.cate3No+'\');" cateFullNm="'+cate1.cate1Nm+'>'+cate2.cate2Nm+'>'+cate3.cate3Nm+'" data-open="N" data-depth="3" data1="'+cate1.cate1No+'" data2="'+cate2.cate2No+'" data3="'+cate3.cate3No+'">'+cate3.cate3Nm+'</a>\n';
+								if(cate3.leafYn == 'N' && cate3.cate4List.length >0){
+									tag += '<div class="sub_cate">\n';
+									tag += '	<ul>\n';
+									$.each(cate3.cate4List, function (idx4,cate4){
+										tag += '<li><a href="javascript:void(0);" onclick="fnSetCateTest(this, \'off\', \''+cate1.cate1No+'\',\''+cate2.cate2No+'\',\''+cate3.cate3No+'\',\''+cate4.cate4No+'\');" cateFullNm="'+cate1.cate1Nm+'>'+cate2.cate2Nm+'>'+cate3.cate3Nm+'>'+cate4.cate4Nm+'" data-open="N" data-depth="4" data1="'+cate1.cate1No+'" data2="'+cate2.cate2No+'" data3="'+cate3.cate3No+'" data4="'+cate4.cate4No+'">'+cate4.cate4Nm+'</a>\n';
+										/*if(cate4.leafYn = 'N' && cate4.cate5List.length>0){
+											tag += '<div class="sub_cate">\n';
+											tag += '	<ul>\n';
+											$.each(cate4.cate5List, function (idx5,cate5){
+												tag += '<li><a href="javascript:;">'+cate5.cate5Nm+'</a>\n';
+												tag += '</li>\n';
+											});
+											tag += '	</ul>\n';
+											tag += '</div>\n';
+										}*/
+										tag += '</li>\n';
+									});
+									tag += '	</ul>\n';
+									tag += '</div>\n';
+								}
+								tag += '</li>\n';
+							});
+							tag += '	</ul>\n';
+							tag += '</div>\n';
+						}
+						tag += '</li>\n';
+						// tag += '		<li><a href="javascript:;>'+cate2.cate2Nm+'</a></li>\n';
+					});
+					tag += '	</ul>\n';
+					tag += '</div>\n';
+				}
+				tag += '</li>\n';
+			}
+			return tag;
+		}
+
+		// 카테고리 그리기
+		let fnGetSearchCategoryList2 = function (cate1){
 			let tag = '';
 			if(cate1 != null){
 				tag += '<li>\n';

src/main/webapp/biz/search.js

@@ -278,7 +278,6 @@ var filterSel = function (obj, gubun, staus, sizeGb){
 
 var fnFilterSet = function (searchId, sizeGb, appGb){
 	fnCategoryGoodsInfiniteScrollInit();
-	console.log(searchId);
 	$("#searchGoodsForm input:hidden[name="+searchId+"Arr]").remove();
 	var tag = '';
 	var mobTag = '';
@@ -304,7 +303,6 @@ var fnFilterSet = function (searchId, sizeGb, appGb){
 				$('#'+searchId+'FilterDiv').find('.daps1').find('.pic').find('span').html('');
 				var mobTag = '';
 				var color = $(this).attr('data-id');
-				console.log('color::'+$(this).attr('data-id'));
 				if(color=='FFFFFF'){
 					mobTag += '<span class="pdColor-color" style="background-color:#'+color+';border:1px solid #aaa;"></span>';
 				}else{
@@ -455,6 +453,94 @@ var fnClickGoodsCd = function (goodsCd, mainColorCd){
 	cfnGoToGoodsDetail(goodsCd, mainColorCd);
 }
 
+// 카테고리 set test
+var fnSetCateTest = function (obj, status, cate1No, cate2No, cate3No, cate4No, cate5No){
+	$('.fillter').show();
+	$("#categorySpan").remove();
+	gagaInfiniteScroll.pageStatus.filterHtml = filterHtml;
+	gagaInfiniteScroll.pageStatus.filterStatHtml = filterStatHtml;
+
+	$("#ulAllCate").find('li > a').each(function (){
+		$(this).removeClass("on");
+		$(this).attr('onclick','fnSetCateTest(this, \'off\','+$(this).attr('data1')+','+$(this).attr('data2')+','+$(this).attr('data3')+','+$(this).attr('data4')+','+$(this).attr('data5')+');');
+	});
+
+	if(status=='on'){
+		// 필터 제거
+		filterStatHtml = '';
+
+		if($(obj).attr('data-depth') > 1){
+			// 상위카테고리 선택
+			let dep = $(obj).attr('data-depth') - 1;
+			if(dep>1){
+				$(obj).parent().parent().parent().parent().find('[data-depth='+dep+']').click();
+			}else{
+				$(obj).parent().parent().parent().parent().find('[data-depth='+dep+']').click();
+				$(obj).parent().parent().parent().parent().find('[data-depth='+dep+']').parent().find('.sub_cate').css('display','block');
+			}
+			gagaInfiniteScroll.pageStatus.filterStatHtml = filterStatHtml;
+			filterStatHtml = $("#filterData").html();
+		}else{
+			console.log('28');
+			gagaInfiniteScroll.pageStatus.filterStatHtml = filterStatHtml;
+			filterStatHtml = $("#filterData").html();
+			fnSetCateFilter('', '', '', '', '');
+		}
+	}else{
+		$(obj).attr('onclick','fnSetCateTest(this, \'on\','+$(obj).attr('data1')+','+$(obj).attr('data2')+','+$(obj).attr('data3')+','+$(obj).attr('data4')+','+$(obj).attr('data5')+');');
+		$(obj).addClass("on");
+		let tag = '';
+		let cateNm = '';
+		tag += '<span id="categorySpan">\n';
+		if(!gagajf.isNull(cate1No)){
+			cateFullNm = $(obj).attr("cateFullNm");
+			cateNm  = cateFullNm;
+		}
+		if(!gagajf.isNull(cate2No)){
+			cateFullNm = $(obj).attr("cateFullNm");
+			cateNm  = cateFullNm;
+		}
+		if(!gagajf.isNull(cate3No)){
+			cateFullNm = $(obj).attr("cateFullNm");
+			cateNm  = cateFullNm;
+		}
+		if(!gagajf.isNull(cate4No)){
+			cateFullNm = $(obj).attr("cateFullNm");
+			cateNm  = cateFullNm;
+		}
+		tag += cateNm;
+		tag += '<a href="javascript:void(0);" class="filter_delete" onclick="fnDeleteCategoryFilter(this);"></a>\n';
+		tag += '</span>\n';
+
+		$("#filterData").append(tag);
+		filterStatHtml += tag;
+
+		gagaInfiniteScroll.pageStatus.filterStatHtml = filterStatHtml;
+		fnSetCateFilter(cate1No, cate2No, cate3No, cate4No, cate5No);
+	}
+	
+}
+
+var fnDeleteCategoryFilter = function (obj){
+	filterStatHtml = '';
+	filterStatHtml = $("#filterData").html();
+	$("#ulAllCate").find('li > a').each(function (){
+		$(this).removeClass("on");
+		$(this).parent().removeClass("on");
+		$(this).parent().find('.sub_cate').css('display','none');
+	});
+	$("#searchGoodsForm input:hidden[name=cate1No]").remove();
+	$("#searchGoodsForm input:hidden[name=cate2No]").remove();
+	$("#searchGoodsForm input:hidden[name=cate3No]").remove();
+	$("#searchGoodsForm input:hidden[name=cate4No]").remove();
+	$("#searchGoodsForm input:hidden[name=cate5No]").remove();
+	$(obj).closest("span").remove();
+	fnSetFilterHtml();
+	fnCategoryGoodsInfiniteScrollInit();
+	fnSearchGoodsListSearch();
+}
+
+// 카테고리 set
 var fnSetCateFilter = function (cate1No, cate2No, cate3No, cate4No, cate5No){
 	fnCategoryGoodsInfiniteScrollInit();
 	$("#searchGoodsForm input:hidden[name=cate1No]").remove();
@@ -479,10 +565,9 @@ var fnSetCateFilter = function (cate1No, cate2No, cate3No, cate4No, cate5No){
 	if(!gagajf.isNull(cate5No)){
 		tag += '<input type="hidden" name="cate5No" value="'+cate5No+'"/>';
 	}
-
 	$("#searchGoodsForm").append(tag);
-	fnSetFilterHtml();
 
+	fnSetFilterHtml();
 	fnSearchGoodsListSearch();
 }