Commit @8db8aaf00157a02a38b12e0d3e6fe6d0f201e839

JIWOO 2025-08-20

이지우 - 사용자 > 결제관리 > 요금 사용내역 > 알림톡, 친구톡 상세 팝업 수정

@8db8aaf00157a02a38b12e0d3e6fe6d0f201e839

4dd7d36

8db8aaf

src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailPopAjax.jsp

--- src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailPopAjax.jsp

+++ src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailPopAjax.jsp


     <!--// 탭스타일 -->
 
     <!-- 카카오 알림톡 미리보기 -->
-<!--     <div class="tab_phone current" id="tab_phone_1"> -->
-<!--         <div class="phone_kakako friendtalk"> -->
     <div class="tab_phone current kakao_wrap" id="tab_phone_1">
         <div class="phone_kakako friendtalk">
             <div class="phoneIn">
-                <p class="prev_p"><img src="/publish/images/content/kakao_prev_icon.png" alt=""><c:out value="${searchVO.yellowId}"/></p>
-                <!-- 텍스트 미리보기 -->
+				<div class="rev_pop_middle clearfix">
+					<fmt:parseDate value="${resultMsgDetail.reqDate}" var="parsedDate" pattern="yyyy-MM-dd HH:mm:ss.S"/>
+					<span>발송일시 : <fmt:formatDate value="${parsedDate}" pattern="yyyy-MM-dd HH:mm:ss"/></span>
+					<span class="msg_com msg_allimtalk">
+				        <c:choose>
+				            <c:when test="${msgType eq '8'}">알림톡</c:when>
+				            <c:when test="${msgType eq '9'}">친구톡</c:when>
+				        </c:choose>
+					</span>
+				</div>
+              <!-- 텍스트 미리보기 -->
+              <div class="rev_pop_txt">
                 <div class="text_preview">
-					<c:if test="${resultMsgDetail.adFlag eq 'Y'}">
-						<p class="friend_talk_title"><span>(광고)</span></p>
-					</c:if>
+                    <div class="allimtalk_title">
+                        <img src="/publish/images/content/icon_allimtalk.png" alt="">
+                        <c:choose>
+                            <c:when test="${msgType eq '8'}">알림톡 도착</c:when>
+                            <c:when test="${msgType eq '9'}">친구톡 도착</c:when>
+                        </c:choose>
+                    </div>
                     <div class="allimtalk_content">
                         <c:choose>
                             <c:when test="${kakaoTemplateInfo.templateEmphasizeType eq 'TEXT'}">

                                 </div>
                             </c:when>
                         </c:choose>
-
+					<c:if test="${resultMsgDetail.adFlag eq 'Y'}">
+						<p class="friend_talk_title"><span>(광고)</span></p>
+					</c:if>
                         <p class="template_text">
                             <c:out value="${fn:replace(fn:replace(kakaoTemplateInfo.templateContent, newLineChar, '<br/>'), newLineChar2, '<br/>')}" escapeXml="false"/>
                         </p>

 					</c:if>
                     
                 </div>
+              </div>
             </div>
             <p class="addText">※ 단말기 설정에 따라 다르게 보일 수 있습니다</p>
         </div>

 	                	<c:if test="${resultMsgDetail.bizKakaoResendYn eq 'Y'}">
 		                	<c:choose>
 		                		<c:when test="${resultMsgDetail.bizKakaoResendType eq 'SMS'}">
-		                			<span class="msg_com msg_short">단문</span>
+		                			<span class="msg_com msg_short" style="float:right;">단문</span>
 		               			</c:when>
 		                		<c:otherwise>
-		                			<span class="msg_com msg_long">장문</span>
+		                			<span class="msg_com msg_long" style="float:right;">장문</span>
 		                		</c:otherwise>
 		                	</c:choose>
 <%-- 		                	<c:choose>

4dd7d36

8db8aaf

src/main/webapp/WEB-INF/jsp/web/pay/PayUserMsgDetailPopAjax.jsp

--- src/main/webapp/WEB-INF/jsp/web/pay/PayUserMsgDetailPopAjax.jsp

+++ src/main/webapp/WEB-INF/jsp/web/pay/PayUserMsgDetailPopAjax.jsp


         <%-- <label for="subject" class="label">발송된 문자 제목</label>
         <input type="text" id="subject" name="subject" placeholder="${resultMsgDetail.subject}" value="${resultMsgDetail.subject}" readonly> --%>
         <div class="rev_pop_middle clearfix">
-            <span>발송일시  :  <c:out value="${resultMsgDetail.sentDate}"/></span>
+            <span>발송일시  :  <c:out value="${resultMsgDetail.reqDate}"/></span>
             <c:choose>
             	<c:when test="${resultMsgDetail.msgType == '4'}">
             		<span class="msg_com msg_short">SMS</span>		

