Merge remote-tracking branch 'origin/master'

This commit is contained in:
jazz
2026-03-10 12:09:49 +09:00
2 changed files with 23 additions and 5 deletions

View File

@@ -40,15 +40,20 @@
<div class="shipping-list__item">
<div class="shipping-list__item-top">
<div class="custom-radio-container">
<div class="custom-radio" onclick = "fn_select_mngrOrdr_postcode(${callbackNm},${status.index}, '${formId}')">
<label for="${status.index}">
<div class="custom-radio">
<%-- <div class="custom-radio" onclick = "fn_select_mngrOrdr_postcode(${callbackNm},${status.index}, '${formId}')">--%>
<%-- <label for="${status.index}">--%>
<span><c:out value="${resultMap.dlvylcDcCn }" /></span>
</label>
<%-- </label>--%>
</div>
<c:if test="${resultMap.dftDlvylcAt eq 'Y'}">
<span class="default-address">기본배송지</span>
</c:if>
</div>
<button type = "button" class="shipping-apply-btn"
onclick = "fn_select_mngrOrdr_postcode(${callbackNm}, ${status.index}, '${formId}')">
적용
</button>
<button type = "button" class="shipping-modify-btn" id="upt<c:out value="${resultMap.adbkInnb}" />"
onclick="fn_move_dlvylc_uptpage_pop('<c:out value='${pageIndex}'/>',
'<c:out value='${resultMap.adbkInnb}'/>',
@@ -64,7 +69,7 @@
</button>
</c:if>
</div>
<label for="${status.index}" onclick = "fn_select_mngrOrdr_postcode(${callbackNm},${status.index}, '${formId}')">
<%-- <label for="${status.index}" onclick = "fn_select_mngrOrdr_postcode(${callbackNm},${status.index}, '${formId}')">--%>
<div class="shipping-list__item-inner">
<p class="name"><c:out value="${resultMap.recpntNm }" /></p>
<p>(<c:out value="${resultMap.zip }" />)
@@ -80,7 +85,7 @@
</p>
<p class="number mbtlnbPop"><c:out value="${resultMap.mbtlnb}" /></p>
</div>
</label>
<%-- </label>--%>
</div>
</div>
<input type="hidden" name="zip" class = "zip" value="<c:out value='${resultMap.zip}'/>" />