itfirst/sake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
jazz
2026-02-10 13:48:38 +09:00
parent daf9770fbe 86c7b59070
commit 780f061592
4 changed files with 1313 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/webapp/WEB-INF/views/sopmal/main/SubscribeR.jsp
View File

@@ -94,8 +94,7 @@
justify-content: center; justify-content: center;
} }
.box > span { .box > .boxTitle {
width: 100%;
margin-bottom: 16px; margin-bottom: 16px;
} }
@@ -130,7 +129,9 @@
<c:when test="${not empty resultMap.subsvcList}"> <c:when test="${not empty resultMap.subsvcList}">
<div class="container"> <div class="container">
<div class="box"> <div class="box">
<span>구독서비스</span> <div class="boxTitle">
<span>구독서비스</span>
</div>
<div class="select-box"> <div class="select-box">
<select title="구독 서비스 선택" id="subsvcInnb" name="subsvcInnb" onchange="fn_select_subsvcDetail(this.value);"> <select title="구독 서비스 선택" id="subsvcInnb" name="subsvcInnb" onchange="fn_select_subsvcDetail(this.value);">
<c:forEach var="subsvcList" items="${resultMap.subsvcList}" varStatus="status"> <c:forEach var="subsvcList" items="${resultMap.subsvcList}" varStatus="status">
@@ -140,7 +141,6 @@
</div> </div>
</div> </div>
<div class="box"> <div class="box">
<span>구독서비스 내역</span>
<ul> <ul>
<li> <li>
구독기간 : <span id="subPd"></span>개월 구독기간 : <span id="subPd"></span>개월
@@ -151,14 +151,14 @@
<li> <li>
배송주기 : <span id="dlvyCycle"></span> 배송주기 : <span id="dlvyCycle"></span>
</li> </li>
<li>
상품금액 : <span id="cnsmrpric" class="product-unit-price__original"></span>
<span id="selpric" class="product-unit-price__current"></span>
<span id="dscntRaito" style="color: red">%</span>
</li>
</ul> </ul>
</div> </div>
<div class="box"> <div class="box">
<div class="productDetailInfo__price__price boxTitle">
<span id="cnsmrpric" class="product-unit-price__original"></span>
<span id="selpric" class="product-unit-price__current"></span>
<span id="dscntRaito" style="color: red">%</span>
</div>
<button id="subscribeBtn" class="btn theme large">구독하기</button> <button id="subscribeBtn" class="btn theme large">구독하기</button>
</div> </div>
</div> </div>

14
src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDtlR.jsp
View File

