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

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

@@ -309,14 +309,14 @@ public class TsfReviewService {
 	public void updateMypageReview(Review review) {
 		review.setRegNo(TsfSession.getInfo().getCustNo());
 		review.setUpdNo(TsfSession.getInfo().getCustNo());		
-		review.setConfirmYn("Y");
+		//review.setConfirmYn("Y");
 		review.setReviewGb("R");
 		reviewDao.updateMypageReview(review);
 		reviewDao.reviewAttachDelete(review);
 		
 		//이미지등록
 		if(!StringUtils.isAllEmpty(review.getOrgFileNmArr())) {
-			review.setConfirmYn("Y");
+			//review.setConfirmYn("Y");
 			review.setReviewGb("P");
 			ReviewAttach fileReview = new ReviewAttach();
 			fileReview.setRegNo(TsfSession.getInfo().getCustNo());
@@ -360,7 +360,7 @@ public class TsfReviewService {
 		}
 		
 		if(!StringUtils.isAllEmpty(review.getKufKeyArr())) {
-			review.setConfirmYn("N");
+			//review.setConfirmYn("Y");
 			ReviewAttach fileReview = new ReviewAttach();
 			fileReview.setRegNo(TsfSession.getInfo().getCustNo());
 			fileReview.setUpdNo(TsfSession.getInfo().getCustNo());
@@ -376,7 +376,7 @@ public class TsfReviewService {
 			}
 			
 		}
-		reviewDao.updateMypageReviewConfimYn(review);
+		//reviewDao.updateMypageReviewConfimYn(review);
 	}
 	
 	/**

src/main/java/com/style24/front/support/controller/TsfBaseController.java

@@ -48,6 +48,9 @@ public class TsfBaseController {
 	@Autowired
 	private TscMessageByLocale message;
 
+	@Autowired
+	private TsfEnvsetInfo envsetInfo;
+
 	/**
 	 * Json data 형식 외의 모든 문자열의 앞, 뒤 공백 제거
 	 * Json data 형식의 모든 문자열의 앞, 뒤 공백 제거 시는 AdmStringTrim에서 처리 (@RequestBody annotation 이용 시)
@@ -104,8 +107,8 @@ public class TsfBaseController {
 	 */
 	@ModelAttribute("metaInfo")
 	public Meta getMetaInfo() {
-//		return TsfEnvsetInfo.getInstance().getMetaInfo();
-		return (new TsfEnvsetInfo()).getMetaInfo();
+		return envsetInfo.getMetaInfo();
+//		return (new TsfEnvsetInfo()).getMetaInfo();
 	}
 
 	/**
@@ -114,7 +117,8 @@ public class TsfBaseController {
 	 */
 	@ModelAttribute("allCateList")
 	public Collection<Cate1> getAllCateList() {
-		return (new TsfEnvsetInfo()).getAllCateList();
+//		return (new TsfEnvsetInfo()).getAllCateList();
+		return envsetInfo.getAllCateList();
 	}
 
 	@ModelAttribute("osType")

src/main/java/com/style24/front/support/startup/TsfEnvsetInfo.java

@@ -67,11 +67,12 @@ public class TsfEnvsetInfo {
 	 * @return
 	 */
 	public Collection<Cate1> getAllCateList() {
-		if (allCateList == null) {
-			allCateList = displayService.getAllCategoryList(TsfConstants.CateGb.BYITEM.value());
-		}
-
-		return allCateList;
+//		if (allCateList == null) {
+//		allCateList = displayService.getAllCategoryList(TsfConstants.CateGb.BYITEM.value());
+//		}
+//
+//		return allCateList;
+		return displayService.getAllCategoryList(TsfConstants.CateGb.BYITEM.value());
 	}
 
 }

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

@@ -655,7 +655,7 @@
 		FROM   TB_CATE_FILTER
 		WHERE  SITE_CD = #{siteCd}
 		AND    CATE_GB = #{cateGb}
-		<if test='formalGb != null and formalGb = "G009_20"'>
+		<if test='formalGb != null and formalGb == "G009_20"'>
 		AND    FORMAL_GB = #{formalGb}
 		</if>
 		AND    BRAND_GROUP_NO = #{brandGroupNo}

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

@@ -79,7 +79,7 @@
 
 				<th:block th:if="${contentsLoc=='007'}">
 					<!-- 뉴아이템 슬라이드 -->
-					<div class="inner" th:if="${brandMainLayoutData.goodsList != null}">
+					<div class="inner" th:if="${brandMainLayoutData.goodsList != null and !brandMainLayoutData.goodsList.empty}">
 						<div class="new_item">
 							<p class="br_subtitle" th:text="${contentsTitle}"></p>
 							<div class="area_slider">
@@ -118,7 +118,7 @@
 
 				<th:block th:if="${contentsLoc=='006' || contentsLoc=='014'||contentsLoc=='015'||contentsLoc=='016'}">
 					<!-- 배너 슬라이드 -->
-					<div class="inner wide" th:if="${brandMainLayoutData.ContentsList!=null}">
+					<div class="inner wide" th:if="${brandMainLayoutData.ContentsList!=null and !brandMainLayoutData.ContentsList.empty}">
 						<div class="swiper-container br_second_slide">
 							<div class="swiper-wrapper">
 								<th:block th:each="ContentsData, ContentsStat : ${brandMainLayoutData.ContentsList}">
@@ -142,7 +142,7 @@
 
 				<th:block th:if="${contentsLoc=='008'}">
 					<!-- 베스트아이템 슬라이드 -->
-					<div class="inner" th:if="${brandMainLayoutData.goodsList != null}">
+					<div class="inner" th:if="${brandMainLayoutData.goodsList != null and !brandMainLayoutData.goodsList.empty}">
 						<div class="pd_together best_item">
 							<p class="br_subtitle" th:text="${contentsTitle}">BEST ITEMS</p>
 							<div class="area_slider">
@@ -225,7 +225,7 @@
 
 				<th:block th:if="${contentsLoc=='009' or contentsLoc=='017' or contentsLoc=='018' or contentsLoc=='019'}">
 					<!-- 엠디픽 슬라이드 -->
-					<div class="inner" th:if="${brandMainLayoutData.goodsList != null}">
+					<div class="inner" th:if="${brandMainLayoutData.goodsList != null and !brandMainLayoutData.goodsList.empty}">
 						<div class="pd_together md_item">
 							<p class="br_subtitle" th:text="${contentsTitle}"></p>
 							<div class="area_slider">
@@ -265,7 +265,7 @@
 
 				<th:block th:if="${contentsLoc=='011'}">
 					<!-- 스페셜샵 슬라이드 -->
-					<div class="inner" th:if="${brandMainLayoutData.planningList != null}">
+					<div class="inner" th:if="${brandMainLayoutData.planningList != null and !brandMainLayoutData.planningList.empty}">
 						<div class="special_shop">
 							<p class="br_subtitle" th:text="${contentsTitle}"></p>
 							<div class="area_slider">
@@ -320,10 +320,11 @@
 					<div class="inner" th:if="${brandMainLayoutData.goodsList != null and !brandMainLayoutData.goodsList.empty}">
 						<div class="brand_product">
 							<p class="br_subtitle" th:text="${contentsTitle}"></p>
+							<div class="itemsGrp">
 							<th:block th:each="goodsData, goodsStat : ${brandMainLayoutData.goodsList}">
-								<th:block th:if="${(goodsStat.index%2)==0 or goodsStat.first}">
-									<div class="itemsGrp">
-								</th:block>
+<!--								<th:block th:if="${(goodsStat.index%2)==0 or goodsStat.first}">-->
+
+<!--								</th:block>-->
 								<div class="item_prod">
 									<div class="item_state">
 										<button type="button" class="itemLike" th:classappend="${goodsData.likeIt == 'likeit'}? 'likeit' : ''"  onclick="cfnPutWishList(this);" th:attr="goodsCd=${goodsData.goodsCd}, ithrCd='', contentsLoc='SBMM013', planDtlSq=''">관심상품 추가</button>
@@ -353,10 +354,11 @@
 										</a>
 									</div>
 								</div>
-								<th:block th:if="${(goodsStat.index%2)== 1 or goodsStat.last}">
-									<th:block th:utext="'</div>'"></th:block>
-								</th:block>
+<!--								<th:block th:if="${(goodsStat.index%2)== 1 or goodsStat.last}">-->
+<!--									<th:block th:utext="'</div>'"></th:block>-->
+<!--								</th:block>-->
 							</th:block>
+							</div>
 
 							<div class="btn_group_flex">
 								<div>
@@ -369,7 +371,7 @@
 
 				<th:block th:if="${contentsLoc=='012'}">
 					<!-- 유튜브 슬라이드 -->
-					<div class="inner wide" th:if="${brandMainLayoutData.ContentsList != null}">
+					<div class="inner wide" th:if="${brandMainLayoutData.ContentsList != null and !brandMainLayoutData.ContentsList.empty}">
 						<div class="youtube">
 							<p class="br_subtitle" th:text="${contentsTitle}">STYLE24 TV</p>
 							<div class="swiper-container br_youtube_slide">
@@ -378,7 +380,7 @@
 										<div class="swiper-slide">
 											<div class="movbox">
 												<iframe th:if="${item.strVar1=='Y'}" width="100%" height="100%" th:src="${'https://www.youtube.com/embed/'+item.strVar2+'?rel=0'}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
-												<iframe th:if="${item.strVar1=='M'}" class="pd_mov"  th:src="${'http://v.kr.kollus.com/'+item.strVar2+'?enable_initialize_focus=false'}" allowfullscreen></iframe>
+												<iframe th:if="${item.strVar1=='M'}" class="pd_mov"  th:src="${kollusMediaUrl+'/'+item.strVar2+'?enable_initialize_focus=false'}" allowfullscreen></iframe>
 											</div>
 										</div>
 									</th:block>

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

@@ -1085,7 +1085,7 @@
 					// fnCategoryGoodsInfiniteScrollInit();
 					console.log('here*'+historyData.scroll);
 					fnGoodsListSearch();
-					$('html, body').animate({scrollTop: historyData.backScroll});
+					// $('html, body').animate({scrollTop: historyData.backScroll});
 					// window.scrollTo(0, historyData.backScroll);
 				}
 			}else{

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

@@ -715,7 +715,7 @@
 										<div class="swiper-slide" th:each="item, stat : ${mainData.ContentsList}">
 											<div class="movbox">
 												<iframe th:if="${item.strVar1=='Y'}" width="100%" height="100%" th:src="${'https://www.youtube.com/embed/'+item.strVar2+'?rel=0'}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
-												<iframe th:if="${item.strVar1=='M'}" class="pd_mov"  th:src="${'http://v.kr.kollus.com/'+item.strVar2+'?enable_initialize_focus=false'}" allowfullscreen></iframe>
+												<iframe th:if="${item.strVar1=='M'}" class="pd_mov"  th:src="${kollusMediaUrl+'/'+item.strVar2+'?enable_initialize_focus=false'}" allowfullscreen></iframe>
 												<!--										<iframe width="100%" height="100%" src="https://www.youtube.com/embed/hGjFwebN5ks" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>-->
 											</div>
 										</div>

src/main/webapp/WEB-INF/views/mob/goods/GoodsDealDescFormMob.html

@@ -44,9 +44,12 @@
 			<th:block th:each="goodsVideo, status : ${goodsVideoList}">
 			<div class="movblock">
 				<th:block th:if="${goodsVideo.videoGb == 'Y'}">
+				<div style="height:4rem"></div><!-- 여백용 html -->
 				<iframe th:src="${'https://www.youtube.com/embed/'+goodsVideo.kmcKey+'?rel=0'}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
 				</th:block>
 				<th:block th:unless="${goodsVideo.videoGb == 'Y'}">
+				<div style="height:4rem"></div><!-- 여백용 html -->
+				<iframe class="pd_mov" width="100%" height="100%" th:src="${kollusMediaUrl+'/'+goodsVideo.kmcKey +'?enable_initialize_focus=false&autoplay&mute&controls_activation=none'}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
 				</th:block>
 			</div>
 			</th:block>
@@ -54,20 +57,28 @@
 			<th:block th:if="${goodsBannerList != null and !goodsBannerList.empty}">
 			<th:block th:each="goodsBanner, status : ${goodsBannerList}" >
 			<th:block th:if="${goodsBanner.strVar1 != null and  not #strings.equals(goodsBanner.strVar1, '#')}">
+				<div style="height:4rem"></div><!-- 여백용 html -->
 				<a th:href="${goodsBanner.strVar1}" target="_blank">
 				<img th:src="${imgUrl+goodsBanner.imgPath1}" alt="">
 				</a>
 			</th:block>
 			<th:block th:unless="${goodsBanner.strVar1 != null and  not #strings.equals(goodsBanner.strVar1, '#')}">
+				<div style="height:4rem"></div><!-- 여백용 html -->
 				<img th:src="${imgUrl+goodsBanner.imgPath1}" alt="">
 			</th:block>
 			</th:block>
 			</th:block>
 			
 			<!-- 관리자 에디터입력 내용 노출  상단 html -->
-			<th:block  th:if="${goodsInfo.goodsTopDesc != null  and !goodsInfo.goodsTopDesc.empty }" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTopDesc))}"></th:block >
+			<th:block  th:if="${goodsInfo.goodsTopDesc != null  and !goodsInfo.goodsTopDesc.empty }" >
+				<div style="height:4rem"></div><!-- 여백용 html -->
+				<th:block th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTopDesc))}"></th:block>
+			</th:block >
 			
