Merge branch 'develop' into eskim

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/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">
@@ -369,7 +369,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 +378,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/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/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/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/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';