Merge branch 'develop' into sowon

src/main/java/com/style24/front/biz/thirdparty/Yes24Login.java

@@ -188,7 +188,8 @@ public class Yes24Login {
 		String snsId = nodeMap.getString("str_MEM_ID");
 		String custNm = nodeMap.getString("str_MEM_NM");
 		String email = nodeMap.getString("str_MEM_EML");
-		String cellphnno = nodeMap.getString("str_ADDR_MOB_NO");
+		String telNo = nodeMap.getString("str_ADDR_TEL_NO");     // YES24 회원정보가 - 필수전화
+		String mobNo = nodeMap.getString("str_ADDR_MOB_NO"); // YES24 회원정보가 - 휴대전화 
 		String birthYmd = nodeMap.getString("str_BIRTH_DM").replaceAll("-","");
 		String sexGb = nodeMap.getString("str_SEX").equals("M")? TscConstants.Gender.MALE.value() : TscConstants.Gender.FEMALE.value();
 		String ci = nodeMap.getString("str_IPIN_CI");
@@ -196,6 +197,8 @@ public class Yes24Login {
 		String homeBaseAddr = nodeMap.getString("str_ADDR_ADDR1");
 		String homeDtlAddr = nodeMap.getString("str_ADDR_ADDR2");
 
+		String cellphnno = getValidationCellphone(telNo,mobNo);
+		
 		resultMap.setString("memNo", memNo);
 		resultMap.setString("snsId", snsId);
 		resultMap.setString("custNm", custNm);
@@ -291,6 +294,17 @@ public class Yes24Login {
 			log.error(e.getMessage());
 		}
 	}
+	
+	private String getValidationCellphone (String telNo, String mobNo) {
+		String result = "";
+		String regExp = "^01(?:0|1|[6-9])[.-]?(\\d{3}|\\d{4})[.-]?(\\d{4})$";
+		if(telNo.matches(regExp)) {
+			return telNo;
+		} else if(mobNo.matches(regExp)) {
+			return mobNo;
+		}
+		return result;
+	}
 
 
 

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

@@ -1221,8 +1221,8 @@
 		                  , A.MAIN_PIMG AS IMG_PATH1
 		                  , CONCAT('/planning/detail/form?planSq=',A.PLAN_SQ) AS STR_VAR1
 		                  , A.PLAN_NM AS STR_TITLE1
-		                  , A.DTL_TITLE1 AS STR_TITLE2
-		                  , '' AS SUB_TEXT1
+		                  , '' AS STR_TITLE2
+		                  , A.DTL_TITLE1 AS SUB_TEXT1
 		                  , '' AS SUB_TEXT2
 		            FROM  TB_PLAN A
 		            INNER JOIN TB_PLAN_CATE B ON A.PLAN_SQ = B.PLAN_SQ

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

@@ -209,7 +209,7 @@
 		tag +='			<div class="itemsGrp rowtype">\n';
 		tag +='				<div class="item_prod">\n';
 		tag +='					<div class="item_state';
-		if(obj9 == 'Y'){
+		if(obj8 < 1 || obj9 == 'Y'){
 			tag += ' soldout';
 		}
 		tag +='">\n';

src/main/webapp/WEB-INF/views/web/common/fragments/GnbWeb.html

@@ -438,7 +438,7 @@
 									tag +=' 	<button class="btn_toggle_bnr">열기</button>';
 								}
 								tag +='</div>';
-								if(item.strVar8=='Y'){
+								// if(item.strVar8=='Y'){
 									tag+='<div class="close_bnr_area">';
 									tag+=' 	<form class="form_wrap">';
 									tag+=' 		<div class="form_field">';
@@ -447,7 +447,7 @@
 									tag+=' 	</form>';
 									tag+=' 	<button id="btn_close_bnr" class="btn_close" onclick="fnGnbTobBannerClose(1);"><span>닫기</span></button>';
 									tag+='</div>';
-								}
+								// }
 							}else if(item.contentsType == 'IMG'){
 								tag+='<div class="bnrtype_img" style="background-color:#'+item.strVar5+';">';
 								tag+=' 	<a href="'+item.strVar1+'" target="">';
@@ -493,6 +493,14 @@
 							if(bannerYn=="Y"){
 								$('#divTopbanner').html(tag);
 							}
+
+							// if(item.contentsType == 'OPEN'){
+							// 	if(item.strVar7!='IMG'){
+							// 		var countdown = document.getElementById("testOpen");
+							// 		var vvv = ""+item.html+"";
+							// 		countdown.innerHTML = vvv;
+							// 	}
+							// }
 						}
 					});
 				}
