Compare commits

...

2 Commits

Author SHA1 Message Date
김현욱
e1616910cd 마이페이지 > 주문배송 목록, 상세 수정 2026-03-25 17:48:14 +09:00
김현욱
5b483bd3b6 관리자, 통합관리자 로고변경 2026-03-25 17:46:46 +09:00
6 changed files with 29 additions and 3 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

View File

@@ -21,7 +21,8 @@
<div class="orderList__item__top">
<a href="javascript:void(0);" onclick="fn_go_ordr_dtl('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>');" class="orderList__orderNum"><c:out value="${order.ordrInnb}"/></a>
<span class="orderList__dot">·</span>
<span class="orderList__date"><c:out value="${order.ordrDt}"/> <span class="orderList__dot">·</span> ${order.ordrTyCdNm}</span>
<%-- <span class="orderList__date"><c:out value="${order.ordrDt}"/> <span class="orderList__dot">·</span> ${order.ordrTyCdNm}</span>--%>
<span class="orderList__date"><c:out value="${order.ordrDt}"/></span>
</div>
<a href="javascript:void(0);" onclick="fn_go_ordr_dtl('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>');" class="orderList__productTitle"><c:out value="${order.goodsNm}"/></a>
<%--<span class="orderList__option"><c:out value="${order.optnNm}"/></span>--%>

View File

@@ -142,7 +142,7 @@
div += ' <div class="orderListItem">';
div += ' <div class="orderListItem__top">';
div += ' <span class="orderListItem__top__date"><span class="misc">'+ row.ordrDt +'(' + row.ordrInnb +') ';
div += ' <span className="orderList__dot">·</span> ' + row.ordrTyCdNm;
// div += ' <span className="orderList__dot">·</span> ' + row.ordrTyCdNm;
div += ' </span></span>';
div += ' <a href="javascript:void(0);" onclick="fn_go_ordr_dtl(\'' + row.sopmalCd + '\', \'' + row.ordrInnb + '\');" class="orderListItem__top__more">상세보기</a>';
div += ' </div>';

View File

@@ -26,6 +26,8 @@
fn_dlvy_event();
fn_set_saveMlg();
// MicroModal.init();
});
@@ -69,6 +71,29 @@
/* ********************************************************
* function
**********************************************************/
const fn_set_saveMlg = function (data) {
<c:set var="totSaveMlg" value="0"/>
<c:forEach var="ntc" items="${data.mlgAccmlNtcList}">
<c:choose>
<c:when test="${'06' == ntc.bbsTyCd}">
<c:set var="totSaveMlg" value="${totSaveMlg + ntc.gnrlRvwAmt+ntc.photoRvwAmt}"/>
</c:when>
<c:otherwise>
<c:set var="totSaveMlg" value="${totSaveMlg + ntc.photoRvwAmt}"/>
</c:otherwise>
</c:choose>
</c:forEach>
var totSaveMlg = ${totSaveMlg};
totSaveMlg = totSaveMlg + ${data.mlgAccmlAmt};
// 적립예상 마일리지가 0이면 보이지 않게 처리
if (totSaveMlg == 0){
$('#saveMlg').hide();
}else{
$('#saveMlg').show();
}
}
/* 주문 무효 상태 수정 확인창 */
const fn_post_cancl_ordr_confirm = function (sopmalCd, ordrInnb, currOrdrSttusCd) {
const modalId = 'confirmModal';
@@ -924,7 +949,7 @@
</c:choose>
<%--주문취소, 결제취소시 미노출--%>
<c:if test = "${order.ordrSttusCd ne '85' && order.ordrSttusCd ne '95'}">
<div class="sub-box">
<div class="sub-box" id="saveMlg">
<div class="orderDetailProduct">
<div class="orderDetailProduct__top" role="button" tabindex="0">
<span class="orderDetailProduct__top__title">