Просмотр исходного кода

탈퇴화면, 가입 화면 수정

jsshin 4 лет назад
Родитель
Сommit
ab67b79c58

+ 7 - 2
src/main/java/com/style24/front/biz/web/TsfMypageController.java

@@ -6,6 +6,7 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +20,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.gagaframework.web.parameter.GagaMap;
@@ -2292,8 +2295,6 @@ public class TsfMypageController extends TsfBaseController {
 			log.error(e.getMessage());
 		}
 
-		TsfSession.invalidate(request);
-
 		// RememberMe 쿠키가 있으면
 		String ckRememberMe = GagaCookieUtil.getCookie(request, TsfConstants.CK_PREFIX + "_remember-me");
 
@@ -2305,6 +2306,10 @@ public class TsfMypageController extends TsfBaseController {
 			GagaCookieUtil.deleteCookie(response, TsfConstants.CK_PREFIX + "_remember-me");
 		}
 
+		//sessionInfo
+		TsfSession.invalidate(request);
+		mav.addObject("sessionInfo", null);
+
 		mav.setViewName(super.getDeviceViewName("mypage/MypageCustSecedeCompleteForm"));
 
 		return mav;

+ 3 - 2
src/main/webapp/WEB-INF/views/mob/customer/JoinFormMob.html

@@ -432,12 +432,13 @@
 			let msg = '';
 			if (result.custStat === 'G104_30') {
 				msg = "탈퇴한 회원입니다. 탈퇴 후 60일 동안 재가입이 불가능합니다.";
+				$dupPhnnoDiv.hide();
 			} else {
 				msg = result.maskingCustId+"로 가입된 이력이 있습니다.";
+				$dupPhnnoDiv.show();
 			}
-			$dupPhnno.html(msg);
 			$dupPhnno.show();
-			$dupPhnnoDiv.show();
+			$dupPhnno.html(msg);
 			authCheck = false;
 		} else {
 			$dupPhnno.hide();

+ 1 - 1
src/main/webapp/WEB-INF/views/mob/mypage/MypageCustSecedeCompleteFormMob.html

@@ -102,7 +102,7 @@
 			<div class="goods_btn_wrap btn_group_flex">
 				<div>
 					<button type="button" id="btnConfirm" class="btn btn_dark" onclick="cfnGoToPage(_PAGE_MAIN);">
-						<span>확인</span>
+						<span>메인이동</span>
 					</button>
 				</div>
 			</div>

+ 1 - 1
src/main/webapp/WEB-INF/views/mob/mypage/MypageCustSecedeFormMob.html

@@ -280,7 +280,7 @@
 		if (result.isMatch) {
 			$("#secedeCustForm").submit();
 		} else {
-			mcxDialog.alertC('비밀번호를 다시 입력해주세요.',{
+			mcxDialog.alertC('비밀번호를 다시 확인해주세요.',{
 				sureBtnText: "확인",
 				sureBtnClick: function() {
 					$('#secedeCustForm input[name=passwd]').focus();

+ 3 - 2
src/main/webapp/WEB-INF/views/web/customer/JoinFormWeb.html

@@ -401,12 +401,13 @@
 			let msg = '';
 			if (result.custStat === 'G104_30') {
 				msg = "탈퇴한 회원입니다. 탈퇴 후 60일 동안 재가입이 불가능합니다.";
+				$dupPhnnoDiv.hide();
 			} else {
 				msg = result.maskingCustId+"로 가입된 이력이 있습니다.";
+				$dupPhnnoDiv.show();
 			}
-			$dupPhnno.html(msg);
 			$dupPhnno.show();
-			$dupPhnnoDiv.show();
+			$dupPhnno.html(msg);
 			authCheck = false;
 		} else {
 			$dupPhnno.hide();

+ 2 - 2
src/main/webapp/WEB-INF/views/web/mypage/MypageCustSecedeCompleteFormWeb.html

@@ -97,8 +97,8 @@
 					</div>
 				</div>
 				<div class="btn_footer_area">
-					<button type="button" id="btnConfirm" class="btn btn_dark btn_md hide" onclick="cfnGoToPage(_PAGE_MAIN);">
-						<span>확인</span>
+					<button type="button" id="btnConfirm" class="btn btn_dark btn_md" onclick="cfnGoToPage(_PAGE_MAIN);">
+						<span>메인이동</span>
 					</button>
 				</div>
 			</div>

+ 1 - 1
src/main/webapp/WEB-INF/views/web/mypage/MypageCustSecedeFormWeb.html

@@ -269,7 +269,7 @@
 		if (result.isMatch) {
 			$("#secedeCustForm").submit();
 		} else {
-			mcxDialog.alertC('비밀번호를 다시 입력해주세요.',{
+			mcxDialog.alertC('비밀번호를 다시 확인해주세요.',{
 				sureBtnText: "확인",
 				sureBtnClick: function() {
 					$('#secedeCustForm input[name=passwd]').focus();