Selaa lähdekoodia

Merge branch 'eskim' into develop

Conflicts:
	src/main/webapp/ux/mo/css/layout_m.css
eskim 5 vuotta sitten
vanhempi
commit
c00ba2afb3

+ 61 - 0
src/main/webapp/WEB-INF/views/mob/goods/GoodsDeliveryFormMob.html

@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html lang="ko"
+	xmlns:th="http://www.thymeleaf.org">
+<!--
+ *******************************************************************************
+ * @source  :GoodsDeliveryFormMob.html
+ * @desc	: 상품 배송안내 팝업
+ *============================================================================
+ * STYLE24
+ * Copyright(C) 2020 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE		 AUTHOR	  DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2021.04.06   eskim		최초 작성
+ *******************************************************************************
+ -->
+<div class="modal-dialog" role="document">
+	<div class="modal-content">
+		<div class="modal-header">
+			<!-- 해당상품 -->
+			<div class="item_blk">
+				<div class="item_prod" th:with="imgGoodsUrl=${@environment.getProperty('upload.goods.view')}, uxImgUrl=${@environment.getProperty('domain.uximage')}">
+					<div class="item_state">
+						<a href="javascript:void(0);" class="itemLink">
+							<div class="itemPic">
+								<img alt="" class="vLHTC pd_img" th:src="${imgGoodsUrl+'/'+goodsInfo.sysImgNm}" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'">
+							</div>
+							<p class="itemBrand" th:text="${goodsInfo.brandGroupNm}">NBA</p>
+							<div class="itemName" th:text="${goodsInfo.goodsFullNm}">남성</div>
+						</a>
+					</div>
+				</div>
+			</div>
+			<!-- //해당상품 -->
+		</div>
+		<div class="modal-body" id="goodsDealDelivery">
+		</div>
+	</div>
+</div>
+<a href="javascript:void(0);" rel="modal:close" onclick="cfCloseLayer('layer_goods_delivery')" class="close-modal">Close</a>
+<script th:inline="javascript">
+/*<![CDATA[*/
+		
+	// 구성 상품 상세 배송정보
+	var fnGoodsDetailDelivery = function(params) {
+		gagajf.ajaxSubmit("/goods/detail/delivery/frame", "html", "goodsDealDelivery", params);
+	}
+	
+	$(document).ready( function() {
+
+		// 배송정보 
+		var params = new Object();
+		let goodsCd = [[${goodsInfo.goodsCd}]]
+		params.goodsCd = goodsCd;
+		fnGoodsDetailDelivery(params);  // ajax html
+		
+	});
+	
+/*]]>*/
+</script>
+ </html>

+ 101 - 0
src/main/webapp/WEB-INF/views/mob/goods/GoodsDetailDeliveryFormMob.html

@@ -0,0 +1,101 @@
+<!DOCTYPE html>
+<html lang="ko"
+	xmlns:th="http://www.thymeleaf.org">
+<!--
+ *******************************************************************************
+ * @source  : GoodsDetailDeliveryFormMob.html
+ * @desc	: 딜 구상상품 배송정보 Page
+ *============================================================================
+ * STYLE24
+ * Copyright(C) 2020 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE		 AUTHOR		 DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2021.04.07   eskim	   최초 작성
+ *******************************************************************************
+ -->
+ <div class="pd_delivery">
+	<div class="inner">
+		<div class="delivery">
+			<div class="pop_cont">
+				<h2>배송안내</h2>
+				<h3>구분</h3>
+				<th:block th:if="${goodsInfo.quikDelvYn = 'Y'}" ><p class="dot">총알배송(오전 10시까지 주문 시)</p></th:block>
+				<th:block th:unless="${goodsInfo.quikDelvYn = 'Y'}" ><p class="dot">일반배송</p></th:block>
+			</div>
+			<div class="pop_cont">
+				<h3>배송비</h3>
+				<p class="dot">
+					<th:block th:if="${goodsInfo.delvFee <= 0}">무료배송</th:block>
+					<th:block th:if="${goodsInfo.delvFee > 0}" th:text="${#numbers.formatInteger(goodsInfo.delvFee, 0,'COMMA')}" ></th:block>원
+					<th:block th:if="${goodsInfo.minOrdAmt > 0}">(<th:block th:text="${#numbers.formatInteger(goodsInfo.minOrdAmt, 0,'COMMA')}" ></th:block>원 이상 무료배송)</th:block>
+				</p>
+			</div>
+			<div class="pop_cont">
+				<h3>배송업체</h3>
+				<p class="dot"><th:block th:if="${deliveryInfo != null}" th:text="${deliveryInfo.shipCompNm}" ></th:block></p>
+			</div>
+			<div class="pop_cont">
+				<h3>기간</h3>
+				<p class="dot">총알배송 : 오늘 밤 12시까지 도착 (토/일/공휴일 제외)</p>
+				<p class="dot">일반배송 : 결제 완료 후 2~3일 이내 (일/공휴일 제외)</p>
+				<p class="dot">단, 제주도나 도서 지방은 별도요금이 부과될 수 있습니다. 날씨나 택배사 사정에 따라 배송이 지연될 수 있습니다.</p>
+			</div>
+		</div>
+	</div>
+	<div class="inner wide">
+		<div class="pop_board"></div>
+	</div>
+	<div class="inner">
+		<div class="change">
+			<div class="pop_cont">
+				<h2>반품/교환안내</h2>
+				<table class="pop_table">
+					<tbody>
+					<tr>
+						<th>반품/교환<br>배송업체</th>
+						<td><th:block  th:if="${deliveryInfo != null}" th:text="${deliveryInfo.shipCompNm}" ></th:block></td>
+					</tr>
+					<tr>
+						<th>반품배송비</th>
+						<td><th:block  th:if="${deliveryInfo != null and deliveryInfo.delvFeeCd != null}" th:text="${#numbers.formatInteger(deliveryInfo.rtnDelvFee, 0,'COMMA')}" ></th:block>원(최소 배송비가 무료인 경우 왕복 배송비 <th:block th:if="${deliveryInfo != null and deliveryInfo.delvFeeCd != null}" th:text="${#numbers.formatInteger((deliveryInfo.rtnDelvFee+deliveryInfo.delvFee), 0,'COMMA')}" ></th:block>원 부과)
+						</td>
+					</tr>
+					<tr>
+						<th>교환배송비</th>
+						<td><th:block  th:if="${deliveryInfo != null and deliveryInfo.delvFeeCd != null}" th:text="${#numbers.formatInteger((deliveryInfo.rtnDelvFee+deliveryInfo.delvFee), 0,'COMMA')}" ></th:block>원</td>
+					</tr>
+					<tr>
+						<th>반품/교환 주소</th>
+						<td><th:block th:if="${deliveryInfo != null and deliveryInfo.delvFeeCd != null}" th:text="${deliveryInfo.rtnLocZipcode +' '+ deliveryInfo.rtnLocBaseAddr +'<br/>'+ deliveryInfo.rtnLocDtlAddr }"></th:block></td>
+					</tr>
+				</tbody></table>
+			</div>
+			<div class="pop_cont">
+				<h3>반품/교환 신청</h3>
+				<p class="dot">반품/교환 시 먼저 고객센터(1544-5336)나 일대일 문의로 반품/교환 신청 후 상품을 발송 해 주시기 바랍니다.</p>
+				<p class="dot">마이페이지 &gt; 나의쇼핑 &gt; 정상주문내역에서 하실 수 있습니다.</p>
+				<p class="dot">반품/교환 신청시 상품의 반송입고 확인 후 환불/교환 처리해 드립니다.</p>
+			</div>
+			<div class="pop_cont">
+				<h3>반품시기</h3>
+				<p class="dot">상품의 반품/교환은 상품 수령 후 7일 이내 가능합니다. 단, 상품을 수령하셨을 때의 상태를 그대로 보존해 주셔야 합니다.</p>
+			</div>
+			<div class="pop_cont">
+				<h3>반품/교환 불가사유</h3>
+				<p class="dot">반품/교환 가능기간을 초과하였을 경우.</p>
+				<p class="dot">상품 및 구성품을 분실하였거나 취급 부주의로 인한 파손/고장/오염된 경우.</p>
+				<p class="dot">고객님의 요청에 따른 주문제작 상품의 경우.</p>
+				<p class="dot">상품을 착용 또는 설치하였거나, 상품의 일부를 소비하였을 경우.</p>
+				<p class="dot">상품의 포장을 개봉하여 사용 및 설치가 완료 되거나 상품의 가치가 훼손되었을 경우.</p>
+				<p class="dot">구매한 상품의 구성품(세트, 기프트상품, 부속품, 의류부착 악세사리 등)이 누락 된 경우.</p>
+				<p class="dot">신발, 그릇류의 박스포장을 포함, 상품이 판매할 수 없게 훼손 된 경우(신발박스 등의 파손, 박스포장 위 송장 부착, 박스 훼손/파손/찢어집, 택 분실 등)</p>
+			</div>
+			<div class="pop_cont" th:if="${deliveryInfo != null and deliveryInfo.delvFeeCd != null and not #strings.isEmpty(deliveryInfo.note)}">
+				<h3>기타사항</h3>
+				<th:block th:if="${not #strings.isEmpty(deliveryInfo.note)}" th:utext="${#strings.unescapeJava(#strings.escapeJava(deliveryInfo.note))}"></th:block>
+			</div>
+		</div>
+	</div>
+</div>	
+</html>

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

