Merge branch 'stage_tsit' of https://style24@dev.azure.com/style24/style24/_git/style24.front into stage_tsit

src/main/resources/config/application-tsit.yml

@@ -21,8 +21,8 @@ logging:
 domain:
     admin: //tdadmin.style24.com
     front: //ts5000.ipdisk.co.kr
-    image: //tdimage.style24.com
-#    image: //ts5000.ipdisk.co.kr:8999
+#    image: //tdimage.style24.com
+    image: //ts5000.ipdisk.co.kr:8999
 #    uximage: //tdimage.style24.com
 #    uximage: //image.istyle24.com/Style24
     uximage: //ts5000.ipdisk.co.kr:8999

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

@@ -405,74 +405,6 @@
 	// 상품리스트 페이지 확인용
 	var listIdx = 1;
 
-	$(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)) {
-			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();
 	}
@@ -891,6 +823,81 @@
 			$("#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();
+				}
+			}
+		});
 	});
 
 	// 카테고리 필터 생성

src/main/webapp/WEB-INF/views/mob/display/CategoryGoodsListFormMob.html

@@ -723,7 +723,13 @@
 			fnCategoryGoodsInfiniteScrollInit();
 			fnGoodsListSearch();
 		}
-
+		
+		// 크롬 mobile device 
+	    var chromeHistoryBack = false;
+	    if(window.performance && window.performance.navigation.type == 2){
+	    	chromeHistoryBack = true;
+	    }
+	    
 		// 사파리 - event.persisted || 크롬 - window.performance.navigation.type 이 1이면 새로고침, 2면 페이지 이동을 통한 캐쉬페이징
 		$(window).on("pageshow", function(event) {
 			if( history.scrollRestoration ) window.history.scrollRestoration = 'manual';
@@ -751,7 +757,8 @@
 			$('#filterForm input[name=price]:checked').each(function(){
 				$(this).attr('checked', true);
 			});
-			if ( (event.originalEvent && event.originalEvent.persisted) || (window.performance && window.performance.navigation.type == 2)) {
+			
+			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();

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

@@ -468,99 +468,7 @@
 	// 상품리스트 페이지 확인용
 	var listIdx = 1;
 
-	$(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)) {
-			$("#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();
-			}
-		}
-	});
-
+	
 	var fnSearchGoodsListSearch = function (){
 		gagaInfiniteScroll.getHistory();
 	}
@@ -970,6 +878,105 @@
 		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();
+				}
+			}
+		});
 	});
 
 	// 카테고리 필터 생성

src/main/webapp/WEB-INF/views/mob/order/OrderAddPaymentFormMob.html

@@ -181,7 +181,7 @@
 																<th>제공받는 자</th>
 																<td>
 																	<th:block th:each="delvFeeCd, i : ${delvFeeCdList}">
-																		<th:block th:unless="${delvFeeCd.delvFeeCd} == 'WMS' || ${delvFeeCd.delvFeeCd} == 'WMS_FREE'">
+																		<th:block th:unless="${delvFeeCd.delvFeeCd} == 'WMS' or ${delvFeeCd.delvFeeCd} == 'WMS_FREE'">
 																			<th:block th:if="${i.count == #lists.size(delvFeeCdList)}">
 																				<th:block th:text="|${delvFeeCd.supplyCompNm}|"></th:block>
 																			</th:block>

src/main/webapp/WEB-INF/views/mob/order/OrderFormMob.html

@@ -265,7 +265,7 @@
 													<th>제공받는 자</th>
 													<td>
 														<th:block th:each="delvFeeCd, i : ${delvFeeCdList}">
-															<th:block th:unless="${delvFeeCd.delvFeeCd} == 'WMS'">
+															<th:block th:unless="${delvFeeCd.delvFeeCd} == 'WMS' or ${delvFeeCd.delvFeeCd} == 'WMS_FREE'">
 																<th:block th:if="${i.count == #lists.size(delvFeeCdList)}">
 																	<th:block th:text="|${delvFeeCd.supplyCompNm}|"></th:block>
 																</th:block>
@@ -355,7 +355,7 @@
 													<th>제공받는 자</th>
 													<td>
 														<th:block th:each="delvFeeCd, i : ${delvFeeCdList}">