-			<th:block th:if="${goodsInfo.tobeFormYn == 'N' and goodsInfo.goodsDesc != null  and !goodsInfo.goodsDesc.empty}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDesc))}"></th:block>
+			<th:block th:if="${goodsInfo.tobeFormYn == 'N' and goodsInfo.goodsDesc != null  and !goodsInfo.goodsDesc.empty}" >
+				<div style="height:4rem"></div><!-- 여백용 html -->
+				<th:block th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDesc))}"></th:block>
+			</th:block>
 		</div>	
 			
 		<th:block th:if="${goodsInfo.tobeFormYn == 'Y'}">	

src/main/webapp/WEB-INF/views/mob/goods/GoodsDealDetailFormMob.html

@@ -226,8 +226,8 @@
 																		</div>
 																		<div class="itemName" ><span class="tit_option" th:text="${'[상품'+status.count+']'}">[상품1]</span><th:block th:text="${goodsInfo.goodsFullNm}"></th:block></div>
 																		<p class="itemPrice">
-																			<span class="itemPrice_original" th:if="${goodsInfo.listPrice > goodsInfo.currPrice}" th:text="${#numbers.formatInteger(goodsInfo.listPrice, 0,'COMMA')}">89,000</span>
 																			<th:block th:text="${#numbers.formatInteger(goodsInfo.currPrice, 0,'COMMA')}"> 134,100</th:block>