Add a comment

Open 0
Closed 0

List

...	...	@@ -18,17 +18,29 @@
18	18	<!--// 탭스타일 -->
19	19
20	20	<!-- 카카오 알림톡 미리보기 -->
21		-<!-- <div class="tab_phone current" id="tab_phone_1"> -->
22		-<!-- <div class="phone_kakako friendtalk"> -->
23	21	<div class="tab_phone current kakao_wrap" id="tab_phone_1">
24	22	<div class="phone_kakako friendtalk">
25	23	<div class="phoneIn">
26		- <p class="prev_p"><img src="/publish/images/content/kakao_prev_icon.png" alt=""><c:out value="${searchVO.yellowId}"/></p>
27		- <!-- 텍스트 미리보기 -->
	24	+ <div class="rev_pop_middle clearfix">
	25	+ <fmt:parseDate value="${resultMsgDetail.reqDate}" var="parsedDate" pattern="yyyy-MM-dd HH:mm:ss.S"/>
	26	+ <span>발송일시 : <fmt:formatDate value="${parsedDate}" pattern="yyyy-MM-dd HH:mm:ss"/></span>
	27	+ <span class="msg_com msg_allimtalk">
	28	+ <c:choose>
	29	+ <c:when test="${msgType eq '8'}">알림톡</c:when>
	30	+ <c:when test="${msgType eq '9'}">친구톡</c:when>
	31	+ </c:choose>
	32	+ </span>
	33	+ </div>
	34	+ <!-- 텍스트 미리보기 -->
	35	+ <div class="rev_pop_txt">
28	36	<div class="text_preview">
29		- <c:if test="${resultMsgDetail.adFlag eq 'Y'}">
30		- <p class="friend_talk_title"><span>(광고)</span></p>
31		- </c:if>
	37	+ <div class="allimtalk_title">
	38	+ <img src="/publish/images/content/icon_allimtalk.png" alt="">
	39	+ <c:choose>
	40	+ <c:when test="${msgType eq '8'}">알림톡 도착</c:when>
	41	+ <c:when test="${msgType eq '9'}">친구톡 도착</c:when>
	42	+ </c:choose>
	43	+ </div>
32	44	<div class="allimtalk_content">
33	45	<c:choose>
34	46	<c:when test="${kakaoTemplateInfo.templateEmphasizeType eq 'TEXT'}">
...	...	@@ -41,7 +53,9 @@
41	53	</div>
42	54	</c:when>
43	55	</c:choose>
44		-
	56	+ <c:if test="${resultMsgDetail.adFlag eq 'Y'}">
	57	+ <p class="friend_talk_title"><span>(광고)</span></p>
	58	+ </c:if>
45	59	<p class="template_text">
46	60	<c:out value="${fn:replace(fn:replace(kakaoTemplateInfo.templateContent, newLineChar, '<br/>'), newLineChar2, '<br/>')}" escapeXml="false"/>
47	61	</p>
...	...	@@ -72,6 +86,7 @@
72	86	</c:if>
73	87
74	88	</div>
	89	+ </div>
75	90	</div>
76	91	<p class="addText">※ 단말기 설정에 따라 다르게 보일 수 있습니다</p>
77	92	</div>
...	...	@@ -90,10 +105,10 @@
90	105	<c:if test="${resultMsgDetail.bizKakaoResendYn eq 'Y'}">
91	106	<c:choose>
92	107	<c:when test="${resultMsgDetail.bizKakaoResendType eq 'SMS'}">
93		- <span class="msg_com msg_short">단문</span>
	108	+ <span class="msg_com msg_short" style="float:right;">단문</span>
94	109	</c:when>
95	110	<c:otherwise>
96		- <span class="msg_com msg_long">장문</span>
	111	+ <span class="msg_com msg_long" style="float:right;">장문</span>
97	112	</c:otherwise>
98	113	</c:choose>
99	114	<%-- <c:choose>

...	...	@@ -11,7 +11,7 @@
11	11	<%-- <label for="subject" class="label">발송된 문자 제목</label>
12	12	<input type="text" id="subject" name="subject" placeholder="${resultMsgDetail.subject}" value="${resultMsgDetail.subject}" readonly> --%>
13	13	<div class="rev_pop_middle clearfix">
14		- <span>발송일시 : <c:out value="${resultMsgDetail.sentDate}"/></span>
	14	+ <span>발송일시 : <c:out value="${resultMsgDetail.reqDate}"/></span>
15	15	<c:choose>
16	16	<c:when test="${resultMsgDetail.msgType == '4'}">
17	17	<span class="msg_com msg_short">SMS</span>

Delete comment