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

src/main/webapp/WEB-INF/views/mob/common/fragments/FooterMob.html

@@ -202,14 +202,16 @@
 		$("#hstrFull").removeClass('on');
 		return false;
 	}
-	
+
+	// 210521_ 수정 : 현재 선택된 on만 오픈.
 	$(document).on('click','.hasCate a',function(e){
-		$(this).next('.depthCate').slideToggle(300);
 		$(this).toggleClass('on');
+		$(this).next('.depthCate').slideToggle(300);
+		$(this).parents('li').siblings('li').find('a').removeClass('on');
+		$(this).parents('li').siblings('li').find('.depthCate').slideUp(300);
 		return false;
 	});
 	
-	
 	// 퀵메뉴카테고리
 	let fnGetQuickMenuCategory = function(cate1) {
 		let tag = '';

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

@@ -142,9 +142,9 @@
 											</a>
 										</div>
 									</th:block>
-									<!-- Add Pagination -->
-									<div class="swiper-pagination"></div>
 								</div>
+								<!-- Add Pagination -->
+								<div class="swiper-pagination"></div>
 							</div>
 						</div>
 					</div>
@@ -214,7 +214,7 @@
 															<th:block th:if="${LookbookData.lookbookGoodsList != null and !LookbookData.lookbookGoodsList.empty}" th:each="lookbookGoods, status : ${LookbookData.lookbookGoodsList}">
 																<div class="item_picker" th:style="${'left:'+lookbookGoods.xlim+'%; top:'+lookbookGoods.ylim+'%;'}">
 																	<div>
-																		<button type="button" th:onclick="fnGoodsPopup([[${lookbookGoods.sysImgNm}]],[[${lookbookGoods.brandGroupNm}]],[[${lookbookGoods.goodsFullNm}]],[[${lookbookGoods.listPrice}]],[[${lookbookGoods.currPrice}]],[[${lookbookGoods.dcRate}]],[[${lookbookGoods.goodsCd}]])"><span class="ico ico_picker"></span></button>
+																		<button type="button" th:onclick="fnGoodsPopup([[${lookbookGoods.sysImgNm}]],[[${lookbookGoods.brandGroupNm}]],[[${lookbookGoods.goodsFullNm}]],[[${lookbookGoods.listPrice}]],[[${lookbookGoods.currPrice}]],[[${lookbookGoods.dcRate}]],[[${lookbookGoods.goodsCd}]],[[${lookbookGoods.stockQty}]],[[${lookbookGoods.soldoutYn}]])"><span class="ico ico_picker"></span></button>
 																		<div class="pick_descr">
 																			<a href="javascript:void(0);"></a>
 																		</div>
@@ -431,7 +431,7 @@
 	var goodsImgUrl = [[${@environment.getProperty('upload.goods.view')}]];
 
 	// 픽커모달
-	var fnGoodsPopup = function(obj1,obj2,obj3,obj4,obj5,obj6,obj7){
+	var fnGoodsPopup = function(obj1,obj2,obj3,obj4,obj5,obj6,obj7,obj8,obj9){
 		$("#reco_pop .modal-dialog").remove();
 		var tag = '';
 
@@ -443,7 +443,11 @@
 		tag += '		<div class="modal-body">\n';
 		tag += '			<div class="itemsGrp rowtype">\n';
 		tag += '				<div class="item_prod">\n';
-		tag += '					<div class="item_state">\n';
+		tag += '					<div class="item_state';
+		if(obj8 < 1 || obj9 == 'Y'){
+			tag += ' soldout';
+		}
+		tag += '">\n';
 		tag += '						<a href="javascript:void(0);" class="itemLink" onclick="cfnGoToGoodsDetail(\''+obj7+'\',\'\',\'\')">\n';
 		tag += '							<div class="itemPic">\n';
 		tag += '								<img class="vLHTC pd_img" src="'+goodsImgUrl+'/'+obj1+'?RS=260" alt="" onerror="noneImg(this)">\n';
@@ -504,12 +508,15 @@
 		});
 	});
 
+	//210624_ 추가 : 슬라이드 속성 추가.
 	// 서브비주얼 슬라이드
 	var myArray = ["01", "02", "03"];
 	var submainVisualSwiper = new Swiper('.swiper-container.submain_visual', {
 		//210414_자동롤링 추가
+		speed: 1000,
 		autoplay : {
 			delay : 3000,   // 시간 설정
+			disableOnInteraction: false,
 		},
 		pagination: {
 			el: '.swiper-pagination',
@@ -520,20 +527,36 @@
 		}
 	});
 
