이호영 이호영 2024-07-16
Merge branch 'master' into hylee
@fb44ab739d6ef3d444b31ef73edba0d14915f8db
src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java
--- src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java
+++ src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java
@@ -215,7 +215,7 @@
 						
 						String title = kakaoSubMagTxtRepl(kakaoVO.getTemplateTitle(), kakaoVO, count);
 						String subTitle = kakaoVO.getTemplateSubtitle();
-						title = title +"§§"+ subTitle;
+//						title = title +"§§"+ subTitle;
 						setSendMsgVO.setTemplateEmphasizeType(kakaoVO.getTemplateEmphasizeType());
 						setSendMsgVO.setTemplateTitle(title);
 					}
@@ -226,7 +226,7 @@
 						
 						String title = kakaoSubMagTxtRepl(kakaoVO.getTemplateTitle(), kakaoVO, count);
 						String subTitle = kakaoVO.getTemplateSubtitle();
-						title = title +"§§"+ subTitle;
+//						title = title +"§§"+ subTitle;
 						setSendMsgVO.setTemplateEmphasizeType(kakaoVO.getTemplateEmphasizeType());
 						setSendMsgVO.setTemplateTitle(title);
 					}
src/main/webapp/WEB-INF/jsp/web/pay/PayList.jsp
--- src/main/webapp/WEB-INF/jsp/web/pay/PayList.jsp
+++ src/main/webapp/WEB-INF/jsp/web/pay/PayList.jsp
@@ -213,12 +213,12 @@
 					<c:when test="${prePaymentYn eq 'Y'}">
 						<ul class="tabType1">
 							<li class="tab active"><button type="button" onclick="TabType5(this,'1');listLoad('/web/member/pay/PayListAllAjax.do'); return false;" >전체</button></li>
-							<li class="tab"><button type="button" onclick="TabType5(this,'2');listLoad('/web/member/pay/PayListSPayAjax.do'); return false;">간편결제 결제내역</button></li>
-							<li class="tab"><button type="button" onclick="TabType5(this,'2');listLoad('/web/member/pay/PayListVBankAjax.do'); return false;">전용계좌 결제내역</button></li>
-							<li class="tab"><button type="button" onclick="TabType5(this,'3');listLoad('/web/member/pay/PayListCardAjax.do'); return false;">신용카드 결제내역</button></li>
-							<li class="tab"><button type="button" onclick="TabType5(this,'4');listLoad('/web/member/pay/PayListMobileAjax.do'); return false;">휴대폰  결제내역</button></li>
-							<li class="tab"><button type="button" onclick="TabType5(this,'5');listLoad('/web/member/pay/PayListBankAjax.do'); return false;">즉시이체 결제내역</button></li>					
-							<li class="tab"><button type="button" onclick="TabType5(this,'6');listLoad('/web/member/pay/PayListPointAjax.do'); return false;">포인트 교환내역</button></li>					
+							<li class="tab"><button type="button" onclick="TabType5(this,'2');listLoad('/web/member/pay/PayListSPayAjax.do'); return false;">간편결제</button></li>
+							<li class="tab"><button type="button" onclick="TabType5(this,'2');listLoad('/web/member/pay/PayListVBankAjax.do'); return false;">전용계좌</button></li>
+							<li class="tab"><button type="button" onclick="TabType5(this,'3');listLoad('/web/member/pay/PayListCardAjax.do'); return false;">신용카드</button></li>
+							<li class="tab"><button type="button" onclick="TabType5(this,'4');listLoad('/web/member/pay/PayListMobileAjax.do'); return false;">휴대폰</button></li>
+							<li class="tab"><button type="button" onclick="TabType5(this,'5');listLoad('/web/member/pay/PayListBankAjax.do'); return false;">즉시이체</button></li>					
+							<li class="tab"><button type="button" onclick="TabType5(this,'6');listLoad('/web/member/pay/PayListPointAjax.do'); return false;">포인트 교환</button></li>					
 							<li class="tab"><button type="button" id="tab6" onclick="TabType5(this,'7');listLoad('/web/member/pay/PayListRefundAjax.do'); return false;">환불신청</button></li> 
 						</ul>
 					</c:when>
src/main/webapp/WEB-INF/jsp/web/pay/PayView.jsp
--- src/main/webapp/WEB-INF/jsp/web/pay/PayView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/pay/PayView.jsp
@@ -969,19 +969,21 @@
 														<div class="account_holder">
 															(예금주 : <c:out value="${result.cmfNm}"/>)
 														</div>
+														
 													</td>
-													<td class="right">
+													<td class="right account_te">
+														<button type="button">가상계좌 확인서</button>
 													</td>
 												</tr>
 											</c:forEach>								
 										</c:when>
 										<c:otherwise>
 											<tr>
-												<td class="account_te" colspan="2">
+												<td colspan="2">
 													<div>
 														보유한 전용 계좌가 없습니다.
 													</div>
-													<button type="button">가상계좌 확인서</button>
+													<!-- <button type="button">가상계좌 확인서</button> -->
 												</td>
 											</tr>
 										</c:otherwise>
src/main/webapp/publish/css/content.css
--- src/main/webapp/publish/css/content.css
+++ src/main/webapp/publish/css/content.css
@@ -2009,7 +2009,8 @@
 .tType1 tbody tr .ele_te span{font-weight: 400;}
 
 /* 결제화면 > 전용계좌 > 가상계좌 확인서 버튼 추가 */
-.tType1.account_con tbody tr .account_te{display: flex; justify-content: space-between;}
+.tType1.account_con{table-layout: auto;}
+.tType1.account_con tbody tr .account_te button{white-space: nowrap;}
 
 @keyframes rotate-loading {
 	0% {transform:rotate(0)}
Add a comment
List