From aab28ce0f8fce143deca95711b803e8c3d910953 Mon Sep 17 00:00:00 2001 From: kmg Date: Fri, 13 Oct 2023 18:29:48 +0900 Subject: [PATCH] =?UTF-8?q?2023/10/13=20=EC=9E=AC=EC=A0=84=EC=86=A1=20?= =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EB=B0=8F=20=ED=8C=9D=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsp/web/msgdata/MsgDataSMLView.jsp | 300 ++++++------------ .../jsp/web/msgsent/MsgSentReadyListAjax.jsp | 1 + src/main/webapp/publish/css/button.css | 3 +- src/main/webapp/publish/js/popupLayer.js | 24 +- 4 files changed, 119 insertions(+), 209 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp index 022a9351..a2ca14b5 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp @@ -3180,8 +3180,8 @@ $(".btn_event_cash").off().on("click", function(){ - -
+ +
@@ -3194,6 +3194,9 @@ $(".btn_event_cash").off().on("click", function(){
발송일시 : 2021-05-28 16:52:30 MMS +
    @@ -3211,218 +3214,107 @@ $(".btn_event_cash").off().on("click", function(){
- +
- + - - -
-
-
+ +
+
+

전송내역

-
-
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
발송일시 -
- 		형태 -
- 		발송방식 -
- 		내용받는사람 -
- 		발신번호 -
- 		발송건수 -
- 		재전송 선택 -
2023-06-10 17:50그림WEB - 010-1547-5895 외 1명010-5897-78958
2021-06-10 17:50그림WEB -
-

(광고) 하이~ 무료 거부 08010000008 빨리빨리대리전★☎ 1588-8282 시원한 맥주한잔 후엔 10% 적립! 불러주시면 빨리 달려갑니다! (광고) 하이~ - 무료 거부 08010000008 빨리빨리대리전★☎ 1588-8282 시원한 맥주한잔 후엔 10% 적립! 불러주시면 빨리 달려갑니다!

-
- 		010-1547-5895 외 1명010-5897-78958
2021-06-10 17:50그림WEB010-1547-5895 외 1명010-5897-78958
2021-06-10 17:50그림WEB010-1547-5895 외 1명010-5897-78958
2021-06-10 17:50그림WEB010-1547-5895 외 1명010-5897-78958
2021-06-10 17:50그림WEB010-1547-5895 외 1명010-5897-78958
2021-06-10 17:50그림WEB010-1547-5895 외 1명010-5897-78958
2021-06-10 17:50그림WEB010-1547-5895 외 1명010-5897-78958
2021-06-10 17:50그림WEB - 010-1547-5895 외 1명010-5897-78958
2021-06-10 17:50그림WEB - 010-1547-5895 외 1명010-5897-78958
-
- - - - -
    -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
- -
- -
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
발송일시 +
+ 		형태 +
+ 		발송방식 +
+ 		내용받는사람 +
+ 		발신번호 +
+ 		발송건수 +
+ 		재전송 선택
2023-06-10 17:50그림WEB010-1547-5895 외 1명010-5897-78958
2023-06-10 17:50그림WEB010-1547-5895 외 1명010-5897-78958
+
+ + +
    +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
+
+
- +
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentReadyListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentReadyListAjax.jsp index 9e3d0f16..8c79ca55 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentReadyListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentReadyListAjax.jsp @@ -186,6 +186,7 @@ $(document).ready(function(){ + diff --git a/src/main/webapp/publish/css/button.css b/src/main/webapp/publish/css/button.css index f5734624..e86c23e4 100644 --- a/src/main/webapp/publish/css/button.css +++ b/src/main/webapp/publish/css/button.css @@ -74,12 +74,13 @@ textarea:-ms-input-placeholder {font-family: 'Noto Sans KR', sans-serif; font-we .btnType18 {background-color: #fff; color: #002c9a; width: 145px; height: 50px; border: 1px solid #002c9a; font-size: 18px;} .btnType18:hover {border: 1px solid #002788;color: #002788;} .btnType19{border: 1px solid #d5d5d5;border-radius: 5px; background-color: #fff;height: 50px;padding: 0 16px; margin-right: 2px;} -.btnType20{border: 1px solid #d5d5d5; height: 28px; width: 70px; font-size: 14px; font-weight: 400; color: #555; line-height: 1.5;} +.btnType20{border: 1px solid #d5d5d5; height: 28px; width: 70px; font-size: 14px; font-weight: 400; color: #555; line-height: 1.5; margin:3px 0 0 0;} .btnType21 {height:36px;padding:0 14px;color:#222;background-color:#f8bd0e;} .btnType21:hover {background-color:#eea301;} .btnType22 {height:28px;padding:0 12px;font-size:14px;color:#222;background-color:#f8bd0e; font-weight:500;} .btnType22:hover {background-color:#eea301;} .btnType23 {background:#6a6c72; color:#fff; border-radius: 5px; font-size:14px; font-weight: 400; padding:4px 13px; margin:0 3px;} /*api에 사용*/ +.btnType24 {background:#fff; border: 1px solid #8697c2; color: #002c9a; height: 28px; width: 70px; font-size: 14px; font-weight: 400; line-height: 1.5; margin:3px 0;} /*재사용 버튼*/ /* 기타 반복 사용 */ /* 기타 버튼 타입 */ diff --git a/src/main/webapp/publish/js/popupLayer.js b/src/main/webapp/publish/js/popupLayer.js index bc7caf13..b48da7a0 100644 --- a/src/main/webapp/publish/js/popupLayer.js +++ b/src/main/webapp/publish/js/popupLayer.js @@ -46,6 +46,7 @@ function tooltip() { activeTarget.hide().css('opacity','0'); $('[data-tooltip="' + t + '"]').focus(); } + $(document) .on('click', openBtn, function (e) { @@ -130,7 +131,7 @@ function tooltip() { .on('click', closeBtn, function (e) { e.preventDefault(); close($(this).data('activeTarget')); - $("body").find(".mask").removeClass("on"); + //$("body").find(".mask").removeClass("on"); $("body").css("overflow","inherit"); wrapWindowByMask(); @@ -138,7 +139,13 @@ function tooltip() { if($(".popup01").length != 0){ $("#customPopup").empty(); customPopup(); - } + }else{} + + // 팝업이 보이고 있으면 마스크 노출/미노출 + // 레이어 팝업 2개 뜰 경우 + if($(".popup-com").is(":visible") !== true){ + $(".mask").removeClass("on"); + }else{} }) } @@ -228,7 +235,11 @@ function miniPopup(item){ } if($(item).is(".btn_close") == true){ - $(item).parent("div").removeClass("on") + $(item).parent("div").removeClass("on"); + $(item).parent("div").find("a").removeClass("on"); + $(item).parent("div").find("a:first-child").addClass("on"); + $(item).parent("div").find(".cnt_character").removeClass("on"); + console.log($(item).parent("div")); } } @@ -243,4 +254,9 @@ function miniPopup(item){ if($(item).is(".btn_close") == true){ $(item).parent(".spc_character, .convers").removeClass("on"); } -}*/ \ No newline at end of file +}*/ + + + + +