Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -133,7 +133,7 @@
|
||||
<div class="content__inner">
|
||||
<button class="side-nav__fold"><span class="visually-hidden">좌측메뉴 펼치기/닫기</span></button>
|
||||
<div class="page-title">
|
||||
<h2 class="page-title__title">주문 설정</h2>
|
||||
<h2 class="page-title__title">마일리지 설정</h2>
|
||||
<div class="page-title__btn-container">
|
||||
<button type="button" class="btn primary" onclick="fn_save_ordrSetup(); return false;">
|
||||
<spring:message code="button.save"/></button>
|
||||
|
||||
@@ -4064,6 +4064,9 @@
|
||||
value="${resultMap.goodsDtl.dftDlvyAmt}" default="0"/></span>
|
||||
<span class="priceUnit">${curUnit}</span>)
|
||||
</c:if>
|
||||
<c:if test="${resultMap.goodsDtl.dlvyGroupDvCd eq '02'}">
|
||||
(<span>무료배송</span>)
|
||||
</c:if>
|
||||
<c:if test="${ resultMap.goodsDtl.amtCndUseAt eq 'Y'}">
|
||||
<button id="deliveryFeeInfo" class="infoBtn"><i
|
||||
class="icon icon_question"></i><span
|
||||
|
||||
@@ -3853,6 +3853,9 @@ const fn_move_goodsDtl_login = () => {
|
||||
value="${resultMap.goodsDtl.dftDlvyAmt}" default="0"/></span>
|
||||
<span class="priceUnit">${curUnit}</span>)
|
||||
</c:if>
|
||||
<c:if test="${resultMap.goodsDtl.dlvyGroupDvCd eq '02'}">
|
||||
(<span>무료배송</span>)
|
||||
</c:if>
|
||||
<c:if test="${ resultMap.goodsDtl.amtCndUseAt eq 'Y'}">
|
||||
<button type="button" class="infoBtn" onclick="fn_select_dlvy_info('deliveryFeePop')">
|
||||
<i class="icon icon_question"></i>
|
||||
|
||||
Reference in New Issue
Block a user