+																			<span class="itemPrice_original" th:if="${goodsInfo.listPrice > goodsInfo.currPrice}" th:text="${#numbers.formatInteger(goodsInfo.listPrice, 0,'COMMA')}">89,000</span>
 																			<span class="itemPercent" th:if="${goodsInfo.dcRate > 0}" th:text="|${#numbers.formatDecimal(goodsInfo.dcRate,0,0)}%|">10%</span>
 																		</p>
 																	</a>
@@ -341,9 +341,9 @@
 		let jsonData = JSON.stringify(data);
 		
 		$('.form_field .select_custom.item_opt1').attr('disabled', true);
-		$('.form_field .select_custom.item_opt1').find('.combo .select').html('옵션1선택');
+		$('.form_field .select_custom.item_opt1').find('.combo .select').html('선택');
 		$('.form_field .select_custom.item_opt2').attr('disabled', true);
-		$('.form_field .select_custom.item_opt2').find('.combo .select').html('옵션2선택');
+		$('.form_field .select_custom.item_opt2').find('.combo .select').html('선택');
 		
 		gagajf.ajaxJsonSubmit('/goods/detail/compsGoods/list', jsonData, function(result) {
 			if (result.dataList != null && result.dataList.length > 0) {
@@ -375,10 +375,10 @@
 					tagUp += '				<p class="itemBrand">'+item.brandGroupNm+'</p>\n';
 					tagUp += '				<div class="itemName" ><span class="tit_option">[상품'+(idx+1)+']</span> '+ item.goodsFullNm +'</div>\n';
 					tagUp += '				<p class="itemPrice">\n';
+					tagUp += '					 '+item.currPrice.addComma()+'\n';
 					if (Number(item.listPrice) > Number(item.currPrice)){
 					tagUp += '					<span class="itemPrice_original">'+item.listPrice.addComma()+'</span>\n';	
 					}
-					tagUp += '					 '+item.currPrice.addComma()+'\n';
 					if (Number(item.dcRate) > 0){
 					tagUp += '					<span class="itemPercent">'+item.dcRate+'%</span>\n';	
 					}
@@ -418,9 +418,9 @@
 					};
 		let jsonData = JSON.stringify(data);
 		
-		$('.form_field .select_custom.item_opt1').find('.combo .select').html('옵션1선택');
+		$('.form_field .select_custom.item_opt1').find('.combo .select').html('선택');
 		$('.form_field .select_custom.item_opt2').attr('disabled', true);
-		$('.form_field .select_custom.item_opt2').find('.combo .select').html('옵션2선택');
+		$('.form_field .select_custom.item_opt2').find('.combo .select').html('선택');
 		
 		gagajf.ajaxJsonSubmit('/goods/detail/option1/list', jsonData, function(result) {
 			
@@ -439,7 +439,7 @@
 						//------
 						tag1 += '<div class="select_custom item_opt1">\n';	
 						tag1 += '<div class="combo">\n';
-						tag1 += '<div class="select">옵션1선택</div>\n';
+						tag1 += '<div class="select">선택</div>\n';
 						tag1 += '<ul class="list">\n';
 						//------
 						//tag1 += '<li class="selected" id="goodsOpt1">옵션1선택</li>\n';	
@@ -519,7 +519,7 @@
 						//------
 						tag1 += '<div class="select_custom item_opt2">\n';	
 						tag1 += '<div class="combo">\n';
-						tag1 += '<div class="select">옵션2선택</div>\n';
+						tag1 += '<div class="select">선택</div>\n';
 						tag1 += '<ul class="list">\n';
 						//------
 						//tag1 += '<li class="selected" id="goodsOpt2">옵션2</li>\n';	
@@ -657,9 +657,9 @@
 			//$('.pd_detail .opt_select .select_custom.deal_opt_item').find('.combo .select').html(dTag);
 			//var opt_selecter_item = new sCombo('.opt_select .select_custom.deal_opt_item');
 			$('.form_field .select_custom.item_opt1').attr('disabled', true);
-			$('.form_field .select_custom.item_opt1').find('.combo .select').html('옵션1선택');
+			$('.form_field .select_custom.item_opt1').find('.combo .select').html('선택');
 			$('.form_field .select_custom.item_opt2').attr('disabled', true);
-			$('.form_field .select_custom.item_opt2').find('.combo .select').html('옵션2선택');
+			$('.form_field .select_custom.item_opt2').find('.combo .select').html('선택');
 			
 			$('.pop_option_select').css("display", "none");
 			

src/main/webapp/WEB-INF/views/mob/goods/GoodsDetailFormMob.html

@@ -305,9 +305,11 @@
 					<th:block th:each="goodsVideo, status : ${goodsVideoList}">
 					<div class="movblock">
 						<th:block th:if="${goodsVideo.videoGb == 'Y'}">
+						<div style="height:4rem"></div><!-- 여백용 html -->
 						<iframe th:src="${'https://www.youtube.com/embed/'+goodsVideo.kmcKey+'?rel=0'}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
 						</th:block>
 						<th:block th:unless="${goodsVideo.videoGb == 'Y'}">
+						<div style="height:4rem"></div><!-- 여백용 html -->
 						<iframe class="pd_mov" width="100%" height="100%" th:src="${kollusMediaUrl+'/'+goodsVideo.kmcKey +'?enable_initialize_focus=false&autoplay&mute&controls_activation=none'}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
 						</th:block>
 					</div>
@@ -316,18 +318,27 @@
 					<th:block th:if="${goodsBannerList != null and !goodsBannerList.empty}">
 					<th:block th:each="goodsBanner, status : ${goodsBannerList}" >
 					<th:block th:if="${goodsBanner.strVar1 != null and  not #strings.equals(goodsBanner.strVar1, '#')}">
+						<div style="height:4rem"></div><!-- 여백용 html -->
 						<a th:href="${goodsBanner.strVar1}" target="_blank">
 						<img th:src="${imgUrl+goodsBanner.imgPath1}" alt="">
 						</a>
 					</th:block>
 					<th:block th:unless="${goodsBanner.strVar1 != null and  not #strings.equals(goodsBanner.strVar1, '#')}">
+						<div style="height:4rem"></div><!-- 여백용 html -->
 						<img th:src="${imgUrl+goodsBanner.imgPath1}" alt="">
 					</th:block>
 					</th:block>
 					</th:block>
-					<th:block  th:if="${goodsInfo.goodsTopDesc != null  and !goodsInfo.goodsTopDesc.empty }" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTopDesc))}"></th:block >
+					<th:block  th:if="${goodsInfo.goodsTopDesc != null  and !goodsInfo.goodsTopDesc.empty }" >
+					<div style="height:4rem"></div><!-- 여백용 html -->
+					<th:block th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTopDesc))}"></th:block>
+					</th:block >
 					