@@ -524,16 +524,16 @@
 					</li>
 					<li>
 						<div class="ex_shipping">
-							<a href="#none" id="btn_pdDelivery_Pop">
+							<a href="javascript:void(0)" id="btn_pdDelivery_Pop" th:onclick="cfGoodsDelivery([[${goodsInfo.goodsCd}]])">
 								<span class="tit">배송/교환/반품</span>
 							</a>
 							<!-- 해당 배송정보 선택노출 -->
-							<span class="txt_shippingfee">배송비 2,500원</span>
-							<span class="txt_shippingfee">배송비 2,500원 (4,000원 이상 무료배송)</span>
-							<span class="txt_shippingfee">무료배송</span>
-							<span class="txt_shippingfee">총알배송(오전 10시까지 주문 시)</span>
+							<span class="txt_shippingfee" th:if="${goodsInfo.delvFee > 0}">배송비 <th:block th:text="${#numbers.formatInteger(goodsInfo.delvFee, 0,'COMMA')}" ></th:block>원
+													<th:block th:if="${goodsInfo.minOrdAmt > 0}">(<th:block th:text="${#numbers.formatInteger(goodsInfo.minOrdAmt, 0,'COMMA')}" ></th:block>원 이상 무료배송)</th:block>
+							</span>
+							<span class="txt_shippingfee" th:if="${goodsInfo.delvFee <= 0}">무료배송</span>
+							<span class="txt_shippingfee" th:if="${goodsInfo.quikDelvYn = 'Y'}">총알배송(오전 10시까지 주문 시)</span>
 							<!-- //해당 배송정보 선택노출 -->
-							
 						</div>
 					</li>
 				</ul>

+ 4 - 7
src/main/webapp/WEB-INF/views/mob/goods/GoodsDetailQnaFormMob.html

@@ -15,6 +15,10 @@
  *******************************************************************************
  -->
 <!-- 상품문의 리스트 내용 -->
+<form id="goodsQnaForm" name="goodsQnaForm" action="#" th:action="@{'/goods/qna/list'}">
+<input type="hidden" name="pageNo"  value ="1"/>
+<input type="hidden" name="pageSize" value ="20"/>
+<input type="hidden" name="relGoodsCd" th:value ="${goodsInfo.goodsCd}"/>
 <div class="pd_qnalist">
 	<div class="info_txt">
 		<ul>
@@ -56,10 +60,6 @@
 		<div><button type="button" class="btn btn_dark" id="btn_pdQnaWrite_pop" th:onclick="cfGoodsQngCreate([[${goodsInfo.goodsCd}]] )"><span>상품 문의하기</span></button></div>
 	</div>
 </div>
-<form id="goodsQnaForm" name="goodsQnaForm" action="#" th:action="@{'/goods/qna/list'}">
-<input type="hidden" name="pageNo"  value ="1"/>
-<input type="hidden" name="pageSize" value ="20"/>
-<input type="hidden" name="relGoodsCd" th:value ="${goodsInfo.goodsCd}"/>
 </form>
 <script src="/ux/plugins/jquery/jquery.history.min.js"></script>
 <script src="/ux/plugins/gaga/gaga.infinite.scrollSession.js"></script>
@@ -149,11 +149,8 @@
 			tag += '</li>\n';
 			
 		});
-		
-		
 		return tag;
 	}
-	
 
 	// 인피니트 스크롤 초기화
 	var fnGoodsQnaInfiniteScrollInit = function(){

+ 3 - 5
src/main/webapp/WEB-INF/views/web/goods/GoodsDetailDeliveryFormWeb.html

@@ -31,8 +31,6 @@
 						<td>
 							<th:block th:if="${goodsInfo.quikDelvYn = 'Y'}" >총알배송(오전 10시까지 주문 시)</th:block>
 							<th:block th:unless="${goodsInfo.quikDelvYn = 'Y'}" >일반배송</th:block>
-							
-							 
 						</td>
 					</tr>
 					<tr>
@@ -40,9 +38,9 @@
 							배송비
 						</th>
 						<td>
-							<th:block th:text="${#numbers.formatInteger(goodsInfo.delvFee, 0,'COMMA')}" ></th:block>원
+							<th:block th:if="${goodsInfo.delvFee <= 0}">무료배송</th:block>
+							<th:block th:if="${goodsInfo.delvFee > 0}" th:text="${#numbers.formatInteger(goodsInfo.delvFee, 0,'COMMA')}" ></th:block>원
 							<th:block th:if="${goodsInfo.minOrdAmt > 0}">(<th:block th:text="${#numbers.formatInteger(goodsInfo.minOrdAmt, 0,'COMMA')}" ></th:block>원 이상 무료배송)</th:block>
-							<th:block  th:if="${goodsInfo.delvFee <= 0}">무료배송</th:block>
 						</td>
 					</tr>
 					<tr>
@@ -141,7 +139,7 @@
 							신발, 그릇류의 박스포장을 포함, 상품이 판매할 수 없게 훼손 된 경우(신발박스 등의 파손, 박스포장 위 송장 부착, 박스 훼손/파손/찢어짐, 택 분실 등)
 						</td>
 					</tr>
-					<tr th:if="${deliveryInfo != null and deliveryInfo.delvFeeCd != null}">
+					<tr th:if="${deliveryInfo != null and deliveryInfo.delvFeeCd != null and not #strings.isEmpty(deliveryInfo.note)}">
 						<th>
 							기타사항
 						</th>

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

@@ -14,7 +14,7 @@
  * 1.0  2021.03.05   eskim		최초 작성
  *******************************************************************************
  -->
- <div class="full_popup_wrap" th:with="imgGoodsUrl=${@environment.getProperty('upload.goods.view')}, imgUrl=${@environment.getProperty('upload.image.view')}">
+ <div class="full_popup_wrap" th:with="imgGoodsUrl=${@environment.getProperty('upload.goods.view')}, uxImgUrl=${@environment.getProperty('domain.uximage')}, imgUrl=${@environment.getProperty('upload.image.view')}">
 	<h5 class="sr-only">상품리뷰</h5>
 	<div class="btn_close">
 		<a href="javascript:void(0)" onclick="cfCloseFullLayer('layer_goods_review');">닫기버튼</a>

+ 73 - 36
src/main/webapp/ux/mo/css/common_m.css

@@ -661,11 +661,15 @@ 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; */
 }
+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.1); background-color: #fff;}
+header .htop:after {content: '';display: block; clear: both;}
 header #htopSub{border-bottom: 0px solid #e5e5e5;box-sizing: border-box;}
