6 Commits f87aad909b ... 7171cad756

Auteur SHA1 Message Date
  card007 7171cad756 Merge branch 'develop' into style il y a 4 ans
  card007 6255022ac2 Merge remote-tracking branch 'TSIT/ST24PRJ-578' into stage_tsit il y a 4 ans
  smlee@yes24.com c61a3f46b1 배송지 변경 팝업 수정 il y a 4 ans
  jun820624 0892ec56cc ST24PRJ-445 스크립트 버전 추가 및 수정 (PC:초에서 일로, M:신규추가) il y a 4 ans
  jun820624 02f374c4ec ST24PRJ-698 시작순서값 변경 il y a 4 ans
  sshong 07f83784d3 [ST24PRJ-578][결함][FRONT] 검색 > 필터/ 필터값 유지 안되는 현상 il y a 4 ans

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

@@ -60,7 +60,7 @@
 		<a href="#close-modal" rel="modal:close" id="adrsAddPop_close" class="close-modal">Close</a>
 	</div>
 
-	<script th:src="@{'/biz/mypage.js'}" src="/biz/mypage.js"></script>
+	<script th:src="@{'/biz/mypage.js?v=' + ${#calendars.format(#calendars.createNow(), 'yyyyMMdd')}}" src="/biz/mypage.js"></script>
 
 <script th:inline="javascript">
 /*<![CDATA[*/

+ 81 - 76
src/main/webapp/WEB-INF/views/mob/display/BrandSearchGoodsListFormMob.html

@@ -162,7 +162,7 @@
 									</li>
 								</ul>
 							</li>
-							<li calss="size chkFilter" th:if="${filterSizeList != null and !filterSizeList.empty}" id="sizeFilterDiv">
+							<li class="size chkFilter" th:if="${filterSizeList != null and !filterSizeList.empty}" id="sizeFilterDiv">
 								<a href="javascript:void(0)" class="daps1">사이즈<span class="pic"></span></a>
 								<div class="daps2">
 									<ul class="sizebox">
@@ -405,6 +405,86 @@
 	// 상품리스트 페이지 확인용
 	var listIdx = 1;
 
+	// 크롬 mobile device 
+    var chromeHistoryBack = false;
+    if(window.performance && window.performance.navigation.type == 2){
+    	chromeHistoryBack = true;
+    }
+    
+	$(window).on("pageshow", function(event) {
+		if( history.scrollRestoration ) window.history.scrollRestoration = 'manual';
+		$('#filterForm input[name=brandGroup]:checked').each(function(){
+			$(this).attr('checked', true);
+		});
+		$('#filterForm input[name=size]:checked').each(function(){
+			$(this).attr('checked', true);
+		});
+		$('#filterForm input[name=dcRate]:checked').each(function(){
+			$(this).attr('checked', true);
+		});
+		$('#filterForm input[name=age]:checked').each(function(){
+			$(this).attr('checked', true);
+		});
+		$('#filterForm input[name=season]:checked').each(function(){
+			$(this).attr('checked', true);
+		});
+		$('#filterForm input[name=color]:checked').each(function(){
+			$(this).attr('checked', true);
+		});
+		$('#filterForm input[name=benefit]:checked').each(function(){
+			$(this).attr('checked', true);
+		});
+		$('#filterForm input[name=price]:checked').each(function(){
+			$(this).attr('checked', true);
+		});
+		
+		if ( (event.originalEvent && event.originalEvent.persisted) || (window.performance && window.performance.navigation.type == 2) || chromeHistoryBack) {
+			if( history.scrollRestoration ) window.history.scrollRestoration = 'manual';
+			$("#searchGoodsForm input:hidden[name=unisex]").remove();
+			$("#searchGoodsForm input:hidden[name=newGoods]").remove();
+			var historyData = sessionStorage.getItem(document.location.href);
+			// console.log(historyData);
+			if(historyData!=null){
+				// console.log('historyData>>'+historyData);
+				historyData = JSON.parse(historyData);
+			}else{
+				historyData = {};
+			}
+			if(typeof historyData.filterHtml!='undefined' && historyData.filterHtml!=''){
+			 	//console.log('historyData.filterHtml>>>'+historyData.filterHtml);
+				$("#searchGoodsForm").append(historyData.filterHtml);
+				filterHtml = historyData.filterHtml;
+			}
+			if(typeof historyData.filterStatHtml!='undefined' && historyData.filterStatHtml!=''){
+			 	$("#filterForm").append(historyData.filterStatHtml);
+			 	filterStatHtml = historyData.filterStatHtml;
+			}
+			fnReCheckFilterList();
+			if(typeof historyData.totalCount!='undefined' && historyData.totalCount!=''){
+				$("#totCntId").text(historyData.totalCount.addComma());
+			}
+			if(typeof historyData.sortingType!='undefined' && historyData.sortingType!=''){
+				$("#searchGoodsForm input:hidden[name=sortingType]").val(historyData.sortingType);
+				fnSortingChange(this,historyData.sortingType,'back','Mob');
+			}else{
+				listIdx++;
+				fnSearchGoodsListSearch();
+			}
+		}else{
+			fnCategoryGoodsInfiniteScrollInit();
+
+			var sortingType = $("#searchGoodsForm input:hidden[name=sortingType]").val();
+			if(sortingType=='NEW' || sortingType=='REVIEW' || sortingType=='ROWPRICE'){
+				fnSortingChange(this,sortingType,'','Mob');
+			}else{
+				fnSearchGoodsListSearch();
+				fnGetSearchPlanningList();
+				fnGetSearchEventList();
+			}
+		}
+	});
+	
+	
 	var fnSearchGoodsListSearch = function (){
 		gagaInfiniteScroll.getHistory();
 	}