@@ -78,12 +78,6 @@
newForm.submit(); newForm.submit();
}); });
/* 주문/배송 목록 화면 이동 버튼 선택 이벤트
$(document).on('click', '#reqstRefund', function() {
alert('TODO::반품신청 화면 이동');
});
*/
/* 주문/배송 목록 화면 이동 버튼 선택 이벤트 */ /* 주문/배송 목록 화면 이동 버튼 선택 이벤트 */
$(document).on('click', '#registRvw', function() { $(document).on('click', '#registRvw', function() {
location.href = '<c:url value="/sopmal/mpage/act/selectMyRvwInqireForm"/>'; location.href = '<c:url value="/sopmal/mpage/act/selectMyRvwInqireForm"/>';
@@ -1139,10 +1133,10 @@
<p class="multiDeliveryStatus__title">총 <em><c:out value="${fn:length(data.shippingList)}"/>곳</em>의 배송지로 주문하셨습니다.</p> <p class="multiDeliveryStatus__title">총 <em><c:out value="${fn:length(data.shippingList)}"/>곳</em>의 배송지로 주문하셨습니다.</p>
<c:choose> <c:choose>
<c:when test="${order.ordrSttusCd == 25}"> <c:when test="${order.ordrSttusCd == 25}">
<a href="javascript:void(0);" onclick="fn_call_setle_cancl_pop('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>', '', '<c:out value="${setleDt}"/>', '<c:out value="${setleTyCd}"/>', '<c:out value="${order.ordrSttusCd}"/>');" class="btn gray2">전체결제취소</a> <a href="javascript:void(0);" onclick="fn_call_setle_cancl_pop('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>', '', '<c:out value="${setleDt}"/>', '<c:out value="${setleTyCd}"/>', '<c:out value="${order.ordrSttusCd}"/>');" class="btn gray2">전체 결제취소</a>
</c:when> </c:when>
<c:when test="${goods.ordrSttusCd > 34 && goods.ordrSttusCd < 55}"> <c:when test="${goods.ordrSttusCd > 34 && goods.ordrSttusCd < 55}">
<a href="javascript:void(0);" id="reqstRefund" class="btn-ordr-sttus btn gray sm full" onclick="fn_pop_m2mqna_regist('<c:out value="${order.ordrInnb}"/>');">반품신청</a> <a href="javascript:void(0);" class="btn-ordr-sttus btn gray sm full" onclick="fn_pop_m2mqna_regist('<c:out value="${order.ordrInnb}"/>');">반품신청</a>
</c:when> </c:when>
</c:choose> </c:choose>
</div> </div>
@@ -1303,11 +1297,11 @@
</c:when> </c:when>
<c:when test="${goods.ordrSttusCd > 34 && goods.ordrSttusCd < 55}"> <c:when test="${goods.ordrSttusCd > 34 && goods.ordrSttusCd < 55}">
<a href="javascript:void(0);" onclick="fn_call_dlvy_sweettracker_pop('<c:out value="${order.ordrInnb}"/>');" id="inqireDlvy" class="btn-ordr-sttus btn outline sm full">배송조회</a> <a href="javascript:void(0);" onclick="fn_call_dlvy_sweettracker_pop('<c:out value="${order.ordrInnb}"/>');" id="inqireDlvy" class="btn-ordr-sttus btn outline sm full">배송조회</a>
<a href="javascript:void(0);" id="reqstRefund" class="btn-ordr-sttus btn gray sm full" onclick="fn_pop_m2mqna_regist('<c:out value="${order.ordrInnb}"/>');">반품신청</a> <a href="javascript:void(0);" class="btn-ordr-sttus btn gray sm full" onclick="fn_pop_m2mqna_regist('<c:out value="${order.ordrInnb}"/>');">반품신청</a>
</c:when> </c:when>
<c:when test="${goods.ordrSttusCd > 54 && goods.ordrSttusCd < 76 && order.sknEnvrnCd ne 'POS'}"> <c:when test="${goods.ordrSttusCd > 54 && goods.ordrSttusCd < 76 && order.sknEnvrnCd ne 'POS'}">
<a href="javascript:void(0);" onclick="fn_call_dlvy_sweettracker_pop('<c:out value="${order.ordrInnb}"/>');" id="inqireDlvy" class="btn-ordr-sttus btn outline sm full">배송조회</a> <a href="javascript:void(0);" onclick="fn_call_dlvy_sweettracker_pop('<c:out value="${order.ordrInnb}"/>');" id="inqireDlvy" class="btn-ordr-sttus btn outline sm full">배송조회</a>
<a href="javascript:void(0);" id="reqstRefund" class="btn-ordr-sttus btn gray sm full" onclick="fn_pop_m2mqna_regist('<c:out value="${order.ordrInnb}"/>');">반품신청</a> <a href="javascript:void(0);" class="btn-ordr-sttus btn gray sm full" onclick="fn_pop_m2mqna_regist('<c:out value="${order.ordrInnb}"/>');">반품신청</a>
<c:choose> <c:choose>
<c:when test="${goods.itemOrdrSttusCd > 54 && goods.itemOrdrSttusCd < 76 && goods.purchsDcsnAt eq 'N'}"> <c:when test="${goods.itemOrdrSttusCd > 54 && goods.itemOrdrSttusCd < 76 && goods.purchsDcsnAt eq 'N'}">
<a href="javascript:void(0);" onclick="fn_post_purchs_dcsn_by_item('<c:out value="${goods.sopmalCd}"/>', <a href="javascript:void(0);" onclick="fn_post_purchs_dcsn_by_item('<c:out value="${goods.sopmalCd}"/>',

8
src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDlvyListR.jsp → src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDlvyListRForm.jsp
View File

@@ -144,7 +144,7 @@
div += ' <span class="orderListItem__top__date"><span class="misc">'+ row.ordrDt +'(' + row.ordrInnb +') '; 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 += ' </span></span>';
div += ' <a href="javascript:void(0);" onclick="fn_go_ordr_dtl(\'' + row.sopmalCd + '\', \'' + row.ordrInnb + '\');" class="orderListItem__top__more">상세보기</a>'; div += ' <a href="javascript:void(0);" onclick="fn_go_subsvc_dtl(\'' + row.sopmalCd + '\', \'' + row.ordrInnb + '\');" class="orderListItem__top__more">상세보기</a>';
div += ' </div>'; div += ' </div>';
div += ' <div class="orderListItem__body">'; div += ' <div class="orderListItem__body">';
div += ' <div class="orderListItem__image">'; div += ' <div class="orderListItem__image">';
@@ -159,7 +159,7 @@
div += ' (' + row.giftSttusCdNm + ')'; div += ' (' + row.giftSttusCdNm + ')';
} }
div += ' </p>'; div += ' </p>';
div += ' <a href="javascript:void(0);" onclick="fn_go_ordr_dtl(\'' + row.sopmalCd + '\', \'' + row.ordrInnb + '\');" class="orderListItem__info__name">' + row.goodsNm + '</a>'; div += ' <a href="javascript:void(0);" onclick="fn_go_subsvc_dtl(\'' + row.sopmalCd + '\', \'' + row.ordrInnb + '\');" class="orderListItem__info__name">' + row.goodsNm + '</a>';
if (row.optnNm != null) { if (row.optnNm != null) {
div += ' <p class="orderListItem__info__option">' + row.optnNm + '</p>'; div += ' <p class="orderListItem__info__option">' + row.optnNm + '</p>';
} }
@@ -512,13 +512,13 @@
} }
/* 주문상세 이동 */ /* 주문상세 이동 */
const fn_go_ordr_dtl = function (sopmalCd, ordrInnb) { const fn_go_subsvc_dtl = function (sopmalCd, ordrInnb) {
const form = $('#condForm'); const form = $('#condForm');
$(form).append($('<input/>', {type: 'hidden', name: 'ordrInnb', id: 'ordrInnb', value: ordrInnb})); $(form).append($('<input/>', {type: 'hidden', name: 'ordrInnb', id: 'ordrInnb', value: ordrInnb}));
$(form).attr('method', 'get'); $(form).attr('method', 'get');
$(form).attr('action', '<c:url value="/sopmal/mpage/ordr/selectMbrOrdrDtlInqire"/>'); $(form).attr('action', '<c:url value="/sopmal/mpage/ordr/selectMbrSubsvcOrdrDtlInqire"/>');
$(form).submit(); $(form).submit();
} }

1296
src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDtlR.jsp Normal file
View File

File diff suppressed because it is too large Load Diff