From d4beed6aa35fe62f94d9f90091471a08da162cad Mon Sep 17 00:00:00 2001 From: myname Date: Fri, 25 Oct 2024 12:28:35 +0900 Subject: [PATCH] # WARNING: head commit changed in the meantime MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet 분쟁조정 사례수정 & DB ip 변경 --- src/main/java/kcc/web/MainController.java | 7 +- .../seed/com/user/news/WebNewsController.java | 192 +++++++++- .../egovProps/globals_local.properties | 2 +- .../sqlmap/config/mappers/exam/exam_sql.xml | 359 +++++++++--------- .../sqlmap/config/mappers/news/news_sql.xml | 44 +++ src/main/webapp/META-INF/context.xml | 6 +- .../WEB-INF/jsp/_common/web/jsp/umessage.jsp | 191 ++++++++++ .../jsp/_extra/web/user/exam/examDetail.jsp | 3 + .../jsp/_extra/web/user/exam/examList.jsp | 88 ++++- .../jsp/_extra/web/user/news/newsDetail.jsp | 222 +++++++++++ .../jsp/_extra/web/user/news/newsList.jsp | 168 ++++++-- .../jsp/_extra/web/user/news/newsList2.jsp | 325 ++++++++++++++++ 12 files changed, 1376 insertions(+), 231 deletions(-) create mode 100644 src/main/resources/egovframework/sqlmap/config/mappers/news/news_sql.xml create mode 100644 src/main/webapp/WEB-INF/jsp/_common/web/jsp/umessage.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/_extra/web/user/news/newsDetail.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/_extra/web/user/news/newsList2.jsp diff --git a/src/main/java/kcc/web/MainController.java b/src/main/java/kcc/web/MainController.java index 7f1ff818..8c193665 100644 --- a/src/main/java/kcc/web/MainController.java +++ b/src/main/java/kcc/web/MainController.java @@ -39,7 +39,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.apache.ibatis.annotations.Case; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -1452,11 +1451,9 @@ public class MainController { } /* 분쟁조정 신청 > 분쟁조정 신청하기 */ else if( - menuUrl.contains("/web/user/mediation/case/") - && menuUrl.contains("mediationStep") - && menuUrl.contains(".do") + menuUrl.contains("/web/user/news/case/01/341/") ) { - menuUrl = "/web/user/mediation/case/01/154/mediationApp.do"; + menuUrl = "/web/user/news/case/01/341/newsList.do"; } diff --git a/src/main/java/seed/com/user/news/WebNewsController.java b/src/main/java/seed/com/user/news/WebNewsController.java index e0c8108a..60fb8fab 100644 --- a/src/main/java/seed/com/user/news/WebNewsController.java +++ b/src/main/java/seed/com/user/news/WebNewsController.java @@ -242,6 +242,7 @@ private Logger log = Logger.getLogger(this.getClass()); boolean memberAuth = managerSiteMenuManagerService.getSiteMenuManagerListCnt(siteMenuIdx, memberIdx); //메뉴 권한설정 + /* if(!memberGrant.equals("S") && !memberAuthM && !memberAuth && !managerSiteMenuAuthService.getSiteMenuAuthChk(siteMenuIdx, memberIdx)){ @@ -255,6 +256,14 @@ private Logger log = Logger.getLogger(this.getClass()); return new ModelAndView("/_common/jsp/umessage"); } + */ + + boolean b_ret = true; + b_ret = FairnetUtils.hasUserAuth(memberIdx, memberGrant, memberAuth, session, map); + + if (!b_ret) { + return new ModelAndView("/_common/jsp/message"); + } Map tSiteMenuDB = managerSiteMenuService.getSiteMenuMapForm(siteMenuIdx, new String[] {"siteMenuName", "siteMenuParentTitle", "siteMenuStatus", "siteMenuType", "siteMenuLinkUrl", "siteMenuCharge", "siteMenuCharge", "siteMenuSNS", @@ -354,7 +363,7 @@ private Logger log = Logger.getLogger(this.getClass()); } // /user/news/case/01/322/regReq.do - @RequestMapping(value="/web/user/news/{siteIdx}/01/{siteMenuIdx}/regReq.do", method=RequestMethod.POST) + @RequestMapping(value="/web/user/news/{siteIdx}/01/{siteMenuIdx}/newsDetail.do", method=RequestMethod.POST) public ModelAndView regReq(ModelMap map, HttpSession session, HttpServletRequest req, HttpServletResponse res, @RequestParam Map paramMap, SeedCriteria cri, @PathVariable(value="siteIdx") String siteIdx, @PathVariable(value="siteMenuIdx") Integer siteMenuIdx @@ -369,6 +378,7 @@ private Logger log = Logger.getLogger(this.getClass()); boolean memberAuth = managerSiteMenuManagerService.getSiteMenuManagerListCnt(siteMenuIdx, memberIdx); //메뉴 권한설정 + /* if(!memberGrant.equals("S") && !memberAuthM && !memberAuth && !managerSiteMenuAuthService.getSiteMenuAuthChk(siteMenuIdx, memberIdx)){ @@ -382,6 +392,15 @@ private Logger log = Logger.getLogger(this.getClass()); return new ModelAndView("/_common/jsp/umessage"); } + */ + + boolean b_ret = true; + b_ret = FairnetUtils.hasUserAuth(memberIdx, memberGrant, memberAuth, session, map); + + if (!b_ret) { + return new ModelAndView("/_common/jsp/message"); + } + Map tSiteMenuDB = managerSiteMenuService.getSiteMenuMapForm(siteMenuIdx, new String[] {"siteMenuName", "siteMenuParentTitle", "siteMenuStatus", "siteMenuType", "siteMenuLinkUrl", "siteMenuCharge", "siteMenuCharge", "siteMenuSNS", @@ -492,20 +511,23 @@ private Logger log = Logger.getLogger(this.getClass()); if(dupRs > 1){ map.put("siteIdx", "case"); - map.put("url", "/web/user/news/case/01/"+siteMenuIdx+"/write.do"); + //map.put("url", "/web/user/news/case/01/"+siteMenuIdx+"/write.do"); + map.put("url", "/web/user/news/case/01/"+siteMenuIdx+"/newsList.do"); map.put("message", "user.survey.message.no.overlap"); map.put("opener", ""); map.put("append", ""); map.put("self", ""); - return new ModelAndView("/_common/jsp/umessage"); + //return new ModelAndView("/_common/web/jsp/umessage"); + return new ModelAndView("/_extra/web/user/news/newsDetail"); } // 뉴스레터 추가 int rs = newsService.newsInsert(paramMap); map.put("siteIdx", "case"); - map.put("url", "/web/user/news/case/01/"+siteMenuIdx+"/write.do"); + //map.put("url", "/web/user/news/case/01/"+siteMenuIdx+"/write.do"); + map.put("url", "/web/user/news/case/01/"+siteMenuIdx+"/newsList.do"); if(rs==1){ map.put("message", "common.message.reg"); } @@ -516,6 +538,166 @@ private Logger log = Logger.getLogger(this.getClass()); map.put("append", ""); map.put("self", ""); - return new ModelAndView("/_common/jsp/umessage"); + //return new ModelAndView("/_common/web/jsp/umessage"); + return new ModelAndView("/_extra/web/user/news/newsDetail"); + } + + // /user/news/case/01/322/delReq.do + @RequestMapping(value="/web/user/news/{siteIdx}/01/{siteMenuIdx}/delReq.do", method=RequestMethod.POST) + public ModelAndView delReq(ModelMap map, HttpSession session, HttpServletRequest req, HttpServletResponse res, @RequestParam Map paramMap, SeedCriteria cri, + @PathVariable(value="siteIdx") String siteIdx, + @PathVariable(value="siteMenuIdx") Integer siteMenuIdx + ){ + + setSessionMessageRemove(session); + + /*----권한체크----*/ + Integer memberIdx = Integer.valueOf(SeedUtils.setReplaceNull(session.getAttribute("memberIdx"),"0")); + String memberGrant = (memberIdx == 0) ? "N" : SeedUtils.setReplaceNull(managerMemberService.getMemberMapForm(memberIdx, new String[] {"memberGrant"}).get("_memberGrant"), "N"); + boolean memberAuthM = managerSiteManagerService.getSiteManagerListCnt(siteIdx, memberIdx); + boolean memberAuth = managerSiteMenuManagerService.getSiteMenuManagerListCnt(siteMenuIdx, memberIdx); + + //메뉴 권한설정 + /* + if(!memberGrant.equals("S") && !memberAuthM && !memberAuth && + !managerSiteMenuAuthService.getSiteMenuAuthChk(siteMenuIdx, memberIdx)){ + + map.put("message", "common.message.no.grant"); + + if(memberIdx.equals(0)){ + map.put("url", "/"+siteIdx+"/index.do"); + }else{ + map.put("self", "history"); + } + + return new ModelAndView("/_common/jsp/umessage"); + } + */ + + Map tSiteMenuDB = managerSiteMenuService.getSiteMenuMapForm(siteMenuIdx, + new String[] {"siteMenuName", "siteMenuParentTitle", "siteMenuStatus", "siteMenuType", "siteMenuLinkUrl", "siteMenuCharge", "siteMenuCharge", "siteMenuSNS", + "siteMenuTitle", "siteMenuRegDate", "siteMenuModDate", "siteMenuNameType", "siteMenuIdxs", "siteMenuDepth", "siteMenuSatisfaction", "siteMenuIdx1", + "tSite.siteActiveMenuWidth", "tSite.siteService", "tSite.siteServiceSdate", "tSite.siteServiceSdate"}); + + /* + if(!memberGrant.equals("S") && !memberAuthM && !memberAuth){ + if(!SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuStatus")).equals("U")){ + map.put("message", "common.message.no.siteMenu"); + map.put("self", "history"); + return new ModelAndView("/_common/jsp/umessage"); + } + } + */ + + if(SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteService")).equals("Y")){ + + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + + try{ + + Date getDate = new Date(); + + Date sDate = formatter.parse(SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteServiceSdate"))); + Date eDate = formatter.parse(SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteServiceEdate"))); + + if((sDate.compareTo(formatter.parse(formatter.format(getDate))) > 0 && eDate.compareTo(formatter.parse(formatter.format(getDate))) > 0) || + (sDate.compareTo(formatter.parse(formatter.format(getDate))) < 0 && eDate.compareTo(formatter.parse(formatter.format(getDate))) < 0)){ + return new ModelAndView("redirect:/user/common/service/"+siteIdx+".do"); + } + + }catch(ParseException e){ + log.error("CHECK ERROR:",e); + } + } + + if(SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuType")).equals("F") || + SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuType")).equals("L")){ + return new ModelAndView("redirect:"+SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuLinkUrl"))); + } + + String siteMenuManager = "N"; + StringBuffer siteMenuManagerIdx = new StringBuffer(); + String siteMenuCharge = SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuCharge"), "N"); + + List> siteMenuManagerList = + managerSiteMenuManagerService.getSiteMenuManagerMapList(siteMenuIdx, new String[] {"siteMenuManagerStatus", "tMember.memberIdx"}); + + for(int i=0; i tSiteMenuManagerDB = siteMenuManagerList.get(i); + + if(SeedUtils.setReplaceNull(tSiteMenuManagerDB.get("_siteMenuManagerStatus")).equals("U")){ + + if(!memberIdx.equals(0) && + memberIdx.equals(Integer.parseInt(SeedUtils.setReplaceNull(tSiteMenuManagerDB.get("_memberIdx"), "0"))) && + siteMenuManager.equals("N")){ + siteMenuManager = "Y"; + } + siteMenuManagerIdx.append(SeedUtils.setReplaceNull(tSiteMenuManagerDB.get("_memberIdx")).toString()); + siteMenuManagerIdx.append(","); + } + } + + if(memberGrant.equals("S") || memberAuthM){ + siteMenuManager = "Y"; + } + + //편집 권한 + map.put("siteMenuManager", siteMenuManager); + //담당자 보기 설정 + map.put("siteMenuCharge", siteMenuCharge); + //담당자 이름 + map.put("siteMenuManagerIdx", siteMenuManagerIdx.toString()); + //만족도 설정 + map.put("siteMenuSatisfaction", SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuSatisfaction"), "N")); + + map.put("siteMenuSubTitle", managerSiteMenuService.getSiteMenuSubTitleForm(siteIdx, SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuIdx1")))); + + String siteMenuTitle = managerSiteMenuService.getSiteMenuParentName(siteIdx, SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuIdxs")), "edit").replaceAll("》", "|") + + " | " + SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuName")); + + map.put("siteMenuTitle", siteMenuTitle); + + //부모메뉴 타이틀 설정한 경우 해당 글의 부모 타이틀을 가져옴 + if(SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuParentTitle") ,"N").equals("Y")){ + String[] siteMenuTitles = siteMenuTitle.split("\\|"); + tSiteMenuDB.put("_siteMenuName", siteMenuTitles[Integer.parseInt(tSiteMenuDB.get("_siteMenuDepth").toString())-1]); + } + + map.put("tSiteMenuDB", tSiteMenuDB); + + map.put("memberAuthM", memberAuthM); + map.put("seedMenuAuth", managerGroupService.getGroupList(siteIdx, memberIdx, memberMerge, memberMergeSiteIdx)); + /*----권한체크 종료----*/ + + //여기서부터 작업할거 + String ip = req.getHeader("X-FORWARDED-FOR"); + + if(ip == null) + ip = req.getRemoteAddr(); + + paramMap.put("clientEmail", paramMap.get("clientEmail1")+"@"+paramMap.get("hidEmail2")); + paramMap.put("clientIp", ip); + + // 뉴스레터 제거 + int rs = newsService.newsDelete(paramMap); + + map.put("siteIdx", "case"); + map.put("url", "/user/news/case/01/"+siteMenuIdx+"/write.do"); + if(rs>0){ + map.put("message", "common.message.del"); + } + else if(rs == 0){ + map.put("message","common.message.no.history"); + } + else{ + map.put("message", "common.message.error.del"); + } + map.put("opener", ""); + map.put("append", ""); + map.put("self", ""); + + //return new ModelAndView("/_common/jsp/umessage"); + return new ModelAndView("/_extra/web/user/news/newsDetail"); } } diff --git a/src/main/resources/egovframework/egovProps/globals_local.properties b/src/main/resources/egovframework/egovProps/globals_local.properties index 4d87effd..36b8a7da 100644 --- a/src/main/resources/egovframework/egovProps/globals_local.properties +++ b/src/main/resources/egovframework/egovProps/globals_local.properties @@ -27,7 +27,7 @@ Globals.Password= FAIRNETUR!@#$ # oracle Globals.DriverClassName=oracle.jdbc.OracleDriver #Globals.Url=jdbc:oracle:thin:@192.168.0.30:1523:XE -Globals.Url=jdbc:oracle:thin:@192.168.0.87:1523:XE +Globals.Url=jdbc:oracle:thin:@192.168.0.60:1523:XE # MainPage Setting(admin) Globals.MainPage = /cmm/main/mainPage.do diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/exam/exam_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/exam/exam_sql.xml index 3302e05c..6fb86ce0 100644 --- a/src/main/resources/egovframework/sqlmap/config/mappers/exam/exam_sql.xml +++ b/src/main/resources/egovframework/sqlmap/config/mappers/exam/exam_sql.xml @@ -1,183 +1,178 @@ - - - - - - - select SEQ_EXAMBBS.NEXTVAL FROM DUAL - - INSERT INTO C_EXAMBBS( - EXAM_NO, - EXAM_ID, - EXAM_SUBJ, - EXAM_CONT, - EXAM_CONT2, - EXAM_CONT3, - EXAM_CONT4, - EXAM_CNT, - EXAM_REGMEM_ID, - EXAM_REGMEM_NM, - EXAM_REGDATE, - EXAM_MODMEM_ID, - EXAM_MODDATE, - DEL_YN, - EXAM_TYPE, - EXAM_RESULT1, - EXAM_RESULT2 - ) VALUES ( - ${seq}, - #{boardIdx}, - #{examSubj}, - #{editorParam_examCont}, - #{editorParam_examCont2}, - #{editorParam_examCont3}, - #{editorParam_examCont4}, - 0, - #{memberId}, - #{memberName}, - SYSDATE, - #{memberId}, - SYSDATE, - 'N', - #{examType}, - #{medBig2}, - #{medSmall2} - - ) - - - - - - - - - - UPDATE C_EXAMBBS - SET EXAM_SUBJ = #{examSubj}, - EXAM_CONT = #{editorParam_examCont}, - EXAM_CONT2 = #{editorParam_examCont2}, - EXAM_CONT3 = #{editorParam_examCont3}, - EXAM_CONT4 = #{editorParam_examCont4}, - EXAM_MODMEM_ID = #{memberId}, - EXAM_MODDATE = SYSDATE, - EXAM_TYPE = #{examType}, - EXAM_RESULT1 = #{medBig2}, - EXAM_RESULT2 = #{medSmall2} - WHERE EXAM_NO = #{examNo} - - - - UPDATE C_EXAMBBS - SET DEL_YN = 'Y' - WHERE EXAM_NO = #{examNo} - - - - - - UPDATE C_EXAMBBS - SET EXAM_CNT = EXAM_CNT+1 - WHERE EXAM_NO = #{examNo} - - - - + + + + + + + select SEQ_EXAMBBS.NEXTVAL FROM DUAL + + INSERT INTO C_EXAMBBS( + EXAM_NO, + EXAM_ID, + EXAM_SUBJ, + EXAM_CONT, + EXAM_CONT2, + EXAM_CONT3, + EXAM_CONT4, + EXAM_CNT, + EXAM_REGMEM_ID, + EXAM_REGMEM_NM, + EXAM_REGDATE, + EXAM_MODMEM_ID, + EXAM_MODDATE, + DEL_YN, + EXAM_TYPE, + EXAM_RESULT1, + EXAM_RESULT2 + ) VALUES ( + ${seq}, + #{boardIdx}, + #{examSubj}, + #{editorParam_examCont}, + #{editorParam_examCont2}, + #{editorParam_examCont3}, + #{editorParam_examCont4}, + 0, + #{memberId}, + #{memberName}, + SYSDATE, + #{memberId}, + SYSDATE, + 'N', + #{examType}, + #{medBig2}, + #{medSmall2} + + ) + + + + + + + + + + UPDATE C_EXAMBBS + SET EXAM_SUBJ = #{examSubj}, + EXAM_CONT = #{editorParam_examCont}, + EXAM_CONT2 = #{editorParam_examCont2}, + EXAM_CONT3 = #{editorParam_examCont3}, + EXAM_CONT4 = #{editorParam_examCont4}, + EXAM_MODMEM_ID = #{memberId}, + EXAM_MODDATE = SYSDATE, + EXAM_TYPE = #{examType}, + EXAM_RESULT1 = #{medBig2}, + EXAM_RESULT2 = #{medSmall2} + WHERE EXAM_NO = #{examNo} + + + + UPDATE C_EXAMBBS + SET DEL_YN = 'Y' + WHERE EXAM_NO = #{examNo} + + + + + + UPDATE C_EXAMBBS + SET EXAM_CNT = EXAM_CNT+1 + WHERE EXAM_NO = #{examNo} + + + + \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/news/news_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/news/news_sql.xml new file mode 100644 index 00000000..3e217506 --- /dev/null +++ b/src/main/resources/egovframework/sqlmap/config/mappers/news/news_sql.xml @@ -0,0 +1,44 @@ + + + + + + + select SEQ_NEWSLETTER.NEXTVAL FROM DUAL + + INSERT INTO C_NEWSLETTER( + SEQ_NO + ,CLIENT_NAME + ,CLIENT_EMAIL + ,CLIENT_IP + ,CLIENT_CHECK + ,AGREE_CHECK + ,CLIENT_DATE + ) VALUES ( + ${seq} + ,#{clientName} + ,#{clientEmail} + ,#{clientIp} + ,'Y' + ,#{agreeCheck} + ,SYSDATE + ) + + + + + + UPDATE C_NEWSLETTER + SET CLIENT_CHECK = 'N' + WHERE CLIENT_NAME = #{clientName} + AND CLIENT_EMAIL = #{clientEmail} + AND CLIENT_CHECK = 'Y' + + + \ No newline at end of file diff --git a/src/main/webapp/META-INF/context.xml b/src/main/webapp/META-INF/context.xml index 8e9c8038..9e8f46e6 100644 --- a/src/main/webapp/META-INF/context.xml +++ b/src/main/webapp/META-INF/context.xml @@ -9,7 +9,7 @@ username="FAIRNETUR" password="FAIRNETUR!@#$" type="javax.sql.DataSource" - url="jdbc:oracle:thin:@192.168.0.87:1523/XE" + url="jdbc:oracle:thin:@192.168.0.60:1523/XE" factory="org.apache.tomcat.jdbc.pool.DataSourceFactory" /> diff --git a/src/main/webapp/WEB-INF/jsp/_common/web/jsp/umessage.jsp b/src/main/webapp/WEB-INF/jsp/_common/web/jsp/umessage.jsp new file mode 100644 index 00000000..28002527 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/_common/web/jsp/umessage.jsp @@ -0,0 +1,191 @@ +<%@ page contentType="text/html;charset=utf-8" %> +<%@ taglib uri="http://www.springframework.org/tags" prefix="s"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> + + + + + <s:message code="common.message.title" text="Error Title" /> + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+
+ + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/_extra/web/user/exam/examDetail.jsp b/src/main/webapp/WEB-INF/jsp/_extra/web/user/exam/examDetail.jsp index 56a983db..839a23bf 100644 --- a/src/main/webapp/WEB-INF/jsp/_extra/web/user/exam/examDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/_extra/web/user/exam/examDetail.jsp @@ -34,8 +34,11 @@ + + +
diff --git a/src/main/webapp/WEB-INF/jsp/_extra/web/user/exam/examList.jsp b/src/main/webapp/WEB-INF/jsp/_extra/web/user/exam/examList.jsp index ef7716c6..c63ab913 100644 --- a/src/main/webapp/WEB-INF/jsp/_extra/web/user/exam/examList.jsp +++ b/src/main/webapp/WEB-INF/jsp/_extra/web/user/exam/examList.jsp @@ -5,11 +5,73 @@ <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + +
+ + +
    +
  • +
  • 분쟁조정 안내
  • +
  • 뉴스레터
  • +
  • 뉴스레터 서비스
  • +