@@ -823,81 +903,6 @@
 			$("#htopTitle").text(brandNm);
 		}
 
-		// 크롬 mobile device 
-	    var chromeHistoryBack = false;
-	    if(window.performance && window.performance.navigation.type == 2){
-	    	chromeHistoryBack = true;
-	    }
-	    
-		$(window).on("pageshow", function(event) {
-			$('#filterForm input[name=brandGroup]:checked').each(function(){
-				$(this).attr('checked', true);
-			});
-			$('#filterForm input[name=size]:checked').each(function(){
-				$(this).attr('checked', true);
-			});
-			$('#filterForm input[name=dcRate]:checked').each(function(){
-				$(this).attr('checked', true);
-			});
-			$('#filterForm input[name=age]:checked').each(function(){
-				$(this).attr('checked', true);
-			});
-			$('#filterForm input[name=season]:checked').each(function(){
-				$(this).attr('checked', true);
-			});
-			$('#filterForm input[name=color]:checked').each(function(){
-				$(this).attr('checked', true);
-			});
-			$('#filterForm input[name=benefit]:checked').each(function(){
-				$(this).attr('checked', true);
-			});
-			$('#filterForm input[name=price]:checked').each(function(){
-				$(this).attr('checked', true);
-			});
-			
-			if ( (event.originalEvent && event.originalEvent.persisted) || (window.performance && window.performance.navigation.type == 2) || chromeHistoryBack) {
-				var historyData = sessionStorage.getItem(document.location.href);
-				// console.log(historyData);
-				if(historyData!=null){
-					// console.log('historyData>>'+historyData);
-					historyData = JSON.parse(historyData);
-				}else{
-					historyData = {};
-				}
-				if(typeof historyData.filterHtml!='undefined' && historyData.filterHtml!=''){
-				 	//console.log('historyData.filterHtml>>>'+historyData.filterHtml);
-					$("#searchGoodsForm").append(historyData.filterHtml);
-					filterHtml = historyData.filterHtml;
-				}
-				if(typeof historyData.filterStatHtml!='undefined' && historyData.filterStatHtml!=''){
-				 	$("#filterForm").append(historyData.filterStatHtml);
-				 	filterStatHtml = historyData.filterStatHtml;
-				}
-				
-				fnReCheckFilterList();
-				if(typeof historyData.totalCount!='undefined' && historyData.totalCount!=''){
-					$("#totCntId").text(historyData.totalCount.addComma());
-				}
-				if(typeof historyData.sortingType!='undefined' && historyData.sortingType!=''){
-					$("#searchGoodsForm input:hidden[name=sortingType]").val(historyData.sortingType);
-					fnSortingChange(this,historyData.sortingType,'back','Mob');
-				}else{
-					listIdx++;
-					fnSearchGoodsListSearch();
-				}
-			}else{
-				fnCategoryGoodsInfiniteScrollInit();
-
-				var sortingType = $("#searchGoodsForm input:hidden[name=sortingType]").val();
-				if(sortingType=='NEW' || sortingType=='REVIEW' || sortingType=='ROWPRICE'){
-					fnSortingChange(this,sortingType,'','Mob');
-				}else{
-					fnSearchGoodsListSearch();
-					fnGetSearchPlanningList();
-					fnGetSearchEventList();
-				}
-			}
-		});
 	});
 
 	// 카테고리 필터 생성

