Merge remote-tracking branch 'origin/jsh77b' into develop

src/main/webapp/WEB-INF/views/mob/common/layout/MypageLayoutMob.html

@@ -9,6 +9,9 @@
 
 <th:block th:replace="~{web/common/fragments/VariablesWeb :: variables}"></th:block>
 
+<!-- 2021.08.30 cfCheckLogin 오류 수정 -->
+<th:block th:replace="~{mob/common/fragments/ScriptsMob :: scripts}"></th:block>
+
 <div class="app">
 	<!-- GNB -->
 	<th:block th:replace="~{mob/common/fragments/GnbSubMob :: gnb}"></th:block>
@@ -49,16 +52,14 @@
 	<!-- //교환상품 옵션변경 팝업 -->
 
 	<div class="modal pop_full reclaim_pop" id="reclaimPop" tabindex="-1" role="dialog" aria-labelledby="reclaimLabel" aria-hidden="true" style="display: none;">
-			<div class="modal-dialog" role="document">
-				<div class="modal-content">
+		<div class="modal-dialog" role="document">
+			<div class="modal-content">
 
-				</div>
 			</div>
-			<a href="#close-modal" rel="modal:close" id="adrsAddPop_close" class="close-modal">Close</a>
 		</div>
+		<a href="#close-modal" rel="modal:close" id="adrsAddPop_close" class="close-modal">Close</a>
+	</div>
 
-	<th:block th:replace="~{mob/common/fragments/ScriptsMob :: scripts}"></th:block>
-	
 	<script th:src="@{'/biz/mypage.js'}" src="/biz/mypage.js"></script>
 
 <script th:inline="javascript">

src/main/webapp/WEB-INF/views/web/common/fragments/BrandGnbWeb.html

@@ -73,6 +73,9 @@
 
 <script th:inline="javascript">
 /*<![CDATA[*/
+	// 전체카테고리 조회
+	let gAllCate = [[${allCateList}]];
+	
 	// GNB탭 > 카테고리
 	let fnGetGnbCategory = function(cate1) {
 		let tag = '';

src/main/webapp/WEB-INF/views/web/common/layout/MypageLayoutWeb.html

@@ -15,6 +15,9 @@
 	
 <th:block th:replace="~{web/common/fragments/VariablesWeb :: variables}"></th:block>
 
+<!-- 2021.08.30 cfCheckLogin 오류 수정 -->
+<th:block th:replace="~{web/common/fragments/ScriptsWeb :: scripts}"></th:block>
+
 <!-- GNB -->
 <header id="header" th:replace="~{web/common/fragments/GnbWeb :: gnb}"></header>
 <!--// GNB -->
@@ -68,7 +71,6 @@
 </div>
 <!-- //회수조회 팝업 -->
 
-<th:block th:replace="~{web/common/fragments/ScriptsWeb :: scripts}"></th:block>
 <script th:src="@{'/biz/mypage.js?v=' + ${#calendars.format(#calendars.createNow(), 'yyyyMMddHHmmss')}}" src="/biz/mypage.js"></script>
 
 <script th:inline="javascript">