-					<th:block th:if="${goodsInfo.tobeFormYn == 'N' and goodsInfo.goodsDesc != null  and !goodsInfo.goodsDesc.empty}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDesc))}"></th:block>
+					
+					<th:block th:if="${goodsInfo.tobeFormYn == 'N' and goodsInfo.goodsDesc != null  and !goodsInfo.goodsDesc.empty}" >
+						<div style="height:4rem"></div><!-- 여백용 html -->
+						<th:block th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDesc))}"></th:block>
+					</th:block>
 					
 				</div>
 					
@@ -1031,7 +1042,7 @@
 														<th:block th:each="goodsOption, optionStatus : ${goodsCompose.goodsOption1List}" >
 														<!-- <li class="selected" th:id="|selfGoodsOpt1${goodsCompose.compsGoodsCd}|" th:if=${optionStatus.first}>선택</li> --> 
 														<li th:onclick="fnOption2([[${status.count}]], [[${goodsOption.goodsCd}]],[[${goodsOption.optCd1}]],[[${goodsInfo.minOrdQty}]], [[${goodsInfo.maxOrdQty}]])"
-															th:attr="aria-disabled=${(goodsCompose.goodsStat != 'G008_90' or goodsCompose.stockQty <= 0)? 'true':''}, data-soldout=${(goodsCompose.stockQty <= 0)? 'true':''}"
+															th:attr="aria-disabled=${(goodsCompose.goodsStat != 'G008_90' or goodsOption.stockQty <= 0)? 'true':''}, data-soldout=${(goodsOption.stockQty <= 0)? 'true':''}"
 															><th:block th:text="${goodsOption.optCd1Nm}"></th:block>
 															<input type="hidden" name="opt" th:value="${goodsOption.goodsCd}" th:attr="optCd1=${goodsOption.optCd1},optCd1Nm=${goodsOption.optCd1Nm},optCd2=${goodsOption.optCd2},optCd=${goodsOption.optCd}"/>
 														</li>

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