+ 100 - 101
src/main/webapp/WEB-INF/views/mob/display/SearchGoodsListFormMob.html

@@ -228,7 +228,7 @@
 									</li>
 								</ul>
 							</li>
-							<li calss="size chkFilter" th:if="${filterSizeList != null and !filterSizeList.empty}" id="sizeFilterDiv">
+							<li class="size chkFilter" th:if="${filterSizeList != null and !filterSizeList.empty}" id="sizeFilterDiv">
 								<a href="javascript:void(0)" class="daps1">사이즈<span class="pic"></span></a>
 								<div class="daps2">
 									<ul class="sizebox">
@@ -467,8 +467,106 @@
 	var filterPriceList = [[${filterPriceList}]];
 	// 상품리스트 페이지 확인용
 	var listIdx = 1;
-
 	
+	// 크롬 mobile device
+	  var chromeHistoryBack = false;
+	    if(window.performance && window.performance.navigation.type == 2){
+	    	chromeHistoryBack = true;
+	    }
+
+	$(window).on("pageshow", function(event) {
+		if( history.scrollRestoration ) window.history.scrollRestoration = 'manual';
+		$('#filterForm input[name=brandGroup]:checked').each(function(){
+			$(this).attr('checked', true);
+		});
+		$('#filterForm input[name=size]:checked').each(function(){
+			$(this).attr('checked', true);
+		});
+		$('#filterForm input[name=dcRate]:checked').each(function(){
+			$(this).attr('checked', true);
+		});
+		$('#filterForm input[name=age]:checked').each(function(){
+			$(this).attr('checked', true);
+		});
+		$('#filterForm input[name=season]:checked').each(function(){
+			$(this).attr('checked', true);
+		});
+		$('#filterForm input[name=color]:checked').each(function(){
+			$(this).attr('checked', true);
+		});
+		$('#filterForm input[name=benefit]:checked').each(function(){
+			$(this).attr('checked', true);
+		});
+		$('#filterForm input[name=price]:checked').each(function(){
+			$(this).attr('checked', true);
+		});
+		if ( (event.originalEvent && event.originalEvent.persisted) || (window.performance && window.performance.navigation.type == 2) || chromeHistoryBack) {
+			if( history.scrollRestoration ) window.history.scrollRestoration = 'manual';
+			$("#searchGoodsForm input:hidden[name=unisex]").remove();
+			$("#searchGoodsForm input:hidden[name=newGoods]").remove();
+			var historyData = sessionStorage.getItem(document.location.href);
+			// console.log(historyData);
+			if(historyData!=null){
+				// console.log('historyData>>'+historyData);
+				historyData = JSON.parse(historyData);
+			}else{
+				historyData = {};
+			}
+			if(gagajf.isNull($("#searchGoodsForm").find("input[name=unisex]").val())){
+				$("#unisex").attr('onclick','fnResetListIdx();fnFilterOption(this,\'on\');');
+				$("#unisex").attr('checked', false);
+			}else{
+				$("#unisex").attr('onclick','fnResetListIdx();fnFilterOption(this,\'off\');');
+				$("#unisex").attr('checked', true);
+			}
+
+			if(gagajf.isNull($("#searchGoodsForm").find("input[name=newGoods]").val())){
+				$("#newGoods").attr('onclick','fnResetListIdx();fnFilterOption(this,\'on\');');
+				$("#newGoods").attr('checked', false);
+			}else{
+				$("#newGoods").attr('onclick','fnResetListIdx();fnFilterOption(this,\'off\');');
+				$("#newGoods").attr('checked', true);
+			}
+			 if(typeof historyData.filterHtml!='undefined' && historyData.filterHtml!=''){
+			 	//console.log('historyData.filterHtml>>>'+historyData.filterHtml);
+			 	$("#searchGoodsForm").append(historyData.filterHtml);
+			 	filterHtml = historyData.filterHtml;
+			 }
+			 if(typeof historyData.filterStatHtml!='undefined' && historyData.filterStatHtml!=''){
+			 	$("#filterForm").append(historyData.filterStatHtml);
+			 	filterStatHtml = historyData.filterStatHtml;
+			 }
+			fnReCheckFilterList();
+			if(typeof historyData.totalCount!='undefined' && historyData.totalCount!=''){
+				$("#totCntId").text(historyData.totalCount.addComma());
+				$("#prodListCnt").text('('+historyData.totalCount.addComma()+')');
+			}else{
+				$("#totCntId").text('0');
+				$("#prodListCnt").text('(0)');
+			}
+			if(typeof historyData.sortingType!='undefined' && historyData.sortingType!=''){
+				$("#searchGoodsForm input:hidden[name=sortingType]").val(historyData.sortingType);
+				fnSortingChange(this,historyData.sortingType,'back','Mob');
+			}else{
+				listIdx++;
+				fnSearchGoodsListSearch();
+				fnGetSearchPlanningList();
+				fnGetSearchEventList();
+			}
+		}else{
+			fnCategoryGoodsInfiniteScrollInit();
+
+			var sortingType = $("#searchGoodsForm input:hidden[name=sortingType]").val();
+			if(sortingType=='NEW' || sortingType=='REVIEW' || sortingType=='ROWPRICE'){
+				fnSortingChange(this,sortingType,'','Mob');
+			}else{
+				fnSearchGoodsListSearch();
+				fnGetSearchPlanningList();
+				fnGetSearchEventList();
+			}
+		}
+	});
+
 	var fnSearchGoodsListSearch = function (){
 		gagaInfiniteScroll.getHistory();
 	}
