Prechádzať zdrojové kódy

Merge remote-tracking branch 'origin/develop' into xodud1202

xodud lee 5 rokov pred
rodič
commit
723158e853
21 zmenil súbory, kde vykonal 255 pridanie a 167 odobranie
  1. 2 2
      src/main/java/com/style24/front/biz/web/TsfDisplayController.java
  2. 2 0
      src/main/java/com/style24/persistence/mybatis/shop/TsfDisplay.xml
  3. 2 6
      src/main/webapp/WEB-INF/views/mob/common/fragments/FooterMob.html
  4. 47 0
      src/main/webapp/WEB-INF/views/mob/common/fragments/GnbMob.html
  5. 3 1
      src/main/webapp/WEB-INF/views/mob/display/CategoryGoodsListFormMob.html
  6. 1 1
      src/main/webapp/WEB-INF/views/mob/display/MallMainFormMob.html
  7. 51 5
      src/main/webapp/WEB-INF/views/mob/goods/GoodsDealDetailFormMob.html
  8. 42 10
      src/main/webapp/WEB-INF/views/mob/goods/GoodsDetailFormMob.html
  9. 2 1
      src/main/webapp/WEB-INF/views/mob/goods/GoodsDetailQnaFormMob.html
  10. 1 1
      src/main/webapp/WEB-INF/views/mob/goods/GoodsDetailReviewFormMob.html
  11. 5 1
      src/main/webapp/WEB-INF/views/mob/goods/GoodsQnaDetailFormMob.html
  12. 3 1
      src/main/webapp/WEB-INF/views/web/common/fragments/GnbWeb.html
  13. 35 12
      src/main/webapp/WEB-INF/views/web/display/CategoryGoodsListFormWeb.html
  14. 1 1
      src/main/webapp/WEB-INF/views/web/display/CategoryMainFormWeb.html
  15. 11 91
      src/main/webapp/WEB-INF/views/web/goods/GoodsDetailFormWeb.html
  16. 1 1
      src/main/webapp/WEB-INF/views/web/goods/GoodsDetailQnaFormWeb.html
  17. 6 4
      src/main/webapp/ux/mo/css/common_m.css
  18. 19 10
      src/main/webapp/ux/mo/css/layout_m.css
  19. 8 4
      src/main/webapp/ux/mo/css/style24_m.css
  20. 11 13
      src/main/webapp/ux/mo/js/common_m.js
  21. 2 2
      src/main/webapp/ux/style24_link.js

+ 2 - 2
src/main/java/com/style24/front/biz/web/TsfDisplayController.java

@@ -238,8 +238,8 @@ public class TsfDisplayController extends TsfBaseController {
 	 */
 	@GetMapping("/gnb/topbanner/list")
 	@ResponseBody
-	public Collection<Contents> getGnbTopBannerList(Contents contents) {
-		contents.setContentsLoc("SGNB001");
+	public Collection<Contents> getGnbTopBannerList(Contents contents, @RequestParam(value = "contentsLoc") String contentsLoc) {
+		contents.setContentsLoc(contentsLoc);
 		contents.setMaxRow(1);
 		return displayService.getContentsList(contents);
 	}

+ 2 - 0
src/main/java/com/style24/persistence/mybatis/shop/TsfDisplay.xml

@@ -661,7 +661,9 @@
 		FROM   TB_CATE_FILTER
 		WHERE  SITE_CD = #{siteCd}
 		AND    CATE_GB = #{cateGb}
+		<if test='formalGb != null and formalGb = "G009_20"'>
 		AND    FORMAL_GB = #{formalGb}
+		</if>
 		AND    BRAND_GROUP_NO = #{brandGroupNo}
 		<choose>
 		  <when test="cate1No == null and cate2No == null and cate3No == null and cate4No == null">

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

@@ -19,11 +19,7 @@
 
 	<footer>
 		<button class="btn_top" title="페이지 맨위로 이동">
-			<span>
-				<i class="gl1"></i>
-				<i class="gl2"></i>
-				<i class="gl3"></i>
-			</span>
+			<span>TOP</span>
 		</button>
 		<section class="f1">
 			<div class="inner">
@@ -213,7 +209,7 @@
 		};
 		$.getJSON('/display/popup/list', data, function(result, status) {
 			if (status === 'success') {
-				if(result.dataList.length>0){
+				if(result.dataList != null && result.dataList.length>0){
 					let pClass = "";
 					if ("H" == result.popupGb){
 						pClass = "half";

+ 47 - 0
src/main/webapp/WEB-INF/views/mob/common/fragments/GnbMob.html

@@ -50,6 +50,19 @@
 		</div>
 		<button onclick="$('#gnb').toggleClass('expand');" class="btn-expand"></button>
 	</div>
+
+	<!-- 210510_추가 : 띠배너 추가. -->
+	<div class="bnrtype_banner" id="divTopbanner" style="background-color:#fd4801;">
+<!--		<a href="javascript:;" target="">-->
+<!--			&lt;!&ndash; 텍스트 영역 &ndash;&gt;-->
+<!--			<div>-->
+<!--				<span>APP</span> 수신동의 하면 <span>1</span>만 포인트 증정!-->
+<!--			</div>-->
+<!--			&lt;!&ndash; //텍스트 영역 &ndash;&gt;-->
+<!--		</a>-->
+<!--		<button type="button" class="bnrtype_close"><span class="sr-only">배너 닫기</span></button>-->
+	</div>
+	<!-- //210510_추가 : 띠배너 추가. -->
 	
 	<!-- 통합검색 팝업 -->
 	<div class="modal pop_full schPop sch" id="schPop" tabindex="-1" role="dialog" aria-labelledby="schPopLabel" aria-hidden="true">
@@ -142,6 +155,11 @@
 							tag += '</a>\n';
 							tag += '</li>\n';
 						});
+						tag += '<li>\n';
+						tag += '<a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MAIN);">\n';
+						tag += 'STYLE24<span><img src="/images/mo/thumb/brand16.png" alt="STYLE24"></span>\n';
+						tag += '</a>\n';
+						tag += '</li>\n';
 						$('#liGnbBrandGrp').html(tag);
 					}
 				}
@@ -154,16 +172,45 @@
 				}
 		});
 	}
+
+	// 띠배너 조회
+	let fnCreateTopMobBanner = function (){
+		var url = '/display/gnb/topbanner/list?contentsLoc=SGNB002';
+		let tag = '';
+		$.getJSON(url, function (result, status){
+			if(result.length>0){
+				$.each(result, function (idx, item) {
+					$('#divTopbanner').html('');
+					tag+=' 	<a href="'+item.strVar1+'" target="">';
+					tag+=' 		<div style="color:#fff; font-size:20px; font-weight:300;">';
+					tag+=' 			<span style="font-weight:500">'+item.strTitle1+'</span>';
+					tag+=' 		</div>';
+					tag+=' 	</a>';
+					tag+='<button type="button" class="bnrtype_close"><span class="sr-only">배너 닫기</span></button>';
+					$('#divTopbanner').html(tag);
+				});
+			}
+		});
+	}
 	
 	$(document).on("click",".htop .search",function(){
 		$("#schPop .modal-content").load("popup_sch_layer.html");
 		$("#schPop").modal("show");
 		return false;
 	});
