Merge branch 'develop' into bin2107

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

@@ -820,6 +820,9 @@ public class TsfMypageController extends TsfBaseController {
 		// 주문 결제정보 조회
 		mav.addObject("paymentInfo", orderService.getPaymentInfoForMypage(order));
 
+		// 2021.05.03 은행목록추가
+		mav.addObject("bankList", rendererService.getCommonCodeList("G942", "Y"));
+
 		mav.setViewName(super.getDeviceViewName("/mypage/MypageCancelForm"));
 
 		return mav;

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

@@ -19,6 +19,7 @@ import com.gagaframework.web.parameter.GagaMap;
 import com.gagaframework.web.rest.server.GagaResponse;
 import com.gagaframework.web.rest.server.GagaResponseStatus;
 import com.style24.core.biz.service.TscCustomerService;
+import com.style24.core.biz.service.TscKcpService;
 import com.style24.core.biz.service.TscOrderChangeService;
 import com.style24.core.biz.service.TscOrderRefundService;
 import com.style24.core.biz.service.TscOrderService;
@@ -36,6 +37,7 @@ import com.style24.front.support.controller.TsfBaseController;
 import com.style24.front.support.security.session.TsfSession;
 import com.style24.persistence.TscPageRequest;
 import com.style24.persistence.domain.Cart;
+import com.style24.persistence.domain.CustAccount;
 import com.style24.persistence.domain.Order;
 import com.style24.persistence.domain.OrderChange;
 import com.style24.persistence.domain.SweetTracker;
@@ -94,6 +96,9 @@ public class TsfNoMemberController extends TsfBaseController {
 
 	@Autowired
 	private TsfDeliveryService deliveryService;
+	
+	@Autowired
+	private TscKcpService coreKcpService;
 
 	/**
 	 * 비회원 주문 내역
@@ -520,6 +525,9 @@ public class TsfNoMemberController extends TsfBaseController {
 		// 주문 결제정보 조회
 		mav.addObject("paymentInfo", orderService.getPaymentInfoForMypage(order));
 
+		// 2021.05.03 은행목록추가
+		mav.addObject("bankList", rendererService.getCommonCodeList("G942", "Y"));
+
 		mav.setViewName(super.getDeviceViewName("/mypage/NoMemberCancelForm"));
 
 		return mav;
@@ -639,6 +647,9 @@ public class TsfNoMemberController extends TsfBaseController {
 		// 반품 사유 목록 조회
 		mav.addObject("returnReason", rendererService.getCommonCodeList("G688", "Y"));
 
+		// 2021.05.03 은행목록추가
+		mav.addObject("bankList", rendererService.getCommonCodeList("G942", "Y"));
+
 		mav.setViewName(super.getDeviceViewName("/mypage/NoMemberReturnForm"));
 
 		return mav;
@@ -1423,4 +1434,30 @@ public class TsfNoMemberController extends TsfBaseController {
 
 		return mav;
 	}
+
+	/**
+	 * 비회원 계좌인증
+	 *
+	 * @Param CustAccount
+	 * @return GagaMap
+	 * @author card007
+	 * @since 2021. 05. 26
+	 */
+	@RequestMapping("/account/check")
+	@ResponseBody
+	public GagaMap getAccountCheck(@RequestBody CustAccount custAccount) {
+		custAccount.setIpAddress(TsfSession.getIpAddress());
+		boolean isValid = false;
+
+		log.info("accountNm() >>> {}",custAccount.getAccountNm());
+		log.info("bankCd() >>> {}",custAccount.getBankCd());
+		log.info("accountNo() >>> {}",custAccount.getAccountNo());
+
+		GagaMap result = coreKcpService.checkAccount(custAccount);
+		if ("0000".equals(result.get("resCd"))) {
+			isValid = true;
+		}
+		result.set("isValid", isValid);
+		return result;
+	}
 }

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

@@ -134,7 +134,6 @@
 				 INNER JOIN TB_ORDER_DETAIL_ITEM ODI
 				    ON OD.ORD_NO = ODI.ORD_NO
 				   AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
-				   AND ODI.ORD_DTL_STAT NOT IN ('G013_00', 'G013_11', 'G013_25', 'G013_97', 'G013_98', 'G013_99')
 				 INNER JOIN TB_GOODS G
 				    ON OD.GOODS_CD = G.GOODS_CD
 				 INNER JOIN TB_BRAND B

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

@@ -113,7 +113,6 @@
 		         INNER JOIN TB_ORDER_DETAIL_ITEM ODI
 		            ON OD.ORD_NO = ODI.ORD_NO
 		           AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
-		           AND ODI.ORD_DTL_STAT NOT IN ('G013_00', 'G013_11', 'G013_25', 'G013_97', 'G013_98', 'G013_99')
 		         INNER JOIN TB_GOODS G
 		            ON OD.GOODS_CD = G.GOODS_CD
 		         INNER JOIN TB_BRAND B
@@ -264,7 +263,6 @@
 		         INNER JOIN TB_ORDER_DETAIL_ITEM ODI
 		            ON OD.ORD_NO = ODI.ORD_NO
 		           AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
-		           AND ODI.ORD_DTL_STAT NOT IN ('G013_00', 'G013_11', 'G013_25', 'G013_97', 'G013_98', 'G013_99')
 		         INNER JOIN TB_GOODS G
 		            ON OD.GOODS_CD = G.GOODS_CD
 		         INNER JOIN TB_BRAND B

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

@@ -463,7 +463,6 @@
 				 INNER JOIN TB_ORDER_DETAIL_ITEM ODI
 				    ON OD.ORD_NO = ODI.ORD_NO
 				   AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
-				   AND ODI.ORD_DTL_STAT IN('G013_70','G013_50','G013_60') -- 구매 확정인것만
 				 INNER JOIN TB_GOODS G
 				    ON OD.GOODS_CD = G.GOODS_CD
 				 INNER JOIN TB_BRAND B
@@ -660,7 +659,6 @@
 				 INNER JOIN TB_ORDER_DETAIL_ITEM ODI
 				    ON OD.ORD_NO = ODI.ORD_NO
 				   AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
-				   AND ODI.ORD_DTL_STAT IN('G013_70','G013_50','G013_60') -- 구매 확정인것만
 				 INNER JOIN TB_GOODS G
 				    ON OD.GOODS_CD = G.GOODS_CD
 				 INNER JOIN TB_BRAND B
@@ -752,7 +750,6 @@
 								 				 AND OD.ORD_DTL_STAT IN ('G013_70','G013_50','G013_60') --  구매 확정인것만
 			                INNER JOIN TB_ORDER_DETAIL_ITEM ODI ON OD.ORD_DTL_NO = ODI.ORD_DTL_NO 
 			                  					 AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
-			                  	                 AND ODI.ORD_DTL_STAT IN ('G013_70','G013_50','G013_60')
 			                INNER JOIN TB_GOODS G ON G.GOODS_CD = OD.GOODS_CD 
 			                INNER JOIN TB_BRAND B ON B.BRAND_CD = G.BRAND_CD
 			WHERE 1=1
@@ -911,7 +908,6 @@
 								 				 AND OD.ORD_DTL_STAT IN ('G013_70','G013_50','G013_60') --  구매 확정인것만
 			                INNER JOIN TB_ORDER_DETAIL_ITEM ODI ON OD.ORD_DTL_NO = ODI.ORD_DTL_NO 
 			                  					 AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
-			                  	                 AND ODI.ORD_DTL_STAT IN ('G013_70','G013_50','G013_60')
 			                INNER JOIN TB_GOODS G ON G.GOODS_CD = OD.GOODS_CD 
 			                INNER JOIN TB_BRAND B ON B.BRAND_CD = G.BRAND_CD
 			                INNER JOIN TB_REVIEW R ON R.ORD_NO = O.ORD_NO 
@@ -1122,7 +1118,6 @@
 		   INNER JOIN TB_ORDER_DETAIL_ITEM ODI
 		      ON OD.ORD_NO = ODI.ORD_NO
 		     AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
-		      AND ODI.ORD_DTL_STAT IN('G013_70','G013_50','G013_60') -- 구매 확정인것만
 		   INNER JOIN TB_GOODS G
 		      ON OD.GOODS_CD = G.GOODS_CD
 		   INNER JOIN TB_BRAND B

src/main/webapp/WEB-INF/views/mob/mypage/MypageCancelFormMob.html

@@ -567,6 +567,37 @@ function handleOnInput(el, maxlength) {
 	}
 }
 
