From add6f6f260a40a0dff8e04c09a77f2a8ae60ff17 Mon Sep 17 00:00:00 2001 From: myname Date: Mon, 3 Feb 2025 15:03:51 +0900 Subject: [PATCH 1/3] =?UTF-8?q?2025-02-03=2015:03=20=EC=9D=BC=EB=B3=84/?= =?UTF-8?q?=EC=9B=94=EB=B3=84=20=EB=AC=B8=EC=9E=90=EB=B0=9C=EC=86=A1?= =?UTF-8?q?=EA=B1=B4=EC=88=98=20=ED=86=B5=EA=B3=84=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/jsp/uss/ion/msg/MsgDayChart_230125.jsp | 5 +++-- .../webapp/WEB-INF/jsp/uss/ion/msg/MsgMonthChart_230125.jsp | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/MsgDayChart_230125.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/MsgDayChart_230125.jsp index 9c352a48..d5848619 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/MsgDayChart_230125.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/MsgDayChart_230125.jsp @@ -219,7 +219,7 @@ function fnSetCalMonth(val) { - + @@ -229,7 +229,8 @@ function fnSetCalMonth(val) { - + + diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/MsgMonthChart_230125.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/MsgMonthChart_230125.jsp index 3384d4ac..30ed2bf0 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/MsgMonthChart_230125.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/MsgMonthChart_230125.jsp @@ -150,7 +150,7 @@ function linkPage(){ - + @@ -160,7 +160,7 @@ function linkPage(){ - + From 533e081c2b79f7b537c7929ae4c762fa0f318805 Mon Sep 17 00:00:00 2001 From: wyh Date: Mon, 3 Feb 2025 17:21:56 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=ED=9A=8C?= =?UTF-8?q?=EC=9B=90=20=EB=B9=84=EA=B5=90=20=EB=82=B4=EC=9A=A9=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/itn/let/mjo/event/web/MjonEventController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/itn/let/mjo/event/web/MjonEventController.java b/src/main/java/itn/let/mjo/event/web/MjonEventController.java index ffa3cf64..53fa43e9 100644 --- a/src/main/java/itn/let/mjo/event/web/MjonEventController.java +++ b/src/main/java/itn/let/mjo/event/web/MjonEventController.java @@ -201,7 +201,7 @@ public class MjonEventController { //System.out.println(payCnt); //System.out.println(payCnt); - if (payCnt>=0) { + if (payCnt > 0) { modelAndView.addObject("message", "첫 결제 회원만 이벤트 신청이 가능합니다."); modelAndView.addObject("resultSts", "statusAlreadyPayedFail"); return modelAndView; From 9cd3659bdf6d671de9d829c288085e78b66e2029 Mon Sep 17 00:00:00 2001 From: kmg Date: Tue, 4 Feb 2025 18:38:48 +0900 Subject: [PATCH 3/3] =?UTF-8?q?2025/02/04=20=EB=B0=9C=EC=86=A1=EA=B2=B0?= =?UTF-8?q?=EA=B3=BC=20=EC=83=81=EC=84=B8=20=ED=8C=9D=EC=97=85=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsp/web/event/pay/EventPayView.jsp | 2 +- src/main/webapp/publish/css/content.css | 2 +- src/main/webapp/publish/css/popupLayer.css | 7 +- .../publish/textingmsg_2025_detail.html | 78 ++++++------------- 4 files changed, 31 insertions(+), 58 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/event/pay/EventPayView.jsp b/src/main/webapp/WEB-INF/jsp/web/event/pay/EventPayView.jsp index ce3d0a5f..e4ae53cf 100644 --- a/src/main/webapp/WEB-INF/jsp/web/event/pay/EventPayView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/event/pay/EventPayView.jsp @@ -352,7 +352,7 @@ function pgOpenerPopup(){ // 결제창 호출 if ($currentTab==0) { // 나이스페이 => CARD(카드결제) - pg_opener = window.open('', 'pg_opener', "width=790, height=505, left="+popupX+", top="+popupY, "location = no","status= no","toolbars= no"); + pg_opener = window.open('', 'pg_opener', "width=545, height=830, left="+popupX+", top="+popupY, "location = no","status= no","toolbars= no"); document.pgForm.method = "post"; document.pgForm.target = "pg_opener" ; diff --git a/src/main/webapp/publish/css/content.css b/src/main/webapp/publish/css/content.css index 409402d0..96dbc182 100644 --- a/src/main/webapp/publish/css/content.css +++ b/src/main/webapp/publish/css/content.css @@ -2388,7 +2388,7 @@ button.check_validity:hover {border: 1px solid #a3a3a3;box-shadow: 0px 0px 5px .send_top .resultcont_left .table_bottom_txt{padding:18px 0 0 0;font-size:14px; font-weight:500;} -.tb_wrap1{height:264px; overflow-y: auto; position:relative; border:1px solid #ccc; border-radius:5px;} +.tb_wrap1{height:302px; overflow-y: auto; position:relative; border:1px solid #ccc; border-radius:5px;} .tb_wrap1 table.type4 th{position: sticky; top:0; z-index: 1; background-color:#ededed;} diff --git a/src/main/webapp/publish/css/popupLayer.css b/src/main/webapp/publish/css/popupLayer.css index f0767c71..eb2e6272 100644 --- a/src/main/webapp/publish/css/popupLayer.css +++ b/src/main/webapp/publish/css/popupLayer.css @@ -1211,10 +1211,15 @@ /* 발송화면 개선 : 발송대상 리스트 팝업*/ .layer_in .popup_search_type1 { background-color: #f2f2f2; padding: 9px 20px; border-radius: 5px; margin: 10px 0 20px 0;} .layer_in .popup_search_type1 .selType2.select_btn {width:166px;} -.layer_in .popup_search_type1 input.send_text {width:265px; border:solid 1px #ccc; height:36px; } +.layer_in .popup_search_type1 input.send_text {width:265px; border:solid 1px #ccc; height:36px;} .layer_in .popup_search_type1 button { width:63px;} .layer_in .gorup_join_cont .input_right.type1 {padding:0 0 0 30px; font-size:17px; font-weight:300;} +.layer_in .popup_search_type2 { background-color: #f2f2f2; padding: 9px 20px; border-radius: 5px; margin: 0 0 20px 0; display:flex; align-items:center;} +.layer_in .popup_search_type2 .title {margin:0 20px 0 10px;} +.layer_in .popup_search_type2 input.send_text {width:265px; border:solid 1px #ccc; height:36px;} +.layer_in .popup_search_type2 button { width:63px;} + /* 주소록 대량등록 */ .file_upload_wrap{position:relative;display:flex;justify-content:space-between;align-items:center;} .file_upload_wrap .file_add.upload_area{display:flex;width:78%;margin:0;align-items:center;justify-content:center;} diff --git a/src/main/webapp/publish/textingmsg_2025_detail.html b/src/main/webapp/publish/textingmsg_2025_detail.html index bcab829e..44c063bd 100644 --- a/src/main/webapp/publish/textingmsg_2025_detail.html +++ b/src/main/webapp/publish/textingmsg_2025_detail.html @@ -250,23 +250,12 @@
- -
-
-
발신번호
-
010-2222-7777
-
-
- -
- - + +
+
수신번호
- +
@@ -283,8 +272,8 @@
- - + + @@ -358,8 +347,8 @@
- - + + @@ -377,25 +366,8 @@ - - - - - - - - - - - - - - - - - - - + +
010-1234-5678성공
010-1234-5678성공
010-1234-5678성공
010-1234-5678성공
010-1234-5678성공
내역이 없습니다.
@@ -415,8 +387,8 @@
- - + + @@ -490,8 +462,8 @@
- - + + @@ -510,39 +482,39 @@ - + - + - + - + - + - + - + - + - + @@ -561,10 +533,6 @@ -
010-1234-5678성공실패
010-1234-5678성공실패
010-1234-5678성공실패
010-1234-5678성공실패
010-1234-5678성공실패
010-1234-5678성공실패
010-1234-5678성공실패
010-1234-5678성공실패
010-1234-5678성공실패