Merge branch 'develop' into card007

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

@@ -10,6 +10,7 @@ import java.util.Arrays;
 import javax.annotation.PostConstruct;
 
 import com.gagaframework.web.parameter.GagaMap;
+import istyle.EventSearch;
 import org.json.simple.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
@@ -295,7 +296,7 @@ public class SearchEngineDiquest {
 		log.info("///[getEventList] paramMap: {}", paramMap);
 
 		try {
-			JSONObject jsonObj = PlanSearch.planSearchApi(paramMap);
+			JSONObject jsonObj = EventSearch.eventSearchApi(paramMap);
 			log.info("///[getEventList] jsonObj: {}", jsonObj.toJSONString());
 
 			Gson gson = new Gson();

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

@@ -139,7 +139,7 @@
 				<!-- 가로 긴 배너 슬라이드 -->
 				<!-- 브랜드 배너 -->
 				<th:block th:if="${contentsLoc=='006' || contentsLoc=='014'||contentsLoc=='015'||contentsLoc=='016'}">
-					<div class="content wide main_1stage" th:if="${brandMainLayoutData.ContentsList != null and !brandMainLayoutData.ContentsList.empty}">
+					<div class="content wide main_1stage" th:classappend="${contentsLoc=='006' or contentsLoc=='014' or contentsLoc=='015' or contentsLoc=='016'?'bs'+contentsLoc :''}" th:if="${brandMainLayoutData.ContentsList != null and !brandMainLayoutData.ContentsList.empty}">
 						<div class="cont_head dpnone">
 							<p class="t_c">배너 슬라이드</p>
 						</div>
@@ -253,7 +253,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 and !brandMainLayoutData.goodsList.empty}">
+					<div class="content md_item" th:classappend="${contentsLoc=='009' or contentsLoc=='017' or contentsLoc=='018' or contentsLoc=='019'?'md'+contentsLoc :''}" 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 @@
 													<div class="itemComment" th:unless="${goodsData.goodsTnm == null or goodsData.goodsTnm == ''}" th:text="${goodsData.goodsTnm}">#베이직 셔츠의 정수1</div>
 													<p class="itemPrice" >
 														[[${#numbers.formatInteger(goodsData.currPrice,0,'COMMA')} + 원]]
-														<span class="itemPrice_original" th:text="${#numbers.formatInteger(goodsData.listPrice,1,'COMMA')}">89,000</span>
+														<span class="itemPrice_original" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatInteger(goodsData.listPrice,1,'COMMA')}">89,000</span>
 														<span class=" itemPercent" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${(goodsData.listPrice == 0 ? 0 : #numbers.formatDecimal((goodsData.listPrice - goodsData.currPrice) / (goodsData.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 													</p>
 												</a>
@@ -716,32 +716,209 @@ $(document).ready( function() {
 	});
 
 	/* SLIDE - BEST ITEMS */
-	var br_best_slide = new Swiper('.brand_main .best_item .swiper-container', {
-		navigation: {
-			nextEl: '.best_item .swiper-button-next',
-			prevEl: '.best_item .swiper-button-prev',
-		},
-		loop:true,
-		slidesPerView: 5,
-		slidesPerGroup:5, //210429_추가 : slidesPerGroup 추가.
-		spaceBetween: 22,
-		speed : 1000,
-		pagination: {
-			el: '.best_item .swiper-pagination',
-			clickable: true,
-		},
-	});
+	var bestItemCont = $('.best_item .swiper-slide');
+	var bestItemLength = bestItemCont.length;
+	if(bestItemLength < 6){
+		var br_best_slide = new Swiper('.brand_main .best_item .swiper-container', {
+			navigation: {
+				nextEl: '.best_item .swiper-button-next',
+				prevEl: '.best_item .swiper-button-prev',
+			},
+			loop:false,
+			slidesPerView: 5,
+			// slidesPerGroup:5, //210429_추가 : slidesPerGroup 추가.
+			spaceBetween: 22,
+			speed : 1000,
+			pagination: {
+				el: '.best_item .swiper-pagination',
+				clickable: true,
+			},
+		});
+	}else{
+		var br_best_slide = new Swiper('.brand_main .best_item .swiper-container', {
+			navigation: {
+				nextEl: '.best_item .swiper-button-next',
+				prevEl: '.best_item .swiper-button-prev',
+			},
+			loop:true,
+			slidesPerView: 5,
+			slidesPerGroup:5, //210429_추가 : slidesPerGroup 추가.
+			spaceBetween: 22,
+			speed : 1000,
+			pagination: {
+				el: '.best_item .swiper-pagination',
+				clickable: true,
+			},
+		});
+	}
+
+
+	/* md추천, 추천상품1,2,3 같은 모듈써서 스크립트 충돌나 컨텐츠별로 분리함 */
+	/* SLIDE - MD’S PICK */
+	var mdPick009Cont = $('.md009 .swiper-slide');
+	var mdPick009Length = mdPick009Cont.length;
+	if(mdPick009Length < 6){
+		var br_md_slide = new Swiper('.brand_main .md009 .swiper-container', {
+			initialSlide: 0,
+			navigation: {
+				nextEl: '.md009 .swiper-button-next',
+				prevEl: '.md009 .swiper-button-prev',
+			},
+			loop: false,
+			slidesPerView: 5,
+			//slidesPerGroup:5, //210429_추가 : slidesPerGroup 추가.
+			spaceBetween: 22,
+			speed : 1000,
+			a11y: {
+				enabled: true,
+				notificationClass: 'swiper-notification',
+				prevSlideMessage: '이전 슬라이드',
+				nextSlideMessage: '다음 슬라이드',
+				paginationBulletMessage: '슬라이드 {{index}}로 이동',
+			},
+			pagination: {
+				el: '.md009 .swiper-pagination',
+				clickable: true,
+			},
+		});
+	}else{
+		var br_md_slide = new Swiper('.brand_main .md009 .swiper-container', {
+			navigation: {
+				nextEl: '.md009 .swiper-button-next',
+				prevEl: '.md009 .swiper-button-prev',
+			},
+			loop:true,
+			slidesPerView: 5,
+			slidesPerGroup:5, //210429_추가 : slidesPerGroup 추가.
+			spaceBetween: 22,
+			speed : 1000,
+			a11y: {
+				enabled: true,
+				notificationClass: 'swiper-notification',
+				prevSlideMessage: '이전 슬라이드',
+				nextSlideMessage: '다음 슬라이드',
+				paginationBulletMessage: '슬라이드 {{index}}로 이동',
+			},
+			pagination: {
+				el: '.md009 .swiper-pagination',
+				clickable: true,
+			},
+		});
+	}
+
+	/* SLIDE - MD’S PICK */
+	var mdPick017Cont = $('.md017 .swiper-slide');
+	var mdPick017Length = mdPick017Cont.length;
+	if(mdPick017Length < 6){
+		var br_md_slide = new Swiper('.brand_main .md017 .swiper-container', {
+			initialSlide: 0,
+			navigation: {
+				nextEl: '.md017 .swiper-button-next',
+				prevEl: '.md017 .swiper-button-prev',
+			},
+			loop: false,
+			slidesPerView: 5,
+			//slidesPerGroup:5, //210429_추가 : slidesPerGroup 추가.
+			spaceBetween: 22,
+			speed : 1000,
+			a11y: {
+				enabled: true,
+				notificationClass: 'swiper-notification',
+				prevSlideMessage: '이전 슬라이드',
+				nextSlideMessage: '다음 슬라이드',
+				paginationBulletMessage: '슬라이드 {{index}}로 이동',
+			},
+			pagination: {
+				el: '.md017 .swiper-pagination',
+				clickable: true,
+			},
+		});
+	}else{
+		var br_md_slide = new Swiper('.brand_main .md017 .swiper-container', {
+			navigation: {
+				nextEl: '.md017 .swiper-button-next',
+				prevEl: '.md017 .swiper-button-prev',
+			},
+			loop:true,
+			slidesPerView: 5,
+			slidesPerGroup:5, //210429_추가 : slidesPerGroup 추가.
+			spaceBetween: 22,
+			speed : 1000,
+			a11y: {
+				enabled: true,
+				notificationClass: 'swiper-notification',
+				prevSlideMessage: '이전 슬라이드',
+				nextSlideMessage: '다음 슬라이드',
+				paginationBulletMessage: '슬라이드 {{index}}로 이동',
+			},
+			pagination: {
+				el: '.md017 .swiper-pagination',
+				clickable: true,
+			},
+		});
+	}
 
+	/* SLIDE - MD’S PICK */
+	var mdPick018Cont = $('.md018 .swiper-slide');
+	var mdPick018Length = mdPick018Cont.length;
+	if(mdPick018Length < 6){
+		var br_md_slide = new Swiper('.brand_main .md018 .swiper-container', {
+			initialSlide: 0,
+			navigation: {
+				nextEl: '.md018 .swiper-button-next',
+				prevEl: '.md018 .swiper-button-prev',
+			},
+			loop: false,
+			slidesPerView: 5,
+			//slidesPerGroup:5, //210429_추가 : slidesPerGroup 추가.
+			spaceBetween: 22,
+			speed : 1000,
+			a11y: {
+				enabled: true,
+				notificationClass: 'swiper-notification',
+				prevSlideMessage: '이전 슬라이드',
+				nextSlideMessage: '다음 슬라이드',
+				paginationBulletMessage: '슬라이드 {{index}}로 이동',
+			},
+			pagination: {
+				el: '.md018 .swiper-pagination',
+				clickable: true,
+			},
+		});
+	}else{
+		var br_md_slide = new Swiper('.brand_main .md018 .swiper-container', {
+			navigation: {
+				nextEl: '.md018 .swiper-button-next',
+				prevEl: '.md018 .swiper-button-prev',
+			},
+			loop:true,
+			slidesPerView: 5,
+			slidesPerGroup:5, //210429_추가 : slidesPerGroup 추가.
+			spaceBetween: 22,
+			speed : 1000,
+			a11y: {
+				enabled: true,
+				notificationClass: 'swiper-notification',
+				prevSlideMessage: '이전 슬라이드',
+				nextSlideMessage: '다음 슬라이드',
+				paginationBulletMessage: '슬라이드 {{index}}로 이동',
+			},
+			pagination: {
+				el: '.md018 .swiper-pagination',
+				clickable: true,
+			},
+		});
+	}
 
 	/* SLIDE - MD’S PICK */
-	var mdPickCont = $('.md_item .swiper-slide');
-	var mdPickLength = mdPickCont.length;
-	if(mdPickLength < 6){
-		var br_md_slide = new Swiper('.brand_main .md_item .swiper-container', {
+	var mdPick019Cont = $('.md019 .swiper-slide');
+	var mdPick019Length = mdPick019Cont.length;
+	if(mdPick019Length < 6){
+		var br_md_slide = new Swiper('.brand_main .md019 .swiper-container', {
 			initialSlide: 0,
 			navigation: {
-				nextEl: '.md_item .swiper-button-next',
-				prevEl: '.md_item .swiper-button-prev',
+				nextEl: '.md019 .swiper-button-next',
+				prevEl: '.md019 .swiper-button-prev',
 			},
 			loop: false,
 			slidesPerView: 5,
@@ -756,15 +933,15 @@ $(document).ready( function() {
 				paginationBulletMessage: '슬라이드 {{index}}로 이동',
 			},
 			pagination: {
-				el: '.md_item .swiper-pagination',
+				el: '.md019 .swiper-pagination',
 				clickable: true,
 			},
 		});
 	}else{
-		var br_md_slide = new Swiper('.brand_main .md_item .swiper-container', {
+		var br_md_slide = new Swiper('.brand_main .md019 .swiper-container', {
 			navigation: {
-				nextEl: '.md_item .swiper-button-next',
-				prevEl: '.md_item .swiper-button-prev',
+				nextEl: '.md019 .swiper-button-next',
+				prevEl: '.md019 .swiper-button-prev',
 			},
 			loop:true,
 			slidesPerView: 5,
@@ -779,7 +956,7 @@ $(document).ready( function() {
 				paginationBulletMessage: '슬라이드 {{index}}로 이동',
 			},
 			pagination: {
-				el: '.md_item .swiper-pagination',
+				el: '.md019 .swiper-pagination',
 				clickable: true,
 			},
 		});

src/main/webapp/ux/mo/css/layout_m.css

@@ -796,7 +796,7 @@
 .pd_detail .pd_recommend .area_slider .page .item_wrap .item_area .li_item ul li .item_prod .item_state .itemPic {position:absolute; left:0; top:0; width:10.0rem; height:0; padding-top:15.0rem; margin-bottom:0}
 .pd_detail .pd_recommend .item_area .itemPrice .itemPercent {position:relative;}
 .pd_detail .pd_recommend .area_slider .page .item_wrap .item_area .btn {margin-top:3.0rem; border-color:#fd4802; color:#fd4802;}
-.pd_detail .pd_recommend .item_picker{position:absolute; width:8.33%;}
+.pd_detail .pd_recommend .item_picker{position:absolute; width:8.33%;transform:translate(-50%,-50%);}
 .pd_detail .pd_recommend .item_picker > div{padding-top:100%; background:#000; border-radius:50%; background:url(/images/pc/ico_picker.png) no-repeat 50% 50%; background-size:cover;}
 .pd_detail .pd_recommend .item_picker > div button{position: absolute; width: 100%; height: 100%; top: 0; left: 0;}
 .pd_detail .pd_recommend .item_picker > div .pick_descr{display:none;}
@@ -2315,7 +2315,7 @@
 .br .recommendedArea .area_slider.pic_img .page::after {content:''; clear:both; display:block;}
 .br .recommendedArea .area_slider.pic_img .page .pic {position:relative;}
 .br .recommendedArea .area_slider.pic_img .page .pic span.thumb {display:block; width:100%; height:0; padding-top:100%; background-color:#f5f5f5; background-repeat:no-repeat; background-position:50% 50%; background-size:contain;}
-.br .recommendedArea .area_slider.pic_img .page .item_picker{position:absolute; width:8.33%;}
+.br .recommendedArea .area_slider.pic_img .page .item_picker{position:absolute; width:8.33%;transform:translate(-50%,-50%);}
 .br .recommendedArea .area_slider.pic_img .page .item_picker > div{padding-top:100%; background:#000; border-radius:50%; background:url(/images/pc/ico_picker.png) no-repeat 50% 50%; background-size:cover;}
 .br .recommendedArea .area_slider.pic_img .page .item_picker > div button{position: absolute; width: 100%; height: 100%; top: 0; left: 0;}
 .br .recommendedArea .area_slider.pic_img .page .item_picker > div .pick_descr{display:none;}
@@ -2343,7 +2343,7 @@
 /* br_main *
 /* br_main - 메인배너&info */
 .br .br_main .submain_visual img {width: 100%;}
-.br .br_main .submain_visual .swiper-pagination-fraction {position:absolute; bottom: 4rem ; width:auto; left: 2rem; background: rgba(34,34,34,.5); color: #fff; font-weight: 300;padding:0.5rem 0.7rem; line-height: 1; font-size: 1.2rem; border-radius:2rem;}.br .br_main .br_top_info > p:nth-of-type(1)
+.br .br_main .submain_visual .swiper-pagination-fraction {position:absolute; bottom: 4rem ; width:auto; left: 2rem; background: rgba(34,34,34,.5); color: #fff; font-weight: 300;padding:0.5rem 0.7rem; line-height: 1; font-size: 1.2rem; border-radius:2rem;}
 .br .br_main .submain_visual .swiper-pagination-current {font-weight: 600;}
 .br .br_main .submain_visual a:after {content:''; position: absolute; left: 0; bottom: 0; width: 100%; height: 60%; background: linear-gradient(0deg, rgba(0,0,0,0.5) 0%, transparent 100%);}
 .br .br_main .submain_visual .txtWrap {position: absolute; left: 2rem; right: 2rem; bottom: 9rem; color: #222; z-index:1;}
@@ -2352,6 +2352,7 @@
 .br .br_main .submain_visual .txtWrap p.txt_xs {font-size: 1.4rem; margin-top: 1.6rem; font-weight: 300; -webkit-line-clamp: 1;}
 .br .br_main .br_top_info{position:relative; margin-top:-1rem; padding-top: 0;}
 .br .br_main .br_top_info .br_subtitle{text-align:left; padding-top: 0;}
+.br .br_main .br_top_info > p{word-break: break-all;}
 .br .br_main .br_top_info > p:nth-of-type(1){margin-bottom:1.6rem; font-weight:600;}
 .br .br_main .br_top_info > p:nth-of-type(2){margin-bottom:1.2rem; color:#222; font-weight:500; line-height:2rem;}
 .br .br_main .br_top_info > p:last-of-type {font-size: 1.2rem; font-weight: 100;}

src/main/webapp/ux/pc/css/layout.css

@@ -3970,7 +3970,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.my .my_information .property_box .level::before {content:'N'; position:absolute; left:0; top:0; width:60px; height:60px; border-radius:50%; background:#fff; color:#222; font-size:24px; font-weight:700; text-align:center; line-height:65px;}
 	.my .my_information .property_box .level.lv_vip::before {content:'V'; background:#fd4802;; color:#fff;}
 	.my .my_information .property_box .level.lv_gold::before {content:'G'; background:#cc9d4d; color:#fff;}
-	.my .my_information .property_box .level.lv_sliver::before {content:'S'; background:#888; color:#fff;}
+	.my .my_information .property_box .level.lv_silver::before {content:'S'; background:#888; color:#fff;}
 	.my .my_information .property_box .level.lv_bronze::before {content:'B'; background:#bf966d; color:#fff;}
 	.my .my_information .property_box .level.lv_welcome::before {content:'W'; background:#222; color:#fff;}
 	.my .my_information .property_box .level .txt {color:#222; font-size:36px; font-weight:500;}

src/main/webapp/ux/pc/css/main.css

@@ -319,7 +319,7 @@
 }
 
 /* main_trendy */
-.main .wrap .content.main_trendy {background:#f5f5f5; margin-top:60px; margin-bottom:60px; padding-bottom:80px}
+.main .wrap .content.main_trendy {background:#f5f5f5; margin-top:60px; margin-bottom:60px; padding-bottom: 10px;}
 .main_trendy .cont_head {padding:60px 0 60px 0;}
 .main_trendy .cont_body {position:relative; padding:0 60px;}
 .main_trendy .cont_body dl {}
@@ -631,7 +631,7 @@ header.minify .common_header.br_header::after {bottom:-565px;}
 .brand_main .brand_info .cont_body .brand_desc .desc {font-size:16px; font-weight:200; line-height:26px;}
 
 /* brand_newitems */
-.brand_main .wrap .content.new_item {}
+.brand_main .wrap .content.new_item {margin-bottom: -120px;}
 .new_item .cont_head {margin-bottom:60px}
 .new_item .cont_body {position:relative; padding:0 70px;}
 .new_item .cont_body dl {}