@@ -25,7 +25,7 @@
 			<th:block th:if="${brandMainLayoutData.ContentsList != null and !brandMainLayoutData.ContentsList.empty}">
 				<th:block th:if="${contentsLoc=='004'}">
 					<!-- 1. 비주얼 슬라이드 -->
-					<div class="content wide main_visual brand_visual">
+					<div class="content wide main_visual brand_visual" th:if="${brandMainLayoutData.ContentsList != null}">
 						<div class="cont_head dpnone">
 							<p class="t_c">비주얼 슬라이드</p>
 						</div>
@@ -91,7 +91,7 @@
 
 				<!-- new_item -->
 				<th:block th:if="${contentsLoc=='007'}">
-					<div class="content new_item" th:if="${brandMainLayoutData.goodsList != null}">
+					<div class="content new_item" th:if="${brandMainLayoutData.goodsList != null and !brandMainLayoutData.goodsList.empty}">
 						<div class="cont_head">
 							<p class="displayH t_c" th:text="${contentsTitle}"></p>
 						</div>
@@ -128,7 +128,7 @@
 				<!-- 가로 긴 배너 슬라이드 -->
 				<!-- 브랜드 배너 -->
 				<th:block th:if="${contentsLoc=='006' || contentsLoc=='014'||contentsLoc=='015'||contentsLoc=='016'}">
-					<div class="content wide main_1stage">
+					<div class="content wide main_1stage" th:if="${brandMainLayoutData.ContentsList != null and !brandMainLayoutData.ContentsList.empty}">
 						<div class="cont_head dpnone">
 							<p class="t_c">배너 슬라이드</p>
 						</div>
@@ -161,7 +161,7 @@
 
 				<!-- best_item -->
 				<th:block th:if="${contentsLoc=='008'}">
-					<div class="content best_item" th:if="${brandMainLayoutData.goodsList != null}">
+					<div class="content best_item" th:if="${brandMainLayoutData.goodsList != null and !brandMainLayoutData.goodsList.empty}">
 						<div class="cont_head">
 							<p class="displayH t_c" th:text="${contentsTitle}"></p>
 						</div>
@@ -238,7 +238,7 @@
 
 				<!-- MD’s PICK -->
 				<th:block th:if="${contentsLoc=='009' or contentsLoc=='017' or contentsLoc=='018' or contentsLoc=='019'}">
-					<div class="content md_item" th:if="${brandMainLayoutData.goodsList != null}">
+					<div class="content md_item" th:if="${brandMainLayoutData.goodsList != null and !brandMainLayoutData.goodsList.empty}">
 						<div class="cont_head">
 							<p class="displayH t_c" th:text="${contentsTitle}"></p>
 						</div>
@@ -278,7 +278,7 @@
 
 				<!-- special_shop -->
 				<th:block th:if="${contentsLoc=='011'}">
-					<div class="content wide special_shop" th:if="${brandMainLayoutData.planningList != null}">
+					<div class="content wide special_shop" th:if="${brandMainLayoutData.planningList != null and !brandMainLayoutData.planningList.empty}">
 						<div class="cont_head">
 							<p class="displayH t_c" th:text="${contentsTitle}"></p>
 						</div>
@@ -386,7 +386,7 @@
 
 				<!-- main_tv -->
 				<th:block th:if="${contentsLoc=='012'}">