@@ -878,105 +976,6 @@
 		if ($('#sizeLi2').find('label').length == 0) $('#sizeLi2').hide();
 		if ($('#sizeLi3').find('label').length == 0) $('#sizeLi3').hide();
 
-		// 크롬 mobile device 
-	    var chromeHistoryBack = false;
-	    if(window.performance && window.performance.navigation.type == 2){
-	    	chromeHistoryBack = true;
-	    }
-	    
-		$(window).on("pageshow", function(event) {
-			if( history.scrollRestoration ) window.history.scrollRestoration = 'manual';
-			$('#filterForm input[name=brandGroup]:checked').each(function(){
-				$(this).attr('checked', true);
-			});
-			$('#filterForm input[name=size]:checked').each(function(){
-				$(this).attr('checked', true);
-			});
-			$('#filterForm input[name=dcRate]:checked').each(function(){
-				$(this).attr('checked', true);
-			});
-			$('#filterForm input[name=age]:checked').each(function(){
-				$(this).attr('checked', true);
-			});
-			$('#filterForm input[name=season]:checked').each(function(){
-				$(this).attr('checked', true);
-			});
-			$('#filterForm input[name=color]:checked').each(function(){
-				$(this).attr('checked', true);
-			});
-			$('#filterForm input[name=benefit]:checked').each(function(){
-				$(this).attr('checked', true);
-			});
-			$('#filterForm input[name=price]:checked').each(function(){
-				$(this).attr('checked', true);
-			});
-			
-			if ( (event.originalEvent && event.originalEvent.persisted) || (window.performance && window.performance.navigation.type == 2) || chromeHistoryBack) {
-				$("#searchGoodsForm input:hidden[name=unisex]").remove();
-				$("#searchGoodsForm input:hidden[name=newGoods]").remove();
-				if( history.scrollRestoration ) window.history.scrollRestoration = 'manual';
-				var historyData = sessionStorage.getItem(document.location.href);
-				// console.log(historyData);
-				if(historyData!=null){
-					// console.log('historyData>>'+historyData);
-					historyData = JSON.parse(historyData);
-				}else{
-					historyData = {};
-				}
-				if(gagajf.isNull($("#searchGoodsForm").find("input[name=unisex]").val())){
-					$("#unisex").attr('onclick','fnResetListIdx();fnFilterOption(this,\'on\');');
-					$("#unisex").attr('checked', false);
-				}else{
-					$("#unisex").attr('onclick','fnResetListIdx();fnFilterOption(this,\'off\');');
-					$("#unisex").attr('checked', true);
-				}
-
-				if(gagajf.isNull($("#searchGoodsForm").find("input[name=newGoods]").val())){
-					$("#newGoods").attr('onclick','fnResetListIdx();fnFilterOption(this,\'on\');');
-					$("#newGoods").attr('checked', false);
-				}else{
-					$("#newGoods").attr('onclick','fnResetListIdx();fnFilterOption(this,\'off\');');
-					$("#newGoods").attr('checked', true);
-				}
-				if(typeof historyData.filterHtml!='undefined' && historyData.filterHtml!=''){
-					//console.log('historyData.filterHtml>>>'+historyData.filterHtml);
-					$("#searchGoodsForm").append(historyData.filterHtml);
-					filterHtml = historyData.filterHtml;
-				}
-				if(typeof historyData.filterStatHtml!='undefined' && historyData.filterStatHtml!=''){
-					$("#filterForm").append(historyData.filterStatHtml);
-					filterStatHtml = historyData.filterStatHtml;
-				}
-				fnReCheckFilterList();
-				if(typeof historyData.totalCount!='undefined' && historyData.totalCount!=''){
-					$("#totCntId").text(historyData.totalCount.addComma());
-					$("#prodListCnt").text('('+historyData.totalCount.addComma()+')');
-				}else{
-					$("#totCntId").text('0');
-					$("#prodListCnt").text('(0)');
-				}
-				if(typeof historyData.sortingType!='undefined' && historyData.sortingType!=''){
-					$("#searchGoodsForm input:hidden[name=sortingType]").val(historyData.sortingType);
-					fnSortingChange(this,historyData.sortingType,'back','Mob');
-				}else{
-					listIdx++;
-					fnSearchGoodsListSearch();
-					fnGetSearchPlanningList();
-					fnGetSearchEventList();
-				}
-			}else{
-				fnCategoryGoodsInfiniteScrollInit();
-
-				var sortingType = $("#searchGoodsForm input:hidden[name=sortingType]").val();
-				if(sortingType=='NEW' || sortingType=='REVIEW' || sortingType=='ROWPRICE'){
-					fnSortingChange(this,sortingType,'','Mob');
-				}else{
-					fnSearchGoodsListSearch();
-					fnGetSearchPlanningList();
-					fnGetSearchEventList();
-				}
-			}
-		});
 	});
 
 	// 카테고리 필터 생성

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

