Merge branch 'develop' into bin2107

src/main/java/com/style24/front/biz/web/TsfDisplayController.java

@@ -388,7 +388,7 @@ public class TsfDisplayController extends TsfBaseController {
 				Collection<Contents> conList = displayService.getContentsList(contents);
 				mav.addObject("newGoodsList", null);
 
-				for(Contents contentsData : conList){
+				for (Contents contentsData : conList) {
 					cate.setContentsLoc("SCM002");
 					cate.setMaxRow(20);
 					mav.addObject("newGoodsList", goodsService.getContentsCategoryGoodsList(cate));
@@ -401,7 +401,7 @@ public class TsfDisplayController extends TsfBaseController {
 				contents.setMaxRow(1);
 				Collection<Contents> conList = displayService.getContentsList(contents);
 				mav.addObject("bestGoodsList", null);
-				for(Contents contentsData : conList){
+				for (Contents contentsData : conList) {
 					cate.setContentsLoc("SCM003");
 					cate.setMaxRow(Integer.parseInt(contentsData.getStrVar1()));
 					mav.addObject("bestGoodsList", goodsService.getContentsCategoryGoodsList(cate));
@@ -433,11 +433,11 @@ public class TsfDisplayController extends TsfBaseController {
 	public ModelAndView lookbookMain(Lookbook lookbook) {
 		ModelAndView mav = new ModelAndView(super.getDeviceViewName("display/LookbookMainForm"));
 		// 브랜드그룹 정보 : 브랜드메인 링크에 설정된 기획전으로 들어올때 GNB 변경때문에 사용
-		if(lookbook.getBrandGroupNo() != null && !lookbook.getBrandGroupNo().equals("")){
+		if (lookbook.getBrandGroupNo() != null && !lookbook.getBrandGroupNo().equals("")) {
 			lookbook.setBrandCd(lookbook.getBrandGroupNo().toString());
 			lookbook.setLookbookGb("BL");
 			mav.addObject("brandGroupInfo", displayService.getGnbBrandGroup(lookbook.getBrandGroupNo()));
-		}else{
+		} else {
 			lookbook.setLookbookGb("B");
 			mav.addObject("brandGroupInfo", null);
 		}
@@ -528,7 +528,9 @@ public class TsfDisplayController extends TsfBaseController {
 	public ModelAndView categoryGoodsListForm(Cate4Srch cate4Srch) {
 		ModelAndView mav = new ModelAndView(super.getDeviceViewName("display/CategoryGoodsListForm"));
 
-		cate4Srch.setCustNo(TsfSession.getInfo().getCustNo());
+		if (TsfSession.isLogin()) {
+			cate4Srch.setCustNo(TsfSession.getInfo().getCustNo());
+		}
 		cate4Srch.setSiteCd(TscConstants.Site.STYLE24.value());
 		cate4Srch.setFormalGb("G009_10");
 		cate4Srch.setFrontGb(TsfSession.getFrontGb());
@@ -556,9 +558,9 @@ public class TsfDisplayController extends TsfBaseController {
 		mav.addObject("filterBenefitList", displayService.getCategoryFilterBenefit(cate4Srch));
 		mav.addObject("sortGb", "new");
 		// 브랜드그룹 정보 : 브랜드메인 링크에 설정된 기획전으로 들어올때 GNB 변경때문에 사용
-		if(cate4Srch.getBrandGroupNo() != null && !cate4Srch.getBrandGroupNo().equals("") && !cate4Srch.getBrandGroupNo().equals(0)){
+		if (cate4Srch.getBrandGroupNo() != null && !cate4Srch.getBrandGroupNo().equals("") && !cate4Srch.getBrandGroupNo().equals(0)) {
 			mav.addObject("brandGroupInfo", displayService.getGnbBrandGroup(cate4Srch.getBrandGroupNo()));
-		}else{
+		} else {
 			mav.addObject("brandGroupInfo", null);
 		}
 		mav.addObject("cateInfo", cate4Srch);
@@ -579,7 +581,11 @@ public class TsfDisplayController extends TsfBaseController {
 		GagaMap result = new GagaMap();
 		log.info("getGoodsListgetGoodsListgetGoodsList::::{}", goodsSearch);
 		TscPageRequest pageable = new TscPageRequest((goodsSearch.getPageNo() > 0 ? goodsSearch.getPageNo() - 1 : 0), goodsSearch.getPageSize(), goodsSearch.getPageUnit());
-		goodsSearch.setCustNo(TsfSession.getInfo().getCustNo());
+
+		if (TsfSession.isLogin()) {
+			goodsSearch.setCustNo(TsfSession.getInfo().getCustNo());
+		}
+
 		goodsSearch.setSiteCd(TscConstants.Site.STYLE24.value());
 		goodsSearch.setFormalGb("G009_10");
 		goodsSearch.setFrontGb(TsfSession.getFrontGb());

src/main/webapp/WEB-INF/views/mob/callcenter/FaqFormMob.html

@@ -42,9 +42,9 @@
 				</div>
 				<div class="fold_nav">
 					<ul id="ulFaqType">
-						<li><a href="#none;" onclick="fnGetList(this);" class="on">전체</a></li>
+						<li><a href="#none;" onclick="fnGetList(this, '', true);" class="on">전체</a></li>
 						<li th:if="${faqTypeList != null and !faqTypeList.empty}" th:each="oneData, status : ${faqTypeList}">
-							<a href="javascript:void(0);" th:onclick='fnGetList(this, [[${oneData.cd}]]);' th:text="${oneData.cdNm}">상품문의</a>
+							<a href="javascript:void(0);" th:onclick='fnGetList(this, [[${oneData.cd}]], true);' th:text="${oneData.cdNm}">상품문의</a>
 						</li>
 					</ul>
 				</div>
@@ -88,7 +88,7 @@
 	});
 	
 	// FAQ 목록
-	var fnGetList = function(obj, faqType) {
+	var fnGetList = function(obj, faqType, isCallTab) {
 		if (typeof(obj) != 'undefined') {
 			$li = $(obj).parent('li').parent('ul').find('li>a');
 			$li.each(function(i) {
@@ -103,6 +103,10 @@
 			$('#faqForm input[name=faqType]').val('');
 		}
 		
+		if (isCallTab) {
+			$('#faqForm input[name=searchTxt]').val('');
+		}
+		
 		$('#faqForm input[name=pageNo]').val(1);
 		
 		$('#ulFaq').html('');

src/main/webapp/WEB-INF/views/web/callcenter/FaqFormWeb.html

@@ -67,9 +67,9 @@
 								</div>
 								<div class="fold_nav">
 									<ul id="ulFaqType">
-										<li><a href="#none;" onclick="fnGetList(this);" class="on">전체</a></li>
+										<li><a href="#none;" onclick="fnGetList(this, '', true);" class="on">전체</a></li>
 										<li th:if="${faqTypeList != null and !faqTypeList.empty}" th:each="oneData, status : ${faqTypeList}">
-											<a href="javascript:void(0);" th:onclick='fnGetList(this, [[${oneData.cd}]]);' th:text="${oneData.cdNm}">상품문의</a>
+											<a href="javascript:void(0);" th:onclick='fnGetList(this, [[${oneData.cd}]], true);' th:text="${oneData.cdNm}">상품문의</a>
 										</li>
 									</ul>
 								</div>
@@ -143,7 +143,7 @@
 		fnGetList();
 	});
 	
-	let fnGetList = function(obj, faqType) {
+	let fnGetList = function(obj, faqType, isCallTab) {
 		if (typeof(obj) != 'undefined') {
 			$li = $(obj).parent('li').parent('ul').find('li>a');
 			$li.each(function(i) {
@@ -158,6 +158,10 @@
 			$('#faqForm input[name=faqType]').val('');
 		}
 		
+		if (isCallTab) {
+			$('#faqForm input[name=searchTxt]').val('');
+		}
+		
 		// Initialize a pagination
 		gagaPaging.init('faqForm', fnGetListCallback, 'pageNav', 10);
 

src/main/webapp/WEB-INF/views/web/callcenter/NoticeFormWeb.html

@@ -41,7 +41,7 @@
 							<div class="sec_body">
 								<div class="ui_row" id="divNotice"> <!-- 데이터 없을시 클래스 nodata 추가 -->
 									<!-- list -->
-									<div class="foldGroup case2">
+									<div class="foldGroup case1">
 										<ul id="ulNotice">
 										</ul>
 									</div>

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

@@ -54,7 +54,7 @@
 									<th:block th:each="goodsImg, status : ${goodsImgList}">
 										<div class="swiper-slide" th:classappend="${status.first and videoYn == 'N'}? 'on' : ''"  th:with="count=${(videoYn == 'Y')?  (status.count +1): status.count }"
 																th:if="${ not (#strings.contains(goodsImg.sysImgNm,'_S1.') 
-					`													or #strings.contains(goodsImg.sysImgNm,'_L1.')
+																		or #strings.contains(goodsImg.sysImgNm,'_L1.')
 																		or #strings.contains(goodsImg.sysImgNm,'_L2.'))}">
 											<a th:href="${'#navLocate'+ count}">
 												<span class="thumb">

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

@@ -797,15 +797,16 @@ content: "〉";font-size: 12px;padding-left: 8px;
 .itemLike.likeit::before {opacity: 1;}
 
 .itemLink {z-index:20;position: relative;text-decoration: none;color: rgb(102, 102, 102);cursor: pointer;display: block;}
-.itemPic {position: relative;width: 100%;margin-bottom:20px;padding-top: 150%;font-size: 0px;overflow: hidden;background: #ffffff;}
-.itemPic::after {content: "";display: block;position: absolute;top: 0px;left: 0px;width: 100%;height: 100%;opacity: 0.03;background-color: rgb(0, 0, 0);}
+.itemPic {position: relative;width: 100%;margin-bottom:20px;padding-top: 150%;font-size: 0px;overflow: hidden;background-color: #ffffff;}
+.itemPic::after {content: "";display: block;position: absolute;top: 0px;left: 0px;width: 100%;height: 100%;opacity: 0;background-color: rgb(0, 0, 0);z-index: 999;}
 .itemPic .pd_img,
 .itemPic .pd_mov {position: absolute;width: 100%;height: auto;top: 50%;left: 0px;transform: translateY(-50%);}
 .itemPic .pd_mov {z-index: 2;height: 100%;}
 .itemPic .pd_img {z-index: 1;transition: 0.5s;}
 .itemPic .pd_img::after {content: '';display: block; height: 100%;width: 100%;background: #333;}
 /* .itemPic .pd_img {position: absolute;width: 100%;width: auto; height: auto;max-height: 500px;top: 50%;left: 50%;transform: translate(-50%,-50%);} */
-.itemOpt{z-index:3; pointer-events:none;position: absolute;bottom: -120px; left: 0; right: 0; width: 100%; height:111px;padding: 32px 0; text-align:center; color: #fff; background: rgb(0 0 0 / 0.8); }
+.itemOpt{z-index:3; pointer-events:none;position: absolute;bottom: -120px; left: 0; right: 0; width: 100%; height:111px;padding: 32px 0; text-align:center; color: #fff; background: rgb(0 0 0 / 0.8); transition-duration:0.45s;}
+.itemOpt.on{transition-duration:0.45s;bottom:0;}
 .itemOpt p{font-size: 12px;line-height: 1.2;padding-bottom: 15px;}
 .itemOpt ul{display: block;margin: 0 auto;width: auto;}
 .itemOpt ul li{font-size: 14px;line-height: 1.2;display: inline-block;margin-left: 10px;}

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

@@ -1624,6 +1624,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 
 	/* cs_notice */
 	.cs .notice .foldGroup {margin-top: 0;}
+	.cs .notice .case1 .fold_head .fold_tit::before {display:none;}
 	.notice .foldGroup .critical .fold_head,
 	.notice .foldGroup .critical .fold_detail, 
 	.notice .foldGroup .critical .fold_answer {background:#fff6f2;}
@@ -2772,6 +2773,8 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.option_box [class^="opt_"] .select_custom {min-height:52px;}
 	.option_box [class^="opt_"] .select_custom .select {height:auto; min-height:52px; padding:17px 40px 17px 18px; border-bottom-color:#ddd; overflow:hidden; color:#222; font-weight:200;}
 	.option_box [class^="opt_"] .select_custom .select:after {right:20px;}
+	.option_box [class^="opt_"] div[class*="item_set_"] .select .opt_price {display:none;}
+	.option_box .opt_select div[class*="item_set_"] .select .opt_price {display:none;}
 	.option_box [class^="opt_"] .select_custom .select .opt_price {padding-top: 10px;}
 	.option_box [class^="opt_"] .select_custom[aria-disabled="true"] .select {color:#bbb; background:#f5f5f5;}
 	.option_box [class^="opt_"] .select_custom .combo .list {top:52px; padding:0}

src/main/webapp/ux/pc/js/common-ui.js

@@ -310,51 +310,6 @@ $(document).ready( function() {
 		}
 	});
 
-	//통합검색 - 레이어 열고닫기
-	//210420_수정 : 검색창 호출 스크립트 수정.
-	$(document).on('click','.common_header.main_header .search .promotion_search, .common_header.main_header .search .btn_open_search',function(e){
-		location.href='sch_result.html';
-		return false;
-	}).on('click','.common_search .btn_close_search',function(e){
-		$("#header .common_search").removeClass('active'); 
-		$('body').removeClass('lock');
-		return false;
-	});		
-
-	//브랜드 통합검색 - 레이어 열고닫기
-	$(document).on('click','.common_header.br_header .search .promotion_search, .common_header.br_header .search .btn_open_search',function(e){
-		$('body').addClass('lock');
-		$("#br_header .common_search.schBrand").addClass('active'); 
-		return false;
-	}).on('click','.common_search .btn_close_search',function(e){
-		$("#br_header .common_search.schBrand").removeClass('active'); 
-		$('body').removeClass('lock');
-		return false;
-	});
-
-	//통합검색 - 검색어 입력 시 
-	$(document).on('keyup','.common_search .area_input input',function(e){
-		var searchValue = $(this).val();
-		if(searchValue.length > 0) {
-			$('.common_search .area_result .default_box').hide();	
-			$('.common_search .area_result .searching_box').show();	
-		} else if (searchValue.length == 0) {
-			$('.common_search .area_result .searching_box').hide();	
-			$('.common_search .area_result .default_box').show();	
-		}
-	});
-
-	//통합검색 - 슬라이드 컨트롤러 > 지금 고객님들이 많이 보고 있어요 
-	$(document).on('click','.common_search .realtime_slider .btn_pause',function(e){
-		realtimeItemSwiper.autoplay.stop();
-		$(this).hide();
-		$('.common_search .realtime_slider .btn_play').show();
-	}).on('click','.common_search .realtime_slider .btn_play',function(e){
-		realtimeItemSwiper.autoplay.start();
-		$(this).hide();
-		$('.common_search .realtime_slider .btn_pause').show();
-	});
-
 	//LNB_상품리스트 카테고리
 	$(document).on('click','.lnb .lnb_category ul li a',function(e){
 		$(this).toggleClass('on');
@@ -368,7 +323,9 @@ $(document).ready( function() {
 	});
 
 	/* 고객센터_accordion */
-	$(document).on('click','.cs .foldGroup .fold_head',function(e){
+	$(document).off('click').on('click','.cs .foldGroup .fold_head',function(e){
+		$('.cs .foldGroup .fold_head').removeClass('on');
+        $('.cs .foldGroup .fold_cont').slideUp(100);
 		$(this).parents('.foldGroup li').find('.fold_cont').slideToggle(100);
 		$(this).toggleClass('on');
 		return false;