@@ -534,6 +542,7 @@
 			$('body').toggleClass('lock');
 			$('.bnrtype_open').toggleClass('fixed');
 			$(this).text($(this).text() == '열기' ? '닫기' : '열기');
+			$(this).text() == '열기' ? $('.close_bnr_area').show() : $('.close_bnr_area').hide();
 		});
 		
 		// GNB toggle

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

@@ -568,10 +568,10 @@ $(document).ready( function() {
 			slidesPerView: 'auto',
 			centeredSlides: true,
 			speed : 1000,
-			//autoplay: {
-			//	delay: 7000, //210422_수정 : delay 시간 늘림.
-			//	disableOnInteraction: false,
-			//},
+			autoplay: {
+				delay: 7000, //210422_수정 : delay 시간 늘림.
+				disableOnInteraction: false,
+			},
 			navigation: {
 				nextEl: '.brand_main .brand_visual .swiper-button-next',
 				prevEl: '.brand_main .brand_visual .swiper-button-prev',
@@ -659,7 +659,7 @@ $(document).ready( function() {
 			loop: false,
 			watchOverflow : true, //210503_추가 : 슬라이드 1개일때 롤링 막는 기능 추가.
 			slidesPerView: 1,
-			speed : 1500,
+			speed : 1000,
 			navigation: {
 				nextEl: '.main_1stage .swiper-button-next',
 				prevEl: '.main_1stage .swiper-button-prev',
@@ -670,7 +670,7 @@ $(document).ready( function() {
 		var br_bn_slide = new Swiper ('.brand_main .main_1stage .post-bnnWide', {
 			loop: true,
 			slidesPerView: 1,
-			speed : 1500,
+			speed : 1000,
 			navigation: {
 				nextEl: '.main_1stage .swiper-button-next',
 				prevEl: '.main_1stage .swiper-button-prev',
@@ -688,6 +688,7 @@ $(document).ready( function() {
 		slidesPerView: 5,
 		slidesPerGroup:5, //210429_추가 : slidesPerGroup 추가.
 		spaceBetween: 22,
+		speed : 1000,
 		pagination: {
 			el: '.best_item .swiper-pagination',
 			clickable: true,
@@ -705,6 +706,7 @@ $(document).ready( function() {
 		slidesPerView: 5,
 		slidesPerGroup:5, //210429_추가 : slidesPerGroup 추가.
 		spaceBetween: 22,
+		speed : 1000,
 		pagination: {
 			el: '.md_item .swiper-pagination',
 			clickable: true,
@@ -743,6 +745,7 @@ $(document).ready( function() {
 			slidesPerView: 'auto',
 			freeMode: true,
 			spaceBetween: 20,
+			speed:1000,
 			scrollbar: {
 				el: $('.spe' + index).siblings('.swiper-scrollbar'),
 				hide: false,
@@ -764,7 +767,7 @@ $(document).ready( function() {
 		loop: true,
 		slidesPerView: 'auto',
 		spaceBetween: 20,
-		speed : 800,
+		speed : 1000,
 		autoWidth: true,
 		autoHeight: true,
 		centeredSlides: true,
@@ -787,23 +790,46 @@ $(document).ready( function() {
 	});
 
 
-	/* SLIDE - BRAND_TV */
-	var main_tv_slide = new Swiper ('.brand_main .main_tv .post-tv', {
-		loop: true,
-		slidesPerView: 'auto',
-		spaceBetween: 170,
-		centeredSlides: true,
-		speed : 800,
-		autoplay: false,
-		navigation: {
-			nextEl: '.brand_main .main_tv .swiper-button-next',
-			prevEl: '.brand_main .main_tv .swiper-button-prev',
-		},
-		pagination: {
-			el: '.brand_main .main_tv .swiper-pagination',
-			clickable: true,
-		},
-	});
+	/* SLIDE - MAIN_TV */
+	//210629_ 수정 : 슬라이드 1개일 때, loop랑 롤링 제거.
+	var mainTvCont = $('.main_tv .swiper-slide');
+	var mainTvLength = mainTvCont.length;
+	if (mainTvLength < 2) {
+		var main_tv_slide = new Swiper ('.main_tv .post-tv', {
+			loop: false,
+			watchOverflow:true,
+			slidesPerView: 'auto',
+			spaceBetween: 170,
+			centeredSlides: true,
+			speed : 1000,
+			autoplay: false,
+			navigation: {
+				nextEl: '.main_tv .swiper-button-next',
+				prevEl: '.main_tv .swiper-button-prev',
+			},
+			pagination: {
+				el: '.main_tv .swiper-pagination',
+				clickable: true,
+			},
+		});
+	}else{
+		var main_tv_slide = new Swiper ('.main_tv .post-tv', {
+			loop: true,
+			slidesPerView: 'auto',
+			spaceBetween: 170,
+			centeredSlides: true,
+			speed : 1000,
+			autoplay: false,
+			navigation: {
+				nextEl: '.main_tv .swiper-button-next',
+				prevEl: '.main_tv .swiper-button-prev',
+			},
+			pagination: {
+				el: '.main_tv .swiper-pagination',
+				clickable: true,
+			},
+		});
+	}
 
 	// 브랜드메인 배너 <br> 처리
 	$('.bMainTitle').each(function (){

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

@@ -211,7 +211,7 @@
 		tag += '			<div class="itemsGrp">\n';
 		tag += '				<div class="item_prod">\n';
 		tag += '					<div class="item_state';
-		if(obj9 == 'Y'){
+		if(obj8 < 1 || obj9 == 'Y'){
 			tag += ' soldout';
 		}
 		tag += '">\n';
@@ -221,10 +221,10 @@
 		tag += '							</div>\n';
 		tag += '							<p class="itemBrand">'+obj2+'</p>\n';
 		tag += '							<div class="itemName">'+obj3+'</div>\n';
-		tag += '							<span class="itemPrice_original">'+obj4.addComma()+'</span>\n';
-		if(obj4 != obj5){
-			tag += '							<p class="itemPrice">'+obj5.addComma()+'\n';
+		if(obj4 != obj5) {
+			tag += '							<span class="itemPrice_original">' + obj4.addComma() + '</span>\n';
 		}
+		tag += '							<p class="itemPrice">'+obj5.addComma()+'\n';
 		if(obj6>0){
 			tag += '								<span class="itemPercent">'+obj6+'%</span>\n';
 		}

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

@@ -1031,7 +1031,7 @@ if ( (navigator.appName == 'Netscape' && agent.indexOf('trident') != -1) || (age
 		// Navigation arrows
 		//autoplay: false,
 		autoplay: {
-			delay: 2000,
+			delay: 3000,
 			disableOnInteraction: false,
 		},
 		navigation: {
@@ -1059,7 +1059,7 @@ if ( (navigator.appName == 'Netscape' && agent.indexOf('trident') != -1) || (age
 		speed : 1000,
 		// Navigation arrows
 		autoplay: {
-			delay: 2000,
+			delay: 3000,
 			disableOnInteraction: false,
 		},
 		navigation: {
@@ -1087,16 +1087,17 @@ $(document).on('click','.main_visual .slide-curb-play',function(e){
 	$('.main_visual .slide-curb-pause').show();
 });
 
+//210624_ 수정 : autoplay delay 변경.
 /* SLIDE - MAIN_TRENDY */
 var main_trendy_slide = new Swiper('.main_trendy .post-trendy', {
 	watchSlidesProgress: true,
 	watchSlidesVisibility: true,
 	allowTouchMove: false,
-	loof: false,
+	loop: false,
 	loopAdditionalSlides : 1,
 	speed : 1000,
 	autoplay: {
-		delay: 1500,
+		delay: 3000,
 		disableOnInteraction:false,
 	},
 	navigation: {
@@ -1187,6 +1188,7 @@ var main_deal_slide = new Swiper ('.main_deal .post-deal', {
 	},
 });
 
+//210604_ 수정 : 브랜드 PICK 네비게이션 수정.
 /* 브랜드 PICK 갯수체크 210430_수정 */
 var pickCont = $('.post-pick-nav .swiper-slide');
 var pickLength = pickCont.length;
@@ -1232,9 +1234,9 @@ if (pickLength < 7) { //210614_ 수정 : 슬라이드 갯수 7개 미만일시
 }
 
 //210622_ 삭제 : 슬라이드 주석 삭제.
-var pickForCont = $('.post-pick-for .swiper-slide');
+var pickForCont = $('.post-pick-for > .swiper-wrapper > .swiper-slide');
 var pickForLength = pickForCont.length;
-if (pickForLength < 2) {
+if (pickForLength < 7) {
 	var main_pick_post = new Swiper('.main_pick .post-pick-for', { //thumbs
 		initialSlide: 0,
 		slidesPerView: 1,
@@ -1265,10 +1267,10 @@ if (pickForLength < 2) {
 var main_pick_lookbook = new Swiper ('.main_pick .post-lookbook', {
 	slidesPerView: 1,
 	speed : 1000,
-	// loop: true,
+	loop: false,
 	watchOverflow: true, //loop와 함께 사용 불가.
 	autoplay: {
-		delay: 2000,
+		delay: 3000,
 		disableOnInteraction: false,
 	},
 	pagination: {
@@ -1284,12 +1286,12 @@ if (pickBnnLength < 2) {
 	/* SLIDE - MAIN_BANNER WIDE */
 	var main_bnnWide_slide = new Swiper ('.main_1stage .post-bnnWide', {
 		slidesPerView: 1,
-		speed : 1500,
+		speed : 1000,
 		initialSlide: 0,
 		loop: false,
 		watchOverflow: true, //loop와 함께 사용 불가.
 		autoplay: {
-			delay: 4000,
+			delay: 3000,
 			disableOnInteraction: false,
 		},
 		navigation: {
@@ -1303,12 +1305,12 @@ if (pickBnnLength < 2) {
 	/* SLIDE - MAIN_BANNER WIDE */
 	var main_bnnWide_slide = new Swiper ('.main_1stage .post-bnnWide', {
 		slidesPerView: 1,
-		speed : 1500,
+		speed : 1000,
 		initialSlide: 0,
 		loop: true,
 		watchOverflow: true, //loop와 함께 사용 불가.
 		autoplay: {
-			delay: 4000,
+			delay: 3000,
 			disableOnInteraction: false,
 		},
 		navigation: {
@@ -1336,7 +1338,7 @@ function init(){
 	var main_recomm_slide = new Swiper ('.main_recomm .post-recomm', {
 		slidesPerView: 5,
 		slidesPerGroup: 5,
-		speed : 1500,
+		speed : 1000,
 		spaceBetween: 20,
 		loop : true,
 		pagination: {
@@ -1434,22 +1436,45 @@ $(".fy_nav ul li").click(function(){
 ti = startTimeInterval();
 
 /* SLIDE - MAIN_TV */
-var main_tv_slide = new Swiper ('.main_tv .post-tv', {
-	loop: true,
-	slidesPerView: 'auto',
-	spaceBetween: 170,
-	centeredSlides: true,
-	speed : 800,
-	autoplay: false,
-	navigation: {
-		nextEl: '.main_tv .swiper-button-next',
-		prevEl: '.main_tv .swiper-button-prev',
-	},
-	pagination: {
-		el: '.main_tv .swiper-pagination',
-		clickable: true,
-	},
-});
+//210629_ 수정 : 슬라이드 1개일 때, loop랑 롤링 제거.
+var mainTvCont = $('.main_tv .swiper-slide');
+var mainTvLength = mainTvCont.length;
+if (mainTvLength < 2) {
+	var main_tv_slide = new Swiper ('.main_tv .post-tv', {
+		loop: false,
+		watchOverflow:true,
+		slidesPerView: 'auto',
+		spaceBetween: 170,
+		centeredSlides: true,
+		speed : 1000,
+		autoplay: false,
+		navigation: {
+			nextEl: '.main_tv .swiper-button-next',
+			prevEl: '.main_tv .swiper-button-prev',
+		},
+		pagination: {
+			el: '.main_tv .swiper-pagination',
+			clickable: true,
+		},
+	});
+}else{
+	var main_tv_slide = new Swiper ('.main_tv .post-tv', {
+		loop: true,
+		slidesPerView: 'auto',
+		spaceBetween: 170,
+		centeredSlides: true,
+		speed : 1000,
+		autoplay: false,
+		navigation: {
+			nextEl: '.main_tv .swiper-button-next',
+			prevEl: '.main_tv .swiper-button-prev',
+		},
+		pagination: {
+			el: '.main_tv .swiper-pagination',
+			clickable: true,
+		},
+	});
+}
 
 $(document).ready(function() {
 	// 몰메인 <br> 태그