+//210408_ 추가 : 환불계좌등록 팝업 스크립트
+$(document).on("click","#btn_refund_pop",function(e){
+	$('#refundAccountPop').show().addClass("active");
+	$("body").css({"overflow":"hidden"});
+});
+
+//210408_ 추가 : 은행선택 팝업 스크립트
+$(document).on("click","#refundAccountPop .select_bank",function(e){
+	$('#refundBankPop').show().addClass("active");
+	$('#refundBankPop').css({"z-index":"1000"});
+	$("body").css({"overflow":"hidden"});
+});
+
+//210408_ 추가 : 환불계좌등록 팝업 스크립트 닫기
+$('.refundAccountPop .popup_close').on("click",function(){
+	$('.refundAccountPop').hide().removeClass('active');
+	$("body").css({"overflow":"visible"});
+});
+
+//210408_ 추가 : 은행선택 팝업 스크립트 닫기
+$('.refundBankPop .popup_close').on("click",function(){
+	$('.refundBankPop').hide().removeClass('active');
+});
+
+//210510_추가 : 토스트 팝업 button 클릭 시 팝업 닫기.
+$(document).on('click','.popup_box.refundBankPop .button_list button',function(){
+	$(this).parents('.popup_box.refundBankPop').hide().removeClass('active');
+	$("body").css({"overflow":"visible"});
+})
+
+
 $(document).ready(function(){
 	/*
 	// 세부 사유 글자 수 제한

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberCancelFormMob.html

@@ -223,6 +223,9 @@
 
 <!-- 210408_ 추가 : 환불 계좌 등록 팝업 -->
 <div id="refundAccountPop" class="popup_box refundAccountPop">
+	<input type="hidden" name="confirmedAccountNo"/>
+	<input type="hidden" name="confirmedAccountNm"/>
+	<input type="hidden" name="confirmedBankCd"/>
 	<div class="lap">
 		<div class="popup_close">카테고리닫기</div>
 		<div class="popup_head sr-only">
@@ -264,7 +267,7 @@
 								<th>계좌번호</th>
 								<td>
 									<div class="input_wrap certi_wrap">
-										<input type="tel" class="form_control" value="" placeholder="">
+										<input type="tel" name="accountNo" class="form_control" value="" placeholder="">
 										<button type="button" id="btn_bank_certi" class="btn btn_dark"><span>계좌인증</span></button>
 									</div>
 								</td>
@@ -296,7 +299,7 @@
 		<div class="popup_con">
 			<div class="button_list clear">
 				<th:block th:if="${bankList}" th:each="oneData, status : ${bankList}">
-					<button type="button" th:id="|bankCd_${oneData.cd}|"><span th:text="${oneData.cdNm}"></span></button>
+					<button type="button" th:id="|bankCd_${oneData.cd}|" th:attr="bankCd=${oneData.cd}, bankNm=${oneData.cdNm}"><span th:text="${oneData.cdNm}"></span></button>
 				</th:block>
 			</div>
 		</div>
@@ -393,7 +396,7 @@ var fnCancel = function() {
 			// 취소 처리
 			gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
 				cfnGoToPage(_PAGE_NOMEMBER_ORDER_LIST);
-			});
+			}, true);
 		} else {
 			mcxDialog.alert('이미 배송처리 되어 취소 처리에 실패 하였습니다.');
 		}
@@ -492,17 +495,28 @@ $('#btn_bank_certi').on('click', function () {
 		return false;
 	}
 	
+	// 승인된 계좌 정보
+	let confirmedAccountNm 	= $('#refundAccountPop input[name=confirmedAccountNm]').val();
+	let confirmedAccountNo 	= $('#refundAccountPop input[name=confirmedAccountNo]').val();
+	let confirmedBankCd 	= $('#refundAccountPop input[name=confirmedBankCd]').val();
+	
+	// 계좌정보
+	let accountNm 			= $('#refundAccountPop input[name=accountNm]').val();
+	let accountNo 			= $('#refundAccountPop input[name=accountNo]').val();
+	let bankCd 				= $('#refundAccountPop input[name=bankCd]').val();
+	
+	if (accountNm != confirmedAccountNm || accountNo != confirmedAccountNo || bankCd != confirmedBankCd) {
+		isValid = false;
+	}
+	
 	if (!isValid) {
 		let url 		= '/noMember/account/check';
-		let accountNm 	= $('#refundAccountPop input[name=accountNm]').val();
-		let accountNo 	= $('#refundAccountPop input[name=accountNo]').val();
-		let bankCd 		= $('#refundAccountPop input[name=bankCd]').val();
 		
 		let data = {};
 		data.accountNm 	= accountNm;
 		data.accountNo 	= accountNo;
 		data.bankCd 	= bankCd;
-		data.ordNo 		= ordNo;
+		data.ordNo 		= oneData.ordNo;
 		
 		let jsonData = JSON.stringify(data);
 		
@@ -512,34 +526,48 @@ $('#btn_bank_certi').on('click', function () {
 			if (isValid) {
 				mcxDialog.alert('계좌인증에 성공했습니다.');
 				// 계좌인증 성공 시 Disabled 처리
-				$('#refundAccountPop .select_custom.select_bank').attr('disabled', true);
-				$('#refundAccountPop input[name=accountNo]').attr('disabled', true);
+				//$('#refundAccountPop .select_custom.select_bank').attr('disabled', true);
+				//$('#refundAccountPop input[name=accountNo]').attr('disabled', true);
+				
+				$('#refundAccountPop input[name=confirmedAccountNm]').val(accountNm);
+				$('#refundAccountPop input[name=confirmedAccountNo]').val(accountNo);
+				$('#refundAccountPop input[name=confirmedBankCd]').val(bankCd);
 				return false;
 			} else {
 				mcxDialog.alert('계좌정보를 다시 확인해주세요.');
 				return false;
 			}
-		});
+		}, true);
 	}
 });
 
 //계좌등록 후 환불신청 버튼 클릭 이벤트
 $('#btn_bank_return').click(function() {
 	if (isValid) {
+		// 승인된 계좌 정보
+		let confirmedAccountNm 	= $('#refundAccountPop input[name=confirmedAccountNm]').val();
+		let confirmedAccountNo 	= $('#refundAccountPop input[name=confirmedAccountNo]').val();
+		let confirmedBankCd 	= $('#refundAccountPop input[name=confirmedBankCd]').val();
+		
+		// 계좌정보
 		let accountNm 	= $('#refundAccountPop input[name=accountNm]').val();
 		let accountNo 	= $('#refundAccountPop input[name=accountNo]').val();
 		let bankCd 		= $('#refundAccountPop input[name=bankCd]').val();
-		
-		// 부모창의 input 값으로 환불계좌정보 설정
-		$('#returnForm input[name=accountNo]').val(accountNo);
-		$('#returnForm input[name=accountNm]').val(accountNm);
-		$('#returnForm input[name=bankCd]').val(bankCd);
 
-		// 팝업 닫기
-		$(".close-modal").trigger("click");
-		
-		// 취소신청
-		fnCancel();
+		if (accountNm == confirmedAccountNm && accountNo == confirmedAccountNo && bankCd == confirmedBankCd) {
+			// 부모창의 input 값으로 환불계좌정보 설정
+			$('#cancelForm input[name=accountNo]').val(accountNo);
+			$('#cancelForm input[name=accountNm]').val(accountNm);
+			$('#cancelForm input[name=bankCd]').val(bankCd);
+			
+			// 팝업 닫기
+			$("#refundAccountPop .popup_close").trigger("click");
+			
+			// 취소신청
+			fnCancel();
+		} else {
+			mcxDialog.alert('인증받은 계좌정보와 다릅니다.');
+		}
 	} else {
 		mcxDialog.alert('계좌인증이 필요합니다.');
 	}
@@ -566,91 +594,40 @@ function handleOnInput(el, maxlength) {
 	}
 }
 
-$(document).ready(function(){
-	/*
-	// 세부 사유 글자 수 제한
-	$('.doc_return').keyup(function(e){
-		var content = $(this).val();
-		$('#return_cnt').html(content.length);
-		if (content.length > 200){
-			mcxDialog.alert("최대 200자까지 입력 가능합니다."); //210420_수정 : 시스템 alert -> dialog 변경.
-			$(this).val(content.substring(0, 200));
-			$('#return_cnt').html("200");
-		}
-	});
-
-	//210408_추가 : 스크립트 추가.
-	//반품회수방법 선택 스크립트 추가
-	$(document).on('change','.my_return .retrieve_method #rdi_retrieve_visit',function(e){
-		$('.my_return .retrieve_box.direct').hide();
-		$('.my_return .retrieve_box.visit').show();
-		return false;
-	}).on('change','.my_return .retrieve_method #rdi_retrieve_direct',function(e){
-		$('.my_return .retrieve_box.visit').hide();
-		$('.my_return .retrieve_box.direct').show();
-		return false;
-	});
-
-	//버튼 색
-	$(document).on('click','.popup_box .button_list button',function(){
-		$('.popup_box .button_list button').removeClass('on');
-		$(this).addClass('on');
-	});
-
-	// 반품 수량 선택 팝업
-	//$(document).on("click",".select_custom.select_count",function(e){
-		//$('#returnCountPop').show().addClass("active");
-		//$("body").css({"overflow":"hidden"});
-	//});
-
-	//반품 사유 선택 팝업
-	$(document).on("click",".select_custom.select_return",function(e){
-		$('#returnReasonPop').show().addClass("active");
-		$("body").css({"overflow":"hidden"});
-	});
-
-	//팝업_닫기
-	$('.popup_close').on("click",function(){
-		$('.popup_box').hide().removeClass('active');
-		$("body").css({"overflow":"visible"});
-	});
-
-	//배송지추가_팝업
-	$(document).on('click','#btn_adrsAdd_pop',function(e){
-		$("#adrsAddPop").modal("show");
-		return false;
-	});      
-	$("#adrsAddPop_close").click(function() {
-		$("#adrsAddPop").modal("hide");
-	});
+//210408_ 추가 : 환불계좌등록 팝업 스크립트
+$(document).on("click","#btn_refund_pop",function(e){
+	$('#refundAccountPop').show().addClass("active");
+	$("body").css({"overflow":"hidden"});
+});
 
-	//배송지정보_팝업
-	$(document).on('click','#btn_adrsChange_pop',function(e){
-		$("#adrsChangePop").modal("show");
-		return false;
-	});
-	$("#adrsChangePop_close").click(function() {
-		$("#adrsChangePop").modal("hide");
-	});
+//210408_ 추가 : 은행선택 팝업 스크립트
+$(document).on("click","#refundAccountPop .select_bank",function(e){
+	$('#refundBankPop').show().addClass("active");
+	$('#refundBankPop').css({"z-index":"1000"});
+	$("body").css({"overflow":"hidden"});
+});
 
-	//배송지수정_팝업
-	$(document).on('click','#btn_addrModify_pop',function(e){
-		$("#adrsModifyPop").modal("show");
-		return false;
-	});
-	$("#adrsModifyPop_close").click(function() {
-		$("#adrsModifyPop").modal("hide");
-	});
+//210408_ 추가 : 환불계좌등록 팝업 스크립트 닫기
+$('.refundAccountPop .popup_close').on("click",function(){
+	$('.refundAccountPop').hide().removeClass('active');
+	$("body").css({"overflow":"visible"});
+});
 
-	$(document).on("click", "#btn_order_return", function(){
-		mcxDialog.alert("반품 신청이 접수되었습니다.", {
-				//alert("반품하실 상품의 수량을 선택해주세요.") : 클릭 시 반품 수량을 모두 0개로 선택한 경우
-				//alert("반품 사유를 선택해주세요.") : 반품 사유를 선택하지 않는 경우
-			sureBtnText: "확인",  // Confirmation button text
-		});
-	});
-	*/
+//210408_ 추가 : 은행선택 팝업 스크립트 닫기
+$('.refundBankPop .popup_close').on("click",function(){
+	$('.refundBankPop').hide().removeClass('active');
+});
 
+//210510_추가 : 토스트 팝업 button 클릭 시 팝업 닫기.
+$(document).on('click','.popup_box.refundBankPop .button_list button',function(){
+	let bankCd = $(this).attr('bankCd');
+	let bankNm = $(this).attr('bankNm');
+	
+	$('#refundAccountPop input[name=bankCd]').val(bankCd);
+	$('#refundAccountPop .select_custom.select_bank .combo .select').text(bankNm);
+	
+	$(this).parents('.popup_box.refundBankPop').hide().removeClass('active');
+	$("body").css({"overflow":"visible"});
 });
 </script>
 

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

@@ -249,7 +249,7 @@ input[type="reset"], input[type="button"], input[type="submit"], button {line-he
 
 /* 체크박스 */
 .form_field input[type="checkbox"]{ position:absolute; width:1px; height:1px; padding:0; margin:-1px; overflow:hidden; clip:rect(0,0,0,0); border:0; } 
-.form_field input[type="checkbox"] + label{ display:inline-block; position:relative; padding-left:2.6rem; cursor:pointer; font-size: 1.2rem; line-height: 2.0;font-weight: 300;letter-spacing: 0;} 
+.form_field input[type="checkbox"] + label{ display:inline-block; position:relative; padding-left:2.6rem; cursor:pointer; font-size: 1.2rem; line-height: 2.0;font-weight: 300;letter-spacing: 0;text-align: right;} 
 .form_field input[type="checkbox"] + label:before{ 
   content:''; position:absolute; left:0; top:50%; margin-top:-10px; width:20px; height:20px; text-align:center; background:#fff; /*border:1px solid #ccc;*/ border-radius: 100%; box-sizing:border-box; 
   background: url('/images/mo/ico_chk_rdi.png') no-repeat;
@@ -669,8 +669,8 @@ body.gnb_on {height: 100vh;overflow: hidden;}
 /* header, htop, btn_gnb, header.main, hmenu, bng, bnb */
 header {
   position: fixed;left: 0;top: 0;width: 100%;z-index: 80;
-  position: sticky;left: 0;top: 0;width: 100%;transition: top 0.3s;/* background-color: #fff; */
-}
+  /*position: sticky;*/left: 0;top: 0;width: 100%;transition: top 0.3s;/* background-color: #fff; */
+} /* 210526_ main.container 여백 때문에 sticky 속성 주석. */
 header::after{content: '';display: block;clear: both;}
 header .htop {position: relative;height: 55px;-webkit-box-sizing: border-box;box-sizing: border-box;/*border: rgba(0, 0, 0, 0.1) solid 1px;*/ border-bottom: 1px solid rgba(0, 0, 0, 0.0); background-color: #fff;}
 header .htop:after {content: '';display: block; clear: both;}
@@ -868,11 +868,16 @@ body.header-show .app .gnb{top: 50px;}
 .app .gnb.expand .btn-expand::before{display:none}
 .app .gnb.expand .btn-expand::after {background: url(/images/mo/ico_btn_narrow.png) center bottom/1.8rem 2.0rem no-repeat;}
 
-main.container{margin-top: 0px; overflow: hidden;}
+main.container{margin-top: 0; overflow: hidden;}
 main.container .inner:last-child{padding-bottom: 6.0rem; margin-bottom: 0;}
 
+/* 페이지별 헤더 세팅 */
+section.content {margin-top: 5.5rem;}
+section.main, section.ev_list, section.dp_exhibition, section.dp_lookbook, section.dp_outlets, section.dp_submain, section.dp_hotdeal, section.br_main, section.dp_best {margin-top: 11.1rem;}
+section.main.scr, section.ev_list.scr, section.dp_exhibition.scr, section.dp_lookbook.scr, section.dp_outlets.scr, section.dp_submain.scr, section.dp_hotdeal.scr, section.br_main.scr, section.dp_best.scr {margin-top: 5.5rem;}
+
 /* .tabbar */
-.tabbar{-webkit-transform: translate(0, 55px);-ms-transform: translate(0, 55px);-moz-transform: translate(0, 55px); transform: translate(0, 55px);transition-duration: 0.3s; position: fixed;width: 100%;bottom: 0;background-color: #f8f8f8;z-index: 10; padding-bottom: constant(safe-area-inset-bottom);padding-bottom: env(safe-area-inset-bottom);}
+.tabbar{-webkit-transform: translate(0, 55px);-ms-transform: translate(0, 55px);-moz-transform: translate(0, 55px); transform: translate(0, 55px);transition-duration: 0.3s; position: fixed;width: 100%;bottom: 0;background-color: #f8f8f8;z-index: 20; padding-bottom: constant(safe-area-inset-bottom);padding-bottom: env(safe-area-inset-bottom);}
 .tabbar.fixed{-webkit-transform: translate(0, 0);-ms-transform: translate(0, 0);-moz-transform: translate(0, 0);transform: translate(0, 0);}
 .tabbar .tabbar-inner{display: -webkit-box;display: -moz-box;display: -webkit-flex;display: -ms-flexbox;display: flex; -webkit-box-pack: justify;-moz-box-pack: justify;-ms-flex-pack: justify;-webkit-justify-content: space-between;justify-content: space-between; padding: 10px 20px;}
 .tabbar .tabbar-inner [class*=btn-]{display: block;width: 2.50rem; height: 2.2666rem; font-size: 0;position: relative;background: url(/images/mo/ico_tabbar.png) no-repeat center;background-size: 18.0rem 2.16rem;}
@@ -927,7 +932,7 @@ main.container .inner:last-child{padding-bottom: 6.0rem; margin-bottom: 0;}
 
 /* footer */
 footer{background-color: #f1f1f1;}
-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{position: fixed; bottom: 8%; right: 2.0rem; 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;}
@@ -1400,7 +1405,9 @@ button.alertCls {-webkit-appearance: none;padding: 0;cursor: pointer;background:
 .dialog-mobile button[i='1']{
 	color: #000 !important;
 	background:#fff !important;
-	border:1px solid #777;
+	border: 0;
+    border-top: 1px solid #dddddd;
+	/* border:1px solid #777; */
 	/* min-width:10.0rem; */
 }
 .dialog-mobile button[class$='-button']:nth-last-child(2){width: 50%;}
@@ -2003,6 +2010,7 @@ button.alertCls {-webkit-appearance: none;padding: 0;cursor: pointer;background:
 
 /* etc_noticeApp */
 .app-only .notice {background: #f5f5f5;position: relative;}
+.app-only .notice.nodata{min-height: 58vh;}
 .app-only .notice.nodata::after{content: '알림이 없습니다.';width: 100%;height: auto;display: inline-block;position: absolute;top:13.6rem;left: auto;text-align: center;color: #888888;font-size: 1.3rem;}
 .app-only .notice .inner{background: #ffffff; margin-bottom: 0rem;padding-bottom:0;border-bottom:1px solid #eeeeee;}
 .app-only .notice .inner:last-child{padding-bottom: 0rem;}

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

@@ -420,11 +420,11 @@
 .item_prod .itemPic .pd_mov {position: absolute;width: 100%;height: 100%;top: 50%;left: 0px;transform: translateY(-50%);z-index: 2;}
 .item_prod .itemBrand {display: inline-block; margin: 0px 0.5rem 0.3rem; font-size: 1rem;font-weight: 300;color: rgb(137, 137, 137); text-overflow:ellipsis;white-space:nowrap;word-wrap:normal;width:10rem;overflow:hidden;}
 .item_prod .itemComment{margin: 0.8rem 0.5rem 0px;line-height: 1; font-size: 1.1rem;font-weight: 300;color: #fd4802;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;}
-.item_prod .itemName {margin: 0px 0.5rem 0.8rem; font-size: 1.1rem; font-weight:300; color: rgb(31, 31, 31); max-height: 3rem; position: relative; overflow: hidden; white-space: normal; overflow-wrap: break-word; display: block; letter-spacing: -0.025rem;}
+.item_prod .itemName {margin: 0px 0.5rem 0.8rem; font-size: 1.1rem; font-weight:300; color: rgb(31, 31, 31); height: 3rem; max-height: 3rem; position: relative; overflow: hidden; white-space: normal; overflow-wrap: break-word; display: block; letter-spacing: -0.025rem;}
 /*.item_prod .itemName {display: -webkit-box;text-overflow: ellipsis;-webkit-line-clamp: 2;-webkit-box-orient: vertical;}*/
 .item_prod .itemName .tit_option{font-weight:500;}
-.item_prod .itemPrice {position: relative; line-height: 1;font-size: 1.5rem; font-weight: 300; color:#222; margin: 0px 0.5rem; text-align: left;}
-.item_prod .itemPrice_original {position: relative; margin-bottom:0.5rem; display:block; line-height:1; font-size: 1rem; font-weight: 300; color: rgb(204, 204, 204); text-decoration:line-through;}
+.item_prod .itemPrice {position: relative; line-height: 1;font-size: 1.5rem; font-weight: 300; color:#222; margin: 0px 0.5rem; margin-top: 2.3rem;text-align: left;}
+.item_prod .itemPrice_original {position: relative; margin-top: -1.5rem; margin-bottom:0.5rem; display:block; line-height:1; font-size: 1rem; font-weight: 300; color: rgb(204, 204, 204); text-decoration:line-through;}
 .item_prod .itemText{margin-top:0.5rem; font-size:1.1rem; color:#888888; font-weight:300;} 
 /* .item_prod .itemPrice_original::after{content: ''; display: inline-block; position: absolute; top: 50%; left: 0; bottom:auto; right:auto; width: 100%; height: 1px; background: rgb(204, 204, 204) ; transform: translateY(-50%);} */
 .item_prod .itemPercent {position: absolute;top: auto;right: 0px;bottom: 0;left: auto;margin-left: 1.5rem;line-height:1;font-size: 1.5rem;font-weight: 300;color: #fd4802;}
@@ -803,7 +803,7 @@
 
 
 /* 플롯팅 메뉴 > 구매하기 */
-.product_floormenu{position:fixed; bottom:0; left:0; width:100%; height:5.8rem; line-height:5.8rem; z-index:20;}
+.product_floormenu{position:fixed; bottom:0; left:0; width:100%; height:5.8rem; line-height:5.8rem; z-index:30;}
 .product_floormenu > div{float:left; color:#fff; text-align:center;}
 .product_floormenu > div:nth-child(1){width:37%;}
 .product_floormenu > div:nth-child(2){width:63%; background-color:#fd4802;}
@@ -853,6 +853,8 @@
 .pd_pop.Purchase_pop .form_wrap .form_field{display: block; margin-bottom:1rem;}
 
 /* 토스트팝업 > 구매하기 > 옵션선택팝업 */
+.pd .pd_detail .pd_pop.Purchase_pop .form_field:nth-child(1) .select_custom.option_open .combo .select{min-height: 4.5rem;}
+.pd .pd_detail .pd_pop.Purchase_pop .form_field:nth-child(1) .select_custom.option_open .combo .select::before{content: '옵션을 선택해주세요';display: inline-block;width: 100%;height: 0;position: absolute;left: 1rem; color:#333333}
 .pd_pop.Purchase_pop .pop_option_select{display:none; position:absolute; bottom:0; left:0; width:100%; box-sizing:border-box; z-index:500; background: #fff; height:100%;}
 .pd_pop.Purchase_pop .pop_option_select .pp_body{position:relative; padding:2rem; overflow:auto; max-height:100%; background-color:#fff;}
 .pd_pop.Purchase_pop .pop_option_select .close{opacity: 1; position: absolute; z-index: 98; top: -3.8rem; left: 50%; transform: translate(-50%); display: block; border: 0; width:3.6rem; height:1.6rem; background-image: url(/images/mo/ico_pop_cls_w.png); text-indent: -9999px; background-size: contain; background-repeat: no-repeat; background-position: center center; background-color: transparent;}
@@ -868,7 +870,7 @@
 .pd.deal .pd_detail .pd_pop.Purchase_pop .form_field:nth-child(1) .select_custom.option_open .combo .select::before{content: '옵션을 선택해주세요';display: inline-block;width: 0;height: 0;position: absolute;left: 1rem; color:#333333}
 .pd.deal .pd_detail .pd_pop.Purchase_pop .form_field:nth-child(2) .select_custom .combo .select::before{content: '옵션1';display: inline-block;width: 0;height: 0;position: absolute;left: 1rem; color:#333333}
 .pd.deal .pd_detail .pd_pop.Purchase_pop .form_field:nth-child(3) .select_custom .combo .select::before{content: '옵션2';display: inline-block;width: 0;height: 0;position: absolute;left: 1rem; color:#333333}
-.pd.deal .pd_detail .select_custom .select .item_prod .item_state .itemLink .itemName{text-overflow:ellipsis;white-space:nowrap;word-wrap:normal;width:100%;overflow:hidden;}
+.pd.deal .pd_detail .select_custom .select .item_prod .item_state .itemLink .itemName{text-overflow:ellipsis;white-space:nowrap;word-wrap:normal;width:100%;overflow:hidden; color:#777;}
 .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;}
@@ -1059,6 +1061,8 @@
 .modal.pd_pop.info_size_pop .tbl.type1 table tr td {border-top:1px solid #eeeeee;}
 .modal.pd_pop.info_size_pop .tbl.type1 table tr:first-child th,
 .modal.pd_pop.info_size_pop .tbl.type1 table tr:first-child td {border-top:none;}
+/* 임시 스타일, 차주 제거 예정 */
+.modal.pd_pop.info_size_pop .tbl.type2 {width: 100%;overflow: auto;} 
 .modal.pd_pop.info_size_pop .tbl.type2 {padding:0; border-top:1px solid #000;} 
 .modal.pd_pop.info_size_pop .tbl.type2 table {width:100%; word-break:keep-all;}
 .modal.pd_pop.info_size_pop .tbl.type2 table th,
@@ -1411,7 +1415,7 @@
 
 /* 리뷰 리스트 */
 .pop_detail .review_list {border-top:1px solid #ddd;}
-.pop_detail .review_list > ul > li {padding:0; border-bottom:1px solid #ddd; }
+.pop_detail .review_list > ul > li {padding:0;}
 .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}
@@ -1806,9 +1810,9 @@
 .dp .dp_exhibition .list_content .list_item > div{padding-bottom:6rem;}
 .dp .dp_exhibition .list_content .list_item .visual{position:relative; margin-bottom:2rem;}
 .dp .dp_exhibition .list_content .list_item .visual img {width: 100%;}
-.dp .dp_exhibition .list_content .list_item .visual .txtWrap {position: absolute; left: 2rem; bottom: 4rem; color: fff;}
-.dp .dp_exhibition .list_content .list_item .visual .txtWrap p {color: #fff; font-size: 2.4rem; font-weight: 500; line-height: 1.2;}
-.dp .dp_exhibition .list_content .list_item .visual .txtWrap p.txt_xs {font-size: 1.2rem; margin-top:1.6rem; font-weight: 300;}
+.dp .dp_exhibition .list_content .list_item .visual .txtWrap {position: absolute; left: 0; bottom: 2rem; padding: 2rem; color: #fff; width: 100%;}
+.dp .dp_exhibition .list_content .list_item .visual .txtWrap p:first-child {display: -webkit-box; text-overflow: ellipsis; -webkit-line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden; color: #fff; font-size: 2.4rem; font-weight: 500; line-height: 1.2;}
+.dp .dp_exhibition .list_content .list_item .visual .txtWrap p.txt_xs {font-size: 1.2rem; margin-top:1.6rem; font-weight: 300; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;}
 
 /* 기획전 - dp_detail-case */
 .dp .dp_subtitle{padding-top:4rem;}
@@ -2203,8 +2207,8 @@
 
 /*===================== item_prod쪽으로 이동 예정===================*/
 /* 아이템컬러칩 */
-.itemcolorchip {margin:1.5rem 0.5rem 0;}
-.itemcolorchip [class*="chip_"] {position: relative;display: inline-block;width:1rem; height:1rem; font-size: 0; vertical-align: middle; margin:0 0 0 2px;}
+.itemcolorchip {margin:1.5rem 0.5rem 0; max-width: 20.8rem;}
+.itemcolorchip [class*="chip_"] {position: relative;display: inline-block;width:1rem; height:1rem; font-size: 0; vertical-align: middle; margin:0 0 0 2px;border-radius: 50%;box-sizing: border-box;}
 .itemcolorchip [class*="chip_"]:before {content: "";display: inline-block;width: 100%;height: 100%;border-radius: 50%;box-sizing: border-box;}
 .itemcolorchip [class*="chip_"]:first-child {margin-left:0}
 .chip_color40::before {background-color: #ffffff;border: 1px solid #ddd;}

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

@@ -332,12 +332,14 @@
 .main_trendy .item_state {padding-bottom: 0;}
 .main_trendy .post-trendy {position: relative;top: 2rem;display: block;padding: 0px 0vw 4.8vw;}
 .main_trendy .post-trendy .swiper-slide {overflow: hidden;margin: 0px 0vw;}
-.main_trendy .item_prod {width: 49%;margin-bottom: 36px;margin-right: 0rem;position: relative;padding: 0px 0.7vw;box-sizing: border-box;vertical-align: top;display: inline-block;}
+.main_trendy .item_prod {width: 49.4%;margin-bottom: 36px;margin-right: 0rem;position: relative;padding: 0px 0.7vw;box-sizing: border-box;vertical-align: top;display: inline-block;}
+.main_trendy .item_prod:nth-child(odd) {padding-left: 0;}
+.main_trendy .item_prod:nth-child(even) {padding-right: 0;}
 
-.main_it {position: relative;padding-bottom: 4rem}
+.main_it {position: relative;padding-bottom: 4rem;}
 .main_it .titWrap{padding: 6rem 0 0 0;}
 .main_it::after {content: '';display: block;clear: both;}
-.main_it .it_nav {display: flex;padding: 0 0.8rem;height: 5rem;line-height: 5rem;justify-content: center;}
+.main_it .it_nav {display: flex;padding: 0 0.8rem; margin-bottom: 0.8rem; height: 5rem;line-height: 5rem;justify-content: center;}
 .main_it .swiper-scrollbar {margin: 0; background: #ddd !important; height: 2px;}
 .main_it .swiper-scrollbar-drag {background:#222222 !important;}
 
@@ -347,22 +349,25 @@
 .it_nav li .btn.btn_link:hover{text-decoration: none;}
 .it_nav li .btn.btn_link.active {color: #fd4802; font-weight: 500;}
 .it_nav li .btn.btn_link.active span {border-bottom: 2px solid #fd4802;}
-.main_it .it_item {overflow: visible;}
+.main_it .it_item {overflow: visible;
+  margin-right: 4rem;margin-left: -2rem;padding-left: 2rem; /* 아이템 사이즈 조정 */
+}
 .main_it .it_item {display: none;}
 .main_it .it_item::after {content: '';display: block;clear: both;}
 .it_item.active {display: block;}
 
-.main_2stage {padding: 6rem 0 3rem 0;}
+.main_2stage {padding: 3rem 0 3rem 0;}
 .main_2stage .post-bnnEvent{padding: 0 0px 3.5rem 0;}
 .main_2stage .bnnbox {position: relative; padding-top: 26%; overflow: hidden;}
 .main_2stage a{border: 0px;}
 .main_2stage img{/*width: 100%; height: auto; object-fit: none; */ position: absolute; top: 50%; left: 50%; transform:translate(-50%, -50%); max-width:none; width:auto; height:100%;}
 
 /* deal countdown */
-.main_deal .count {border: 1px solid #ffffff;border-radius: 5.0rem;padding: 0.4rem 2.6rem 0.4rem 4.8rem;width: auto;display: inline-block;}
-.main_deal .count_tit {font-size: 1.3rem;}
+.inner.bg_dark + .inner{margin-top: 6rem;} /* bg_dark는 .main_deal 에서 사용 */
+.main_deal .count {border: 1px solid #ffffff;border-radius: 5.0rem;padding: 0.4rem 2.6rem 0.4rem 4.8rem;width: auto;min-width:20.0rem;display: inline-block;}
+.main_deal .count_tit {font-size: 1.5rem;}
 .hotdealcount{display: inline-block;width: auto;}
-.main_deal .count #countdown #tiles span {width: auto;font-size: 1.3rem;font-weight: 300;text-align: center;color: #fff;display: inline-block;position: relative;}
+.main_deal .count #countdown #tiles span {width: auto;font-size: 1.5rem;font-weight: 300;text-align: center;color: #fff;display: inline-block;position: relative;}
 .main_deal .count #countdown #tiles span:first-child:before {content: '';position: absolute;top: 1.0rem;right: -0.6rem;background: #fff;width: 0.2rem;height: 0.2rem;border-radius: 50%;}
 .main_deal .count #countdown #tiles span:first-child:after {content: '';position: absolute;top: 0.5rem;right: -0.6rem;background: #fff;width: 0.2rem;height: 0.2rem;border-radius: 50%;}
 .main_deal .count #countdown #tiles span:nth-child(2) {margin: 0 1.0rem;}
@@ -372,9 +377,10 @@
 .main_deal::after {content: '';display: block;clear: both;}
 .main_deal .titWrap {padding: 3rem 0 2rem 0px;}
 .main_deal .titWrap a h2:after{filter: invert(100%);}
-.main_deal .titWrap .count{margin-top: 1.5rem;}
+.main_deal .titWrap .count{margin-top: 1.2rem;}
 .main_deal .titWrap .count .count_tit{position:relative;}
 .main_deal .titWrap .count .count_tit:before{content: '';display: inline-block;background: url(/images/mo/ico_count.png) no-repeat;width: 2.4rem;height: 2.4rem;background-size: 2.4rem 2.4rem;position: absolute;left: -2.7rem;bottom: -0.5rem;}
+.main_deal .swiper-container {margin-right: -2rem;margin-left: -2rem;padding-left: 2rem;}
 .main_deal .item_prod .itemName {color: rgb(204, 204, 204);}
 .main_deal .item_prod .itemPrice {color: #ffffff;}
 
@@ -412,8 +418,8 @@
 
 .main_1stage {padding: 2rem 0 0rem 0;}
 .main_1stage .bnnbox{position: relative; /*height:11.3rem;*/ overflow:hidden; padding-top: 35%;}
-.main_1stage .txtWrap{margin: 0 auto; position: absolute; top: 50%; left: 50%; transform:translate(-50%, -50%); z-index: 1;}
-.main_1stage .txtWrap p{font-size: 1.8rem;font-weight: 500;letter-spacing: -0.025em;text-align: center;line-height: 1;color: #222222;padding-bottom:1.0rem;}
+.main_1stage .txtWrap{margin: 0 auto; position: absolute; top: 50%; left: 10%; transform:translate(-10%, -50%); z-index: 1;}
+.main_1stage .txtWrap p{font-size: 1.8rem;font-weight: 500;letter-spacing: -0.025em;text-align: left;line-height: 1;color: #222222;padding-bottom:1.0rem;}
 .main_1stage .txtWrap p:last-child {padding-bottom:0px;}
 .main_1stage img {position: absolute; top: 50%; left:50%; transform:translate(-50%, -50%); max-width:none; width:auto; height:100%;}
 
@@ -427,8 +433,8 @@
 .main_recomm .item_state {}
 .main_recomm .recomm-head, 
 .main_recomm .recomm-post {margin-bottom: 2.5rem;overflow: visible;}
-.main_recomm .recomm-head button {height:3.5rem;font-size:1.23rem;border-radius: 5.0rem;transition: all 1ms ease;}
-.main_recomm .recomm-head button.active {line-height: 1;background: #222222;color: #ffffff;transition: all 200ms cubic-bezier(0.42, -0.04, 1, 1);}
+.main_recomm .recomm-head button {height:3.5rem;font-size:1.23rem;height:4.0rem;font-size:1.28rem;border-radius: 5.0rem;transition: all 1ms ease;}
+.main_recomm .recomm-head button.active {line-height: 1;background: #222222;border-color: #222222;color: #ffffff;transition: all 200ms cubic-bezier(0.42, -0.04, 1, 1);}
 .main_recomm .recomm-post {display: none;transition: ease-in, 1000;}
 .main_recomm .recomm-post.active {display: block;transition: ease-out, 1000;}
 
@@ -646,7 +652,6 @@ main.container .inner h2[data-style~="unusual"] {font-size:2.0rem;top: 0;positio
 .ev .survey_wrap .survey_con .btn_wrap button.btn {width: 100%; padding:1.6rem 0; font-size: 1.4rem; font-weight: 500; height:auto; } 
 
 /* ev_comment_1 */
-.dp {background: #f5f5f5;}
 .dp .inner {background: #fff; padding-bottom: 0; margin-bottom:1.2rem;}
 .dp .inner::after {content:''; clear:none;}
 .cmt_wrap {background: #f5f5f5;}
@@ -2600,7 +2605,8 @@ main.container .od_extra .inner:last-child {padding-bottom: 0;}
 .modal.reclaim_pop .modal-body .pop_cont .goods_tbl .tblWrap table tr th, .modal.reclaim_pop .modal-body .pop_cont .goods_tbl .tblWrap table tr td {border-left: 0; word-break: break-all;}
 
 /* main_띠배너 */
-.bnrtype_banner {background: #fd4801; position: relative;}
+.bnrtype_banner {background: #fd4801; position: absolute; top:11.0rem; left:0; width: 100%; z-index: 2;}
+.bnrtype_banner.scr {top: 5.5rem;}
 .bnrtype_banner a {display: block; padding:1.3rem 2rem; padding-right:4rem;}
 .bnrtype_banner a > div {color:#fff; font-size:1.3rem; font-weight:300;}
 .bnrtype_banner a > div span {font-weight: 500;}

src/main/webapp/ux/mo/js/common_m.js

@@ -28,85 +28,6 @@ $(document).ready(function() {
             }, 50);
         });
 
-        var lastScrollTop = 0;
-        $(window).on('mousewheel',function(e){
-            if($('body').hasClass('gnb_on') === false && $('main').hasClass('pd') === false){
-                var wheel = e.originalEvent.wheelDelta;
-                if(wheel>0){
-                    //스크롤 올릴때
-                    $(".tabbar").addClass('fixed');
-                    $(".gnb").addClass('fixed');
-                    $(".pnb_mo").addClass('fixed');
-                    $("header").css("display", "block");
-                    $("header").css("position", "fixed");
-                    if($(".gnb").hasClass("fixed")){
-                        $("header").css("display", "none");
-                    }
-                    if($(".pnb_mo").hasClass("fixed")){
-                        $("header").css("display", "none");
-                    }
-                    if($(window).scrollTop() < 10){
-                        $(".gnb").css('position', 'relative');
-                        $(".pnb_mo").css('position', 'relative');
-                        $("header").css("position", "relative");
-                        $("header").css("display", "block");
-                    } else {
-                        $(".gnb").css('position', 'fixed');
-                        $(".pnb_mo").css('position', 'fixed');
-                    }
-                } else {
-                    //스크롤 내릴때
-                    $(".tabbar").removeClass('fixed');
-                    $(".pnb_mo").addClass('fixed');
-                    $(".pnb_mo").css('position', 'fixed');
-                    $(".gnb").addClass('fixed');
-                    $(".gnb").css('position', 'fixed');
-                    $("header").css("display", "none");
-                }
-            }
-        });
-        $(window).on('mousewheel',function(e){
-            if($('header').hasClass('main') === true){
-                var wheel = e.originalEvent.wheelDelta;
-                if(wheel>0){
-                    //스크롤 올릴때
-                    $(".tabbar").addClass('fixed');
-                    $(".gnb").addClass('fixed');
-                    $(".gnb").css("top", "5.5rem");
-                    $(".pnb_mo").addClass('fixed');
-                    $("header").css("display", "block");
-                    $("header").css("position", "fixed");
-                    if($(".gnb").hasClass("fixed")){
-                        $("header").css("display", "none");
-                    }
-                    if($(".pnb_mo").hasClass("fixed")){
-                        $("header").css("display", "none");
-                    }
-                    if($(window).scrollTop() < 10){
-                        $(".gnb").css('position', 'relative');
-                        $(".pnb_mo").css('position', 'relative');
-                        $("header").css("position", "relative");
-                        $("header").css("display", "block");
-                        $(".bnrtype_banner").css("z-index", "999");
-                        $(".bnrtype_banner").css("top", "5.5rem");
-                        $("main.container").css("margin-top", "5.5rem");
-                    } else {
-                        $(".gnb").css('position', 'fixed');
-                        $(".pnb_mo").css('position', 'fixed');
-                    }
-                } else {
-                    //스크롤 내릴때
-                    $(".bnrtype_banner").css("z-index", "0");
-                    $(".gnb").css("top", "0");
-                    $(".tabbar").removeClass('fixed');
-                    $(".pnb_mo").addClass('fixed');
-                    $(".pnb_mo").css('position', 'fixed');
-                    $(".gnb").addClass('fixed');
-                    $(".gnb").css('position', 'fixed');
-                    $("header").css("display", "none");
-                }
-            }
-        });
         $(window).scroll(function (event) {
 
             // header height 가 아닌, 스크롤 감지로 변경할 것
@@ -380,6 +301,71 @@ $( document ).ready( function() {
 
 * * * * * * * * * * * * * * * * * * * * * */
 $(document).ready(function () {
+        //210525_마우스 휠을 스크롤 이벤트로 변경 및 3가지 경우의 수 헤더 정리
+        var lastScrollTop = 0;
+        $(window).scroll(function (event) {
+            //경우1 : only htopMain
+            if($('section').is('#htopMain') === true && $('div').is('#gnb') === false){
+                console.log("vvvv");
+                var commonSt = $(this).scrollTop();
+                //스크롤 올릴때
+                if (commonSt > lastScrollTop) {
+                    $("header").css('display', 'none');
+                    $("header").css('position', 'fixed');
+                    $(".tabbar").removeClass("fixed");
+                //스크롤 내릴때
+                } else {
+                    $("header").css('display', 'block');
+                    $("header").css('position', 'fixed');
+                    $(".tabbar").addClass("fixed");
+                }
+                lastScrollTop = commonSt;
+            //경우2 : htopMian + gnb
+            } else if($('section').is('#htopMain') === true && $('div').is('#gnb') === true) {
+                console.log("bvbb");
+                var commonSt = $(this).scrollTop();
+                //스크롤 올릴때
+                if (commonSt > lastScrollTop) {
+                    $("header").css('display', 'none');
+                    $("header").css('position', 'fixed');
+                    $("#gnb").css('display', 'block');
+                    $("#gnb").css('position', 'fixed');
+                    $("#gnb").css('top', '0');
+                    $(".tabbar").removeClass("fixed");
+                    $("section.content, section.main, .bnrtype_banner").addClass('scr');
+                //스크롤 내릴때
+                } else {
+                    $("header").css('display', 'block');
+                    $("header").css('position', 'fixed');
+                    $("#gnb").css('display', 'block');
+                    $("#gnb").css('position', 'fixed');
+                    $("#gnb").css('top', '55px');
+                    $(".tabbar").addClass("fixed");
+                    $("section.content, section.main, .bnrtype_banner").removeClass('scr');
+                }
+                lastScrollTop = commonSt;
+            //경우3 : only htopSub
+            } else {
+                var commonSt = $(this).scrollTop();
+                $("header").css('display', 'block');
+                $("header").css('position', 'fixed');
+                //스크롤 올릴때
+                if (commonSt > lastScrollTop) {
+                    $(".tabbar").removeClass("fixed");
+                //스크롤 내릴때
+                } else {
+                    $(".tabbar").addClass("fixed");
+                }
+                lastScrollTop = commonSt;
+            }
+        })
+        //210525_초기화 시 top:0 이동
+        window.onload = function() {
+            setTimeout (function () {
+                scrollTo(0,0);
+            },1);
+        }
+
         // GNB
         $(".btn_gnb").on("click", function () {
             $(this).toggleClass("on");
@@ -803,83 +789,6 @@ $(document).ready(function () {
             return false;
         });
 
-        // 210407_사이즈 선택유지 스크립트
-        //$('.option_box .form_field div label').click(function(){
-        //    var a = [];
-        //    a = document.querySelectorAll(".option_box .form_field div label span");
-        //    sizeLine = document.querySelectorAll(".option_box .form_field div label");
-        //    sizeGap = this.innerText;
-
-        //    if(sizeGap === "90"){
-        //        for(var i=0; i<a.length; i++){
-        //            sizeLine[i].style.border="1px solid #ddd";
-        //            if(a[i].innerText === "90"){
-        //                sizeLine[i].style.border="1px solid #fd4802";
-        //            }
-        //        }
-        //    }
-        //    if(sizeGap === "95"){
-        //        for(var i=0; i<a.length; i++){
-        //            sizeLine[i].style.border="1px solid #ddd";
-        //            if(a[i].innerText === "95"){
-        //                sizeLine[i].style.border="1px solid #fd4802";
-        //            }
-        //        }
-        //    }
-        //    if(sizeGap === "100"){
-        //        for(var i=0; i<a.length; i++){
-        //            sizeLine[i].style.border="1px solid #ddd";
-        //            if(a[i].innerText === "100"){
-        //                sizeLine[i].style.border="1px solid #fd4802";
-        //            }
-        //        }
-        //    }
-        //    if(sizeGap === "105"){
-        //        for(var i=0; i<a.length; i++){
-        //            sizeLine[i].style.border="1px solid #ddd";
-        //            if(a[i].innerText === "105"){
-        //                sizeLine[i].style.border="1px solid #fd4802";
-        //            }
-        //        }
-        //    }
-        //    if(sizeGap === "110"){
-        //        for(var i=0; i<a.length; i++){
-        //            sizeLine[i].style.border="1px solid #ddd";
-        //            if(a[i].innerText === "110"){
-        //                sizeLine[i].style.border="1px solid #fd4802";
-        //            }
-        //        }
-        //    }
-        //    if(sizeGap === "115"){
-        //        for(var i=0; i<a.length; i++){
-        //            sizeLine[i].style.border="1px solid #ddd";
-        //            if(a[i].innerText === "115"){
-        //                sizeLine[i].style.border="1px solid #fd4802";
-        //            }
-        //        }
-        //    }
-        //    if(sizeGap === "free"){
-        //        for(var i=0; i<a.length; i++){
-        //            sizeLine[i].style.border="1px solid #ddd";
-        //            if(a[i].innerText === "free"){
-        //                sizeLine[i].style.border="1px solid #fd4802";
-        //            }
-        //        }
-        //    }
-        //});
-
-        // 210407_텍스트 카운팅
-        //$('.doc_itemqna').keyup(function (e){
-        //    var content = $(this).val();
-        //    $('#itemqna_cnt').html("<em class='c_primary'>"+content.length+"</em>/500자");//글자수 실시간 카운팅
-        
-        //    if (content.length > 200){
-        //        mcxDialog.alert("최대 500자까지 입력 가능합니다."); //210420_수정 : 시스템 alert -> dialog 변경.
-        //        $(this).val(content.substring(0, 500));
-        //        $('#itemqna_cnt').html("<em class='c_primary'>500</em>/500자");
-        //    }
-        //});
-
         // 210407_스크롤감지 헤더 그림자
         $('.pd_delivery_pop').scroll(function(){
             $(".pd_delivery_pop .modal-header").css("box-shadow", "rgb(0 0 0 / 20%) 0px 0px 5px");
@@ -1024,18 +933,15 @@ $( document ).ready( function() {
         //     $("body").css({"overflow":"visible"});
         // })
 
-        $(window).on('mousewheel',function(e){
-            var wheel = e.originalEvent.wheelDelta;
-            //스크롤값을 가져온다.
-            if(wheel>0){
-            //스크롤 올릴때
-            $("header").css('display', 'block');
-            $("header").css('position', 'fixed');
-            } else {
-            //스크롤 내릴때
-            $("header").css('display', 'none');
-            $("header").css('position', 'fixed');
-            }
-        });
-
+        //$(window).on('scroll',function(e){
+        //    var wheel = e.originalEvent.wheelDelta;
+        //    if(wheel>0){
+        //    $("header").css('display', 'block');
+        //    $("header").css('position', 'fixed');
+        //    } else {
+        //    $("header").css('display', 'none');
+        //    $("header").css('position', 'fixed');
+        //    }
+        //});
+          
 });

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

@@ -1898,8 +1898,8 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.dp_review .cont_body {padding-left:70px; padding-right:70px;}
 	.dp_review .review_list {}
 	.dp_review .review_list::after {content:''; display:block; clear:both;}
-	.dp_review .review_list .reviw_box {float:left; width:calc((100% - 80px)/5); margin-left:20px; background:#fff; }
-	.dp_review .review_list .reviw_box:first-child {margin-left:0}
+	.dp_review .review_list .reviw_box {float:left; width:calc((100% - 80px)/5); margin-right:20px; margin-bottom: 20px; background:#fff; }
+	.dp_review .review_list .reviw_box:nth-child(5n) {margin-right:0}
 	.dp_review .review_list .reviw_box .best_review {}
 	.dp_review .review_list .reviw_box .best_review .pic .thumb {display:block; position:relative; width:100%; padding-top:100%; background-repeat:no-repeat; background-position:50% 50%; background-size:cover;}
 	.dp_review .review_list .reviw_box .best_review .pic .thumb.mov::after {content:''; position:absolute; left:0; top:0; width:100%; height:100%; background:rgba(0,0,0,0.3) url('/images/pc/ico_play.png') no-repeat 50% 50%; z-index:2;}