@@ -613,7 +613,7 @@
 								<div class="ship_info ship_edit">
 									<!--  배송비정보변경가능 -->
 									<th:block th:if="${canChgAddr == 'Y'}">
-										<button type="button" id="btn_adrsChange_pop" class="btn_popup" onclick="fnChangeDeliveryAddr();">
+										<button type="button" id="btn_adrsChange_pop" class="btn_popup" >
 											<span>배송지 변경</span>
 										</button>
 									</th:block>

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

@@ -71,7 +71,7 @@
 </div>
 <!-- //회수조회 팝업 -->
 
-<script th:src="@{'/biz/mypage.js?v=' + ${#calendars.format(#calendars.createNow(), 'yyyyMMddHHmmss')}}" src="/biz/mypage.js"></script>
+<script th:src="@{'/biz/mypage.js?v=' + ${#calendars.format(#calendars.createNow(), 'yyyyMMdd')}}" src="/biz/mypage.js"></script>
 
 <script th:inline="javascript">
 /*<![CDATA[*/

+ 3 - 3
src/main/webapp/WEB-INF/views/web/display/LookbookDetailFormWeb.html

@@ -302,11 +302,11 @@
 		/* 슬라이드 - 상단_LOOKBOOK */
 		var lookbook_visual_slide = new Swiper('.br_lookbook_view.cont_visual .swiper-container', {
 			loop: true,
-			loopAdditionalSlides : 1,
+			// loopAdditionalSlides : 1,
 			slidesPerView: 'auto',
 			spaceBetween: 20,
-			speed : 1000,
-			initialSlide: 1,
+			// speed : 1000,
+			// initialSlide: 0,
 			autoWidth: true,
 			autoHeight: true,
 			observer: true,