From 6a41d7fa79f5e33b05ed2c33a46108c2f7a99003 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=9A=B1?= Date: Thu, 11 Dec 2025 14:20:39 +0900 Subject: [PATCH] =?UTF-8?q?=ED=99=94=ED=8F=90=EB=8B=A8=EC=9C=84=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=EC=83=98=ED=94=8C=20=EB=93=B1=EB=A1=9D(4)?= =?UTF-8?q?=20=EB=A7=88=EC=9D=B4=ED=8E=98=EC=9D=B4=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/login/sopmall/pc/css/default.css | 4 +-- src/main/resources/static/pc/css/default.css | 4 +-- .../static/sopmall/pc/css/default.css | 4 +-- .../views/sopmal/mpage/main/MpageMainR.jsp | 5 +-- .../mpage/ordr/OrdrDlvyListMpageRList.jsp | 5 +-- .../sopmal/mpage/ordr/OrdrDlvyListRList.jsp | 5 +-- .../views/sopmal/mpage/ordr/OrdrDtlR.jsp | 31 ++++++++++--------- .../views/sopmal_m/mpage/main/MpageMainR.jsp | 1 + .../sopmal_m/mpage/ordr/OrdrDlvyListR.jsp | 4 +-- .../views/sopmal_m/mpage/ordr/OrdrDtlR.jsp | 31 ++++++++++--------- 10 files changed, 50 insertions(+), 44 deletions(-) diff --git a/src/main/resources/static/login/sopmall/pc/css/default.css b/src/main/resources/static/login/sopmall/pc/css/default.css index 5373768c..5883ccfd 100644 --- a/src/main/resources/static/login/sopmall/pc/css/default.css +++ b/src/main/resources/static/login/sopmall/pc/css/default.css @@ -6135,7 +6135,7 @@ main { gap: 4px; } .orderList__description__first { - width: 56%; + width: 52%; margin-bottom: 15px; } .orderList__description__second { @@ -6154,7 +6154,7 @@ main { width: 48%; } .orderList__description:has(.orderList__btnControls):has(.orderList__regularDelivery) .orderList__description__first { - width: 56%; + width: 52%; } .orderList__orderNum { font-size: 15px; diff --git a/src/main/resources/static/pc/css/default.css b/src/main/resources/static/pc/css/default.css index 3077c6f3..fdb662f9 100644 --- a/src/main/resources/static/pc/css/default.css +++ b/src/main/resources/static/pc/css/default.css @@ -6160,7 +6160,7 @@ main { gap: 4px; } .orderList__description__first { - width: 56%; + width: 52%; margin-bottom: 15px; } .orderList__description__second { @@ -6179,7 +6179,7 @@ main { width: 48%; } .orderList__description:has(.orderList__btnControls):has(.orderList__regularDelivery) .orderList__description__first { - width: 56%; + width: 52%; } .orderList__orderNum { font-size: 15px; diff --git a/src/main/resources/static/sopmall/pc/css/default.css b/src/main/resources/static/sopmall/pc/css/default.css index 1987d48d..0025f20e 100644 --- a/src/main/resources/static/sopmall/pc/css/default.css +++ b/src/main/resources/static/sopmall/pc/css/default.css @@ -6135,7 +6135,7 @@ main { gap: 4px; } .orderList__description__first { - width: 56%; + width: 52%; margin-bottom: 15px; } .orderList__description__second { @@ -6154,7 +6154,7 @@ main { width: 48%; } .orderList__description:has(.orderList__btnControls):has(.orderList__regularDelivery) .orderList__description__first { - width: 56%; + width: 52%; } .orderList__orderNum { font-size: 15px; diff --git a/src/main/webapp/WEB-INF/views/sopmal/mpage/main/MpageMainR.jsp b/src/main/webapp/WEB-INF/views/sopmal/mpage/main/MpageMainR.jsp index 4cc9e1c7..e3176de7 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/mpage/main/MpageMainR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/mpage/main/MpageMainR.jsp @@ -898,6 +898,7 @@ <%-- 마이페이지 Right 영역 --%> +

주문/배송 조회
- 원 + ${curUnit} - 원 + ${curUnit}
% diff --git a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDlvyListMpageRList.jsp b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDlvyListMpageRList.jsp index f0c09135..730718b1 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDlvyListMpageRList.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDlvyListMpageRList.jsp @@ -13,6 +13,7 @@
" class="orderList__image"> + " onerror="this.src='/pc/images/image_placeholder.png'" alt="">
@@ -30,10 +31,10 @@
- 원 + ${curUnit}
- 예상적립 원 + 예상적립 ${curUnit}
diff --git a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDlvyListRList.jsp b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDlvyListRList.jsp index 516bba15..d2f60a46 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDlvyListRList.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDlvyListRList.jsp @@ -5,6 +5,7 @@ <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> <%@ taglib prefix="ui" uri="http://www.winbit.kr/ctl/ui"%> <%@ taglib prefix="f" uri="/WEB-INF/tlds/f.tld"%> + @@ -30,11 +31,11 @@
- 원 + ${curUnit}
- 예상적립 원 + 예상적립 ${curUnit}
diff --git a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDtlR.jsp b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDtlR.jsp index fcee8400..adad8d8d 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDtlR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDtlR.jsp @@ -6,6 +6,7 @@ <%@ taglib prefix="ui" uri="http://www.winbit.kr/ctl/ui"%> <%@ taglib prefix="f" uri="/WEB-INF/tlds/f.tld"%> + <%-- Class Name : OrdrDtlR.jsp Description : 마이페이지 주문/배송조회 @@ -1230,26 +1231,26 @@ - 원 + ${curUnit} (-) - 원 + ${curUnit} - 원 + ${curUnit} - 원 + 점 @@ -1384,26 +1385,26 @@ - 원 + ${curUnit} (-) - 원 + ${curUnit} - 원 + ${curUnit} - 원 + 점 @@ -1598,7 +1599,7 @@ 결제금액 - 원 + ${curUnit} <%--주문취소시 미노출--%> @@ -1675,36 +1676,36 @@
  • 총 주문금액 - 원 + ${curUnit}
  • 할인금액 - (-)원 + (-)${curUnit}
  • - 원 + ${curUnit}
  • 배송비 - 원 + ${curUnit}
  • - 원 + ${curUnit}
결제금액 - 원 + ${curUnit}
diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/main/MpageMainR.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/main/MpageMainR.jsp index 0eab1505..402db26e 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/main/MpageMainR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/main/MpageMainR.jsp @@ -71,6 +71,7 @@
+ ${ mpageResultMap.info.mbrGradNm }
diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrDlvyListR.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrDlvyListR.jsp index 097a6614..de4bfc4c 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrDlvyListR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrDlvyListR.jsp @@ -6,7 +6,7 @@ <%@ taglib prefix="ui" uri="http://www.winbit.kr/ctl/ui"%> <%@ taglib prefix="f" uri="/WEB-INF/tlds/f.tld"%> - + @@ -163,7 +163,7 @@ if (row.optnNm != null) { div += '

' + row.optnNm + '

'; } - div += '

' + row.orderCnt + '개·' + (row.setleAmt).toLocaleString() + '원'; + div += '

' + row.orderCnt + '개·' + (row.setleAmt).toLocaleString() + '' + '${curUnit}'; div += '

'; div += '
'; div += '
'; diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrDtlR.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrDtlR.jsp index d1b8efcf..49993d14 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrDtlR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrDtlR.jsp @@ -7,6 +7,7 @@ <%@ taglib prefix="f" uri="/WEB-INF/tlds/f.tld"%> + @@ -699,7 +700,7 @@

개 · - 원 + ${curUnit}

@@ -839,7 +840,7 @@

개· - 원 + ${curUnit}

@@ -916,7 +917,7 @@ 구매확정 시 적립예정 - 마일리지 원 + 마일리지 점 리뷰작성 시 적립예정 @@ -925,14 +926,14 @@ - 일반리뷰 원 적립 + 일반리뷰 점 적립 -
포토리뷰 원 적립 +
포토리뷰 점 적립
-
한달리뷰 원 적립 +
한달리뷰 점 적립
@@ -941,7 +942,7 @@ -
( ~ 까지 원 추가 적립) +
( ~ 까지 점 추가 적립)
@@ -1083,7 +1084,7 @@ 결제금액 - 원 + ${curUnit} <%--주문취소시 미노출--%> style="border-bottom: 0.5px solid #e9ecef;"> @@ -1174,31 +1175,31 @@ 총 상품금액 - 원 + ${curUnit} 할인금액 - -원 + -${curUnit} - -원 + -${curUnit} 배송비 - 원 + ${curUnit} - -원 + -${curUnit} @@ -1207,7 +1208,7 @@ 총 결제금액 - 원 + ${curUnit} @@ -1261,7 +1262,7 @@ 처리금액 - 원 + ${curUnit}