-															<th:block th:unless="${delvFeeCd.delvFeeCd} == 'WMS'">
+															<th:block th:unless="${delvFeeCd.delvFeeCd} == 'WMS' or ${delvFeeCd.delvFeeCd} == 'WMS_FREE'">
 																<th:block th:if="${i.count == #lists.size(delvFeeCdList)}">
 																	<th:block th:text="|${delvFeeCd.supplyCompNm}|"></th:block>
 																</th:block>

src/main/webapp/WEB-INF/views/web/order/OrderAddPaymentFormWeb.html

@@ -101,7 +101,7 @@
 															<tr>
 																<td>
 																	<th:block th:each="delvFeeCd, i : ${delvFeeCdList}">
-																		<th:block th:unless="${delvFeeCd.delvFeeCd} == 'WMS' || ${delvFeeCd.delvFeeCd} == 'WMS_FREE'">
+																		<th:block th:unless="${delvFeeCd.delvFeeCd} == 'WMS' or ${delvFeeCd.delvFeeCd} == 'WMS_FREE'">
 																			<th:block th:if="${i.count == #lists.size(delvFeeCdList)}">
 																				<th:block th:text="|${delvFeeCd.supplyCompNm}|"></th:block>
 																			</th:block>

src/main/webapp/WEB-INF/views/web/order/OrderFormWeb.html

@@ -257,7 +257,7 @@
 														<tr class="paymentinfo">
 															<td>
 																<th:block th:each="delvFeeCd, i : ${delvFeeCdList}">
-																	<th:block th:unless="${delvFeeCd.delvFeeCd} == 'WMS'">
+																	<th:block th:unless="${delvFeeCd.delvFeeCd} == 'WMS' or ${delvFeeCd.delvFeeCd} == 'WMS_FREE'">
 																		<th:block th:if="${i.count == #lists.size(delvFeeCdList)}">
 																			<th:block th:text="|${delvFeeCd.supplyCompNm}|"></th:block>
 																		</th:block>
@@ -325,7 +325,7 @@
 														<tr class="paymentinfo">
 															<td>
 																<th:block th:each="delvFeeCd, i : ${delvFeeCdList}">
-																	<th:block th:unless="${delvFeeCd.delvFeeCd} == 'WMS'">
+																	<th:block th:unless="${delvFeeCd.delvFeeCd} == 'WMS' or ${delvFeeCd.delvFeeCd} == 'WMS_FREE'">
 																		<th:block th:if="${i.count == #lists.size(delvFeeCdList)}">
 																			<th:block th:text="|${delvFeeCd.supplyCompNm}|"></th:block>
 																		</th:block>

src/main/webapp/ux/mo/css/common_m.css