+
+	//210510_추가 : 띠배너 닫기
+	$(document).on('click','.bnrtype_banner .bnrtype_close',function(){
+		$(this).parents('.bnrtype_banner').hide();
+		return false;
+	})
 	
 	$(document).ready(function() {
 		// GNB탭 > 브랜드 생성
 		fnCreateGnbBrandGroup();
+
+		// 띠배너 조회
+		fnCreateTopMobBanner();
 	});
 /*]]>*/
 </script>

+ 3 - 1
src/main/webapp/WEB-INF/views/mob/display/CategoryGoodsListFormMob.html

@@ -1041,7 +1041,9 @@
 					fnSortingChange(this,historyData.sortingType,'back','Mob');
 				}else{
 					// fnCategoryGoodsInfiniteScrollInit();
-					console.log('here');
+					console.log('here*'+historyData.scroll);
+					// $('html, body').animate({scrollTop: $('#'+scrollLoc).offset().top}, 'slow');
+					$('html, body').animate({scrollTop: historyData.scroll}, 'slow');
 					fnGoodsListSearch();
 				}
 			}else{

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

@@ -37,7 +37,7 @@
 											<div class="txtWrap">
 												<dl th:class="${ContentsData.strVar7=='BLACK'?'':'w'}">
 													<dt th:if="${ContentsData.strVar5=='P'}" th:text="${ContentsData.planBrandGroupNm}">NBA</dt>
-													<dt th:if="${ContentsData.strVar5!='P'}">EVENT</dt>
+<!--													<dt th:if="${ContentsData.strVar5!='P'}">EVENT</dt>-->
 													<dd class="mainTitle">
 														<input type="hidden" name="mainTitlee" th:value="${ContentsData.strTitle1}"/>
 													</dd>

+ 51 - 5
src/main/webapp/WEB-INF/views/mob/goods/GoodsDealDetailFormMob.html

@@ -163,7 +163,7 @@
 						<!-- 옵션 -->
 						<div class="option_box">
 							<div class="opt_select">
-								<form class="form_wrap">
+								<div class="form_wrap">
 									<div class="form_field">
 										<div class="select_custom option_open">
 											<div class="combo">
@@ -171,7 +171,7 @@
 											</div>
 										</div>
 									</div>
-								</form>
+								</div>
 							</div>
 							<div class="opt_result">
 							</div>
@@ -303,7 +303,7 @@
 	<div class="product_floormenu"><!--  ☞☞ 제품이 품절되면 soldout클래스 추가 -->
 		<div class="share_like">
 			<button type="button" class="share">공유하기</button>
-			<button type="button" class="like" th:classappend="${goodsInfo.wishYn == 'Y'}? 'active' : ''"  
+			<button type="button" class="itemLike" th:classappend="${goodsInfo.wishYn == 'Y'}? 'active' : ''"  
 					onclick="cfnPutWishList(this);" 
 					th:attr="goodsCd=${params.goodsCd}, ithrCd=${params.ithrCd}, contentsLoc=${params.contentsLoc}, planDtlSq=${params.planDtlSq}">위시리스트</button>
 		</div>
@@ -618,8 +618,10 @@
 			let tag = "";
 			tag += '<div class="result_item result_'+optCd+'">\n';
 			tag += '	<div class="opt_header">\n';
-			tag += '		<span class="item_name">'+goodsNm+'</span>\n';
-			tag += '		<span class="item_option">'+optCd1Nm+'/'+optCd2+'</span>\n';
+			tag += '		<div class="bundle">\n';
+			tag += '			<span class="item_name">'+goodsNm+'</span>\n';
+			tag += '			<span class="item_option">'+optCd1Nm+'/'+optCd2+'</span>\n';
+			tag += '		</div>\n';
 			tag += '	</div>\n';
 			tag += '	<div class="number_count">\n';
 			tag += '		<span class="minus min_val" onclick="fnAdjustOrderEa(this);" adjust="-"><em class="sr-only">감소</em></span>\n';
@@ -1214,6 +1216,50 @@
         });   
       
 	      
+      //pd전용 - 썸네일/헤더 블라인드 생성 : 210520_ 추가
+		$('.pd .thumb_box .thumb_list .swiper-slide').prepend('<span></span>');
+		// pd전용 - 스크롤 스크립트
+		//탭 - 딜상품 > 상세정보 탭 고정
+		$(window).scroll(function(){
+			var scrollTop= $(window).scrollTop();
+			var tabTop=$('.pd_desc_wrap').offset().top;
+
+			if (scrollTop >= tabTop){
+				$('.tab_detail_nav').addClass('fix');
+			} else {
+				$('.tab_detail_nav').removeClass('fix');
+			}
+			
+			var lastScrollTop = 0;
+			var st = $(this).scrollTop();
+			if($('header').hasClass("main") !== true){
+				if (st > lastScrollTop){
+					$(".app .gnb").css("position", "fixed");
+					$(".htop").css("background", "#fff");
+					$(".app .gnb .btn-expand").css("position", "fixed");
+					$(".tabbar").removeClass("fixed");
+					$(".thumb_list .swiper-slide span").animate({"opacity": 0}, 30);
+				} else {
+					$(".app .gnb").css("position", "fixed");
+					$(".htop").css("background", "#fff");
+					$(".app .gnb .btn-expand").css("position", "fixed");
+					$(".tabbar").addClass("fixed");
+					$(".thumb_list .swiper-slide span").animate({"opacity": 0.5}, 30);
+					setTimeout(function(){
+						if($(window).scrollTop() === 0){
+							$(".app .gnb").css("position", "relative");
+							$(".app .gnb .btn-expand").css("position", "absolute");
+						}
+					},300)
+				}
+				if(st < 10) {
+					$(".htop").css("background", "transparent");
+					$(".thumb_list .swiper-slide span").animate({"opacity": 0.5}, 0);
+				}
+				lastScrollTop = st;
+			}
+		});
+	      
 			// 광고 스크립트용
 			var goodsNavigation = [[${goodsNavigation}]];
 			var cate1Nm = "";

+ 42 - 10
src/main/webapp/WEB-INF/views/mob/goods/GoodsDetailFormMob.html

@@ -921,7 +921,7 @@
 									<span class="title">옵션선택</span>
 									<div class="check_excluding form_field">
 										<div>
-											<input id="soldoutSkipYn" name="soldoutSkipYn" type="checkbox" value="Y" th:onclick="fnOption1(this,[[${goodsInfo.goodsCd}]]);"><label for="soldoutSkipYn"><span>품절제외</span> </label>
+											<input id="soldoutSkipYn" name="soldoutSkipYn" type="checkbox" value="Y" th:onclick="fnOption1(1,[[${goodsInfo.goodsCd}]]);"><label for="soldoutSkipYn"><span>품절제외</span> </label>
 										</div>
 										<div class="guidance" >
 											<!--210409_ 추가 : .guidance에 .ontoast 추가 시, toast 팝업 작동 -->
@@ -1438,19 +1438,30 @@
 					};
 			let jsonData = JSON.stringify(data);
 			