+ + +

뉴스레터 서비스

+

한국공정거래조정원에서 매월 정기 발행하는 뉴스레터서비스입니다.

+ +
+ +
+ + +
+ +
+
+ +
+ + +
diff --git a/src/main/webapp/WEB-INF/jsp/_extra/web/user/news/newsList.jsp b/src/main/webapp/WEB-INF/jsp/_extra/web/user/news/newsList.jsp index e7d6a89a..d505782c 100644 --- a/src/main/webapp/WEB-INF/jsp/_extra/web/user/news/newsList.jsp +++ b/src/main/webapp/WEB-INF/jsp/_extra/web/user/news/newsList.jsp @@ -84,18 +84,33 @@ alert("입력된 주소를 확인해주세요."); $("#_hidEmail2").focus(); return false; - } - + } - /* if(!$("#_agreeCheck").is(":checked")){ alert("위 약관에 동의 해주세요."); $("#_agreeCheck").focus(); return false; } - */ + + //$("#_aply").prop("data-tooltip","apl_popup"); + //$("#_aply").prop("onclick",""); + //$("#_aply").click(); - $("#_layerPop").show(); + //data-tooltip="apl_popup" + + + $(".apl_popup").show(); + //$("#_regForm").submit(); + + //data-tooltip="apl_popup" + } + + function layerOpenSave(){ + $("#_regForm").submit(); + } + + function layerOpenClose(){ + $(".apl_popup").hide(); } function email_change2(){ @@ -141,7 +156,18 @@ } - $("#_layerPop2").show(); + //$("#_layerPop2").show(); + $(".cancel_popup").show(); + + //data-tooltip="cancel_popup" + } + + function layerOpen2Save(){ + $("#_regForm2").submit(); + } + + function layerOpen2Close(){ + $(".cancel_popup").hide(); } function layerClose(){ @@ -163,8 +189,10 @@ +
+ -
+