Merge branch 'master' of http://vcs.iten.co.kr:9999/hylee/mjon_git
This commit is contained in:
commit
780e8f14a5
@ -2035,7 +2035,7 @@ public class EgovLoginController {
|
||||
if(resultVO.getDormantYn().equals("Y") || resultVO.getDormantYn() == "Y") {
|
||||
|
||||
String message = "휴면계정입니다.";
|
||||
|
||||
modelAndView.addObject("dormantYn", "Y");
|
||||
modelAndView.addObject("status", "fail");
|
||||
modelAndView.addObject("msg", message);
|
||||
return modelAndView;
|
||||
|
||||
@ -1587,9 +1587,9 @@ function actionLogin() {
|
||||
<div class="login_left">
|
||||
<div class="login_put">
|
||||
<label for="id_text" class="label"></label>
|
||||
<input type="text" placeholder="아이디를 입력해주세요"id="id_text" name="id_text" class="id_text" maxlength="20" size="18">
|
||||
<input type="text" placeholder="아이디를 입력해주세요"id="id_text" name="id_text" class="id_text" maxlength="20" size="18" onclick="actionLogin();">
|
||||
<label for="password_text" class="label"></label>
|
||||
<input type="password" placeholder="비밀번호를 입력해주세요" id="password_text" class="password_text" maxlength="30"size="18" onkeypress="if(event.keyCode==13) {actionLogin(); return false;}">
|
||||
<input type="password" placeholder="비밀번호를 입력해주세요" id="password_text" class="password_text" maxlength="30"size="18" onkeypress="if(event.keyCode==13) {actionLogin(); return false;}" onclick="actionLogin();">
|
||||
<label for="login_button" class="label"></label>
|
||||
<button type="button" id="login_button" class="btnType btnType1" class="login_button" onclick="actionLogin();">로그인</button>
|
||||
</div>
|
||||
|
||||
@ -195,8 +195,14 @@ function actionLogin(){
|
||||
|
||||
|
||||
}else if (data.status=="fail"){
|
||||
$("#ret_msg").show();
|
||||
$("#ret_msg_info").html('<i></i>'+data.msg);
|
||||
|
||||
if (data.dormantYn=="Y"){
|
||||
document.loginForm2.action="<c:url value='/web/user/humanPage.do'/>";
|
||||
document.loginForm2.submit();
|
||||
}else{
|
||||
$("#ret_msg").show();
|
||||
$("#ret_msg_info").html('<i></i>'+data.msg);
|
||||
}
|
||||
}
|
||||
|
||||
//alert(JSON.stringify(data));
|
||||
@ -522,7 +528,7 @@ function fn_click_banner_add_stat(bannerMenuCode){
|
||||
<div class="input_list">
|
||||
<p class="welcome">
|
||||
<span>문자온</span>에 오신것을 환영합니다.<br>
|
||||
<span class="c_222 fwMd">로그인1 </span>해주세요.
|
||||
<span class="c_222 fwMd">로그인</span>해주세요.
|
||||
</p>
|
||||
<div class="input_list_item" id="input_list_item_1">
|
||||
<div class="input_left">아이디</div>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user