-					<div class="content wide main_tv" th:if="${brandMainLayoutData.ContentsList != null}">
+					<div class="content wide main_tv" th:if="${brandMainLayoutData.ContentsList != null and !brandMainLayoutData.ContentsList.empty}">
 						<div class="cont_head">
 							<p class="displayH t_c" th:text="${contentsTitle}">TBJ`S TV</p>
 						</div>
@@ -398,7 +398,7 @@
 											<div class="swiper-slide">
 												<div class="movbox">
 													<iframe th:if="${item.strVar1=='Y'}" width="100%" height="100%" th:src="${'https://www.youtube.com/embed/'+item.strVar2+'?rel=0'}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
-													<iframe th:if="${item.strVar1=='M'}" class="pd_mov"  th:src="${'http://v.kr.kollus.com/'+item.strVar2+'?enable_initialize_focus=false'}" allowfullscreen></iframe>
+													<iframe th:if="${item.strVar1=='M'}" class="pd_mov"  th:src="${kollusMediaUrl+'/'+item.strVar2+'?enable_initialize_focus=false'}" allowfullscreen></iframe>
 												</div>
 											</div>
 										</th:block>

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

@@ -314,6 +314,9 @@
 
 		// 컨텐츠 호출
 		$(document).ready( function() {
+			if(!gagajf.isNull([[${brandGroupInfo.brandGroupNo}]])){
+				$(".br_header").css('background-color','#fff');
+			}
 			//가격 슬라이드
 			//var custom_values = ['9,000원', '230,000원', '487,000원', '700,000원', '1,360,000원', '1,799,000원'];
 			let priceLen;

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

@@ -221,6 +221,7 @@
 		if(lookbookGb=='BL'){
 			$("#brandBox").hide();
 			$("#navHome").attr('onclick', 'cfnGoToBrandMain('+brandCd+');');
+			$(".br_header").css('background-color','#fff');
 		}else{
 			$("#navHome").attr('href', '/');
 			fnGetBrandList();

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

@@ -534,7 +534,7 @@
 										<div class="swiper-slide">
 											<div class="movbox">
 												<iframe th:if="${item.strVar1=='Y'}" width="100%" height="100%" th:src="${'https://www.youtube.com/embed/'+item.strVar2+'?rel=0'}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
-												<iframe th:if="${item.strVar1=='M'}" class="pd_mov"  th:src="${'http://v.kr.kollus.com/'+item.strVar2+'?enable_initialize_focus=false'}" allowfullscreen></iframe>
+												<iframe th:if="${item.strVar1=='M'}" class="pd_mov"  th:src="${kollusMediaUrl+'/'+item.strVar2+'?enable_initialize_focus=false'}" allowfullscreen></iframe>
 											</div>
 										</div>
 									</th:block>

src/main/webapp/WEB-INF/views/web/goods/GoodsDealDescFormWeb.html

@@ -44,9 +44,11 @@
 		<th:block th:each="goodsVideo, status : ${goodsVideoList}">
 		<div class="movblock">
 			<th:block th:if="${goodsVideo.videoGb == 'Y'}">
+			<div style="height:100px"></div><!-- 여백용 html -->
 			<iframe th:src="${'https://www.youtube.com/embed/'+goodsVideo.kmcKey+'?rel=0'}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
 			</th:block>
 			<th:block th:unless="${goodsVideo.videoGb == 'Y'}">
+			<div style="height:100px"></div><!-- 여백용 html -->
 			<iframe width="100%" height="100%" th:src="${kollusMediaUrl+'/'+goodsVideo.kmcKey +'?player_version=html5'}" frameborder="0" allowfullscreen webkitallowfullscreen mozallowfullscreen></iframe>
 			</th:block>
 		</div>
@@ -55,20 +57,28 @@
 		<th:block th:if="${goodsBannerList != null and !goodsBannerList.empty}">
 		<th:block th:each="goodsBanner, status : ${goodsBannerList}" >
 		<th:block th:if="${goodsBanner.strVar1 != null and  not #strings.equals(goodsBanner.strVar1, '#')}">
+			<div style="height:100px"></div><!-- 여백용 html -->
 			<a th:href="${goodsBanner.strVar1}" target="_blank">
 			<img th:src="${imgUrl+goodsBanner.imgPath1}" alt="">
 			</a>
 		</th:block>
 		<th:block th:unless="${goodsBanner.strVar1 != null and  not #strings.equals(goodsBanner.strVar1, '#')}">
+			<div style="height:100px"></div><!-- 여백용 html -->
 			<img th:src="${imgUrl+goodsBanner.imgPath1}" alt="">
 		</th:block>
 		</th:block>
 		</th:block>
 		
 		<!-- 관리자 에디터입력 내용 노출  상단 html -->
-		<th:block  th:if="${goodsInfo.goodsTopDesc != null  and !goodsInfo.goodsTopDesc.empty }" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTopDesc))}"></th:block >
+		<th:block  th:if="${goodsInfo.goodsTopDesc != null  and !goodsInfo.goodsTopDesc.empty }" >
+		<div style="height:100px"></div><!-- 여백용 html -->
+		<th:block th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTopDesc))}"></th:block>
+		</th:block >
 		
-		<th:block th:if="${goodsInfo.tobeFormYn == 'N' and goodsInfo.goodsDesc != null  and !goodsInfo.goodsDesc.empty}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDesc))}"></th:block>
+		<th:block th:if="${goodsInfo.tobeFormYn == 'N' and goodsInfo.goodsDesc != null  and !goodsInfo.goodsDesc.empty}" >
+		<div style="height:100px"></div><!-- 여백용 html -->
+		<th:block th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDesc))}"></th:block>
+		</th:block>
 	</div>	
 			
 	<th:block th:if="${goodsInfo.tobeFormYn == 'Y'}">
@@ -151,7 +161,7 @@
 	<div class="view_detail_box" th:if="${not #strings.contains(goodsImgList,'_01')}">
 		<div class="view">
 			<th:block th:each="goodsImg, status : ${goodsImgList}" >
-				<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=720'}" alt="">
+				<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=720'}" alt="" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'">
 				</th:block>
 		</div>
 	</div>

src/main/webapp/WEB-INF/views/web/goods/GoodsDealListFormWeb.html

@@ -42,7 +42,7 @@
 						</div>
 					</div>
 					<ul class="list" th:if="${goodsDealComposeList  != null and !goodsDealComposeList.empty}">
-						<li class="selected" th:each="goodsInfo, status : ${goodsDealComposeList}" th:attr="aria-disabled=${(goodsInfo.goodsStat != 'G008_90' or goodsInfo.stockQty <= 0)? 'true':''}, data-soldout=${(goodsInfo.stockQty <= 0)? 'true':''}">
+						<li class="selected" th:each="goodsInfo, status : ${goodsDealComposeList}" >
 							<div class="item_prod">
 								<div class="item_state">
 									<a href="javascript:void(0);" class="itemLink" th:onclick="fnGoodsDealDesc([[${goodsInfo.compsGoodsCd}]])">

src/main/webapp/WEB-INF/views/web/goods/GoodsDetailFormWeb.html

@@ -265,7 +265,7 @@
 												<ul class="list">
 													<th:block th:each="goodsOption, optionStatus : ${goodsCompose.goodsOption1List}" >
 													<li th:onclick="fnOption2([[${status.count}]], [[${goodsOption.goodsCd}]],[[${goodsOption.optCd1}]],[[${goodsCompose.qty}]],[[${goodsInfo.minOrdQty}]], [[${goodsInfo.maxOrdQty}]])"
-														th:attr="aria-disabled=${(goodsCompose.goodsStat != 'G008_90' or goodsCompose.stockQty <= 0)? 'true':''}, data-soldout=${(goodsCompose.stockQty <= 0)? 'true':''}"
+														th:attr="aria-disabled=${(goodsCompose.goodsStat != 'G008_90' or goodsOption.stockQty <= 0)? 'true':''}, data-soldout=${(goodsOption.stockQty <= 0)? 'true':''}"
 														>
 														<div th:text="${goodsOption.optCd1Nm}">상품옵션</div>
 														<div th:if="${goodsOption.addPrice > 0}" th:text="|+${#numbers.formatInteger(goodsOption.addPrice, 0,'COMMA')}원|">0원</div>
@@ -663,11 +663,12 @@
 					<!-- 관리자 에디터입력 내용   공지 html -->
 					<th:block th:each="goodsVideo, status : ${goodsVideoList}">
 					<div class="movblock">
+					 	<div style="height:100px"></div><!-- 여백용 html -->
 						<th:block th:if="${goodsVideo.videoGb == 'Y'}">
-						<iframe th:src="${'https://www.youtube.com/embed/'+goodsVideo.kmcKey+'?rel=0'}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+						<iframe th:src="${'https://www.youtube.com/embed/'+goodsVideo.kmcKey+'?rel=0&mute=1'}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
 						</th:block>
 						<th:block th:unless="${goodsVideo.videoGb == 'Y'}">
-						<iframe width="100%" height="100%" th:src="${kollusMediaUrl+'/'+goodsVideo.kmcKey +'?player_version=html5'}" frameborder="0" allowfullscreen webkitallowfullscreen mozallowfullscreen></iframe>
+						<iframe width="100%" height="100%" th:src="${kollusMediaUrl+'/'+goodsVideo.kmcKey +'?player_version=html5&mute'}" frameborder="0" allowfullscreen webkitallowfullscreen mozallowfullscreen></iframe>
 						</th:block>
 					</div>
 					</th:block>
@@ -675,20 +676,28 @@
 					<th:block th:if="${goodsBannerList != null and !goodsBannerList.empty}">
 					<th:block th:each="goodsBanner, status : ${goodsBannerList}" >
 					<th:block th:if="${goodsBanner.strVar1 != null and  not #strings.equals(goodsBanner.strVar1, '#')}">
+						 <div style="height:100px"></div><!-- 여백용 html -->
 						<a th:href="${goodsBanner.strVar1}" target="_blank">
 						<img th:src="${imgUrl+goodsBanner.imgPath1}" alt="">
 						</a>
 					</th:block>
 					<th:block th:unless="${goodsBanner.strVar1 != null and  not #strings.equals(goodsBanner.strVar1, '#')}">
+					 	<div style="height:100px"></div><!-- 여백용 html -->
 						<img th:src="${imgUrl+goodsBanner.imgPath1}" alt="">
 					</th:block>
 					</th:block>
 					</th:block>
 					
 					<!-- 관리자 에디터입력 내용 노출  상단 html -->
-					<th:block  th:if="${goodsInfo.goodsTopDesc != null  and !goodsInfo.goodsTopDesc.empty}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTopDesc))}"></th:block >
+					<th:block  th:if="${goodsInfo.goodsTopDesc != null  and !goodsInfo.goodsTopDesc.empty}" >
+						<div style="height:100px"></div><!-- 여백용 html -->
+						<th:block th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTopDesc))}"></th:block> 
+					</th:block >
 					
-					<th:block th:if="${ goodsInfo.tobeFormYn == 'N' and goodsInfo.goodsDesc != null  and !goodsInfo.goodsDesc.empty}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDesc))}"></th:block>
+					<th:block th:if="${ goodsInfo.tobeFormYn == 'N' and goodsInfo.goodsDesc != null  and !goodsInfo.goodsDesc.empty}" >
+						<div style="height:100px"></div><!-- 여백용 html -->
+						<th:block th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDesc))}"></th:block>
+					</th:block>
 				</div>	
 					
 				<th:block th:if="${goodsInfo.tobeFormYn == 'Y'}">
@@ -773,7 +782,7 @@
 				<div class="view_detail_box" th:if="${not #strings.contains(goodsImgList,'_01')}">
 					<div class="view">
 						<th:block th:each="goodsImg, status : ${goodsImgList}" >
-							<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=720'}" alt="">
+							<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=720'}" alt="" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'">
 							</th:block>
 					</div>
 				</div>

src/main/webapp/WEB-INF/views/web/goods/GoodsIncludeFormWeb.html

@@ -285,7 +285,7 @@
 											<ul class="list" th:if="${goodsDealComposeList  != null and !goodsDealComposeList.empty}">
 												<th:block th:each="goodsInfo, status : ${goodsDealComposeList}" th:attr="aria-disabled=${(goodsInfo.goodsStat != 'G008_90' or goodsInfo.stockQty <= 0)? 'true':''}, data-soldout=${(goodsInfo.stockQty <= 0)? 'true':''}">
 												<li  th:onclick="fnOption1('Down', [[${goodsInfo.compsGoodsCd}]], [[${goodsInfo.currPrice}]] , [[${goodsInfo.selfGoodsYn}]]);"
-														th:attr="aria-disabled=${(goodsInfo.goodsStat != 'G008_90')? 'true':''}, data-soldout=${(goodsInfo.goodsStat != 'G008_90')? 'true':''}">
+														th:attr="aria-disabled=${(goodsInfo.goodsStat != 'G008_90' or goodsInfo.stockQty <= 0)? 'true':''}, data-soldout=${(goodsInfo.stockQty <= 0)? 'true':''}">
 													<div class="item_prod">
 														<div class="item_state">
 															<a href="javascript:void(0);" class="itemLink">
@@ -584,10 +584,10 @@
 		params.goodsCd = goodsCd;
 		params.adminYn = "Y";
 		fnGoodsDealDetail2(params);  // ajax html
-		if (soldout == "N"){
+		//if (soldout == "N"){
 			// 옵션1 처리
 			fnOption1("layer", goodsCd, currPrice, selfGoodsYn);
-		}
+		//}
 		
 	}
 	

src/main/webapp/WEB-INF/views/web/planning/PlanningMainFormWeb.html

@@ -187,6 +187,10 @@
 	
 	$(document).ready(function() {
 		fnGetPlanningList([[${cateNo}]],[[${brandGroupNo}]]);
+		if(!gagajf.isNull([[${brandGroupNo}]])){
+			$(".br_header").css('background-color','#fff');
+		}
+
 	});
 /*]]>*/
 </script>

src/main/webapp/biz/goods.js

@@ -153,7 +153,7 @@ var fnCreateGoodsList = function(result, ithrCd, contentLoc, goodsUrl, lastPage,
 				tag += '<iframe id="pdThumbVideo" class="pd_mov" src="https://www.youtube.com/embed/'+videoUrl+'?autoplay=1&mute=1"></iframe>';
 				//tag += '<iframe id="pdThumbVideo" class="pd_mov" src="http://v.kr.kollus.com/164MyIiv?enable_initialize_focus=false&autoplay&mute&controls_activation=none" allow="fullscreen" allowFullScreen></iframe>';
 			}else{
-				tag += '<iframe id="pdThumbVideo" class="pd_mov" src="http://v.kr.kollus.com/'+videoUrl+'?enable_initialize_focus=false&autoplay&mute&controls_activation=none" allow="fullscreen" allowFullScreen></iframe>';
+				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="'+goodsUrl+'/'+item.sysImgNm+'" data-img="'+goodsUrl+'/'+item.sysImgNm2+'" onerror="noneImg(this)">';
@@ -875,9 +875,22 @@ var fnReCheckFilterList = function (){
 	});
 }
 
-var fnClickGoodsCd = function (goodsCd, mainColorCd){
+window.addEventListener('beforeunload', (event) => {
+	console.log('addEventListener-1');
+	// 표준에 따라 기본 동작 방지
+	event.preventDefault();
+	// Chrome에서는 returnValue 설정이 필요함
+	// event.returnValue = '';
+	console.log('addEventListener-2');
 	let scrollTop = document.documentElement.scrollTop;
+	console.log('addEventListener->'+scrollTop);
 	gagaInfiniteScroll.pageStatus.backScroll = scrollTop;
+
+});
+
+var fnClickGoodsCd = function (goodsCd, mainColorCd){
+	// let scrollTop = document.documentElement.scrollTop;
+	// gagaInfiniteScroll.pageStatus.backScroll = scrollTop;
 	fnPushHistory();
 	cfnGoToGoodsDetail(goodsCd, mainColorCd);
 }

src/main/webapp/ux/plugins/gaga/gaga.infinite.scrollSession.js

@@ -98,6 +98,7 @@ var gagaInfiniteScroll = {
 			historyData = {};
 		}
 
+		console.log(historyData);
 		if (historyData.pageNum === undefined || historyData.pageNum === '' || historyData.htm === undefined || historyData.htm == '') {
 			this.pageStatus.loadPage = 0;
 			this.pageStatus.pageNum[0] = 0;
@@ -116,9 +117,12 @@ var gagaInfiniteScroll = {
 			this.pageStatus.filterHtml = historyData.filterHtml;
 			this.pageStatus.filterStatHtml = historyData.filterStatHtml;
 			this.pageStatus.totalCount = historyData.totalCount;
-			this.pageStatus.backScroll = historyData.backScroll;
+			this.pageStatus.backScroll = historyData.scroll;
 
+			console.log('historyData.backScroll:::'+historyData.scroll);
+			console.log('infiniteContainer:::'+$("#infiniteContainer").height());
 			gagaInfiniteScroll.draw(historyData.htm);
+			// gagaInfiniteScroll.draw(historyData.htm, historyData.scroll, 0);
 		};
 
 		$(window).on('scroll', function() {
@@ -158,9 +162,13 @@ var gagaInfiniteScroll = {
 						, gagaInfiniteScroll.pageStatus.backScroll
 					);
 				if (scrollTop && containerHeight) {
-					gagaInfiniteScroll.obj.$window.scrollTop.scrollTop(0).scrollTop(scrollTop);
+					// console.log('here3');
+					// gagaInfiniteScroll.obj.$window.scrollTop.scrollTop(0).scrollTop(scrollTop);
 				} else {
-					gagaInfiniteScroll.obj.$window.scrollTop(gagaInfiniteScroll.obj.$window.scrollTop() + 1);
+					// console.log('here4');
+					// gagaInfiniteScroll.obj.$window.scrollTop = scrollTop+1;
+					// gagaInfiniteScroll.obj.$window.scrollTop(scrollTop+1);
+					// gagaInfiniteScroll.obj.$window.scrollTop(gagaInfiniteScroll.obj.$window.scrollTop() + 1);
 				}
 			};
 
@@ -169,10 +177,15 @@ var gagaInfiniteScroll = {
 			// Append HTML
 			this.obj.$ajaxBox.append($addHtm);
 
-			if (scrollTop && containerHeight) {
-				gagaInfiniteScroll.obj.$window.scrollTop.scrollTop(0).scrollTop(scrollTop);
+			console.log('scrollTop::'+scrollTop);
+			console.log('containerHeight::'+containerHeight);
+			if (scrollTop && containerHeight) { //&& containerHeight
+				// console.log('here5');
+				// gagaInfiniteScroll.obj.$window.scrollTop.scrollTop(0).scrollTop(scrollTop);
+				// gagaInfiniteScroll.obj.$window.scrollTop = scrollTop;
 			} else {
-				$(window).scrollTop($(window).scrollTop() + 1);
+				// console.log('here6');
+				// $(window).scrollTop($(window).scrollTop() + 1);
 			}
 
 			this.pageStatus.loadAlign = 'not';