Explorar o código

Merge branch 'develop' into eskim

eskim %!s(int64=5) %!d(string=hai) anos
pai
achega
cd6678d1d3

+ 14 - 3
src/main/java/com/style24/front/biz/thirdparty/KaKaoLogin.java

@@ -12,6 +12,7 @@ import com.style24.front.support.security.session.TsfSession;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.env.Environment;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -43,7 +44,8 @@ public class KaKaoLogin {
 	@Autowired
 	private RestTemplate restTemplate;
 
-	public static final String PROTOCOL = "http://";
+	@Value("${has-ssl}")
+	private String hasSsl;
 
 	private String callBackUrl;
 	private String restApiKey;
@@ -52,6 +54,7 @@ public class KaKaoLogin {
 	private String userInfoUrl;
 	private String authorizeUrl;
 	private String unlinkUrl;
+	private String protocal;
 
 	@PostConstruct
 	public void init() {
@@ -63,6 +66,14 @@ public class KaKaoLogin {
 		authorizeUrl = env.getProperty("kakao.authorizeUrl");
 		unlinkUrl = env.getProperty("kakao.unlinkUrl");
 
+		boolean isSslServer = Boolean.parseBoolean(hasSsl);
+
+		if (isSslServer) {
+			protocal = "https://";
+		} else {
+			protocal = "http://";
+		}
+
 		log.debug("\n\n---- Kakao initialization started ----");
 		log.debug("callBackUrl: [{}]", callBackUrl);
 		log.debug("restApiKey: [{}]", restApiKey);
@@ -82,7 +93,7 @@ public class KaKaoLogin {
 	 */
 	public String getAuthorizeUrl(String state) {
 		StringBuilder apiUrlBuilder = new StringBuilder();
-		String redirectUri = GagaFileUtil.getConcatenationPath(PROTOCOL + TsfSession.getHttpServletRequest().getServerName(), callBackUrl);
+		String redirectUri = GagaFileUtil.getConcatenationPath(protocal + TsfSession.getHttpServletRequest().getServerName(), callBackUrl);
 		apiUrlBuilder.append(authorizeUrl)
 				.append("?client_id=")
 				.append(restApiKey)
@@ -105,7 +116,7 @@ public class KaKaoLogin {
 	 */
 	public GagaMap getAccessTocken(String code, String state) {
 		GagaMap resultMap = new GagaMap();
-		String redirectUri = GagaFileUtil.getConcatenationPath(PROTOCOL + TsfSession.getHttpServletRequest().getServerName(), callBackUrl);
+		String redirectUri = GagaFileUtil.getConcatenationPath(protocal + TsfSession.getHttpServletRequest().getServerName(), callBackUrl);
 		String requestGb = "";
 		try {
 			MultiValueMap<String, String> params = new LinkedMultiValueMap<>();

+ 13 - 2
src/main/java/com/style24/front/biz/thirdparty/NaverLogin.java

@@ -10,6 +10,7 @@ import com.style24.front.support.security.session.TsfSession;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.env.Environment;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -40,7 +41,8 @@ public class NaverLogin {
 	@Autowired
 	private RestTemplate restTemplate;
 
-	public static final String PROTOCOL = "http://";
+	@Value("${has-ssl}")
+	private String hasSsl;
 
 	private String callBackUrl;
 	private String clientId;
@@ -49,6 +51,8 @@ public class NaverLogin {
 	private String tokenUrl;
 	private String userInfoUrl;
 	private String authorizeUrl;
+	private String protocal;
+
 
 	@PostConstruct
 	public void init() {
@@ -60,6 +64,13 @@ public class NaverLogin {
 		userInfoUrl = env.getProperty("naver.userInfoUrl");
 		authorizeUrl = env.getProperty("naver.authorizeUrl");
 
+		boolean isSslServer = Boolean.parseBoolean(hasSsl);
+		if (isSslServer) {
+			protocal = "https://";
+		} else {
+			protocal = "http://";
+		}
+
 		log.debug("\n\n---- Naver initialization started ----");
 		log.debug("callBackUrl: [{}]", callBackUrl);
 		log.debug("clientId: [{}]", clientId);
@@ -73,7 +84,7 @@ public class NaverLogin {
 
 	public String getAuthorizeUrl(String state) {
 		StringBuilder apiUrlBuilder = new StringBuilder();
-		String redirectUri = GagaFileUtil.getConcatenationPath(PROTOCOL + TsfSession.getHttpServletRequest().getServerName(), callBackUrl);
+		String redirectUri = GagaFileUtil.getConcatenationPath(protocal + TsfSession.getHttpServletRequest().getServerName(), callBackUrl);
 		apiUrlBuilder.append(authorizeUrl)
 				.append("?response_type=code&client_id=")
 				.append(clientId)

+ 16 - 3
src/main/java/com/style24/front/biz/thirdparty/NiceCertify.java

@@ -11,6 +11,7 @@ import com.style24.persistence.domain.Customer;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
 
@@ -32,7 +33,8 @@ public class NiceCertify {
 	@Autowired
 	private Environment env;
 
-	public static final String PROTOCOL = "http://";
+	@Value("${has-ssl}")
+	private String hasSsl;
 
 	private String niceId;			// 나이스휴대폰인증ID
 	private String nicePwd;			// 나이스휴대폰인증비밀번호
@@ -41,6 +43,7 @@ public class NiceCertify {
 	private String ipinPwd;			// 나이스아이핀인증비밀번호
 	private String ipinCallback;	// 나이스아이핀콜백URL
 	private String domain;
+	private String protocal;
 
 	@PostConstruct
 	public void init() {
@@ -51,6 +54,14 @@ public class NiceCertify {
 		ipinPwd = env.getProperty("certify.ipin.pwd");
 		ipinCallback = env.getProperty("certify.ipin.callback");
 		domain = env.getProperty("domain.front");
+
+		boolean isSslServer = Boolean.parseBoolean(hasSsl);
+		if (isSslServer) {
+			protocal = "https://";
+		} else {
+			protocal = "http://";
+		}
+
 		log.debug("\n\n---- NiceCertify initialization started ----");
 		log.debug("나이스휴대폰인증(ID: {}, PWD: {}, callback: {})", niceId, nicePwd, domain + niceCallback);
 		log.debug("나이스아이핀인증(ID: {}, PWD: {}, callback: {})", ipinId, ipinPwd, domain + ipinCallback);
@@ -70,7 +81,9 @@ public class NiceCertify {
 		log.info("sRequestNo: {}", sRequestNo);
 		TsfSession.setAttribute("REQ_SEQ", sRequestNo);
 
-		String callback = GagaFileUtil.getConcatenationPath(PROTOCOL + TsfSession.getHttpServletRequest().getServerName(), niceCallback);
+
+
+		String callback = GagaFileUtil.getConcatenationPath(protocal + TsfSession.getHttpServletRequest().getServerName(), niceCallback);
 		log.info("niceCallback: {}", niceCallback);
 
 		String sAuthType = "M";	// 없으면 기본 선택화면, M: 휴대폰, C: 신용카드, X: 공인인증서
@@ -233,7 +246,7 @@ public class NiceCertify {
 	 */
 	public GagaMap certifyIpin() {
 		IPIN2Client ipinClinet = new IPIN2Client();
-		String callback = GagaFileUtil.getConcatenationPath( PROTOCOL + TsfSession.getHttpServletRequest().getServerName(), ipinCallback);
+		String callback = GagaFileUtil.getConcatenationPath( protocal + TsfSession.getHttpServletRequest().getServerName(), ipinCallback);
 
 		String sCPRequestNo = ipinClinet.getRequestNO(ipinId);
 		TsfSession.setAttribute("CPREQUEST", sCPRequestNo);

+ 14 - 2
src/main/java/com/style24/front/biz/thirdparty/Yes24Login.java

@@ -12,6 +12,7 @@ import com.style24.persistence.domain.CustSnsInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.env.Environment;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -48,7 +49,9 @@ public class Yes24Login {
 	@Autowired
 	private RestTemplate restTemplate;
 
-	public static final String PROTOCOL = "http://";
+	@Value("${has-ssl}")
+	private String hasSsl;
+
 
 	private String id;
 	private String type;
@@ -58,6 +61,7 @@ public class Yes24Login {
 	private String userInfoUrl;
 	private String linkUrl;
 	private String unlinkUrl;
+	private String protocal;
 
 	@PostConstruct
 	public void init() {
@@ -70,6 +74,14 @@ public class Yes24Login {
 		linkUrl = env.getProperty("yes24.linkUrl");
 		unlinkUrl = env.getProperty("yes24.unlinkUrl");
 
+		boolean isSslServer = Boolean.parseBoolean(hasSsl);
+
+		if (isSslServer) {
+			protocal = "https://";
+		} else {
+			protocal = "http://";
+		}
+
 		log.debug("\n\n---- YES24 initialization started ----");
 		log.debug("id: [{}]", id);
 		log.debug("type: [{}]", type);
@@ -93,7 +105,7 @@ public class Yes24Login {
 		String idGb = TsfSession.getFrontGb().equals("P") ? "PID" : "MID";
 		String requestUrl = TsfSession.getFrontGb().equals("P") ? webRequestUrl : mobRequestUrl;
 		StringBuilder apiUrlBuilder = new StringBuilder();
-		String redirectUri = GagaFileUtil.getConcatenationPath(PROTOCOL + TsfSession.getHttpServletRequest().getServerName(), callBackUrl);
+		String redirectUri = GagaFileUtil.getConcatenationPath(protocal + TsfSession.getHttpServletRequest().getServerName(), callBackUrl);
 		apiUrlBuilder.append(requestUrl)
 				.append("?")
 				.append(idGb)

+ 1 - 1
src/main/java/com/style24/front/support/config/TsfRedisSessionConfig.java

@@ -94,7 +94,7 @@ public class TsfRedisSessionConfig extends AbstractHttpSessionApplicationInitial
 		String active = env.getProperty("spring.profiles.active");
 		// TODO : SSL 적용 후 주석 풀고 테스트 해야함 2021-04-13
 		// SSL인증서 적용 시 주석 제거
-		if ("run".equals(active)) {
+		if ("run".equals(active) || "locd".equals(active)) {
 			serializer.setUseSecureCookie(true);
 			serializer.setSameSite("NONE");
 		}

+ 1 - 1
src/main/resources/config/application-locd.yml

@@ -17,7 +17,7 @@ logging:
     config: classpath:log/logback-locd.xml
 
 # SSL Server
-has-ssl: false
+has-ssl: true
 
 domain:
     front: //ldfront.style24.com

+ 102 - 9
src/main/webapp/WEB-INF/views/mob/common/fragments/FooterMob.html

@@ -6,11 +6,11 @@
 	<nav id="tabbar" class="tabbar fixed">
 	<!-- <nav id="tabbar" class="tabbar"> -->
 		<div class="tabbar-inner">
+			<a href="javascript:void(0);" onclick="menu();" class="btn-menu" data-popup-trigger="" data-target="#menu">Menu</a>
+			<a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MYPAGE);" class="btn-my">Mypage</a>
 			<a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MAIN);" class="btn-home">Home</a>
-			<a href="javascript:history;" class="btn-history">History</a>
 			<a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_WISHLIST);" class="btn-wish">Wish</a>
-			<a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MYPAGE);" class="btn-my">Mypage</a>
-			<a href="javascript:menu;" class="btn-menu" data-popup-trigger="" data-target="#menu">Menu</a>
+			<a href="javascript:history.back(-1);" class="btn-history">History</a>
 		</div>
 			<!-- 
 				<span class="txt-balloon" id="tutorial_mycloset" style=""> 툴팁예제</span>
@@ -49,22 +49,42 @@
 				</div>
 				
 				<ul class="link">
-					<li><a href="#none">사업자정보확인</a></li>
+					<li><a href="http://www.ftc.go.kr/bizCommPop.do?wrkr_no=2298137000">사업자정보확인</a></li>
 					<li><a href="#none">PC버전</a></li>
 					<li><a href="#none">APP 다운로드</a></li>
-					<li><a href="#none">SN&#64;PP</a></li>
+					<li><a href="http://zine.istyle24.com">SN&#64;PP</a></li>
 				</ul>
 				<ul class="copy">
 					<li>COPYRIGHTⓒ2020 STYLE24 ALL RIGHTS RESERVED.</li>
 				</ul>
 				<ul class="sns">
-					<li><a href="#none" class="insta">Instagram</a></li>
-					<li><a href="#none" class="facebook">facebook</a></li>
+					<li><a href="https://instagram.com/istyle24.official?igshid=o3nzm9tydg9n" class="insta">Instagram</a></li>
+					<li><a href="https://www.facebook.com/istyle24" class="facebook">facebook</a></li>
 				</ul>
 			</div>
 		</section>
 	</footer>
 	
+	<div id="menuFull">
+		<div class="fullHead">
+			<div class="goHome"><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MAIN);"><img src="/images/mo/logo_STYLE24_full.png" alt=""></a></div>
+			<a href="javascript:void(0);" class="appSett">AppSetting</a>
+			<a href="javascript:menu_cls();" class="menu_cls">close</a>
+		</div>
+		<div class="fullBody">
+			<div class="inner">
+				<ul class="fullCate" id="ulQuickMenuCate">
+				</ul>
+			</div>
+			<div class="inner">
+				<div class="btn_group btn_group_flex">
+					<div th:if="${sessionInfo != null}"><button type="button" class="btn" onclick="cfnGoToPage(_PAGE_LOGOUT);"><span>로그아웃</span></button></div>
+					<div><button type="button" class="btn" onclick="cfnGoToPage(_PAGE_FAQ);"><span>고객센터</span></button></div>
+				</div>
+			</div>
+		</div>
+	</div>
+	
 	<!-- 배송지관리_팝업 -->
 	<div class="modal pop_full adrsChange_Pop" id="adrsChangePop" tabindex="-1" role="dialog" aria-labelledby="adrsChangeLabel" aria-hidden="true">
 		<div class="modal-dialog" role="document">
@@ -113,7 +133,76 @@
 
 <script th:inline="javascript">
 /*<![CDATA[*/
+	function menu() {
+		$("#menuFull").addClass('on');
+		return false;
+	}
+	
+	function menu_cls() {
+		$("#menuFull").removeClass('on');
+		return false;
+	}
+	
+	$(document).on('click','.hasCate a',function(e){
+		$(this).next('.depthCate').slideToggle(300);
+		$(this).toggleClass('on');
+		return false;
+	});
+	
+	// 퀵메뉴카테고리
+	let fnGetQuickMenuCategory = function(cate1) {
+		let tag = '';
+		if (cate1 != null) {
+			tag += '<li class="hasCate">\n';
+			tag += '	<a href="javascript:;"><span>' + cate1.cate1Nm + '</span></a>\n';
+			if (cate1.leafYn == 'N' && cate1.cate2List.length > 0) {
+				tag += '	<ul class="depthCate">\n';
+				tag += '		<li><a href="javascript:void(0);" onclick="cfnGoToCategoryMain(\'' + cate1.cateGb + '\',' + cate1.cate1No + ');"><span>메인</span></a>\n';
+				tag += '		<li><a href="javascript:void(0);" onclick="cfnGoToGoodsList(0,\'' + cate1.cateGb + '\',' + cate1.cate1No + ');"><span>전체</span></a>\n';
+				$.each(cate1.cate2List, function(idx2, cate2) {
+					tag += '		<li><a href="javascript:void(0);" onclick="cfnGoToGoodsList(0,\'' + cate2.cateGb + '\',' + cate2.cate1No + ',' + cate2.cate2No + ');"><span>' + cate2.cate2Nm + '</span></a>\n';
+				});
+				tag += '	</ul>\n';
+			}
+			tag += '</li>\n';
+		}
+		return tag;
+	}
+	
+	// 퀵메뉴탭 생성
+	let fnCreateQuickMenuTab = function() {
+		$.getJSON('/display/gnb/tab/list'
+			, function(result, status) {
+				if (status == 'success') {
+					if (result.length > 0) {
+						$('#ulQuickMenuCate').html('');
+						
+						let tag = '';
+						tag += '<li><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_ALL_BRAND);"><span>브랜드</span></a></li>\n';
+						
+						let allCate = [[${allCateList}]];
+						$.each(result, function(idx, item) {
+							if (item.contentsType == 'C' || item.contentsType == 'O') { // 컨텐츠유형: 카테고리, 아울렛
+								$.each(allCate, function(allCateIdx, allCateItem) {
+									if (item.cate1No == allCateItem.cate1No) {
+										tag += fnGetQuickMenuCategory(allCateItem);
+									}
+								});
+							} else if (item.contentsType == 'L') { // 컨텐츠유형:링크
+								tag += '<li><a href="' + item.linkUrl + '"><span>' + item.gtabNm + '</span></a></li>';
+							}
+						});
+						
+						$('#ulQuickMenuCate').html(tag);
+					}
+				}
+			});
+	}
+	
 	$(document).ready(function() {
+		// 퀵메뉴탭 조회
+		fnCreateQuickMenuTab();
+		
 		$.getJSON('/cart/goods/not/soldout/cnt', function (order, status) {
 			let cartCnt;
 			if (order.cartGoodsList.length > 99) {
@@ -122,8 +211,12 @@
 				cartCnt = order.cartGoodsList.length;
 			}
 
-			$("header #htopSub .button_wrap .store>span").text(cartCnt);
-			$("#header .gnb .btn_cart").attr("href", _PAGE_CART);
+// 			$("header #htopSub .button_wrap .store>span").text(cartCnt);
+// 			$("#header .gnb .btn_cart").attr("href", _PAGE_CART);
+			if (cartCnt > 0) {
+				$('#spanGnbCartCnt').html(cartCnt);
+				$('#spanGnbCartCnt').show();
+			}
 		});
 	});
 /*]]>*/

+ 14 - 7
src/main/webapp/WEB-INF/views/mob/common/fragments/GnbMob.html

@@ -25,9 +25,9 @@
 				<button class="search">
 					<img src="/images/mo/ico_btn_search_w.png" alt="검색">
 				</button>
-				<button class="store">
+				<button class="store" onclick="cfnGoToPage(_PAGE_CART);">
 					<img src="/images/mo/ico_btn_store_w.png" alt="쇼핑백">
-					<span>99+</span>
+					<span id="spanGnbCartCnt" style="display: none;"></span>
 				</button>
 			</div>
 		</section>
@@ -65,6 +65,10 @@
 	
 <script th:inline="javascript">
 /*<![CDATA[*/
+	let fnClickGnbTab = function(gtabSq) {
+		gagajf.setCookie("ckGnbTab", gtabSq, 1);
+	}
+	
 	// GNB탭 생성
 	let fnCreateGnbTab = function() {
 		$.getJSON('/display/gnb/tab/list'
@@ -73,16 +77,19 @@
 					if (result.length > 0) {
 						$('#ulGnbTab').html('');
 						
+						let ckGnbTabSq = gagajf.getCookie("ckGnbTab");
+						
 						let tag = '';
-						tag += '<li><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MAIN);">홈</a></li>\n';
-						tag += '<li class="on"><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_ALL_BRAND);">브랜드</a></li>\n';
+						tag += '<li class="' + (gagajf.isNull(ckGnbTabSq) ? "on" : "") + '"><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MAIN);">홈</a></li>\n';
+						tag += '<li class="' + (ckGnbTabSq == 100 ? "on" : "") + '"><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_ALL_BRAND); fnClickGnbTab(100);">브랜드</a></li>\n';
+						
 						$.each(result, function(idx, item) {
 							if (item.contentsType == 'C') { // 컨텐츠유형: 카테고리
-								tag += '<li><a href="javascript:void(0);" onclick="cfnGoToCategoryMain(\'G032_101\',' + item.cate1No + ');">' + item.gtabNm + '</a></li>\n';
+								tag += '<li class="' + (ckGnbTabSq == item.gtabSq ? "on" : "") + '"><a href="javascript:void(0);" onclick="cfnGoToCategoryMain(\'G032_101\',' + item.cate1No + '); fnClickGnbTab(' + item.gtabSq + ');">' + item.gtabNm + '</a></li>\n';
 							} else if (item.contentsType == 'O') { // 컨텐츠유형: 아울렛
-								tag += '<li><a href="javascript:void(0);" onclick="cfnGoToOutletMain(\'G032_103\');">' + item.gtabNm + '</a></li>\n';
+								tag += '<li class="' + (ckGnbTabSq == item.gtabSq ? "on" : "") + '"><a href="javascript:void(0);" onclick="cfnGoToOutletMain(\'G032_103\'); fnClickGnbTab(' + item.gtabSq + ');">' + item.gtabNm + '</a></li>\n';
 							} else { // 컨텐츠유형: 링크
-								tag += '<li><a href="' + item.linkUrl + '">' + item.gtabNm + '</a></li>\n';
+								tag += '<li class="' + (ckGnbTabSq == item.gtabSq ? "on" : "") + '"><a href="' + item.linkUrl + '" onclick="fnClickGnbTab(' + item.gtabSq + ');">' + item.gtabNm + '</a></li>\n';
 							}
 						});
 						

+ 3 - 3
src/main/webapp/WEB-INF/views/mob/common/fragments/GnbSubGoodsMob.html

@@ -28,9 +28,9 @@
 					<button type="button" class="search">
 						<img src="/images/mo/ico_btn_search.png" alt="검색">
 					</button>
-					<button type="button" class="store">
-						<img src="/images/mo/ico_btn_store.png" alt="쇼핑백">
-						<span>99+</span> 
+					<button class="store" onclick="cfnGoToPage(_PAGE_CART);">
+						<img src="/images/mo/ico_btn_store_w.png" alt="쇼핑백">
+						<span id="spanGnbCartCnt" style="display: none;"></span>
 					</button>
 				</div>
 			</section>

+ 3 - 3
src/main/webapp/WEB-INF/views/mob/common/fragments/GnbSubMob.html

@@ -26,9 +26,9 @@
 				<button type="button" class="search">
 					<img src="/images/mo/ico_btn_search.png" alt="검색">
 				</button>
-				<button type="button" class="store" onclick="cfnGoToPage(_PAGE_CART);">
-					<img src="/images/mo/ico_btn_store.png" alt="쇼핑백">
-					<span>99+</span>
+				<button class="store" onclick="cfnGoToPage(_PAGE_CART);">
+					<img src="/images/mo/ico_btn_store_w.png" alt="쇼핑백">
+					<span id="spanGnbCartCnt" style="display: none;"></span>
 				</button>
 			</div>
 		</section>

+ 3 - 3
src/main/webapp/WEB-INF/views/mob/common/fragments/GnbSubPlanningMob.html

@@ -26,9 +26,9 @@
 				<button type="button" class="search">
 					<img src="/images/mo/ico_btn_search.png" alt="검색">
 				</button>
-				<button type="button" class="store">
-					<img src="/images/mo/ico_btn_store.png" alt="쇼핑백">
-					<span>99+</span>
+				<button class="store" onclick="cfnGoToPage(_PAGE_CART);">
+					<img src="/images/mo/ico_btn_store_w.png" alt="쇼핑백">
+					<span id="spanGnbCartCnt" style="display: none;"></span>
 				</button>
 			</div>
 		</section>

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

@@ -94,13 +94,14 @@
 	var fnConfirmCallback = function (result) {
 		let confirmYn = 'Y';
 		let $passwd = $('#confirmForm input[name=passwd]');
+		let $custId = $('#confirmForm input[name=custId]');
 		if (result.isMatch) {
 			confirmYn = 'Y';
 			cfnGoToPage(_PAGE_MYPAGE_CUSTOMER_MODIFY+'?confirmYn='+ confirmYn);
 		} else {
 			mcxDialog.alert('비밀번호가 일치하지 않습니다.');
 			$passwd.val('');
-			$passwd.focus();
+			$custId.focus();
 			return;
 		}
 	};

+ 6 - 3
src/main/webapp/WEB-INF/views/mob/mypage/MypageCustModifyFormMob.html

@@ -248,6 +248,9 @@
 		fnDisplayEmailAgree(custInfo.emailAgreeYn);
 		fnDisplaySmsAgree(custInfo.smsAgreeYn);
 
+		// 회원(고객) 계좌 조회
+		fnGetCustAccountInfo();
+
 	}
 
 	// 이메일 수신동의
@@ -517,6 +520,7 @@
 	});
 
 	$(document).ready(function(){
+
 		if (!gagajf.isNull(sEncData)) {
 			fnNiceCallBack(sEncData, authMethod);
 		}
@@ -526,9 +530,6 @@
 		// 회원(고객) 조회
 		fnGetCustInfo();
 
-		// 회원(고객) 계좌 조회
-		fnGetCustAccountInfo();
-
 		//버튼 색
 		$(document).on('click','.popup_box .button_list button',function(){
 			$('.popup_box .button_list button').removeClass('on');
@@ -549,6 +550,8 @@
 			$("body").css({"overflow":"visible"});
 		});
 
+
+
 	})
 	/*]]>*/
 </script>