diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 7a95527..ecbcad7 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -9,10 +9,13 @@ - + - - + + + + + @@ -231,7 +234,7 @@ - + 1645354476031 @@ -534,7 +537,14 @@ 1650796823828 - + + 1650801028670 + + + + 1650801028670 + + @@ -554,7 +564,6 @@ - @@ -579,6 +588,7 @@ - + + \ No newline at end of file diff --git a/src/main/java/com/backoffice/m/login/M_LoginController.java b/src/main/java/com/backoffice/m/login/M_LoginController.java index e43e5fe..5e4f9ae 100644 --- a/src/main/java/com/backoffice/m/login/M_LoginController.java +++ b/src/main/java/com/backoffice/m/login/M_LoginController.java @@ -490,7 +490,7 @@ public class M_LoginController extends AbstractControllerManager{ }else{ ConstantResultCode.putResultCode(map_json, true, ConstantResultCode.RESULT_MEMBER_IS_NULL); // json result code - gmUtil.redirectParamFlash(ra, DataMap.fromNameValue(new String[]{"phone_num","script_msg"}, new String[]{RenaStringUtil.getData(paramMap, "member_id"),"로그인에 실패했습니다"})); + gmUtil.redirectParamFlash(ra, DataMap.fromNameValue(new String[]{"phone_num","script_msg"}, new String[]{RenaStringUtil.getData(paramMap, "member_id"),"아이디 또는 비밀번호를 확인해 주세요."})); } } }catch(Exception ex1){ redirect_url = gmUtil.redirectError(true, ex1, request, paramMap, ra, ""); ex1.printStackTrace();} @@ -540,7 +540,7 @@ public class M_LoginController extends AbstractControllerManager{ redirect_url = "redirect:" + action_url; }else{ ConstantResultCode.putResultCode(map_json, true, ConstantResultCode.RESULT_MEMBER_IS_NULL); // json result code - gmUtil.redirectParamFlash(ra, DataMap.fromNameValue(new String[]{"phone_num","script_msg"}, new String[]{RenaStringUtil.getData(paramMap, "member_id"),"로그인에 실패했습니다"})); + gmUtil.redirectParamFlash(ra, DataMap.fromNameValue(new String[]{"phone_num","script_msg"}, new String[]{RenaStringUtil.getData(paramMap, "member_id"),"아이디 또는 비밀번호를 확인해 주세요."})); } } }catch(Exception ex1){ redirect_url = gmUtil.redirectError(true, ex1, request, paramMap, ra, ""); ex1.printStackTrace();} diff --git a/src/main/webapp/WEB-INF/views/ftl/m/index/include_nochild.ftl b/src/main/webapp/WEB-INF/views/ftl/m/index/include_nochild.ftl index 9fd3ad9..b77819e 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/index/include_nochild.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/index/include_nochild.ftl @@ -7,21 +7,21 @@ - + 아이를 등록하세요 0세 0개월(남) - + - + 아이를 등록하세요 0세 0개월(남) - + @@ -129,4 +129,9 @@ + diff --git a/src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl b/src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl index 4acad2b..8e8b05a 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl @@ -40,6 +40,9 @@ ${model['temp_pwd']!}#if>" class="" placeholder="비밀번호 입력"> + + 아이디 저장 + @@ -172,13 +175,15 @@ if($('#member_id').val() == ""){ alert('이메일을 입력해주세요'); $('#member_id').focus(); - }else if($('#password').val() == ""){ + } else if($('#password').val() == ""){ alert('비밀번호를 입력해주세요'); $('#password').focus(); - }else{ - setCookie('member_id', $('#member_id').val(), 365); - sessionStorage.setItem('member_id', $('#member_id').val()) - + } else { + if($("#remember").is(":checked")) { + setCookie('member_id', $('#member_id').val(), 365); + } else { + setCookie('member_id', "", 365); + } $('#frmJoin').submit(); } } @@ -196,10 +201,15 @@ if(sessionStorage.getItem('member_id')){ $('#member_id').val(sessionStorage.getItem('member_id')); }else if(getCookie('member_id')){ - setCookie('member_id', $('#member_id').val(), 365); + $('#member_id').val(getCookie('member_id')); + $("#remember").prop("checked", true); + // setCookie('member_id', $('#member_id').val(), 365); } - <#if model['script_msg']?has_content> + <#if model['script_msg']?has_content> + setCookie('member_id', "", 365); + $("#remember").prop("checked", false); + Swal.fire({ text: "${model['script_msg']}", icon: 'warning', diff --git a/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting.ftl b/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting.ftl index e849f33..419e952 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting.ftl @@ -15,7 +15,7 @@ 계정 관리 - 아이 정보 변경 + 아이 정보 입력/변경 diff --git a/src/main/webapp/m/html/4-4.회원가입-계정연동(ppt20).html b/src/main/webapp/m/html/4-4.회원가입-계정연동(ppt20).html index b93ef65..cd9e80c 100644 --- a/src/main/webapp/m/html/4-4.회원가입-계정연동(ppt20).html +++ b/src/main/webapp/m/html/4-4.회원가입-계정연동(ppt20).html @@ -33,7 +33,7 @@ - 같은 아이 정보를 가지고 이유식당을 사용하시는 계정이 있으신가요? + 같은 아이 정보로 사용하시는 이유식당 계정이 있으신가요?
0세 0개월(남)
+ 아이디 저장 +
같은 아이 정보를 가지고 이유식당을 사용하시는 계정이 있으신가요?
같은 아이 정보로 사용하시는 이유식당 계정이 있으신가요?