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

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

@@ -413,7 +413,6 @@
 
 			// TOP 동일 카테고리
 			fnCreateDepthList();
-
 			// 상단노출 하위 카테고리
 			fnCreateCategoryList();
 
@@ -641,81 +640,96 @@
 			var tag = '';
 			$("#cateDepth").html('');
 
-			if(!gagajf.isNull(cate5No)){
-
-			}else if(!gagajf.isNull(cate4No)) {
-				$.each(cateList, function (idx, cate){
-					$.each(cate.cate2List, function (idx2,cate2){
-						if(cate2.leafYn == 'N' && cate2.cate3List != null){
-							$.each(cate2.cate3List, function (idx3, cate3){
-								if(cate3.leafYn == 'N' && cate3.cate4List != null){
-									$.each(cate3.cate4List, function (idx4, cate4){
-										if(cate4.cate4No == cate4No){
-											$("#htopTitle").append(fnDisplayTitle(cate4.cate4Nm));
+			let actionUrl = '';
+			if(gagajf.isNull(brandGroupNo) || brandGroupNo == 0){
+				if( [[${cateInfo.formalGb}]] == 'G009_20'){
+					actionUrl = '/display/outlet/cate/list?cate1No='+cate1No+'&formalGb='+ [[${cateInfo.formalGb}]];
+				}else{
+					actionUrl = '/display/category/reload/list?cateGb='+[[${cateInfo.cateGb}]];
+				}
+			}else{
+				actionUrl = '/display/brand/cate/list?brandGroupNo=' + [[${cateInfo.brandGroupNo}]];
+			}
+
+			$.getJSON(actionUrl, function (result, status){
+				if(result.length>0){
+					if(!gagajf.isNull(cate5No)){
+
+					}else if(!gagajf.isNull(cate4No)) {
+						$.each(result, function (idx, cate){
+							$.each(cate.cate2List, function (idx2,cate2){
+								if(cate2.leafYn == 'N' && cate2.cate3List != null){
+									$.each(cate2.cate3List, function (idx3, cate3){
+										if(cate3.leafYn == 'N' && cate3.cate4List != null){
+											$.each(cate3.cate4List, function (idx4, cate4){
+												if(cate4.cate4No == cate4No){
+													$("#htopTitle").append(fnDisplayTitle(cate4.cate4Nm));
+												}
+												if(cate4.cate3No==cate3No){
+													tag += '<li><a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + cate4.cate1No + ',' + cate4.cate2No + ',' + cate4.cate3No + ',' + cate4.cate4No + ' ';
+													if(formalGb=='G009_20'){
+														tag += ' ,\'\',\''+formalGb+'\'';
+													}
+													tag += ');">'+cate4.cate4Nm+'</a></li>';
+												}
+											});
 										}
-										if(cate4.cate3No==cate3No){
-											tag += '<li><a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + cate4.cate1No + ',' + cate4.cate2No + ',' + cate4.cate3No + ',' + cate4.cate4No + ' ';
+									});
+								}
+							});
+						});
+						$("#cateDepth").append(tag);
+					}else if(!gagajf.isNull(cate3No)){
+						$.each(result, function (idx, cate){
+							$.each(cate.cate2List, function (idx2,cate2){
+								if(cate2.leafYn == 'N' && cate2.cate3List != null){
+									$.each(cate2.cate3List, function (idx3, cate3){
+										if(cate3.cate3No == cate3No){
+											$("#htopTitle").append(fnDisplayTitle(cate3.cate3Nm));
+										}
+										if(cate3.cate2No==cate2No){
+											tag += '<li><a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + cate3.cate1No + ',' + cate3.cate2No + ',' + cate3.cate3No + ' ';
 											if(formalGb=='G009_20'){
-												tag += ' ,\'\',\''+formalGb+'\'';
+												tag += ' ,\'\',\'\',\''+formalGb+'\'';
 											}
-											tag += ');">'+cate4.cate4Nm+'</a></li>';
+											tag += ');">'+cate3.cate3Nm+'</a></li>';
 										}
 									});
 								}
 							});
-						}
-					});
-				});
-				$("#cateDepth").append(tag);
-			}else if(!gagajf.isNull(cate3No)){
-				$.each(cateList, function (idx, cate){
-					$.each(cate.cate2List, function (idx2,cate2){
-						if(cate2.leafYn == 'N' && cate2.cate3List != null){
-							$.each(cate2.cate3List, function (idx3, cate3){
-								if(cate3.cate3No == cate3No){
-									$("#htopTitle").append(fnDisplayTitle(cate3.cate3Nm));
+						});
+						$("#cateDepth").append(tag);
+					}else if(!gagajf.isNull(cate2No)){
+						$.each(result, function (idx, cate){
+							$.each(cate.cate2List, function (idx2,cate2){
+								if(cate2.cate2No == cate2No){
+									$("#htopTitle").append(fnDisplayTitle(cate2.cate2Nm));
 								}
-								if(cate3.cate2No==cate2No){
-									tag += '<li><a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + cate3.cate1No + ',' + cate3.cate2No + ',' + cate3.cate3No + ' ';
+								if(cate2.cate1No==cate1No){
+									tag += '<li><a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + cate2.cate1No + ',' + cate2.cate2No + ' ';
 									if(formalGb=='G009_20'){
-										tag += ' ,\'\',\'\',\''+formalGb+'\'';
+										tag += ' ,\'\',\'\',\'\',\''+formalGb+'\'';
 									}
-									tag += ');">'+cate3.cate3Nm+'</a></li>';
+									tag += ');">'+cate2.cate2Nm+'</a></li>';
 								}
 							});
-						}
-					});
-				});
-				$("#cateDepth").append(tag);
-			}else if(!gagajf.isNull(cate2No)){
-				$.each(cateList, function (idx, cate){
-					$.each(cate.cate2List, function (idx2,cate2){
-						if(cate2.cate2No == cate2No){
-							$("#htopTitle").append(fnDisplayTitle(cate2.cate2Nm));
-						}
-						if(cate2.cate1No==cate1No){
-							tag += '<li><a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + cate2.cate1No + ',' + cate2.cate2No + ' ';
+						});
+						$("#cateDepth").append(tag);
+					}else{
+						$.each(result, function (idx, cate1){
+							if(cate1.cate1No == cate1No){
+								$("#htopTitle").append(fnDisplayTitle(cate1.cate1Nm));
+							}
+							tag += '<li><a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + cate1.cate1No + ' ';
 							if(formalGb=='G009_20'){
-								tag += ' ,\'\',\'\',\'\',\''+formalGb+'\'';
+								tag += ' ,\'\',\'\',\'\',\'\',\''+formalGb+'\'';
 							}
-							tag += ');">'+cate2.cate2Nm+'</a></li>';
-						}
-					});
-				});
-				$("#cateDepth").append(tag);
-			}else{
-				$.each(cateList, function (idx, cate1){
-					if(cate1.cate1No == cate1No){
-						$("#htopTitle").append(fnDisplayTitle(cate1.cate1Nm));
-					}
-					tag += '<li><a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + cate1.cate1No + ' ';
-					if(formalGb=='G009_20'){
-						tag += ' ,\'\',\'\',\'\',\'\',\''+formalGb+'\'';
+							tag += ');">'+cate1.cate1Nm+'</a></li>';
+						});
+						$("#cateDepth").append(tag);
 					}
-					tag += ');">'+cate1.cate1Nm+'</a></li>';
-				});
-				$("#cateDepth").append(tag);
-			}
+				}
+			});
 		}
 
 		// 상단 하위카테고리 노출
@@ -745,13 +759,27 @@
 					$("#leafCateList").html('');
 
 					let allCate = [[${cateList}]];
-					$.each(result, function(idx, item) {
-						$.each(allCate, function(allCateIdx, allCateItem) {
-							if (item.cate1No == allCateItem.cate1No) {
-								$('#leafCateList').append(fnGetCategoryList(item));
-							}
+					if(brandGroupNo > 0){
+						if(gagajf.isNull(cate1No)){
+							$('#htopTitle').append('상품');
+						}else{
+							$.each(result, function(idx, item) {
+								$.each(allCate, function(allCateIdx, allCateItem) {
+									if (item.cate1No == allCateItem.cate1No) {
+										$('#leafCateList').append(fnGetCategoryList(item));
+									}
+								});
+							});
+						}
+					}else{
+						$.each(result, function(idx, item) {
+							$.each(allCate, function(allCateIdx, allCateItem) {
+								if (item.cate1No == allCateItem.cate1No) {
+									$('#leafCateList').append(fnGetCategoryList(item));
+								}
+							});
 						});
-					});
+					}
 				}
 			});
 		}
@@ -1075,6 +1103,28 @@
 			return tag;
 		}
 
+		var fnTest = function (){
+			let actionUrl = '/display/brand/cate/list?brandGroupNo=' + [[${cateInfo.brandGroupNo}]];
+			let brandGroupNo = [[${cateInfo.brandGroupNo}]];
+			let cate1No = [[${cateInfo.cate1No}]];
+			let allCate = [[${cateList}]];
+			let tag = '';
+			$.getJSON(actionUrl, function(result, status){
+				$.each(allCate, function(allCateIdx, allCateItem) {
+					if (item.cate1No == allCateItem.cate1No) {
+						$.each(allCate, function(allCateIdx, allCateItem) {
+							if (item.cate1No == allCateItem.cate1No) {
+								tag += '<li>';
+								tag += '<a href="javascript:void(0);" onclick="cfnGoToGoodsList('+brandGroupNo+',\'' + cateGb + '\',' + item.cate1No + ',' + item.cate2No + ',' + item.cate3No + ',' + item.cate4No + ',' + item.cate5No + ')">'+item.cate1Nm+'</a>';
+								tag += '</li>\n';
+							}
+						});
+					}
+				});
+			});
+			$('#cateDepth').append(tag);
+		}
+
 	</script>
 
 

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

@@ -272,12 +272,8 @@
 								</div>
 
 							</div>
-							<div class="list_content">
-								<div class="list_defult" id="endPage">
-									<div>
-										<p>마지막 페이지 입니다.</p>
-									</div>
-								</div>
+							<div class="last_page" id="endPage">
+								<span>마지막 페이지입니다.</span>
 							</div>
 						</div>
 					</form>
@@ -504,9 +500,11 @@
 					// 필터 값으로 조회 데이터 없을때
 					$('#noFilterData').show();
 					$('.list_content .count_wrap').hide();
+					$('#endPage').hide();
 				}else{
 					// 마지막 페이지 일때
 					$('#endPage').show();
+					$('#noFilterData').hide();
 					//$('.list_content .count_wrap').hide();
 				}
 				gagaInfiniteScroll.draw('not');

src/main/webapp/biz/payment.js

@@ -43,7 +43,6 @@ function call_pay_form()
 	if(v_frm.encoding_trans == undefined) {
 		v_frm.action = PayUrl;
 	} else if(v_frm.encoding_trans.value == "UTF-8") {
-		alert(PayUrl);
 		v_frm.action = PayUrl.substring(0, PayUrl.lastIndexOf("/")) + "/jsp/encodingFilter/encodingFilter.jsp";
 		v_frm.PayUrl.value = PayUrl;
 	} else {