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:
이경숙
2026-05-06 17:05:25 +09:00
parent eff6ce35bd 9cc4a26f0f
commit 16c373cb14
53 changed files with 2375 additions and 813 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/webapp/WEB-INF/views/sopmal_m/goods/GoodsDtlR.jsp
View File

@@ -3935,7 +3935,7 @@ const fn_move_goodsDtl_login = () => {
<span class="productDetailTab__num"><span id="goodsQnaCnt"><fmt:formatNumber value="${resultMap.bbscttInfo.qnaCnt}" pattern="#,###"/></span></span>
</li>
<li class="productDetailTab__item">
<button id="productReTurnA">교환/반품</button>
<button id="productReTurnA">배송/반품</button>
</li>
</ul>
<div class="productDetailTab__content active">

15
src/main/webapp/WEB-INF/views/sopmal_m/mbr/JoinGuidanceR.jsp
View File

@@ -24,12 +24,15 @@
<script>
$(document).ready(function() {
fn_set_header_title("회원가입");
let signUpPromo = $('.signUp-promotion__section__content');
let figureTable = signUpPromo.find('figure.table').length;
let signUpPromo = $('.signUp-promotion__col-3.ck-content');
let figureTable = signUpPromo.find('figure.table');
if(figureTable.length == 4){
signUpPromo.removeClass('signUp-promotion__col-3').addClass('signUp-promotion__col-2');
if(figureTable) {
if (figureTable % 3 == 0) {
signUpPromo.addClass('signUp-promotion__col-3');
} else if (figureTable % 2 == 0) {
signUpPromo.addClass('signUp-promotion__col-2');
}
}
});
@@ -131,7 +134,7 @@
<div class="sub-box">
<div class="signUp-promotion__section">
<h5 class="signUp-promotion__section__title"><c:if test="${integrated}">GC ONE (통합 회원) </c:if>주요 혜택</h5>
<div class="signUp-promotion__col-3 ck-content">
<div class="signUp-promotion__section__content ck-content">
<c:out value='${sopmalInfo.joinBnef}' escapeXml='false'/>
</div>
</div>

6
src/main/webapp/WEB-INF/views/sopmal_m/ordr/MbrPurchsC.jsp
View File

@@ -659,7 +659,11 @@
fn_set_csh_rcipt_issu(id);
}
} else {
$(form).find('#pgCmpnyNm').val($('input[name="pg"]:checked').val());
if('bank' === id) {
$(form).find('#pgCmpnyNm').val(id);
} else {
$(form).find('#pgCmpnyNm').val($('input[name="pg"]:checked').val());
}
if ('hndwr-card' !== id) {
if ('payco' === id || 'card' === id) {

8
src/main/webapp/WEB-INF/views/sopmal_m/ordr/SubsvcPurchsC.jsp
View File

@@ -662,7 +662,11 @@
fn_set_csh_rcipt_issu(id);
}
} else {
$(form).find('#pgCmpnyNm').val($('input[name="pg"]:checked').val());
if('bank' === id) {
$(form).find('#pgCmpnyNm').val(id);
} else {
$(form).find('#pgCmpnyNm').val($('input[name="pg"]:checked').val());
}
if ('hndwr-card' !== id) {
if ('payco' === id || 'card' === id) {
@@ -4676,6 +4680,7 @@
</div>
</div>
</c:if>
<%--
<c:if test="${'Y' eq payInfo.npayUseAt}">
<div id="naverpay-content" class="order-method-normal__content" style="display: none">
<div id="naverpay-content-inner" class="order-method-normal__content-inner">
@@ -4694,6 +4699,7 @@
</div>
</div>
</c:if>
--%>
</div>
</div>
</c:if>