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

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

@@ -97,6 +97,10 @@
 				}else{
 					$("#divLastPage").show();
 				}
+			}else{
+				if($("#lbMainForm input[name=pageNo]").val()==1){
+					$("#divLookbookNoData").show();
+				}
 			}
 
 			gagaInfiniteScroll.draw('not');

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

@@ -48,7 +48,7 @@
 						<div>
 							<p>등록된 룩북이 없습니다.</p>
 						</div>
-						<button type="button" class="btn btn_default" th:unless="${lbInfo.lookbookGb=='BL'}" onclick="cfnGoToPage(_PAGE_MAIN);"><span>메인으로 가기</span></button>
+						<button type="button" class="btn btn_default" th:unless="${lbInfo.lookbookGb=='BL'}" onclick="cfnGoToPage(_PAGE_MAIN);"><span>홈으로 가기</span></button>
 						<button type="button" class="btn btn_default" th:if="${lbInfo.lookbookGb=='BL'}" th:onclick="cfnGoToBrandMain([[${lbInfo.brandCd}]]);"><span th:text="${brandGroupInfo.brandGroupNm+' 홈으로 가기'}"><span>메인으로 가기</span></button>
 					</div>
 					<div class="lookbookGrp">
@@ -135,6 +135,8 @@
 	}
 
 	var fnDrawInfiniteScrollData = function (result){
+		$("#filterChkArea").show();
+		$("#filter").show();
 		totalCnt = result.paging.totalCount;
 		$("#lookbookTotCnt").text(totalCnt);
 		$("#lbMainForm").find("input[name=totalCnt]").val(totalCnt);
@@ -151,9 +153,17 @@
 			if(totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
 				if($("#lbMainForm input[name=pageNo]").val()==1){
 					$("#divLookbookNoData").show();
+					$("#filterChkArea").hide();
+					$("#filter").hide();
 				}else{
 					$("#divLastPage").show();
 				}
+			}else{
+				if($("#lbMainForm input[name=pageNo]").val()==1){
+					$("#divLookbookNoData").show();
+					$("#filterChkArea").hide();
+					$("#filter").hide();
+				}
 			}
 
 			gagaInfiniteScroll.draw('not');

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

@@ -168,7 +168,7 @@
 		// Load data
 		gagaPaging.load(1);
 	}
-	
+	var idx = 1;
 	var fnGetListCallback = function(result) {
 		$('#ulFaq').html('');
 
@@ -195,12 +195,15 @@
 				$('#ulFaq').append(tag);
 			});
 			$('#divFaq').removeClass('nodata');
+			if(idx>1){
+				document.getElementById('faqForm').scrollIntoView();
+			}
+			idx++;
 		} else {
 			let tag = '<li>내역이 없습니다.</li>\n';
 			$('#ulFaq').append(tag);
 			$('#divFaq').addClass('nodata');
 		}
-
 		// Create pagination
 		gagaPaging.createPagination(result.paging.pageable);
 	}

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

@@ -125,7 +125,8 @@
         }
         return tag[0];
     }
-	
+
+	var idx = 1;
 	var fnGetListCallback = function(result) {
 		$('#ulQna').html('');
 
@@ -170,6 +171,10 @@
 				
 				$('#ulQna').append(tag);
 				$('#divQna').removeClass('nodata');
+				if(idx>1){
+					document.getElementById('callcenterLnb').scrollIntoView();
+				}
+				idx++;
 			});
 		} else {
 			let tag = '<li>내역이 없습니다.</li>\n';

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

@@ -92,7 +92,7 @@
 
 
 
-	
+	var idx = 1;
 	var fnGetListCallback = function(result) {
 		$('#ulNotice').html('');
 
@@ -136,6 +136,10 @@
 			});
 			
 			$('#divNotice').removeClass('nodata');
+			if(idx>1){
+				document.getElementById('callcenterLnb').scrollIntoView();
+			}
+			idx++;
 		} else {
 // 			let tag = '<li>등록된 공지사항이 없습니다.</li>\n';
 // 			$('#ulNotice').html(tag);

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

@@ -178,7 +178,8 @@
         }
         return tag;
     }
-	
+
+    var idx = 1;
 	var fnGetListCallback = function(result) {
 		$('#ulQna').html('');
 
@@ -244,6 +245,10 @@
 			});
 			
 			$('#divQna').removeClass('nodata');
+			if(idx>1){
+				document.getElementById('callcenterLnb').scrollIntoView();
+			}
+			idx++;
 		} else {
 			let tag = '<li>내역이 없습니다.</li>\n';
 			$('#ulQna').append(tag);

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

@@ -143,6 +143,10 @@
 				}else{
 					$("#divLastPage").show();
 				}
+			}else{
+				if($("#lbMainForm input[name=pageNo]").val()==1){
+					$("#divLookbookNoData").show();
+				}
 			}
 
 			gagaInfiniteScroll.draw('not');

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

@@ -124,6 +124,7 @@
 	}
 
 	var fnDrawInfiniteScrollData = function (result){
+		$("#brandBox").show();
 		totalCnt = result.paging.totalCount;
 		$("#lookbookTotCnt").text(totalCnt);
 		$("#lbMainForm").find("input[name=totalCnt]").val(totalCnt);
@@ -140,9 +141,15 @@
 			if(totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
 				if($("#lbMainForm input[name=pageNo]").val()==1){
 					$("#divLookbookNoData").show();
+					$("#brandBox").hide();
 				}else{
 					$("#divLastPage").show();
 				}
+			}else{
+				if($("#lbMainForm input[name=pageNo]").val()==1){
+					$("#divLookbookNoData").show();
+					$("#brandBox").hide();
+				}
 			}
 
 			gagaInfiniteScroll.draw('not');