-			fnOption1Display(ridx, jsonData );
+			$('.form_field .select_custom.item_opt2.' +goodsCd ).attr('disabled', true);
+			$('.form_field .select_custom.item_opt2.' +goodsCd ).find('.combo .select').html('선택');
+			
+			fnOption1Display(ridx, jsonData, goodsCd );
 			
 		}else if("G056_S" == $("#cartForm  input[name=goodsType]").val() ){ 
 
 			let idx = 1;
 			target=$('.select_custom.item_opt1');
-			target.each(function(){
+			
+			target.each(function(){ 
+				$('.form_field .select_custom.item_opt1.' +$(this).attr('id') ).find('.combo .select').html('선택');
+				$('.form_field .select_custom.item_opt2.' +$(this).attr('id') ).attr('disabled', true);
+				$('.form_field .select_custom.item_opt2.' +$(this).attr('id') ).find('.combo .select').html('선택');
+			});
+			
+			
+			target.each(function(){ 
 				let data = {goodsCd : $(this).attr('id')
 							,optionSoldoutSkip : optionSoldoutSkip 
 							};
 				let jsonData = JSON.stringify(data);
-				
-				fnOption1Display(idx, jsonData );
+				 
+				fnOption1Display(idx, jsonData, $(this).attr('id') );
 				
 				idx++;
 				
@@ -1460,15 +1471,15 @@
 	}
 	
 	// 옵션1 노출처리
-	var fnOption1Display = function(ridx, jsonData ){
+	var fnOption1Display = function(ridx, jsonData, goodsCd ){ 
 		
 		gagajf.ajaxJsonSubmit('/goods/detail/option1/list', jsonData, function(result) {
 			
-			if (result.dataList != null && result.dataList.length > 0) {
+			if (result.dataList != null && result.dataList.length > 0) { 
 				let tag = "";
 				let $obj = null;
 				let selfGoodsYn = 'N';
-				$.each(result.dataList, function(idx, item) {
+				$.each(result.dataList, function(idx, item) { 
 					if (idx == 0){
 						
 						//$('.form_field .select_custom.item_opt1.' +item.goodsCd ).attr('disabled', false)
@@ -1482,11 +1493,11 @@
 						selfGoodsYn = item.selfGoodsYn;
 					}
 					let soldoutYn = ""; 
-					let disabledYn = ""; 
+					let disabledYn = "";  
 					if (item.stockQty <= 0) soldoutYn = "true";
 					if (soldoutYn == "true" || item.goodsStat != 'G008_90') disabledYn = "true";
 					tag += '<li aria-disabled="'+disabledYn+'" data-soldout="'+soldoutYn +'" onclick="fnOption2('+ ridx+', \''+ item.goodsCd+'\' , \''+ item.optCd1+'\', \''+ item.minOrdQty+'\', \''+ item.maxOrdQty+'\' )">\n';	
-					tag += '<div>' +item.optCd1 +'</div>';
+					tag += '<div>' +item.optCd1Nm +'</div>';
 					tag += '<input type="hidden" name="opt" value="'+ item.goodsCd+'" optCd1="'+ item.optCd1 +'" qty="'+ item.qty +'" />\n';
 					tag += '</li>\n';
 				});
@@ -2251,7 +2262,28 @@
 				type: 'fraction',
 			},
 		});
+		
+		var bestCount = 0;
+		//팝업 - 상품문의 리스트	
+		$(document).on('click','#btn_pdQnaList_pop',function(e){
+			bestCount = 1;
+			return false;
+		});
 
+		//팝업 - 상품문의 작성
+		$(document).on('click','#btn_pdQnaWrite_pop',function(e){
+			bestCount = 2;
+			return false;
+		});
+		$(document).on('click','.pd_qnawrite_pop .close-modal',function(e){
+			if(bestCount === 2){
+				$('#layer_goods_qna').modal('show');
+				setTimeout(fnGoodsQnaList, 100);
+				bestCount = 1;
+			}
+            return false;
+        });
+		
 		$(document).on('click','.pd_detail .thumb_box',function(e){
 			$('#pdItemThumbPop').css("display", "block");
 			return false;

+ 2 - 1
src/main/webapp/WEB-INF/views/mob/goods/GoodsDetailQnaFormMob.html

@@ -68,7 +68,7 @@
 /*<![CDATA[*/
 	
 	var fnGoodsQnaList = function() {
-		$('#layer_goods_qna_reg').find('.close-modal').trigger("click");
+		//$('#layer_goods_qna_reg').find('.close-modal').trigger("click");
 		gagajf.ajaxFormSubmit($('#goodsQnaForm').prop('action'), '#goodsQnaForm', fnGetListCallback);
 	}
 
@@ -166,4 +166,5 @@
 	
 /*]]>*/
 </script>	
+<a href="javascript:void(0);" rel="modal:close" onclick="cfCloseLayer('layer_goods_qna')" class="close-modal">Close</a>
  </html>

+ 1 - 1
src/main/webapp/WEB-INF/views/mob/goods/GoodsDetailReviewFormMob.html

@@ -787,7 +787,7 @@
 	}
 	
 	// 상품평 초기화
-	var fnReviewSearchInit = function(){debugger;
+	var fnReviewSearchInit = function(){
 		
 		$('#goodsReviewForm').find('#grade').find('ul li').eq(0).trigger('click');
 		$('#goodsReviewForm').find('#size').find('ul li').eq(0).trigger('click');

+ 5 - 1
src/main/webapp/WEB-INF/views/mob/goods/GoodsQnaDetailFormMob.html

@@ -113,9 +113,13 @@
 	}
 
 	var btnGoodsQnaSaveCallBack = function(){
-		setTimeout(fnGoodsQnaList, 100);
+		$('#layer_goods_qna_reg').find('.close-modal').trigger("click");
+		//$('#layer_goods_qna').modal('show');
+		//setTimeout(fnGoodsQnaList, 100);
 	}
 	
+	
+	
 /*]]>*/
 </script>
  </html>

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

@@ -835,7 +835,9 @@
 
 	// 띠배너 조회
 	let fnCreateTopBanner = function (){
-		$.getJSON('/display/gnb/topbanner/list', function (result, status){
+		var url = '/display/gnb/topbanner/list?contentsLoc=SGNB001';
+
+		$.getJSON(url, function (result, status){
 			if(status=='success'){
 				if(result.length>0){
 					let bannerYn = "N";

+ 35 - 12
src/main/webapp/WEB-INF/views/web/display/CategoryGoodsListFormWeb.html

@@ -23,6 +23,7 @@
 		<div class="breadcrumb">
 			<ul id="navArea">
 				<li class="bread_home" id="idHome"><a href="javascript:void(0);" id="navHome">홈</a></li>
+				<li class="bread_2depth" id="mainNm" style="display: none;"></li>
 				<li class="bread_2depth" id="brandNm" style="display: none;"></li>
 				<li class="bread_2depth" id="navNm"></li>
 			</ul>
@@ -315,22 +316,40 @@
 		$(document).ready( function() {
 			//가격 슬라이드
 			//var custom_values = ['9,000원', '230,000원', '487,000원', '700,000원', '1,360,000원', '1,799,000원'];
+			let priceLen;
 			if(!gagajf.isNull(filterPriceList)){
+				priceLen = filterPriceList.length-1;
 				$.each(filterPriceList, function (priceIdx, priceItem){
 					custom_values[priceIdx] = priceItem.filterNm;
+					if(priceLen==0){
+						custom_values[1] = priceItem.filterNm;
+					}
 				});
+				let my_from;
+				let my_to;
+				if(filterPriceList.length > 1){
+					my_from = custom_values.indexOf(custom_values[0]);
+					my_to = custom_values.indexOf(custom_values[priceLen]);
+				}else{
+					my_from = 0;
+					my_to = 1;
+				}
 
-				let my_from = custom_values.indexOf(custom_values[0]);
-				let my_to = custom_values.indexOf(custom_values[5]);
-				
 				if(gagajf.isNull($("#filterForm input:hidden[name=priceFrom]").val())){
 					my_from = $("#filterForm input:hidden[name=priceFrom]").val();
 				}
 				if(gagajf.isNull($("#filterForm input:hidden[name=priceTo]").val())){
 					my_to = $("#filterForm input:hidden[name=priceTo]").val();
 				}
-				let minValue = custom_values[0];
-				let maxValue = custom_values[5];
+				let minValue;
+				let maxValue;
+				if(filterPriceList.length > 1){
+					minValue = custom_values[0];
+					maxValue = custom_values[priceLen];
+				}else{
+					minValue = custom_values[0];
+					maxValue = custom_values[1];
+				}
 
 				$(".dp .js-range-slider01, .sch_result .js-range-slider01").ionRangeSlider({
 					type: "double",
@@ -348,8 +367,8 @@
 					//  	fnCheckPrice(data);
 					// },
 					// onChange : fnCheckPrice,
-					onFinish : function(data){
-						fnCheckPrice(data);
+					onFinish : function(data,priceLen){
+						fnCheckPrice(data,priceLen);
 					}
 				});
 			}
@@ -416,14 +435,14 @@
 		}
 
 		// 필터 가격 확인
-		var fnCheckPrice = function (data){
+		var fnCheckPrice = function (data,priceLen){
 			$("#priceSpan").remove();
 			$("#searchGoodsForm input:hidden[name=priceFrom]").remove();
 			$("#searchGoodsForm input:hidden[name=priceTo]").remove();
 			let min = data.from;
 			let max = data.to;
 			$("#price_input_from").val(custom_values[0]);
-			$("#price_input_to").val(custom_values[5]);
+			$("#price_input_to").val(custom_values[priceLen]);
 
 			fnFilterSlider('price' , custom_values[min].addComma(), custom_values[max].addComma());
 		}
@@ -458,7 +477,9 @@
 			$("#unisex").attr('onclick','fnFilterOption(this,\'on\');');
 			$("#searchGoodsForm input:hidden[name=unisex]").remove();
 			$("#newGoods").prop('checked',true);
-			$("#newGoods").attr('onclick','fnFilterOption(this,\'on\');');
+			$("#newGoods").attr('onclick','fnFilterOption(this,\'off\');');
+			$("#searchGoodsForm input:hidden[name=newGoods]").val('40');
+
 			fnFilterSliderMove(0,5);
 			fnDcRateFilterSliderMove(0,10);
 			$('.filter_content .sort').find('input[type=checkbox]').each(function (idx){
@@ -540,7 +561,7 @@
 							$("#brandNm").show();
 							$("#brandNm").text(brandGroupNm);
 							$("#navNm").hide();
-							$('#ulAllCate').append('<li><a href="javascript:void(0);" onclick="cfnGoToGoodsList(\''+brandGroupNo+'\',\''+cateGb+'\');">전체</a></li>\n');
+							$('#ulAllCate').append('<li><a href="javascript:void(0);" onclick="cfnGoToGoodsList(\''+brandGroupNo+'\',\''+cateGb+'\');" class="on">전체</a></li>\n');
 							navNm += '<li class="bread_2depth" id="navNm1">전체</li>';
 						}else{
 							if(formalGb=='G009_20'){
@@ -626,6 +647,7 @@
 					$("#navArea").append(navNm);
 				}else if(cate1.cate1No == cate1No && cate3No == null){
 					$("#navNm").hide();
+
 					navNm += '<li class="bread_2depth" id="navNm1">' + cate1.cate1Nm + '</li>';
 					$("#navArea").append(navNm);
 				}else if(cate3No != null){
@@ -847,7 +869,7 @@
 
 								if (cate3.leafYn == 'N' && cate3.cate4List != null && cate3.cate4List.length > 0) {
 									tag += '<div class="sub_cate"';
-									if (cate2.cate2No == cate2No) {
+									if (cate3.cate3No == cate3No) {
 										tag += ' style="display: block;"';
 									}
 									tag += '>\n';
@@ -1051,6 +1073,7 @@
 				}else{
 					$(".fillter").show();
 					// fnCategoryGoodsInfiniteScrollInit();
+					$('html, body').animate({scrollTop: historyData.scroll}, 'slow');
 					fnGoodsListSearch();
 					fnSetPriceFilter();
 					fnImgOnoff();

+ 1 - 1
src/main/webapp/WEB-INF/views/web/display/CategoryMainFormWeb.html

@@ -233,7 +233,7 @@
 					});
 				}
 				$('.dp_cate_list').html(tag);
-				$('.cate1Nm').html(cate1.cate1Nm);
+				$('.cate1Nm').html(cate1.cate1Nm+'메인');
 			}
 		});
 	}

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

@@ -303,7 +303,8 @@
 												<div class="select">옵션1선택</div>
 												<ul class="list">
 													<th:block th:each="goodsOption, optionStatus : ${goodsOption1List}" >
-													<li th:onclick="fnOption2([[${optionStatus.count}]], [[${goodsOption.goodsCd}]],[[${goodsOption.optCd1}]],1,[[${goodsInfo.minOrdQty}]], [[${goodsInfo.maxOrdQty}]])">
+													<li th:onclick="fnOption2([[${optionStatus.count}]], [[${goodsOption.goodsCd}]],[[${goodsOption.optCd1}]],1,[[${goodsInfo.minOrdQty}]], [[${goodsInfo.maxOrdQty}]])"
+														th:attr="aria-disabled=${(goodsOption.goodsStat != 'G008_90' or goodsOption.stockQty <= 0)? 'true':''}, data-soldout=${(goodsOption.stockQty <= 0)? 'true':''}">
 														<div th:text="${goodsOption.optCd1}">상품옵션</div>
 														<div th:if="${goodsOption.addPrice > 0}" th:text="|+${#numbers.formatInteger(goodsOption.addPrice, 0,'COMMA')}원|">0원</div>
 														<input type="hidden" name="opt" th:attr="addPrice=${goodsOption.addPrice}, optCd1=${goodsOption.optCd1},optCd2=${goodsOption.optCd2}, optCd=${goodsOption.optCd}"/>
@@ -1846,85 +1847,6 @@
 		params.contentsLoc = "tmtb";
 		fnGoodsLikeSearch(params);
 	
-		
-		// 상품 대표설명 > 좌측 상품썸네일 navi, 우측 상품정보 고정 
-		$(window).scroll(function(){
-			var scrollTop= $(window).scrollTop();
-			var firstFixed =  $('#header').outerHeight();
-			var thumbListWrap_h = $('.pd_detail .thumb_list_wrap').outerHeight();
-			var descWrap_h = $('.pd_detail .desc_wrap').outerHeight();
-			var secondFixed_left =  firstFixed + $('.pd_detail').outerHeight() - $('.pd_detail .thumb_nav_wrap').outerHeight();
-			var secondFixed_right =  firstFixed + $('.pd_detail .desc_wrap').outerHeight() - $(window).outerHeight();
-			var secondFixed_right2 =  firstFixed + $('.pd_detail').outerHeight() - $(window).outerHeight();
-
-			/* 좌측 상품썸네일 navi 고정 */
-			if (scrollTop > firstFixed){  
-				$('.pd_detail .area_pic .thumb_nav_wrap').removeClass('fixbottom').addClass('fixtop');
-			}
-			else if (scrollTop < firstFixed){
-				$('.pd_detail .area_pic .thumb_nav_wrap').removeClass('fixtop');
-			}
-			if (scrollTop > secondFixed_left){
-				$('.pd_detail .area_pic .thumb_nav_wrap').removeClass('fixtop').addClass('fixbottom');
-			} 
-			
-			/* 우측 상품정보 고정 */
-			if (thumbListWrap_h > descWrap_h && scrollTop > secondFixed_right) {
-				$('.pd_detail .area_desc .desc_wrap').removeClass('absbottom').addClass('fixbottom');
-			}
-			else if (thumbListWrap_h > descWrap_h && scrollTop < secondFixed_right) {
-				$('.pd_detail .area_desc .desc_wrap').removeClass('fixbottom');
-			}
-			if (thumbListWrap_h > descWrap_h && scrollTop > secondFixed_right2) {
-				$('.pd_detail .area_desc .desc_wrap').removeClass('fixbottom').addClass('absbottom');
-			}
-		});
-
-		//슬라이드 - 상품 대표설명 > 좌측 상품썸네일 navi
-		var thumbNavSwiper = new Swiper('.area_pic .thumb_nav_wrap .swiper-container', {
-			direction: 'vertical',
-			slidesPerView: 6,
-			slidesPerGroup : 6,
-			spaceBetween: 10,
-			navigation: {
-				nextEl: '.area_pic .thumb_nav_wrap .swiper-button-next',
-				prevEl: '.area_pic .thumb_nav_wrap .swiper-button-prev',
-			},
-		});
-
-		//상품 대표설명 > 상품썸네일 1개일때
-		var thumblist = $('.area_pic .thumb_list_wrap li');	
-		var thumblistLength = thumblist.length;
-		if (thumblistLength == 1) {
-			thumblist.parents('.area_pic').addClass('onlyitem');
-		} else {
-			thumblist.parents('.area_pic').removeClass('onlyitem');
-		}
-
-		//상품 대표설명 > 좌측 상품썸네일 6개 이하일때
-		var thumbnavSlide = $('.area_pic .thumb_nav_wrap .swiper-container .swiper-slide');	
-		var thumbnavLength = thumbnavSlide.length;
-		if (thumbnavLength < 7) {
-			thumbnavSlide.parents('.thumbnav').addClass('disabled');
-		} else {
-			thumbnavSlide.parents('.thumbnav').removeClass('disabled');
-		}
-
-		//상품 대표설명 > 좌측 상품썸네일 navi 선택시 해당 대표 썸네일 위치로 이동
-		$(document).on('click','.pd_detail .area_pic .thumbnav .swiper-slide a',function(e){
-			e.preventDefault();
-			var hdHeight = $('#header').outerHeight();
-			var targetThumb = $($(this).attr('href'));
-			var topThumb = targetThumb.offset().top - hdHeight;
-			$(this).parents('.thumbnav').find('.swiper-slide').removeClass('on');
-			$(this).parent('.swiper-slide').addClass('on');
-			targetThumb.siblings('li').removeClass('on');
-			targetThumb.addClass('on');
-			$('html,body').animate({scrollTop : topThumb}, 500);
-			return false;
-		});
-
-		
 		var opt_selecter01 = new sCombo('.opt_select .select_custom.item_opt1.item_opt1_1');
 		var opt_selecter01_1 = new sCombo('.opt_set_select .select_custom.item_opt1.item_opt1_1');
 		var opt_selecter01_2 = new sCombo('.opt_set_select .select_custom.item_opt1.item_opt1_2');
@@ -1964,17 +1886,15 @@
 			setInterval(function() { promotionTimer(); }, 1000);
 		}
 
-		
-		
-		//스타일링 추천 picker	
-		$(document).on('mouseenter','.pd_recommend .area_slider .item_picker button',function(e){
-			$(this).parents('.item_picker').find('.pick_descr').show();
-			return false;
-		}).on('mouseleave','.pd_recommend .area_slider .item_picker button', function(e){
-			$(this).parents('.item_picker').find('.pick_descr').hide();
-			return false;
-		});   
-
+		//스타일링 추천 picker 상품팝업
+/*         $(document).on('click','.pd_recommend .area_slider .item_picker button',function(e){
+            $("#pdLookbookPop").modal("show");
+            return false;
+        });
+        $("#pdLookbookPop_close").click(function() {
+            $("#pdLookbookPop").modal("hide");
+        });
+ */		
 		//상품상세정보 더보기   
 		$(document).on('click','.pd_descrp .btn_more_box button',function(e){
 			$('.pd_descrp .cont_body').toggleClass('on'); 

+ 1 - 1
src/main/webapp/WEB-INF/views/web/goods/GoodsDetailQnaFormWeb.html

@@ -119,7 +119,7 @@
 				tag += '	</div>\n';
 				tag += '	<div class="fold_cont" style="display: none;">\n';
 				tag += '		<div class="fold_detail">\n'; //문의 내용
-				tag += '			<div>\n'; debugger;
+				tag += '			<div>\n'; 
 				tag += '				<p>' + item.questContent.escapeHtml() + '</p>\n';
 				tag += '			</div>\n';
 				tag += '		</div>\n';

+ 6 - 4
src/main/webapp/ux/mo/css/common_m.css

@@ -891,11 +891,13 @@ main.container .inner:last-child{padding-bottom: 6.0rem; margin-bottom: 0;}
 .fullHead .goHome {display: inline-block;width: auto;padding:2.4rem 2rem;}
 .fullHead a {display: inline-block;}
 .fullHead img {width: 10.666rem; height:1.6rem;}
-.fullBody {background:#f5f5f5;min-height: calc(100% - 5.2rem);max-height: calc(100% - 5.2rem);overflow-y: scroll;}
+.fullBody {background:#ffffff;min-height: calc(100% - 5.2rem);max-height: calc(100% - 5.2rem);overflow-y: scroll;}
 .fullBody .inner {background:#ffffff;margin:0;padding:0;}
 .fullBody .inner .flow{display: inline-block;width: 100%;height: 100%;vertical-align: top;padding:2.5rem 0;}
+.fullBody .fullCate::after{content: '';display: block;width: 100%;height: 1.2rem;background-color: #f5f5f5;}
 .fullBody .inner .flow li{width:49.0%;height:3.1333rem;line-height:3.1333rem;padding:0 0 0 2rem;border: 0;box-sizing: border-box;text-align: left;display: inline-block;}
-.fullBody .inner .flow span{font-size: 1.333rem;}
+.fullBody .inner .flow span{font-size: 1.333rem;color: #666666;}
+.fullBody .inner:last-child .btn_group{position: fixed;bottom: 0;left: auto; right: auto;}
 .fullBody .btn_group {margin: 0;}
 .fullBody .btn_group div {margin:0;position: relative;}
 .fullBody .btn_group div button{border: 0;background: #f5f5f5;font-size: 1.2rem;}
@@ -907,7 +909,7 @@ main.container .inner:last-child{padding-bottom: 6.0rem; margin-bottom: 0;}
 .fullBody .fullCate > li > ul {display: none; background: #f5f5f5;}
 .fullBody .fullCate > li > a {position:relative;display: block; padding:1.6rem 2.0rem; font-size: 1.4rem; font-weight: 400;font-family: 'Noto Sans kr', sans-serif;}
 .fullBody .fullCate > li > a::after {content: '';display: inline-block;width: 2.0rem;height: 2.0rem;background: url(/images/mo/ico_full.png) no-repeat;background-size: 0.8rem 1.4rem;-webkit-transform: rotate(0deg);-moz-transform: rotate(0deg);-ms-transform: rotate(0deg);-o-transform: rotate(0deg);transform: rotate(0deg);position: absolute;right: 1.2rem;background-position: left center;}
-.fullBody .fullCate > li > a:hover span {color: #fd4802; border-bottom: 1px solid #fd4802;}
+.fullBody .fullCate > li > a:active span {color: #fd4802; border-bottom: 1px solid #fd4802;}
 .fullBody .fullCate > li.hasCate > a::after {right: 1.8rem;background: url('/images/mo/ico_full.png') no-repeat;background-position: center;background-size: 0.8rem 1.4rem;-webkit-transform: rotate(90deg);-moz-transform: rotate(90deg);-ms-transform: rotate(90deg);-o-transform: rotate(90deg);transform: rotate(90deg);}
 .fullBody .fullCate > li.hasCate > a.on {font-size: 1.4rem; color: #fd4802;}
 .fullBody .fullCate > li.hasCate > a.on span {border-bottom: 1px solid #fd4802;}
@@ -924,7 +926,7 @@ main.container .inner:last-child{padding-bottom: 6.0rem; margin-bottom: 0;}
 
 /* footer */
 footer{background-color: #f1f1f1;}
-footer .btn_top{position: fixed; bottom: 3.0rem; right: 2.5rem; opacity: 0; background-color: rgba(0, 0, 0, 0.4); width: 4.1rem; height: 4.0rem; font-size: 0; z-index: 50; background:url(/images/mo/mo_btn_top.png) no-repeat;}
+footer .btn_top{position: fixed; bottom: 6.0rem; right: 2.5rem; opacity: 0; background-color: rgba(0, 0, 0, 0.4); width: 4.1rem; height: 4.0rem; font-size: 0; z-index: 50; background:url(/images/mo/mo_btn_top.png) no-repeat;}
 footer .btn_top span{display: block;width: 2.4rem;height: 2.4rem;margin: 0 auto;position: relative;opacity: 1;color: #222222;font-size: 1.1rem;font-weight: 600;line-height: 3.4rem;letter-spacing: -0.025em;}
 footer .f1{background-color: #f1f1f1;padding: 0 0 4.5rem; position: relative;}
 footer .f1 .inner{padding: 0 2.0rem 2.0rem;}

+ 19 - 10
src/main/webapp/ux/mo/css/layout_m.css

@@ -462,7 +462,7 @@
 .pd .pd_detail .Purchase_pop .select_custom.on .combo .select{border-bottom:1px solid #dcdcdc;}
 .pd .pd_detail .Purchase_pop .select_custom .combo .list>li{padding:1.2rem 4.2rem 1.2rem 1.2rem; line-height:2rem; word-wrap: break-word;}
 .pd .pd_detail .Purchase_pop .select_custom .combo .list>li[data-soldout="true"]::after{top:1rem}
-.pd .pd_detail .Purchase_pop .select_custom .opt_price{font-size:1.2rem; color:#888888}
+.pd .pd_detail .Purchase_pop .select_custom .opt_price{font-size:1.2rem; color:#888888;}
 .pd .pd_detail .Purchase_pop .btn_box{display:flex;}
 .pd_detail .pd_info > .inner:after, .pd_detail > .inner:after{content: '';width: 100%;height: 1.2rem;padding: 0;background: #f5f5f5;position: absolute;bottom: -1.2rem;left: 0;right: auto;}
 .pd_detail > .inner:last-child::after{content: '';width: 100%;height: 0rem;}
@@ -857,13 +857,15 @@
 .pd_pop.Purchase_pop .pop_option_select .opt_header .check_excluding{float:right; width:auto;}
 .pd_pop.Purchase_pop .pop_option_select .opt_header .check_excluding.form_field input[type="checkbox"] + label{ font-size:1.3rem; color:#222;}
 .pd_pop.Purchase_pop .pop_option_select .text_excluding{margin-top:-1rem; padding:1.2rem; background-color:#383838; font-size:1.3rem; color:#fff; text-align:center;}
-.pd_pop.Purchase_pop .select_custom .combo .select{font-size:1.4rem; height:auto; text-overflow: ellipsis; white-space: nowrap; word-wrap: normal; overflow: hidden; padding-right: 4rem;}
+.pd_pop.Purchase_pop .select_custom .combo .select{font-size:1.4rem; height:auto; text-overflow: ellipsis; word-wrap: normal; overflow: hidden; padding-right: 4rem;}
 .pd_pop.Purchase_pop .pop_option_select .setOption{}
 .pd_pop.Purchase_pop .pop_option_select .setOption .title{margin-bottom:1rem;}
 .pd_pop.Purchase_pop .pop_option_select .setOption .form_wrap{margin-top:2rem;}
 .pd_pop.Purchase_pop .pop_option_select .setOption .form_wrap:first-child{margin-top:0;}
 .pd_pop.Purchase_pop div[class$="Option"] .form_wrap .form_field .select{color:#777777; text-overflow:ellipsis;white-space:nowrap;word-wrap:normal;overflow:hidden; padding-right:4rem;padding-left: 5rem;}
 .pd_pop.Purchase_pop div[class$="Option"] .form_wrap .form_field .select:before{color:#333333}
+.pd_pop.Purchase_pop div[class$="Option"] .form_wrap .form_field .select .opt_name{pointer-events: none;}
+.pd_pop.Purchase_pop div[class$="Option"] .form_wrap .form_field .select .opt_price{pointer-events: none;}
 .pd_pop.Purchase_pop div[class$="Option"] .form_wrap .form_field:nth-child(1) .select:before {content: '옵션1';display: inline-block;width: 0;height: 0;position: absolute;left: 1rem;}
 .pd_pop.Purchase_pop div[class$="Option"] .form_wrap .form_field:nth-child(2) .select:before {content: '옵션2';display: inline-block;width: 0;height: 0;position: absolute;left: 1rem;}
 
@@ -1351,14 +1353,14 @@
 .modal.pd_pop[class*="reviewdetail_pop"] .modal-header{border-bottom:0;}
 .modal.pd_pop[class*="reviewdetail_pop"] .modal-body{margin-top:5.2rem; padding:0 0;}
 .modal.pd_pop[class*="reviewdetail_pop"] .modal-body .pd_review .area_rv_all .review_list{border-top:0;}
-.modal.pd_pop[class*="reviewdetail_pop"] .area_slider .thumb{position:relative; width:100%; padding-bottom:150%;}
+.modal.pd_pop[class*="reviewdetail_pop"] .area_slider .thumb{position:relative; width:100%; height:100%;}
 .modal.pd_pop[class*="reviewdetail_pop"] .area_slider .thumb img,
-.modal.pd_pop[class*="reviewdetail_pop"] .area_slider .thumb video{position: absolute; left: 50%; right: 0; top: 50%; bottom: auto; transform: translate(-50%, -50%); width: auto; height: auto; max-height: 100%; max-width: 100%; margin: auto 0; cursor: pointer;}
-.modal.pd_pop[class*="reviewdetail_pop"] .area_slider .thumb{position:relative; background-color:#ddd; background-position:center center; background-repeat:no-repeat; background-size:contain;}
+.modal.pd_pop[class*="reviewdetail_pop"] .area_slider .thumb video{position: absolute; left: 50%; right: 0; top: 45%; bottom: auto; transform: translate(-50%, -50%); width: auto; height: auto; max-height: 100%; max-width: 100%; margin: auto 0; cursor: pointer;}
+.modal.pd_pop[class*="reviewdetail_pop"] .area_slider .thumb{position:relative; background-color:#ddd; /*background-position:center center; background-repeat:no-repeat; background-size:contain;*/}
 .modal.pd_pop[class*="reviewdetail_pop"] .area_slider .thumb.nodata:before{display:block; content:''; position:absolute; top:0; left:0; width:100%; height:100%; background-color:rgba(0,0,0,.5); z-index:1;}
 .modal.pd_pop[class*="reviewdetail_pop"] .area_slider .thumb.nodata:after{display:block; content:'리뷰에 등록된 이미지가 없습니다.'; position:absolute; top:50%; left:50%; width:90%; font-size:1.2rem; color:#fff; text-align:center; z-index:2; -webkit-transform:translate(-50%, -50%); transform:translate(-50%, -50%);}
 .modal.pd_pop[class*="reviewdetail_pop"] .area_slider .swiper-pagination {display: inline-block; width: auto; padding: 0.2rem 1rem; border-radius: 2rem; font-size: 1.2rem; color: #fff; background-color: rgba(34,34,34,.5);}
-.modal.pd_pop[class*="reviewdetail_pop"] .area_slider .swiper-pagination-fraction {position: absolute; left: 50%; bottom: 2rem; margin:0; -webkit-transform: translateX(-50%); transform: translateX(-50%);}
+.modal.pd_pop[class*="reviewdetail_pop"] .area_slider .swiper-pagination-fraction {position: absolute; left: 50%; bottom: 6rem; margin:0; -webkit-transform: translateX(-50%); transform: translateX(-50%);}
 .modal.pd_pop[class*="reviewdetail_pop"] .area_rv_all{padding-top:1rem;}
 .modal.pd_pop[class*="reviewdetail_pop"] .area_rv_all .review_list > ul > li {padding-top:1.5rem;}
 .modal.pd_pop[class*="reviewdetail_pop"] .btn_review_open{text-indent:-999999px; background:url(/images/mo/ico_pop_arrow.png) center center no-repeat; background-size:3rem 1rem;}
@@ -1372,15 +1374,22 @@
 .modal.pd_pop[class*="reviewdetail_pop"] .pd_review .area_rv_all .review_list.active .response_box2{display:block;}
 .modal.pd_pop[class*="reviewdetail_pop"] .pd_review .area_rv_all .review_list.active .reply_box{display:block;}
 .modal.pd_pop.pd_photoreviewdetail_pop #btn_more_photoreview{display:inline-block; margin-right:1rem; margin-top: -0.3rem; width:2rem; height:2rem; background:url(/images/mo/ico_thumblist.png) center center no-repeat; background-size:contain; vertical-align:middle;}
-.modal.photo_comment_popup.pd_bestreviewdetail_pop .modal-body .pop_cont{padding-top:0 !important;}
+.modal.pd_pop.pd_photoreviewdetail_pop .modal-body .pop_cont{padding-top:0; height:100%;}
+.modal.pd_pop.pd_photoreviewdetail_pop .modal-body .pop_cont .area_slider{height:100%;}
+.modal.pd_pop.pd_photoreviewdetail_pop .modal-body .pop_cont .area_slider .swiper-container{height:100%;}
+/*.modal.pd_pop.pd_bestreviewdetail_pop .pop_cont .nodata{padding-top:0;}*/
+.modal.photo_comment_popup.pd_bestreviewdetail_pop .modal-body .pop_cont{height:calc(var(--vh, 1vh) * 100); padding-top:0}
+.modal.photo_comment_popup.pd_bestreviewdetail_pop .modal-body .pop_cont .area_slider{position: relative;height: 100%;overflow: hidden;}
+.modal.photo_comment_popup.pd_bestreviewdetail_pop .modal-body .pop_cont .area_slider .swiper-container{height:100%;}
 .modal.photo_comment_popup.pd_bestreviewdetail_pop .pop_detail .review_list{border:0px none;}
+.modal.photo_comment_popup.pd_photoreviewdetail_pop .pop_detail .review_list{border:0px none;}
 .modal.photo_comment_popup.pd_bestreviewdetail_pop .pop_detail .review_list ul li{padding:0;}
 
 
 
 /* 리뷰 리스트 */
 .pop_detail .review_list {border-top:1px solid #ddd;}
-.pop_detail .review_list > ul > li {padding:3rem 0; border-bottom:1px solid #ddd; }
+.pop_detail .review_list > ul > li {padding:0; border-bottom:1px solid #ddd; }
 .pop_detail .review_list > ul > li .review {}
 .pop_detail .review_list .review .info_box {}
 .pop_detail .review_list .review .info_box .star_score {float:left}
@@ -1555,7 +1564,7 @@
 .item_blk .item_prod .item_state .itemLink .itemName {display:block; margin-top:0.5rem; font-size:1.3rem; max-height: 3.3rem; margin-left:0; margin-right:0; display: -webkit-box; text-overflow: ellipsis; -webkit-line-clamp: 2; -webkit-box-orient: vertical; max-height: 3.3rem; overflow: hidden; white-space: normal; overflow-wrap: break-word; width:calc(100% - 5%);}
 .item_blk .item_prod .item_state .itemLink .itemPrice{margin-left:0; margin-right:0;}
 /*select_custom > item_prod*/
-.select_custom .select .item_prod{margin:0; padding-right:0; overflow:hidden;}
+.select_custom .select .item_prod{margin:0; padding-right:0; overflow:hidden;pointer-events: none;}
 .select_custom .select .item_prod .item_state{display:block;}
 .select_custom .select .item_prod .itemLink{padding-left:0; display:block; height:auto;}
 .select_custom .select .item_prod .item_state .itemLink .itemPic{display:none;}
@@ -2165,7 +2174,7 @@
 
 /* 상품아이콘*/
 .itemBadge {margin:2.0rem 0.5rem 0; margin-top:1rem; font-size: 0px; overflow:hidden;}
-.itemBadge [class*="badge"] {display:inline-block; height:2.2rem; margin:0 0 0 0.5rem; padding:0 0.8rem; border:1px solid #888888; background: #fff; color:#888888; font-size: 1.1rem; font-weight: 300; line-height: 21px;}
+.itemBadge [class*="badge"] {display:inline-block; height:2.2rem; margin:0.5rem 0.5rem 0 0; padding:0 0.8rem; border:1px solid #888888; background: #fff; color:#888888; font-size: 1.1rem; font-weight: 300; line-height: 21px;}
 .itemBadge [class*="badge"]:first-child {margin-left:0}
 .itemBadge .badge13 {background:#f5f5f5; border-color:#f5f5f5;}
 

+ 8 - 4
src/main/webapp/ux/mo/css/style24_m.css

@@ -211,7 +211,7 @@
 .brand_main .main_visual::after {content: '';display: block;width: 100%; height: 485px;position: absolute;top: 0;left: 0;background: #436564 ;z-index: -1;}
 .post-visual .swiper-pagination-bullets{bottom: 0px;}
 .post-visual .swiper-wrapper{width: 100%;height:auto; margin: 0px auto;padding-bottom: 2.5rem;filter: drop-shadow(0px 0px 10px rgba(0, 0, 0, 0.2));}
-.main .post-visual .swiper-slide{width:auto;}
+.main .post-visual .swiper-slide{width:auto;    max-height: 47.0rem;overflow: hidden;}
 
 
 /* 크롬일경우 */
@@ -239,6 +239,8 @@
 .post-visual .swiper-slide img{
 	display: block;
 	z-index: 2;
+  width: 100%;
+  height: 100%;
 }
 .post-visual .swiper-slide::before{
 	box-shadow: 0 -20px 20px -20px rgba(0,0,0,0.20);
@@ -465,6 +467,7 @@ width: 0.5rem; height: 0.9rem; background-size:100%;}
 .main_tv .cont_head p{ color: #ffffff;}
 .main_tv .cont_body::before {content: '';z-index: -1;display: block;width: 100%;height: 520px;position: absolute;top: 0;left: 0;background: #444444;}
 .main_tv .movbox {height:50vw; position: relative;}
+.main_tv .movbox iframe{width: 100%; height:100%;}
 .main_tv .movbox:after {content:''; position: absolute; right: 0; top: 50%; transform:translateY(-50%); padding-top:23%; width: 40%;}
 .main_tv .movbox:before {content:''; position: absolute; left: 0; top: 50%; transform:translateY(-50%); padding-top:23%; width: 40%;}
 
@@ -508,6 +511,7 @@ main.container .inner h2[data-style~="unusual"] {font-size:2.0rem;top: 0;positio
 .hookGrp .hook_list ul li a:focus span:after{content: '';display: block; color: #fd4802; box-sizing: border-box; border-bottom: 1px solid #fd4802;}
 .hookGrp .hook_cont {font-size:1.6rem;color:#666666;line-height:2.6rem;letter-spacing:-0.025em;}
 .hookGrp .hook_cont div{margin-top: 2.6rem;}
+.hookGrp .hook_cont div::before{content: ""; display: block; height: 7.5rem; margin-top: -7.5rem; visibility: hidden;}
 .hookGrp .hook_cont div:last-child{margin-bottom: 5.0rem;}
 .hookGrp .hook_cont h4 {font-size:1.4rem;font-weight:500;color:#222222;line-height:1.6rem;letter-spacing:-0.025em;}
 .hookGrp .hook_cont p {font-size:1.2rem;color:#666666;line-height:2.2rem;letter-spacing:-0.025em;}
@@ -1647,13 +1651,13 @@ main.container .inner h2[data-style~="unusual"] {font-size:2.0rem;top: 0;positio
 .my .restock .restock_past {display:inline-block; font-size: 1.2rem; padding-left:1.5rem; margin-bottom:1.0rem; color:#888; background:url('/images/mo/ico_restock_past.png') no-repeat 0% 45%;background-size: 1.1rem;}
 
 /* my_wishlist */
-.my .my_wishlist .wishlist {padding-top: 3rem;}
+.my .my_wishlist .wishlist {padding-top: 8rem;}
 .my .my_wishlist .monthly_wish_wrap {margin-top:1rem;}
 .my .my_wishlist .monthly_wish_wrap:first-child {margin-top:0}
 .my .my_wishlist .monthly_wish_wrap .itemsGrp {margin:0 -1.25%;}
 .my .my_wishlist .monthly_wish_wrap .itemsGrp:after {content:''; display: block; clear:both;}
-.my .my_wishlist .monthly_wish_wrap .itemsGrp .item_prod {width:50%; padding:0 1.25%; float:left;}
-.my .my_wishlist .monthly_wish_wrap .itemsGrp .item_prod:nth-child(2n) {margin-right: 0;}
+.my .my_wishlist .monthly_wish_wrap .itemsGrp .item_prod {width:50%; height:60rem; padding:0 1.25%; float:left;}
+.my .my_wishlist .monthly_wish_wrap .itemsGrp .item_prod:nth-child(2n) {margin-right: 0;float: right;}
 .my .my_wishlist .monthly_wish_wrap .itemsGrp .item_prod .item_state {padding-bottom:4rem}
 .my .my_wishlist .monthly_wish_wrap .date {display:block; position:relative; width:100%; margin-bottom:1.8rem; text-align: center;}
 .my .my_wishlist .monthly_wish_wrap .date span {display:inline-block; width:7.4rem; height:2.6rem; background-color:#222; color:#fff; font-size:1.4rem; font-weight:300; text-align:center; border-radius:20px; overflow:hidden; line-height: 2.6rem;}

+ 11 - 13
src/main/webapp/ux/mo/js/common_m.js

@@ -121,11 +121,12 @@ $(document).ready(function() {
                     "opacity": 1
                 }, 50);
                 
-                if ( $(window).scrollTop() > ($("footer").position().top - $("footer").height() )) {
-                    $(".btn_top").css("bottom", ($("footer").height() + 20) + "px");
-                } else {
-                    $(".btn_top").css("bottom", "60px");
-                }
+                // 210521_ 위치고정으로 변경
+                // if ( $(window).scrollTop() > ($("footer").position().top - $("footer").height() )) {
+                //     $(".btn_top").css("bottom", ($("footer").height() + 20) + "px");
+                // } else {
+                //     $(".btn_top").css("bottom", "60px");
+                // }
             } else {
                 $(".btn_top").animate({
                     "opacity": 0
@@ -793,11 +794,11 @@ $(document).ready(function () {
             console.log();
             $('.container').addClass('btPop_open');
             // autome.style.top  = autotop /10 + "vh";
-            if (autotop > 251) {
-                autome.style.top = 25.0 + "vh";
-            }else{
-                autome.style.top  = pxtop/10 + "vh";
-            }
+            //if (autotop > 251) {
+            //    autome.style.top = 25.0 + "vh";
+            //}else{
+            //    autome.style.top  = pxtop/10 + "vh";
+            //}
             return false;
         });
 
@@ -1037,6 +1038,3 @@ $( document ).ready( function() {
         });
 
 });
-// $(window).load(function() {
-//     $('#load').hide();
-// });

+ 2 - 2
src/main/webapp/ux/style24_link.js

@@ -519,11 +519,11 @@ function layerPop_resize(tgt) {
  * @param  : tgt - 숨길 레이어 ID(예, div 태크의 ID). 필수
  */
 function cfCloseLayer(tgt) {
-	if (_frontGb == "M"){
+	if (_frontGb == "P"){
 		$('#' + tgt).hide();
+		$('#' + tgt).remove();
 	}else{
 		$('#' + tgt).hide();
-		$('#' + tgt).remove();
 	}
 	return false;
 }