-	//  이미지배너 슬라이드
-	var imgBannerSwiper = new Swiper('.swiper-container.br_second_slide', {
-		//210414_자동롤링 추가
-		autoplay : {
-			delay : 3000,   // 시간 설정
-		},
-		pagination: {
-			el: '.swiper-pagination',
-		},
-	});
+	// post-bnnWide (210602_ 교체)
+	// 와이드배너 슬라이드 카운팅
+	var pickbnnWdCont = $('.post-bnnWide .swiper-slide');
+	var pickbnnWdLength = pickbnnWdCont.length;
+	if (pickbnnWdLength < 2) {
+		var post_bnnWide = new Swiper ('.swiper-container.post-bnnWide', {
+			speed: 1000,
+			loop: false,
+			autoplay: false,
+			pagination: false,
+		});
+	} else {
+		var post_bnnWide = new Swiper ('.swiper-container.post-bnnWide', {
+			loop: true,
+			slidesPerView: 1,
+			speed: 1000,
+			autoplay: {
+				delay: 4000,
+				disableOnInteraction: false,
+			},
+			pagination: {
+				el: '.swiper-pagination',
+			},
+		});
+	}
 
 	// 뉴아이템 슬라이드
 	var newItemSwiper = new Swiper('.new_item .area_slider .swiper-container', {
 		slidesPerView: 1,
+		speed: 1000,
 		pagination: {
 			el: '.swiper-pagination',
 		},
@@ -541,19 +564,22 @@
 
 	// 베스트아이템 슬라이드
 	var bestItemSwiper = new Swiper('.best_item .area_slider .swiper-container', {
-		slidesPerView: 2,
+		slidesPerView: 2.22,
+		speed: 1000,
 		spaceBetween: 8,
 	});
 
 	// 엠디픽 슬라이드
 	var mdItemSwiper = new Swiper('.md_item .area_slider .swiper-container', {
-		slidesPerView: 2,
+		slidesPerView: 2.22,
+		speed: 1000,
 		spaceBetween: 8,
 	});
 
 	// 스페셜샵 슬라이드
 	var specialShopSwiper = new Swiper('.special_shop .area_slider .swiper-container', {
 		slidesPerView: 1,
+		speed: 1000,
 		spaceBetween: 10,
 	});
 
@@ -561,6 +587,7 @@
 	var rcmdPicimgSwiper = new Swiper('.recommendedArea .area_slider .swiper-container', {
 		slidesPerView: 1,
 		spaceBetween: 0,
+		speed: 1000,
 		pagination: {
 			el: '.swiper-pagination',
 			type: 'fraction',
@@ -569,8 +596,10 @@
 
 	// 유튜브 슬라이드
 	var swiperYoutu = new Swiper('.swiper-container.br_youtube_slide', {
+		speed: 1000,
 		pagination: {
 			el: '.swiper-pagination',
+			clickable:true,
 		},
 	});
 

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

@@ -58,7 +58,7 @@
 
 					<th:block th:if="${contentsLoc=='002'}">
 						<!-- 2. 스타일리포트 -->
-						<div class="inner bg_gray">
+						<div class="inner bg_gray" th:if="${mainData.ContentsList != null and !mainData.ContentsList.empty}">
 							<div class="main_stylereport">
 								<th:block th:if="${mainData.contentsTitle != null and !mainData.contentsTitle.empty}">
 									<div class="titWrap">
@@ -795,6 +795,8 @@
 		}
 		// 컨텐츠 호출
 		$(document).ready(function() {
+			post_visual.slideTo(2, 0, false); // 접속 시, 슬라이드페이지 이동
+
 			// 몰메인 띠배너 표출
 			$("#divTopbanner").show();
 
@@ -862,10 +864,12 @@
 				$("#pickBtn"+(idx+1)).click();
 			}
 		}
+
 		/*]]>*/
 	</script>
 
 	<script type="text/javascript">
+		//210624_ 추가 : 슬라이드 속성 추가.
 		// post-visual
 		// 비주얼 슬라이드 카운팅
 		var pickvisualCont = $('.post-visual .swiper-slide');
@@ -875,6 +879,7 @@
 			var post_visual = new Swiper('.swiper-container.post-visual', {
 				autoplay: false,
 				loop:false,
+				speed:1000,
 				// pagination: false,
 				pagination: {
 					el: '.swiper-pagination',
@@ -884,8 +889,10 @@
 		} else {
 			var post_visual = new Swiper('.swiper-container.post-visual', {
 				slideTo: 2,
+				speed:1000,
 				autoplay: {
 					delay: 3000,
+					disableOnInteraction: false,
 				},
 				loop:true,
 				pagination: {
@@ -898,6 +905,7 @@
 
 		// post-trendy
 		var post_trendy = new Swiper('.swiper-container.post-trendy', {
+			speed:1000,
 			pagination: {
 				el: '.swiper-pagination',
 			},
@@ -905,7 +913,7 @@
 
 		// post-it
 		var post_it = new Swiper('.swiper-container.post-it', {
-			slidesPerView: 2,
+			slidesPerView: 2.22,
 			spaceBetween: 8,
 			observer: true,
 			observeParents: true,
@@ -924,6 +932,7 @@
 		// post-stylereport
 		var post_stylereport = new Swiper('.swiper-container.post-stylereport', {
 			slidesPerView: 1,
+			speed:1000,
 			pagination: {
 				el: '.swiper-pagination',
 			},
@@ -945,7 +954,7 @@
 		//post-pick-head
 		var Head_pick = new Swiper(".pick-head", {
 			slidesPerView: "auto",
-			spaceBetween: 20,
+			spaceBetween: 0,
 			autoHeight: true,
 			preventClicks: true,
 			preventClicksPropagation: false,
@@ -979,7 +988,7 @@
 			}
 
 			setTimeout(function(){snbwrap.css({
-				"transform": "translate3d("+ (pos*-2) +"px, 0, 0)",
+				"transform": "translate3d("+ (pos*-1) +"px, 0, 0)",
 				"transition-duration": "500ms"
 			})}, 200);
 		}
@@ -995,9 +1004,10 @@
 		var post_pick = new Swiper(".pick-cont .swiper-container", {
 			//slidesPerView: 1,
 			watchOverflow:true, //210520_ 추가 : 슬라이드 1개일 경우 롤링 제거.
+			speed: 1000,
 			//210520_ 추가 : 자동재생 시간 추가.
 			autoplay: {
-				delay: 4000,
+				delay: 3000,
 				disableOnInteraction: false,
 			},
 			observer: true,
@@ -1044,9 +1054,9 @@
 			var post_bnnWide = new Swiper ('.swiper-container.post-bnnWide', {
 				loop: true,
 				slidesPerView: 1,
-				speed : 1500,
+				speed : 1000,
 				autoplay: {
-					delay: 4000,
+					delay: 3000,
 					disableOnInteraction: false,
 				},
 				pagination: {
@@ -1062,6 +1072,7 @@
 		if (pickbnnEvLength < 2) {
 			var post_bnnEvent = new Swiper ('.swiper-container.post-bnnEvent', {
 				loop: false,
+				speed : 1000,
 				autoplay: false,
 				pagination:false,
 			});
@@ -1069,9 +1080,9 @@
 			var post_bnnEvent = new Swiper ('.swiper-container.post-bnnEvent', {
 				loop: true,
 				slidesPerView: 1,
-				speed : 1500,
+				speed : 1000,
 				autoplay: {
-					delay: 4000,
+					delay: 3000,
 					disableOnInteraction: false,
 				},
 				pagination: {
@@ -1086,7 +1097,6 @@
 			pagination: {
 				el: '.swiper-pagination',
 			},
-			//autoHeight: true,
 			autoplay: {
 				delay: 24700,
 				disableOnInteraction: false,
@@ -1180,33 +1190,27 @@
 		}
 		var stopInter = startTimeInterval();
 
+
+		//setTimeout(function () {
+		//		foryouInterval(foryouIndex);
+		//		if (foryouIndex >= 5) foryouIndex = 0;
+		//		foryouIndex++;
+		//}, 2000);
+
+
+
 		var post_sug_items = new Swiper ('.swiper-container.post-sug-items', {
 			slidesPerView: 3,
 			spaceBetween: 10,
-			speed : 800,
-			//autoplay: {
-			//	delay: 3000,
-			//	disableOnInteraction: false,
-			//},
+			speed : 1000,
 		});
 
 		// post-tv
 		var post_tv = new Swiper ('.post-tv', {
 			loop: true,
-			// slidesPerView: 2,
-			// spaceBetween: 20,
 			centeredSlides: true,
-			speed : 800,
-			// effect: 'fade',
+			speed : 1000,
 			autoplay: false,
-			//autoplay: {
-			//	delay: 10000,
-			//	disableOnInteraction: false,
-			//},
-			// navigation: {
-			// 	nextEl: '.main_tv .swiper-button-next',
-			// 	prevEl: '.main_tv .swiper-button-prev',
-			// },
 			pagination: {
 				el: '.main_tv .swiper-pagination',
 				clickable: true,

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

@@ -76,7 +76,7 @@
 
 				<!-- 2. 스타일리포트 -->
 				<th:block th:if="${contentsLoc=='002'}">
-					<div class="content main_stylereport">
+					<div class="content main_stylereport" th:if="${mainLayoutData.ContentsList != null and !mainLayoutData.ContentsList.empty}">
 						<th:block th:if="${mainLayoutData.contentsTitle != null and !mainLayoutData.contentsTitle.empty}">
 						<div class="cont_head">
 							<p class="displayH t_c" th:text="${mainLayoutData.contentsTitle}"></p>
@@ -1534,6 +1534,7 @@ $(document).ready(function() {
 			$(this).append(tag);
 		}
 	});
+
 });
 /*]]>*/
 </script>