@@ -1140,7 +1140,7 @@ button.alertCls {-webkit-appearance: none;padding: 0;cursor: pointer;background:
 .foldGroup.case2 .fold_answer{padding-top:1.8rem;}
 
 .fold_head {padding: 0; border-bottom: 0.1rem solid transparent;}
-.fold_head::after {content: ''; position: absolute; display: inline-block; top:50%; left: auto; right:2.0rem; transform: translateY(-50%);  width:1.3rem; height:0.7rem; background: url('//image.istyle24.com/Style24/images/mo/ico_fold_arrow1.png'); background-repeat: no-repeat; background-position: 0 100%; background-size: cover;z-index:-1;}
+.fold_head::after {content: ''; position: absolute; display: inline-block; top:50%; left: auto; right:2.0rem; transform: translateY(-50%);  width:1.3rem; height:0.7rem; background: url('//image.istyle24.com/Style24/images/mo/ico_fold_arrow1.png'); background-repeat: no-repeat; background-position: 0 100%; background-size: cover;}
 .fold_head.on::after {background-repeat: no-repeat; background-position:0 0%;}
 .fold_head a::after ,
 .fold_head a div::after,

src/main/webapp/ux/mo/css/layout_m.css

@@ -2123,6 +2123,8 @@
 
 /* 브랜드 */
 /* 픽커모달 */
+body.recoPop,
+body.recoPop .app {height:100%; min-height:100%; overflow:hidden !important; touch-action:none;}
 .recoPop .blocker{background-color:rgba(255,255,255,0);}
 .modal#reco_pop a.close-modal{top:1rem; right:1.33rem;}
 .modal#reco_pop .modal-header{padding:1rem 1.33rem 2.0rem; font-size:0;}

src/main/webapp/ux/mo/css/style24_m.css

@@ -1562,6 +1562,7 @@ main.my .my_wishlist .inner:last-child {padding-bottom: 0;}
 .od .foldGroup .fold_customitem .fold_head.on .data .form_field input[type="checkbox"] + label span {display: none;}
 /* 주문결제_배송지변경 팝업 */
 .modal.adrsChange_Pop .modal-header {padding: 0; height: 5.5rem;}
+.modal.adrsChange_Pop {z-index : 1000;}
 .modal.adrsChange_Pop .modal-body {margin-top: 5.2rem;}
 .modal.adrsChange_Pop .modal-body {padding: 0;}
 .adrsChange_Pop .htop {position: relative;height: 5.5rem;-webkit-box-sizing: border-box;box-sizing: border-box;background-color: #fff;}

src/main/webapp/ux/pc/css/layout.css

@@ -2629,7 +2629,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.pd_detail .area_desc .desc_wrap .benefit_box dl div dd .btn_popup {position:absolute; right:0; top:0; z-index:2;}
 
 	/* pd_deal_상품옵션선택 영역 */
-	.pd .option_box {margin-top:30px;}
+	.pd .option_box {margin-top:30px;overflow-y: auto;height: calc(100% - 35%);} /* 0126 */
 	.option_box > [class^="opt_"] {padding-top:40px;}
 	.option_box > [class^="opt_"]:first-of-type {padding-top:0;}
 	.option_box > [class^="opt_"] .opt_header {position: relative; margin-bottom:20px;}
@@ -2900,7 +2900,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.pd.deal ul::after {content:''; clear:both; display:block;}
 	.pd.deal .tab_detail_nav {position:relative; width:100%; height:60px; padding-bottom:60px; box-sizing:initial;}
 	.pd.deal .tab_detail_nav ul {position:absolute; left:0; top:0; width:100%; height:70px; background: #ffffff; z-index:2;}
-	.pd.deal .tab_detail_nav.fix ul {position:fixed; left:70px; top:80px; min-width:760px; width:calc(100% - 700px); max-width:1200px; z-index:25;}
+	.pd.deal .tab_detail_nav.fix ul {position:fixed; left: auto; top:80px; min-width:760px; width:calc(100% - 700px); max-width:1200px; z-index:25;} /* 0126 */
 	.pd.deal .tab_detail_nav ul li {float:left; width:25%;}
 	.pd.deal .tab_detail_nav ul li a {display:block; padding:22px 0px 18px; color:#888; font-size:18px; text-align:center; background:#f5f5f5; border:1px solid #f5f5f5; border-bottom-color:#222; box-sizing:border-box;}
 	.pd.deal .tab_detail_nav ul li.active a {border:1px solid #222; border-bottom-color:#fff; color:#222; font-weight:300; background:#fff;}
@@ -2938,14 +2938,22 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.pd_desc_wrap .item_descrp .area_list::after {content:''; position:absolute; right:-62px; top:0; bottom:0; width:1px; height:100%; background:#ddd; z-index:2;}
 	.pd_desc_wrap .item_descrp .area_option {float:right;}
 	.pd_desc_wrap .item_descrp .area_option .opt_wrap {width:500px; padding-left:60px; padding-top:30px;}
-	.pd_desc_wrap .item_descrp .area_option .opt_wrap.fixtop {position:fixed; right:70px; bottom:80px; width:500px;height: calc(100% - 11%);}
+	/* 0126 */
+	.pd_desc_wrap .item_descrp .area_option .opt_wrap.fixtop {position:fixed; right: auto; left: 50%; margin-left: 380px; bottom:80px; width:500px;height: calc(100% - 11%);}
 	.pd_desc_wrap .item_descrp .area_option .opt_wrap.fixtop .option_box {overflow-y: auto; height: calc(100% - 25%);}
-	.pd_desc_wrap .item_descrp .area_option .opt_wrap.absbottom {position:absolute; top:auto; bottom:0px; right:70px;}
-	@media screen and (max-width:1459px) {
-		.pd.deal .tab_detail_nav.fix ul {position:absolute; left:0; top:0; width:100%; height:60px; z-index:25;}
-		.pd_desc_wrap .item_descrp .area_option .opt_wrap.fixtop,
-		.pd_desc_wrap .item_descrp .area_option .opt_wrap.absbottom {position:relative; top:auto; bottom:auto; right:auto;}
-	}
+	.pd_desc_wrap .item_descrp .area_option .opt_wrap.absbottom {position:absolute; top:auto; bottom:0px; right:70px;height: calc(100% - 21%);}
+	.pd_desc_wrap .item_descrp .area_option .opt_wrap.fixbottom {position: absolute;top: auto;bottom: 0;right: auto;left: 50%;margin-left: 380px;}
+	.pd_desc_wrap .item_descrp .area_option .opt_wrap.fixbottom .option_box {overflow-y: auto; }
+	.pd_desc_wrap .item_descrp .area_option .opt_wrap ,
+	.pd_desc_wrap .item_descrp .area_option .opt_wrap.fixbottom {height: 1000px;}
+	/* 0126 */
+
+@media screen and (max-width:1459px) {
+    .pd.deal .tab_detail_nav.fix ul {position:absolute; left:0; top:0; width:100%; height:60px; z-index:25;}
+    .pd_desc_wrap .item_descrp .area_option .opt_wrap.fixtop,
+    .pd_desc_wrap .item_descrp .area_option .opt_wrap.absbottom {position:relative; top:auto; bottom:auto; right:auto; left: auto; margin-left: 0;} /* 0126 */
+
+}
 
 	.pd_desc_wrap .btn_box .ui_row {margin-bottom: 0;}
 	.pd_desc_wrap .btn_box .ui_row [class^='ui_col_']:first-child {margin-right: 0;}

src/main/webapp/ux/pc/js/common-ui.js

@@ -576,9 +576,13 @@ $(document).ready( function() {
 		var secondFixed_right2 =  firstFixed + $('.pd_detail').outerHeight() - $(window).outerHeight();
 
 		var pdDetail_t = firstFixed + $('.pd_detail').outerHeight() + 100;
+		var pdDDetail_t = firstFixed + $('.pd_deal_detail').outerHeight() + 100; // 0126
 		var pdDescWrap_t = pdDetail_t + $('.pd_desc_wrap').outerHeight();
+		var pdDDescWrap_t = pdDDetail_t + $('.pd_desc_wrap').outerHeight() + 500; // 0126
 		var optionFixed_right =  pdDetail_t + $('.pd_desc_wrap').outerHeight() - $('.area_option .opt_wrap').outerHeight();
 
+		var optionFree = scrollTop - pdDDescWrap_t; // 0126
+
 		/* 좌측 상품썸네일 navi 고정 */
 		if (scrollTop > firstFixed){  
 			$('.pd_detail .area_pic .thumb_nav_wrap').removeClass('fixbottom').addClass('fixtop');
@@ -600,6 +604,10 @@ $(document).ready( function() {
 		if (thumbListWrap_h > descWrap_h && scrollTop > secondFixed_right2) {
 			$('.pd_detail .area_desc .desc_wrap').removeClass('fixbottom').addClass('absbottom');
 		}
+		// 220124 추가
+		else if(thumbListWrap_h < descWrap_h && scrollTop < secondFixed_right2) {
+			$('.pd_detail .area_desc .desc_wrap').removeClass('fixbottom').removeClass('absbottom');
+		}
 
 		/* 딜 - 상세정보 탭 고정 */
 		if (scrollTop > pdDetail_t && scrollTop < pdDescWrap_t){
@@ -608,15 +616,19 @@ $(document).ready( function() {
 			$('.tab_detail_nav').removeClass('fix');
 		}
 
-		/* 딜 - 우측옵션 고정 */
+		/* 딜 - 우측옵션 고정 */ /* 0126 */
 		if (scrollTop > pdDetail_t){
-			$('.area_option .opt_wrap').removeClass('absbottom').addClass('fixtop');
+			$('.area_option .opt_wrap').removeClass('absbottom').removeClass('fixbottom').addClass('fixtop');
+			if (scrollTop > pdDDescWrap_t || optionFree == optionFixed_right){
+				$('.area_option .opt_wrap').removeClass('fixtop').addClass('fixbottom');
+			}
 		} else if (scrollTop < pdDetail_t) {
-			$('.area_option .opt_wrap').removeClass('fixtop');
-		}		
-		if (scrollTop > optionFixed_right){
-			$('.area_option .opt_wrap').removeClass('fixtop').addClass('absbottom');
+			$('.area_option .opt_wrap').removeClass('fixtop').removeClass('fixbottom');
 		}
+		// 0126제거
+		// if (scrollTop > optionFixed_right){
+		// 	$('.area_option .opt_wrap').removeClass('fixtop').addClass('absbottom');
+		// }
 
 	});