-header #htopSubs{border-bottom: 1px solid #000000;box-sizing: border-box;}
-header .htop h1 {display: inline-block;position: relative;height: 40px;line-height: 4.0rem;vertical-align: top;margin: 10px 0 0 10px;font-size: 1.8rem;color: #222;}
-header .htop h1 img {position: relative;top: 50%;left: 0;right: 0;transform: translate(0, -50%);margin: 0px 0;}
+header #htopSubs{border-bottom: 0px solid #000000;box-sizing: border-box;}
+header .htop h1 {display: inline-block;position: relative;width: 10.666rem;height: 100%;line-height: 4.5rem;vertical-align: middle;margin: 0px 0 0 2.0rem;font-size: 1.8rem;color: #222;}
+header .htop h1#htopTitle {display: inline-block;position: relative;max-width: 18rem;width: auto;height: 100%;line-height: 4.5rem;vertical-align: middle;padding: 0px 1.5rem 0px 0rem;font-size: 1.8rem;color: #222;}
+header .htop h1 a {height: 100%;width: 100%;display: block;}
+header .htop h1 img {position: absolute;top: 50%;left: 0;right: 0;transform: translate(0, -50%);margin: 0px 0;width: 10.666rem;height: auto;line-height: 1.6rem;vertical-align: middle;}
 header .htop .btn_back {margin: 10px 0 0 15px;width: 35px;height: 35px;}
 header .htop .btn_back span {display: block;width: 24px;height: 24px;margin: 0 auto;position: relative;}
 header .htop .btn_back span i {display: block;position: absolute;background: #222;-webkit-transition: all 0.3s ease-out;transition: all 0.3s ease-out;}
@@ -673,35 +677,52 @@ header .htop .btn_back span i.gl1 {left: 0;top: 6px;width: 12px;height: 2px;-web
 header .htop .btn_back span i.gl2 {left: 0;top: 50%;-webkit-transform: translateY(-50%);transform: translateY(-50%);width: 24px;height: 2px;}
 header .htop .btn_back span i.gl3 {left: 0;bottom: 6px;width: 12px;height: 2px;-webkit-transform: rotate(45deg);transform: rotate(45deg);}
 header .htop .btn_back:active span i {left: -20px;}
+
+
+header .htop .button_wrap {height: 5.5rem; float: right; padding: 1.6rem 0 0; margin: 0 2.5rem 0 0; box-sizing: border-box;}
+header .htop .button_wrap .search { margin:0 1.1666rem 0 0; }
+header .htop .button_wrap .search img{width: 2.0rem;}
+header .htop .button_wrap .store img{width: 1.6rem;}
+header .htop .button_wrap .store img:nth-child(1) { height: 2rem; }
+header .htop .button_wrap .store span { width: 2.1rem; height: 1.4rem; position: absolute; top: 1.2rem; right: 1.5rem; background: #fd4802; border-radius: 0.8rem; font-size: 0.8rem; color: #fff; line-height: 1.6rem;}
+
+
 header .subs {}
 
-header .btn_gnb {position: absolute;top: 0px;right: -45px;width: 35px;height: 35px;z-index: 10;}
+
+header .btn_gnb {position: absolute;top: 0px;right: -4.5rem;width: 3.5rem;height: 100%;z-index: 10;}
 header .btn_gnb span {display: block;width: 24px;height: 24px;margin: 0 auto;position: relative;}
-header .btn_gnb span i {display: block;position: absolute;left: 0;width: 24px;height: 2px;background: #222;-webkit-transition: all 0.15s ease-out;transition: all 0.15s ease-out;}
-header .btn_gnb span i.gl1 {top: 6px;}
-header .btn_gnb span i.gl2 {bottom: 6px;}
-header .btn_gnb.on span i {width: 24px;top: 10px;background: #222;}
-header .btn_gnb.on span i.gl1 {transform: rotate(45deg);-webkit-transform: rotate(45deg);}
-header .btn_gnb.on span i.gl2 {transform: rotate(-45deg);-webkit-transform: rotate(-45deg);}
-
-header .subs .btn_gnbs {position: absolute;top: 0px;right: -45px;width: 35px;height: 35px;z-index: 10;}
+header .btn_gnb span i {display: block;position: absolute;left: 0;width:100%;height: 100%;-webkit-transition: all 0.5s ease-out;transition: all 0.5s ease-out;}
+/* header .btn_gnb span i.gl1 {top: 6px;} */
+/* header .btn_gnb span i.gl2 {bottom: 6px;} */
+/* header .btn_gnb.on span i {width: 24px;top: 10px;background: #222;} */
+/* header .btn_gnb.on span i.gl1 {transform: rotate(45deg);-webkit-transform: rotate(45deg);} */
+/* header .btn_gnb.on span i.gl2 {transform: rotate(-45deg);-webkit-transform: rotate(-45deg);} */
+
+header .subs .btn_gnbs {position: absolute;top: 0px;right: -2.0rem;width: 3.5rem;height: 4.5rem;z-index: 10;}
+header .subs .btn_gnbs span i {display: block;position: absolute;left: 0;width: 100%;height: 100%;-webkit-transition: all 0.5s ease-out;transition: all 0.5s ease-out;}
+/* header .subs .btn_gnbs span {display: block;width: 24px;height: 24px;margin: 0 auto;position: relative;} */
+/* header .subs .btn_gnbs span i {display: block;position: absolute;left: 0;width: 24px;height: 2px;background: #222;-webkit-transition: all 0.15s ease-out;transition: all 0.15s ease-out;} */
 header .subs .btn_gnbs span {display: block;width: 24px;height: 24px;margin: 0 auto;position: relative;}
-header .subs .btn_gnbs span i {display: block;position: absolute;left: 0;width: 24px;height: 2px;background: #222;-webkit-transition: all 0.15s ease-out;transition: all 0.15s ease-out;}
-header .subs .btn_gnbs span i.gl1 {top: 6px;background: #222;}
-header .subs .btn_gnbs span i.gl2 {bottom: 6px;background: #222;}
-header .subs .btn_gnbs.on span i {width: 24px;top: 10px;background: #222;}
-header .subs .btn_gnbs.on span i.gl1 {transform: rotate(45deg);-webkit-transform: rotate(45deg);}
-header .subs .btn_gnbs.on span i.gl2 {transform: rotate(-45deg);-webkit-transform: rotate(-45deg);}
+header .subs .btn_gnbs span i {background: url(/images/mo/ico_btn_more.png) no-repeat;background-size: 1.3rem 0.733rem;background-position: 50% 50%;}
+/* header .subs .btn_gnbs span i.gl1 {top: 6px;background: #222;} */
+/* header .subs .btn_gnbs span i.gl2 {bottom: 6px;background: #222;} */
+/* header .subs .btn_gnbs.on span i {width: 24px;top: 10px;background: #222;} */
+header .subs .btn_gnbs.on span i {transform: rotate(-180deg);-webkit-transform: rotate(-180deg);}
+/* header .subs .btn_gnbs.on span i.gl1 {transform: rotate(45deg);-webkit-transform: rotate(45deg);} */
+/* header .subs .btn_gnbs.on span i.gl2 {transform: rotate(-45deg);-webkit-transform: rotate(-45deg);} */
 
 header.hide {display: none;}
 header.main .htop {border: rgba(255, 255, 255, 0.2) solid 1px;background-color: #222222;}
 header.main .htop.bright {background-color: transparent;}
-header.main .htop h1 {margin: 10px 0 0 20px;width: 95px;}
-header.main .btn_gnb span i {background: #fff;}
-header.main .btn_gnb.on span i {background: #222;}
-
-header .hmenu {position: absolute;left: 0;bottom: 100%;background-color: rgba(0, 0, 0, 0.5);padding: 0 0 0 0;-webkit-box-sizing: border-box;box-sizing: border-box;width: 100%;height: 100vh;-webkit-transition: all 0 ease-out;transition: all 0 ease-out;}
-header .hmenu .inner {padding: 0 25px;background-color: #fff;position: relative;top: 0;-webkit-transition: all 0.5s ease-out;transition: all 0.5s ease-out;}
+/* header.main .htop h1 {margin: 10px 0 0 20px;width: 95px;} */
+header.main .btn_gnb span i {background: url(/images/mo/ico_btn_more_w.png) no-repeat;background-size: 1.3rem 0.733rem;background-position: 50% 50%;}
+header.main .btn_gnb.on span i {transform: rotate(-180deg);-webkit-transform: rotate(-180deg);}
+/* header.main .btn_gnb span i {background: #fff;} */
+/* header.main .btn_gnb.on span i {background: #222;} */
+
+header .hmenu {position: absolute;left: 0;bottom: 100%;background-color: rgba(0, 0, 0, 0.0);padding: 0 0 0 0;-webkit-box-sizing: border-box;box-sizing: border-box;width: 100%;height: 100vh;-webkit-transition: all 0 ease-out;transition: all 0 ease-out;}
+header .hmenu .inner {padding: 0;background-color: #fff;position: relative;top: 0;-webkit-transition: all 0.5s ease-out;transition: all 0.5s ease-out;}
 header .hmenu.on {bottom: 0;}
 header .hmenu.on .inner {top: 100%;}
 header .hmenu .scrollWrap {height: calc(100vh - 50px);-webkit-box-sizing: border-box;box-sizing: border-box;overflow-y: auto;}
@@ -716,9 +737,12 @@ header .hmenu .tnb ul > li a{display: block; padding: 5px 0; color: #888; font-w
 header .hmenu .tnb ul > li a.on{color: #222; font-weight: 400; border-bottom: #9f7952 solid 2px;}
 */
 
-header .hmenu .bng{background: #ffffff; padding-top: 40px;}
-header .hmenu .bng .d1 > li{position: relative;}
-header .hmenu .bng .d1 > li > a{display: block; padding: 8px 0; font-size: 2.8rem; font-family: 'Lato'; color: #222;}
+header .hmenu .bng{background: #ffffff;}
+header .hmenu .bng .d1 > li{position: relative;height: 7.2rem;border-bottom: 0.1rem solid #eeeeee;}
+header .hmenu .bng .d1 > li > a{display: block;padding: 0 2.0rem;line-height: 7.2rem;font-size: 1.8rem;font-weight: 400; font-family: 'Lato'; color: #222;}
+header .hmenu .bng .d1 > li > a::after{content: '';display: block; clear:both;}
+header .hmenu .bng .d1 > li > a span{float: right;}
+header .hmenu .bng .d1 > li > a span img{opacity: 0.3;max-width: 8.333rem;max-height: 4.533rem;width: auto;height: auto;vertical-align: middle;}
 header .hmenu .bng .d1 > li.folder::before{content: ''; display: block; position: absolute; right: 5px; top: 15px; width: 1px; height: 12px; background-color: #222;}
 header .hmenu .bng .d1 > li.folder::after{content: ''; display: block; position: absolute; right: 0; top: 20px; width: 12px; height: 1px; background-color: #222;}
 header .hmenu .bng .d1 > li.folder.on::before{display: none;}
@@ -737,13 +761,13 @@ header .hmenu .bng .d3 > li{position: relative; padding-left: 15px;}
 header .hmenu .bng .d3 > li::before{content: ''; display: block; position: absolute; left: 2px; top: 15px; width: 4px; height: 4px; background-color: #999;}
 header .hmenu .bng .d3 > li > a{display: block; padding: 8px 0; font-size: 1.5rem; color: #222;}
 
-header .hmenu .bnb{background-color: #f5f5f5; margin: 30px -25px 0 -25px; padding: 30px 25px; position: relative;}
+header .hmenu .bnb{background-color: #f5f5f5; position: relative;}
 header .hmenu .bnb ul > li{position: relative;}
 header .hmenu .bnb ul > li::after{content: ''; display: block; position: absolute; right: 2px; top: 20px; width: 10px; height: 10px; border: #9f7952 solid; border-width: 1px 1px 0 0; -webkit-transform: translateY(-50%) rotate(45deg); transform: translateY(-50%) rotate(45deg);}
 header .hmenu .bnb ul > li > a{display: block; padding: 8px 0; font-size: 1.5rem; color: #9f7952;}
 
 
-header .hmenus {position: absolute;left: 0;bottom: 100%;background-color: rgba(0, 0, 0, 0.5);padding: 0 0 0 0;-webkit-box-sizing: border-box;box-sizing: border-box;width: 100vw;height: 100vh;-webkit-transition: all 0 ease-out;transition: all 0 ease-out;}
+header .hmenus {position: absolute;left: 0;bottom: 100%;background-color: rgba(0, 0, 0, 0.0);padding: 0 0 0 0;-webkit-box-sizing: border-box;box-sizing: border-box;width: 100vw;height: 100vh;-webkit-transition: all 0 ease-out;transition: all 0 ease-out;}
 header .hmenus .inner {padding: 0 25px;background-color: #fff;position: relative;top: 0;-webkit-transition: all 0.5s ease-out;transition: all 0.5s ease-out;}
 header .hmenus.on {bottom: 0;}
 header .hmenus.on .inner {top: 100%;}
@@ -759,7 +783,7 @@ header .hmenus .tnb ul > li a{display: block; padding: 5px 0; color: #888; font-
 header .hmenus .tnb ul > li a.on{color: #222; font-weight: 400; border-bottom: #9f7952 solid 2px;}
 */
 
-header .hmenus .bng{background: #ffffff; padding-top: 40px;}
+header .hmenus .bng{background: #ffffff;}
 header .hmenus .bng .d1 > li{position: relative;}
 header .hmenus .bng .d1 > li > a{display: block; padding: 8px 0; font-size: 2.8rem; font-family: 'Lato'; color: #222;}
 header .hmenus .bng .d1 > li.folder::before{content: ''; display: block; position: absolute; right: 5px; top: 15px; width: 1px; height: 12px; background-color: #222;}
@@ -780,12 +804,25 @@ header .hmenus .bng .d3 > li{position: relative; padding-left: 15px;}
 header .hmenus .bng .d3 > li::before{content: ''; display: block; position: absolute; left: 2px; top: 15px; width: 4px; height: 4px; background-color: #999;}
 header .hmenus .bng .d3 > li > a{display: block; padding: 8px 0; font-size: 1.5rem; color: #222;}
 
+header .hmenus .bng{position: relative; width:100%; height:100%;background:rgba(0,0,0,.0); z-index:600;}
+/* header .hmenus .bng .nav_box.active{visibility:visible;} */
+header .hmenus .bng .lap{position:absolute; top:0; left:0; padding:0; width:100%; background:#fff;}
+header .hmenus .bng .nav_list{min-height:15rem; max-height:40rem; overflow-y:auto;}
+/* header .hmenus .bng .nav_box .nav_close{position:absolute; bottom:-3.8rem; left:50%; width:1.6rem; height:1.6rem; background-image: url(/images/mo/ico_pop_cls_w.png); background-repeat:no-repeat; background-position:center center; font-size:0; text-indent:-999999px; background-size: contain; -webkit-transform:translateX(-50%); transform:translateX(-50%);} */
+header .hmenus .bng .nav_list {padding:0;}
+header .hmenus .bng .nav ul {}
+header .hmenus .bng .nav ul > li {}
+header .hmenus .bng .nav ul > li .daps1{display:block; font-size:1.4rem; color:#666; font-weight:300; line-height:5rem; border-bottom:1px solid #ddd;}
+header .hmenus .bng .nav ul > li .daps2 li > a{display:block; font-size:1.4rem; font-weight:300; color:#222; line-height:4rem;}
+header .hmenus .bng .nav ul > li .daps2 li.on > a{color:#fd4802; font-weight:500; line-height:5rem;}
+
 header .hmenus .bnb{background-color: #f5f5f5; margin: 30px -25px 0 -25px; padding: 30px 25px; position: relative;}
 header .hmenus .bnb ul > li{position: relative;}
 header .hmenus .bnb ul > li::after{content: ''; display: block; position: absolute; right: 2px; top: 20px; width: 10px; height: 10px; border: #9f7952 solid; border-width: 1px 1px 0 0; -webkit-transform: translateY(-50%) rotate(45deg); transform: translateY(-50%) rotate(45deg);}
 header .hmenus .bnb ul > li > a{display: block; padding: 8px 0; font-size: 1.5rem; color: #9f7952;}
 
 
+
 /* gnb */
 body.header-show .app .gnb{top: 50px;}
 .app .gnb {position: -webkit-sticky; position: sticky; top: 0px; padding-right: 50px; background-color: #000; z-index: 9; transition: top 0.3s; width: 100%;}
@@ -907,7 +944,7 @@ footer .collapse .infos > li.fn{clear: both; padding-left: 0;}
 footer .collapse .infos.on{padding: 0px 0px 20px 0; height: auto;}
 
 /* sub page slide nav */
-.lnb{padding: 1.46rem 2.0rem 1.3rem 2.0rem; border-bottom: #e5e5e5 solid 1px; box-sizing: border-box;}
+.lnb{padding: 1.46rem 2.0rem 1.0rem 2.0rem; border-bottom: #e5e5e5 solid 1px; box-sizing: border-box;}
 .lnb .swiper-wrapper{transform: translate3d(0px, 0px, 0px);}
 .lnb ul > li{width: auto; text-align: center;}
 .lnb ul > li button,
@@ -938,8 +975,8 @@ footer .collapse .infos.on{padding: 0px 0px 20px 0; height: auto;}
 /* page nav */
 .pnb ul{border-bottom: #e5e5e5 solid 1px;}
 .pnb ul::after{content: ''; display: block; clear: both;}
-.pnb ul > li{float: left; width: auto; padding: 0 2.6rem;}
-.pnb ul > li:first-child{padding: 0 2.6rem 0 2.0rem;}
+.pnb ul > li{float: left; width: auto; padding: 0 1.6rem;}
+.pnb ul > li:first-child{padding: 0 1.6rem 0 1.0rem;}
 .pnb ul > li a{display: block; width: 100%; padding: 1.46rem 0 1.3rem 0; text-align: center; position: relative;}
 .pnb ul > li a.on{color: #fd4802;}
 .pnb ul > li a.on::after{content: ''; display: block; width: 100%; height: 3px; background-color: #fd4802; color: #fd4802; position: absolute; bottom: 0; left: 50%; right: 50%; transform: translate(-50%);}
@@ -1241,7 +1278,7 @@ button.alertCls {-webkit-appearance: none;padding: 0;cursor: pointer;background:
 	position: fixed;
 	top: 0;
 	left: 0;
-	z-index: 19;
+	z-index: 1000;
 	width: 100%;
 	height: 100%;
 	background-color: rgba(0, 0, 0, 0.3);
@@ -1257,7 +1294,7 @@ button.alertCls {-webkit-appearance: none;padding: 0;cursor: pointer;background:
 	position: fixed;
 	top: 50%;
 	left: 0;
-	z-index: 20;
+	z-index: 1001;
 	min-width:13.3rem;
 	max-width: 95%;
 	background-color: rgba(255, 255, 255,1);
@@ -1598,7 +1635,7 @@ button.alertCls {-webkit-appearance: none;padding: 0;cursor: pointer;background:
 
 /* modal */
 /*  modal popup  */
-.blocker{position:fixed;top:0;right:0;bottom:0;left:0;width:100%;height:100%;overflow:auto;z-index:999999;padding:0px;box-sizing:border-box;background-color:#000;background-color:rgba(0,0,0,0.75);text-align:center;}
+.blocker{position:fixed;top:0;right:0;bottom:0;left:0;width:100%;height:100%;overflow:auto;z-index:999;padding:0px;box-sizing:border-box;background-color:#000;background-color:rgba(0,0,0,0.75);text-align:center;}
 .blocker:before{content:"";display:inline-block;height:100%;vertical-align:middle;margin-right:-0.05em;}
 .blocker.behind{background-color:transparent;}
 .modal{display:none; vertical-align:middle;position:relative;z-index:2;max-width:960px;box-sizing:border-box;width:90%;background:#fff;padding:0;text-align:left; -webkit-box-shadow:0 0 10px #000;-moz-box-shadow:0 0 10px #000;-o-box-shadow:0 0 10px #000;-ms-box-shadow:0 0 10px #000;box-shadow:0 0 10px #000;}

+ 48 - 12
src/main/webapp/ux/mo/css/layout_m.css

@@ -441,13 +441,13 @@
 .pd_detail .option_box > [class^="opt_"] .opt_header {margin-bottom:0.5rem;}
 .pd_detail .option_box > [class^="opt_"] .opt_header .title {margin-right:1rem; font-weight:500; color:#222;}
 .pd_detail .option_box > [class^="opt_"] .opt_header .color {color:#666666; font-weight:300;}
-.pd_detail .option_box .opt_size .form_field {display:block;}
+.pd_detail .option_box .opt_size .form_field {display:block; margin-left: -0.8rem !important;}
 .pd_detail .option_box .opt_size .form_field .lap{margin:-0.25rem -0.25rem 0; overflow:hidden;}
 .pd_detail .option_box .opt_size .form_field .lap > div {margin:0.25rem; float:left; width:auto;}
 .pd_detail .option_box .opt_size .form_field input[type="radio"] + label {display:block; width:6rem; height:3.4rem; padding:0; line-height:3.4rem; text-align:center; background:#fff; box-sizing:border-box; border:1px solid #ddd; color:#222; font-weight:200; font-size:1.2rem;}
 .pd_detail .option_box .opt_size .form_field input[type="radio"] + label::before,
 .pd_detail .option_box .opt_size .form_field input[type="radio"] + label::after {display:none;}
-.pd_detail .option_box .opt_size .form_field input[type="radio"]:checked + label {border:1px solid #222;}
+.pd_detail .option_box .opt_size .form_field input[type="radio"]:checked + label {border:1px solid #fd4802;}
 .pd_detail .option_box .opt_size .form_field input[type="radio"]:disabled + label {text-decoration:line-through; background:#f5f5f5; border-color:#f5f5f5; color:#bbb; opacity:1;}
 .pd_detail .option_box .opt_count {padding-bottom:0;}
 .pd_detail .option_box .opt_result {}
@@ -541,7 +541,12 @@
 [class*="pd_descrp"] [class^="view_"]:first-of-type {margin-top:0;}
 [class*="pd_descrp"] [class^="view_"] .tit_view {display:block; color:#222; font-size:2.1rem; font-weight:400; text-align:center;}
 [class*="pd_descrp"] [class^="view_"] .model_info {display:block; margin-top:1rem; color:#666; font-size:1.2rem; font-weight:200; text-align:center;}
+<<<<<<< HEAD
 [class*="pd_descrp"] [class^="view_"] .view {margin-top:2rem}
+=======
+[class*="pd_descrp"] [class^="view_"] .view {margin-top:2rem; margin:0 -2rem;}
+[class*="pd_descrp"] .view_label_box .view{margin:0;}
+>>>>>>> refs/heads/eskim
 [class*="pd_descrp"] [class^="view_"] .view img {display:block; margin:0.5rem auto 0}
 [class*="pd_descrp"] [class^="view_"] .view img:first-child {margin-top:0}
 [class*="pd_descrp"] .view_label_box .view span {display:block; margin:0 -0.5rem; overflow:hidden;}
@@ -569,8 +574,9 @@
 [class*="pd_descrp"] .required_box .tbl.type1 {border-top:1px solid #000; border-bottom:1px solid #ddd;} 
 [class*="pd_descrp"] .required_box .tbl.type1 table {width:100%; text-align:left; word-break:keep-all;}
 [class*="pd_descrp"] .required_box .tbl.type1 table th,
-[class*="pd_descrp"] .required_box .tbl.type1 table td {position:relative; padding:1.4rem 1.2rem; font-weight:300; font-size:1.3rem; letter-spacing:-0.025em;}
+[class*="pd_descrp"] .required_box .tbl.type1 table td {position:relative; padding:0.4rem 1.2rem; font-weight:300; font-size:1.3rem; letter-spacing:-0.025em;}
 [class*="pd_descrp"] .required_box .tbl.type1 table th {font-weight:400;}
+[class*="pd_descrp"] .required_box .tbl.type1 table td {color:#666666}
 [class*="pd_descrp"] .required_box .tbl.type2 {padding:0; border-top:1px solid #000;} 
 [class*="pd_descrp"] .required_box .tbl.type2 table {width:100%; word-break:keep-all;}
 [class*="pd_descrp"] .required_box .tbl.type2 table th,
@@ -667,7 +673,30 @@
 .pd_detail .pd_relate .area_slider .itemName {height:3.2rem}
 /* 210405 */
 header .htop.trans{position:absolute; background:transparent !important;}
+<<<<<<< HEAD
 .pd_qnalist_pop .btn_group_flex > div > .btn{height:5.5rem;}
+=======
+.pd_qnalist_pop .btn_group_flex > div > .btn{height:5.3rem;}
+/* 210406 */
+.push_restock_pop .btn_group_flex > div > .btn{height:5.3rem;}
+.pd_review_pop .btn_group_flex > div > .btn{height:5.3rem;}
+.modal.pd_pop.pd_qnawrite_pop .modal-footer button{height:5.3rem;}
+.modal.pd_pop.pd_qnawrite_pop .modal-header{border-bottom:0px none;}
+.modal.pd_pop.push_restock_pop .item_blk .item_prod .item_state .itemLink .itemBrand {display:block; font-size:1rem; color:#888888; font-weight:300; margin-left:0; margin-right:0; text-overflow:ellipsis;white-space:nowrap;word-wrap:normal;width:30rem;overflow:hidden;}
+.modal.pd_pop.push_restock_pop .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:30rem;}
+.select_custom .combo .list>li[aria-disabled="true"]{background:#fff;}
+.Purchase_pop .select_custom.on .combo .select{border-bottom:1px solid #dcdcdc}
+.pd_qnalist_pop .foldGroup > ul > li{border-bottom:0px none;}
+.pd_qnalist_pop .fold_cont .fold_answer{border-top:0px none;}
+.pd_qnalist_pop .fold_cont > div:first-of-type{border-bottom:1px solid #dcdcdc}
+.pd [class*="pd_descrp"] .cont_body.on{overflow: visible;}
+.pd .mdhtml_box a{margin:0 -2rem; display:block;}
+
+.option_box .opt_size .form_field > div {margin-left:8px; margin-top:8px;}
+/*.option_box .opt_size .form_field > div:nth-child(7n-6) {margin-left:0px;}*/
+.option_box .opt_size .form_field > div {float:left; width:auto;}
+
+>>>>>>> refs/heads/eskim
 
 /* 플롯팅 메뉴 > 구매하기 */
 .product_floormenu{position:fixed; bottom:0; left:0; width:100%; height:5.8rem; line-height:5.8rem; z-index:20;}
@@ -904,6 +933,7 @@ header .htop.trans{position:absolute; background:transparent !important;}
 .modal.pd_pop.info_size_pop .tbl.type2 table th,
 .modal.pd_pop.info_size_pop .tbl.type2 table td {position:relative; padding:1.5rem 0; border-bottom:1px solid #ddd; font-weight:200; font-size:1.3rem; letter-spacing:-0.025em; text-align:center;}
 .modal.pd_pop.info_size_pop .tbl.type2 table th {font-weight:300; color:#222;}
+.modal.pd_pop.info_size_pop .tbl.type2 table thead tr{background:#f5f5f5;}
 
 /* pd_popup > 재입고 알림 신청 */
 .modal.pd_pop.push_restock_pop {max-width:none;}
@@ -943,7 +973,7 @@ header .htop.trans{position:absolute; background:transparent !important;}
 .pd_qnalist .qna_list .form_field input[type="checkbox"] + label {line-height:1;}
 .pd_qnalist .qna_list .form_field input[type="checkbox"] + label:before,
 .pd_qnalist .qna_list .form_field input[type="checkbox"] + label:after {top:50%; transform:translateY(-50%); margin-top:0;}
-.pd_qnalist .qna_list .foldGroup .fold_head a{padding: 1.4rem 1.33rem;}
+.pd_qnalist .qna_list .foldGroup .fold_head a{padding: 1.4rem 1.33rem; border-bottom:0.1rem solid #E5E5E5;}
 .pd_qnalist .qna_list .foldGroup .fold_head .fold_tit .ico {display:inline-block; width:auto; height:auto; vertical-align:middle;}
 .pd_qnalist .qna_list .foldGroup .fold_head .fold_tit .ico_myqna::after {content:'내문의'; display:inline-block; margin-right:1rem; color:#fd4802; font-size:1.1rem; text-align:center; box-sizing:border-box; line-height:20px;}
 .pd_qnalist .qna_list .foldGroup .fold_head .fold_tit .ico_secret::after {content:''; display:inline-block; margin-right:1rem; width:1.2rem; height:1.2rem; background:url('/images/mo/ico_secret.png') no-repeat 50% 50%; background-size:contain;}
@@ -1030,8 +1060,8 @@ header .htop.trans{position:absolute; background:transparent !important;}
     .pd_review .area_rv_empty .txt_box div dl {margin-left:5vw;}
   }
 .pd_review .area_rv_empty .txt_box div dl:first-child {margin-left:0}
-.pd_review .area_rv_empty .txt_box div dl dt {color:#666; font-weight:200; line-height:1.4;} 
-.pd_review .area_rv_empty .txt_box div dl dd {color:#fd4802; font-weight:300;}
+.pd_review .area_rv_empty .txt_box div dl dt {color:#666; font-weight:200; line-height:1.4; font-size:1.3rem;} 
+.pd_review .area_rv_empty .txt_box div dl dd {color:#000; font-weight:300;font-size:1.7rem;}
 .pd_review .area_rv_empty .btn_box .review_go{margin-top:3rem;}
 .pd_review .area_rv_average {margin-bottom:0!important; padding-bottom:0!important; text-align:center;}
 .pd_review .area_rv_average .star_score {margin-bottom:2rem;}
@@ -1047,7 +1077,7 @@ header .htop.trans{position:absolute; background:transparent !important;}
 .pd_review .area_rv_average .average .part_average .pa_head .tit{position:absolute; left:0; display:block; padding-top:0.5rem; width:6rem; height:2.4rem; border:1px solid #fd4802; font-size: 1.3rem; color:#fd4802; font-weight:300; line-height:1; border-radius:2.2rem; text-align:center;}
 .pd_review .area_rv_average .average .part_average .pa_head dl dt {padding-left:0; width:5.2rem; font-size:1.5rem; font-weight:300; color:#222;}
 .pd_review .area_rv_average .average .part_average .pa_head dl dd {width:calc(100% - 5.2rem);}
-.pd_review .area_rv_average .average .part_average .pa_head dl dd .percent{font-size:1.4rem; font-weight:500; color:#222;}
+.pd_review .area_rv_average .average .part_average .pa_head dl dd .percent{font-size:1.5rem; font-weight:500; color:#222;}
 .pd_review .area_rv_average .average .part_average .pa_body{display:none; margin-top:1.3rem;}
 .pd_review .area_rv_average .average .btn_group_flex{margin-top:2.4rem;}
 .pd_review .area_rv_average .average .btn_group_flex button{border:1px solid #a7a7a7; color:#222;}
@@ -1055,11 +1085,11 @@ header .htop.trans{position:absolute; background:transparent !important;}
 .pd_review .area_rv_average .average .btn_group_flex button span:before{display:"inline-block"; content:'자세히보기'; vertical-align:middle;}
 .pd_review .area_rv_average .average .btn_group_flex button.active span:before{display:"inline-block"; content:'접기'; }
 .pd_review .area_rv_average .average .btn_group_flex button.active span:after{transform:rotate(180deg);}
-.pd_review .area_rv_average .average .part_average dl{margin-bottom:0.1rem;}
+.pd_review .area_rv_average .average .part_average dl{margin-bottom:0.5rem;}
 .pd_review .area_rv_average .average .part_average dl:last-child{margin-bottom:1rem;}
 .pd_review .area_rv_average .average .part_average:last-child dl:last-child{margin-bottom:0;}
 .pd_review .area_rv_average .average .part_average dl dt {float:left; padding-left:0.7rem; width:7.2rem; font-size:1.2rem; box-sizing:border-box;}
-.pd_review .area_rv_average .average .part_average dl dd {position:relative; float:left; width:calc(100% - 7.2rem); padding-right:4.2rem; box-sizing:border-box;}
+.pd_review .area_rv_average .average .part_average dl dd {position:relative; float:left; width:calc(100% - 7.2rem); padding-right:4.7rem; box-sizing:border-box;}
 .pd_review .area_rv_average .average .part_average dl dd::after {content:''; clear:both; display:block;}
 .pd_review .area_rv_average .average .part_average dl dd span {float:left; display:inline-block;}
 .pd_review .area_rv_average .average .part_average dl dd .ratio {width:100%; height:5px; margin-top:6px; background:#f5f5f5; overflow:hidden;}
@@ -1071,7 +1101,7 @@ header .htop.trans{position:absolute; background:transparent !important;}
 .pd_review .area_rv_average .average .part_average dl.on dd {color:#222; font-weight:300;}
 .pd_review .area_rv_average .average .part_average dl.on dd .ratio .progbar {background:#222;}
 .pd_review .area_rv_average .average .part_average dl.on dd .ratio .progbar::after {border:4px solid #222; border-bottom-color:transparent;border-right-color:transparent;}
-.pd_review .area_rv_average .info_review {color:#222; font-size:1.3rem; font-weight:500; background:#fff6f2; padding:2.4rem 2rem; vertical-align:middle;}
+.pd_review .area_rv_average .info_review {color:#222; font-size:1.3rem; font-weight:500; background:#fff6f2; padding:2.4rem 2rem; vertical-align:middle; margin: 0 -1.4rem;}
 .pd_review .area_rv_average .info_review p {position:relative; text-align:left; padding-left:2rem; font-weight:300; display: inline-block;}
 .pd_review .area_rv_average .info_review p i.ico_point {position:absolute; left:0; top:2px; display:inline-block; width:1.5rem; height:1.5rem; background:url('/images/mo/ico_point3.png') no-repeat 50% 50%; background-size:100% 100%;}
 .pd_review .area_rv_average .info_review p span {font-weight:500;}
@@ -1090,7 +1120,7 @@ header .htop.trans{position:absolute; background:transparent !important;}
 .pd_review .area_rv_photo .photo_list > div > div{position:relative; width:100%; padding-bottom:100%;}
 .pd_review .area_rv_photo .photo_list button {position:absolute; width:100%; height:100%; background:rgba(0,0,0,0.6); color:#fff; font-size:1.4rem; z-index:1; text-align:center; box-sizing:border-box; z-index:2;}
 .pd_review .area_rv_photo .photo_list button::before {content:''; display:block; margin:0 auto; width:2rem; height:2rem; background:url('/images/mo/ico_plus_white.png') no-repeat 50% 50%; z-index:1;}
-.pd_review .area_rv_photo .photo_list button span{margin-top:0.5vw; display:block; font-size:1rem;}
+.pd_review .area_rv_photo .photo_list button span{margin-top:0.5vw; display:block; font-size:1.2rem; position:relative; top:0.6rem}
 .pd_review .area_rv_all {}
 .pd_review .area_rv_all h6 span {display:inline-block; margin-left:5px; color:#666; font-weight:200;}
 .pd_review .area_rv_all .review_list {border-top:1px solid #ddd;}
@@ -1123,7 +1153,7 @@ header .htop.trans{position:absolute; background:transparent !important;}
 .pd_review .area_rv_all .review_list .review .photo_box .photo_list > ul li {display:inline-block; margin-left:0.8rem; width:7.5rem; height:7.5rem;}
 .pd_review .area_rv_all .review_list .review .photo_box .photo_list > ul li:first-child{margin-left:1.33rem;}
 .pd_review .area_rv_all .review_list .review .photo_box .photo_list > ul li:last-child{margin-right:1.33rem;}
-.pd_review .area_rv_all .review_list .review .txt_review_box {margin-top:1.6rem; font-size:1.3rem; overflow:hidden;}
+.pd_review .area_rv_all .review_list .review .txt_review_box {margin-top:1.6rem; font-size:1.4rem; overflow:hidden; color:#000}
 .pd_review .area_rv_all .review_list .review .reply_box {margin-top:1.5rem; padding-top:1.5rem;}
 .pd_review .area_rv_all .review_list .review .reply_box .reply {position:relative; padding:2rem; background:#f5f5f5;}
 .pd_review .area_rv_all .review_list .review .reply_box .reply::after {content:''; position:absolute; left:0px; top:-1.5rem; width:0px; height:0px; border:1.5rem solid #f5f5f5; border-top-color:transparent; border-right-color:transparent;}
@@ -1314,7 +1344,11 @@ header .htop.trans{position:absolute; background:transparent !important;}
 .item_blk .item_prod .itemLink{position: relative; display:table-cell; width: 100%; height:60px; padding-left:56px; vertical-align: middle;}
 .item_blk .item_prod .item_state .itemLink .itemPic {position:absolute; left:0; top:0; padding: 0; width:40px; height:60px; z-index:2;}
 .item_blk .item_prod .item_state .itemLink .itemBrand {display:block; font-size:1rem; color:#888888; font-weight:300; margin-left:0; margin-right:0; text-overflow:ellipsis;white-space:nowrap;word-wrap:normal;width:30rem;overflow:hidden;}
+<<<<<<< HEAD
 .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;}
+=======
+.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:30rem;}
+>>>>>>> refs/heads/eskim
 .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;}
@@ -1674,6 +1708,7 @@ header .htop.trans{position:absolute; background:transparent !important;}
 
 
 /* 전시제품메뉴 공통 */
+/* 제거예정/ 공통 헤더로 교체 */
 .dp .nav_box{position:fixed; width:100%; height:100%; top:5.5rem; left:0; background:rgba(0,0,0,.5); z-index:600;}
 .dp .nav_box.active{visibility:visible;}
 .dp .nav_box .lap{position:absolute; top:0; left:0; padding:0 2rem 0; width:100%; background:#fff;}
@@ -2078,6 +2113,7 @@ header .htop.trans{position:absolute; background:transparent !important;}
 .br_search_wrap .brand.nodata .btn { font-size: 1.2rem; border: 0.1rem solid #888; height: 3rem; padding: 0 1rem;}
 /* 브랜드 - br_search */
 .htop.br { overflow: hidden;}
+/* 제거 예정/ 공통으로 교체 */
 .htop.br .button_wrap {height: 5.5rem; display: inline-block; float: right; padding: 1.6rem 0 0; margin: 0 2.5rem 0 0; box-sizing: border-box;}
 .htop.br .button_wrap .br_search { margin: 0 2.5rem 0 0; }
 .htop.br .button_wrap .br_store img:nth-child(1) { height: 2rem; }

+ 29 - 11
src/main/webapp/ux/mo/css/style24_m.css

@@ -848,6 +848,7 @@ main.container .inner h2[data-style~="unusual"] {font-size:2.0rem;top: 0;positio
 
 /* mypage_공통 */
 .my {background: #f5f5f5;}
+.my .pnb{background: #ffffff;}
 .my .mypage {background: #f5f5f5;}
 .my .inner {padding-bottom: 0; background: #fff;}
 .my .inner.bg_gray {background: #f5f5f5;}
@@ -904,6 +905,7 @@ main.container .inner h2[data-style~="unusual"] {font-size:2.0rem;top: 0;positio
 .goods_btn_wrap > div > .btn.btn_primary {background-color:#fff; border-color:#fd4802; color: #fd4802;}
 
 /* my_index */
+main.container.my .inner:last-child {padding-bottom: 0;}
 .my .lnb_list {margin-top: 1.2rem; padding-bottom: 6rem;}
 .my .lnb_list li { border-bottom: 1px solid #ddd;}
 .my .lnb_list li a {display: block; padding: 2rem; background: url(/images/mo/ico_lnb_arrow.png) no-repeat right 2rem center; background-size:0.7rem 1.26rem;}
@@ -950,8 +952,8 @@ main.container .inner h2[data-style~="unusual"] {font-size:2.0rem;top: 0;positio
 .my .goods_top .delete_btn {position: absolute; bottom: 1.5rem; right: 0; font-size: 1.3rem; color: #8d8d8d; padding-right: 1.4rem; background: url(/images/mo/ico_btn_cls.png) no-repeat right top 3px; background-size:0.9rem 0.9rem;}
 .my .goods_top .purchase_btn {position: absolute; bottom: 1.5rem; right: 0; font-size: 1.3rem; color: #8d8d8d; padding-right: 1.6rem; background: url(/images/mo/ico_check01.png) no-repeat right top 3px; background-size:1.06rem 0.8rem;}
 .my .badge_wrap {display: inline-block;}
-.my .order_badge {font-size: 0.9rem; color: #666; font-weight: 300; border:1px solid #888; padding:0.5rem 0.4rem; margin-left: 1px; vertical-align: top;}
-.my .order_bullet_badge {color: #fd4802; border:1px solid #fd4802;}
+.my .order_badge {font-size: 1rem; border-radius: 0.1rem; color: #666; font-weight: 300; border:1px solid #888; padding:0.4rem 0.4rem 0.25rem; margin-left: 1px; vertical-align: top;}
+.my .order_bullet_badge {background: #fff6f2; color: #fd4802; border:1px solid #fd4802;}
 
 .my .part_goods {position:relative;}
 .my .part_goods:first-child {margin-top: -1.2rem; padding-top:3rem}
@@ -1018,7 +1020,7 @@ main.container .inner h2[data-style~="unusual"] {font-size:2.0rem;top: 0;positio
 
 
 /* my_review_1 */
-.my .review {}
+.my .review .inner {margin-bottom: 0;}
 .my .review .inner.wide {background: #f5f5f5;}
 /* .my .review .inner .tabWrap .inner{margin-bottom:1.3rem;} */
 .my .review .tabIndex{margin-bottom: 0.85em;}
@@ -1032,7 +1034,7 @@ main.container .inner h2[data-style~="unusual"] {font-size:2.0rem;top: 0;positio
 .my .review .tip2 .tip_contents:after{left: 64.5%;}
 .my .review .tip_wrap ul li{position: relative;padding-left: 1.0rem;font-weight: 200;}
 .my .review .tip_wrap ul li::before{content: '';position: absolute;top: 7px;left: 0;background: #858585;width: 3px;height: 3px;}
-.my .review .part_goods .goods_section:last-of-type {margin-bottom: 2.4rem;border-bottom: 1px solid #ddd;}
+.my .review .part_goods .goods_section:last-of-type {margin-bottom: 0;border-bottom: 1px solid #ddd;}
 .my .review .part_goods .goods_detail .info_box .od_name .name{-webkit-line-clamp: 1;}
 
 /* my_review_2 */
@@ -1095,7 +1097,7 @@ main.container .inner h2[data-style~="unusual"] {font-size:2.0rem;top: 0;positio
 /* .my .tbl.review_tbl .form_field input[type="radio"] + label:before {background-position: 0 0;} */
 .my .review .tbl_wrap {padding:3rem 0 0 0;}
 .my .review .tbl_wrap:last-child {padding: 0;}
-.my .review .tbl_wrap .tbl:last-child {border-top: 0;}
+.my .review .tbl_wrap:last-child .tbl {border-top: 0;}
 .my .review .tbl_wrap .tbl .tbl_row {padding:0 0 2rem; border-bottom: 1px solid #ddd;}
 /* .my .review .tbl_wrap .tbl .tbl_row:first-child {margin-bottom: 2rem;} */
 .my .review .tbl_wrap .tbl .tbl_row:last-child { border-bottom: 0;}
@@ -1112,7 +1114,7 @@ main.container .inner h2[data-style~="unusual"] {font-size:2.0rem;top: 0;positio
 
 .my .review .tbl_wrap .tbl th.ver_top {vertical-align: top; padding-top: 25px;}
 .my .review .tbl_wrap .tbl th.ver_top02 {vertical-align: top;}
-.my .review .tbl_wrap .tbl td textarea {width: 100%; resize:none; height: 82px; padding: 15px; font-size: 14px; color: #868686;}
+.my .review .tbl_wrap .tbl td textarea {width: 100%; resize:none; height: 15rem; padding: 15px; font-size: 14px; color: #868686;}
 .my .review .tbl_wrap .tbl.review_tbl td {padding-left: 0;}
 .my .review .tbl_wrap .tbl.review_tbl td textarea {height: 200px;}
 .my .review .tbl_wrap .tbl td .select {width: 400px;}
@@ -1344,6 +1346,8 @@ main.container .inner h2[data-style~="unusual"] {font-size:2.0rem;top: 0;positio
 
 /* my_delivery_1 */
 .my .my_delivery {}
+.my .my_delivery .inner > .btn_group {position: fixed; left: 0; bottom: 0; width: 100%; z-index: 99; transition:all 0.3s;}
+.my .my_delivery .inner > .btn_group.active {transform: translate(0, -4.3rem);}
 .my .my_delivery .inner:last-child {padding-bottom: 0;}
 .my .my_delivery .ship_info {padding:3rem 2rem; border-bottom: 1px solid #eee;}
 .my .my_delivery .ship_info.active {background: #fff6f2;}
@@ -1390,10 +1394,10 @@ main.container .inner h2[data-style~="unusual"] {font-size:2.0rem;top: 0;positio
 .my .myMbLeave .tbl.type5 th p {font-size: 1.3rem; color: #888888;}
 .my .myMbLeave .announce_txt .announce_list{padding: 1.0rem 0 3rem;}
 .my .myMbLeave .announce_txt + .check_box {padding: 3.0rem 0;border-top: 1px dashed #dcdcdc;}
-.my .message { width: 100%; display: inline-table;position: relative; border:1px solid #ffe4d9; padding:0 1.5rem; margin-top: 1.2rem;background: #fff6f2;}
-.my .message .msg_tit {font-size: 1.3rem; color: #fd4802; margin-bottom: 1rem; font-weight: 500; padding-top: 1.5rem;   padding-left: 2rem;}
-.my .message .msg_tit.t_err {text-indent: -2rem;}
-.my .message .content {font-size: 1.3rem; padding-bottom: 1.5rem;padding-left: 2rem;color: #888888;}
+.my .myMbLeave .message { width: 100%; display: inline-table;position: relative; border:1px solid #ffe4d9; padding:0 1.5rem; margin-top: 1.2rem;background: #fff6f2;}
+.my .myMbLeave .message .msg_tit {font-size: 1.3rem; color: #fd4802; margin-bottom: 1rem; font-weight: 500; padding-top: 1.5rem;   padding-left: 2rem;}
+.my .myMbLeave .message .msg_tit.t_err {text-indent: -2rem;}
+.my .myMbLeave .message .content {font-size: 1.3rem; padding-bottom: 1.5rem;padding-left: 2rem;color: #888888;}
 
 
 /* my_point */
@@ -1656,7 +1660,7 @@ background-size:100%;}
 .od .foldGroup .fold_head a {padding: 0;}
 .od .foldGroup .fold_head .data {position:absolute; top:50%; right:50px; transform:translateY(-50%); color:#000; font-size:1.3rem; font-weight:300; z-index:-1; padding-right: 0; width: 40%; white-space: nowrap; overflow:hidden; text-overflow: ellipsis; text-align: right;}
 .od .foldGroup .fold_head .data.fixed {display: block;}
-.od .foldGroup .fold_head .data.custom_disc {}
+.od .foldGroup .fold_head .data.custom_disc {z-index: 2;}
 .od .foldGroup .fold_head .data.custom_disc label {line-height: 2rem;}
 .od .foldGroup .fold_head .data.maxdisc {z-index:2; text-align: center; width:auto;}
 .od .foldGroup .fold_head .data.maxdisc span {padding-left: 0; margin-left: 0;}
@@ -2037,6 +2041,14 @@ background-size:100%;}
 .od .completed .btn_group_md::after {}
 .od .completed .btn_group_md .btn {margin:0px 3px; width:230px;}
 
+.od .completed .gift_wrap {padding:3rem 0;}
+.od .completed .gift_wrap h3 {font-size: 1.6rem; border-bottom: 1px solid #000; padding-bottom: 1.5rem;}
+.od .completed .gift_wrap .gift_con {padding:2rem 0 0;}
+.od .completed .gift_wrap .gift_con .gift_info {font-size: 1.3rem; margin-bottom: 1.5rem; font-weight: 500;}
+.od .completed .gift_wrap .gift_con .message {border:1px solid #ffe4d9; padding:1.5rem; background: #fff6f2;}
+.od .completed .gift_wrap .gift_con .message .gift_tit {font-size: 1.3rem; color: #fd4802; margin-bottom: 1rem; font-weight: 500;}
+.od .completed .gift_wrap .gift_con .message .content {font-size: 1.3rem;}
+
 .od .my_order .inner {margin-bottom: 1.2rem;}
 .od .my_order .inner:last-child {margin-bottom: 0;}
 .od .inner.bg_beige {background: #fff6f2;}
@@ -2130,6 +2142,10 @@ background-size:100%;}
 
 /* 쇼핑백 */
 main.container .shopping_bag .inner:last-child {padding-bottom: 0;}
+.shopping_bag .od_method label span {vertical-align: bottom;}
+.shopping_bag .tbl_radio {} 
+.shopping_bag .tbl_radio table {width: 100%;}
+.shopping_bag .tbl_radio th, .shopping_bag .tbl_radio td {padding-top: 1.5rem;}
 .shopping_bag .sec_select {position: relative;}
 .shopping_bag .sec_select .form_field input[type="checkbox"] + label {font-size: 1.3rem;}
 .shopping_bag .sec_select .btn {position: absolute; top: 0; right: 0; width: 5.8rem; height: 2.5rem; padding: 0; font-size: 1.1rem;}
@@ -2137,6 +2153,8 @@ main.container .shopping_bag .inner:last-child {padding-bottom: 0;}
 .shopping_bag .inner.wide {padding: 0;}
 .shopping_bag .btn_delete {position: absolute; top: 0; right: 0; z-index: 9; width: 4rem; height: 4rem; background: url(/images/mo/ico_itemdelete_btn.png) no-repeat center/1.2rem; background-position: center;}
 .shopping_bag .inner:nth-child(2) {padding:1.5rem 2rem;}
+.shopping_bag .nodata {min-height:13rem; line-height:13rem; text-align: center;}
+.shopping_bag .nodata p {color: #888;}
 .shopping_bag .goods_top {padding-top: 0; border-bottom: 1px solid #000;}
 
 .shopping_bag .area_salecoupon h4 {margin-bottom: 1.5rem; font-size: 1.6rem;}

+ 21 - 5
src/main/webapp/ux/mo/js/common_m.js

@@ -683,13 +683,13 @@ $(document).ready(function () {
             return false;
         });
 
-        //let autome = document.querySelector('.btPopAuto'); 
-        //let headsize = this.querySelector('.btPopAuto .btPopAuto_head');
-        //let bodysize = this.querySelector('.btPopAuto .btPopAuto_body');
+        let autome = document.querySelector('.btPopAuto'); 
+        let headsize = this.querySelector('.btPopAuto .btPopAuto_head');
+        let bodysize = this.querySelector('.btPopAuto .btPopAuto_body');
         //console.log('★ btPop_auto헤더 높이 : ' + headsize.offsetHeight);
         //console.log('★ btPop_auto바디 높이 : ' + bodysize.clientHeight);
-		
-        //let autotop = appHeight - (headsize.offsetHeight + bodysize.offsetHeight);
+
+        let autotop = appHeight - (headsize.offsetHeight + bodysize.offsetHeight);
         //console.log('★ btPopAuto전체 높이 - 컨텐츠 높이 : ' + autotop);
         //console.log('★ btPopAuto전체 높이 - 컨텐츠 높이 /10 : ' + autotop /10);
 
@@ -704,6 +704,20 @@ $(document).ready(function () {
             }
             return false;
         });
+        // 210405_사이즈 선택시 구매하기 팝업 추가
+        $('.opt_size .form_field div').click(function(){
+            popOpenScroll();
+            //$('.btPop_body .lap span').css('color', 'red')
+            //console.log($(this)[0]);
+            $('.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";
+            }
+            return false;
+        });
 
 
         // 쇼핑백팝업
@@ -742,6 +756,8 @@ $( document ).ready( function() {
 
         /* 상품문의_accordion */
         $(document).on('click','.pd_qnalist .fold_head .fold_tit',function(e){	
+            $('.fold_head').removeClass('on');
+            $('.fold_cont').slideUp(100);
             $(this).parents('.foldGroup li').find('.fold_cont').slideToggle(100);
             $(this).parents('.fold_head').toggleClass('on');
             return false;

+ 10 - 1
src/main/webapp/ux/style24_link.js

@@ -700,12 +700,21 @@ function cfGoodsQngCreate(goodsCd) {
 function cfGoodsDelivery(goodsCd) {
 	var Param = new Object();
 	var str = '<div class="pd_pop full_pop pd_delivery_pop" id="layer_goods_delivery"></div>';
+	if ("P" != _frontGb){
+		str = '<div class="modal pop_full fade pd_pop pd_delivery_pop" id="layer_goods_delivery" tabindex="-1" role="dialog" aria-labelledby="exampleFullLabel" aria-hidden="true"></div>';
+	}
 
 	if ($('#layer_goods_delivery').length == 0) {
 		$('body').append(str);
 	}
 
-	cfOpenFullLayer(_PAGE_GOODS_DELIVERY_LAYER + goodsCd, 'layer_goods_delivery');
+	if ("P" == _frontGb){
+		cfOpenFullLayer(_PAGE_GOODS_DELIVERY_LAYER + goodsCd, 'layer_goods_delivery');
+	}else{
+		cfOpenLayer(_PAGE_GOODS_DELIVERY_LAYER + goodsCd, 'layer_goods_delivery');
+	}
+	
+	
 }
 
 /**