Merge branch 'develop' into bin2107

src/main/webapp/WEB-INF/views/mob/goods/GoodsDetailFormMob.html

@@ -1240,19 +1240,19 @@
 				$obj.append(tag);
 				if (selfGoodsYn == "Y"){
 					if (ridx == 1){
-						var opt_selecter02_1 = new sCombo('.pop_option_select .select_custom.item_opt1.item_opt1_1');	
+						var opt_selecter01_1 = new sCombo('.pop_option_select .select_custom.item_opt1.item_opt1_1');	
 					}else if (ridx == 2){
-						var opt_selecter02_2 = new sCombo('.pop_option_select .select_custom.item_opt1.item_opt1_2');	
+						var opt_selecter01_2 = new sCombo('.pop_option_select .select_custom.item_opt1.item_opt1_2');	
 					}else if (ridx == 3){
-						var opt_selecter02_3 = new sCombo('.pop_option_select .select_custom.item_opt1.item_opt1_3');
+						var opt_selecter01_3 = new sCombo('.pop_option_select .select_custom.item_opt1.item_opt1_3');
 					}else if (ridx == 4){
-						var opt_selecter02_4 = new sCombo('.pop_option_select .select_custom.item_opt1.item_opt1_4');
+						var opt_selecter01_4 = new sCombo('.pop_option_select .select_custom.item_opt1.item_opt1_4');
 					}else{
-						var opt_selecter02_5 = new sCombo('.pop_option_select .select_custom.item_opt1.item_opt1_5');
+						var opt_selecter01_5 = new sCombo('.pop_option_select .select_custom.item_opt1.item_opt1_5');
 					}
 					
 				}else{
-					var opt_selecter02 = new sCombo('.pop_option_select .select_custom.item_opt1.item_opt1_1');
+					var opt_selecter01_1 = new sCombo('.pop_option_select .select_custom.item_opt1.item_opt1_1');
 					$('.pop_option_select .select_custom.item_opt2 .combo .list > li').eq(0).trigger("click");
 					$('.pop_option_select .select_custom.item_opt2.item_opt2_1').attr('disabled',true)
 				}	
@@ -1299,7 +1299,7 @@
 					}
 					
 				}else{
-					$obj = $('.form_field .select_custom.item_opt2.item_opt2_1');
+					$obj = $('.pop_option_select .select_custom.item_opt2.item_opt2_1');
 				}	
 				let qty = $obj.parent().parent().find('.select_custom').attr('qty'); // 구성수량
 				
@@ -1357,7 +1357,7 @@
 					}
 					
 				}else{
-					var opt_selecter02 = new sCombo('.pop_option_select .select_custom.item_opt2.item_opt2_1');
+					var opt_selecter02_1 = new sCombo('.pop_option_select .select_custom.item_opt2.item_opt2_1');
 				}	
 			}
 			
@@ -1537,35 +1537,25 @@
 		}else { 
 			
 			let cartGoodsList = [];
-			let compsList = [];
-			let goodsList = {
-				cartCompsList : new Array()
-			}
+			
 			let target = $('#cartForm input[name=cea]');
 			
 			if (goodsType == 'G056_N'){
-				
+				let compsList = [];
 				target.each(function() {
-					
-					let targetItem = $(this).parent().parent();
-					
+
 					let ea = parseInt($(this).val());
-					//let goodsCd = $(this).parent().find('input[name="coption"]').attr('goodscd');
-					//let optCd = $(this).parent().find('input[name="coption"]').val();
-					let addPrice = parseInt(.find('input[name="coption"]').attr('addprice'));
-					let goodsPrice = parseInt($(this).parent().find('input[name="coption"]').attr('price'));
+					let goodsCd = $(this).parent().find('input[name="coption"]').attr('goodscd');
+					let optCd = $(this).parent().find('input[name="coption"]').val();
+					//let addPrice = parseInt($(this).parent().find('input[name="coption"]').attr('addprice'));
+					//let goodsPrice = parseInt($(this).parent().find('input[name="coption"]').attr('price'));
 					
 					var obj = new Object();
 					obj.cartGb = btnType;
 					obj.goodsType = $("#cartForm  input[name=goodsType]").val();
-					obj.goodsCd = $("#cartForm  input[name=goodsCd]").val();
-					
-					targetItem.each(function() {
-						obj.itemCd = $(this).parent().parent()
-						obj.optCd = arrInfo[1];
-					}
-					
-					obj.goodsQty = $("#cartForm  input[name=ordQty]").val();
+					obj.goodsCd = goodsCd
+					obj.optCd = optCd;
+					obj.goodsQty = ea;
 					obj.afLinkCd =$("#cartForm  input[name=afLinkCd]").val();
 					obj.ithrCd =$("#cartForm  input[name=ithrCd]").val();
 					obj.contentsLoc =$("#cartForm  input[name=contentsLoc]").val();
@@ -1574,38 +1564,47 @@
 					
 				});
 				
+				
 				// 장바구니담기
 				cfnAddCart(compsList);
 
 			}else{ // 세트
 				
 				target.each(function() {
-					var arrInfo = $(this).find('input[name=opt2]').val().split('|');	// 상품코드|사이즈|구성수량
+					let compsList = [];
+					let goodsList = {
+						cartCompsList : new Array()
+					}
 					
-					var obj = new Object();
-					obj.cartGb = btnType;
-					obj.goodsType = $("#cartForm  input[name=goodsType]").val();
-					obj.goodsCd = $("#cartForm  input[name=goodsCd]").val();
-					obj.itemCd = arrInfo[0];
-					obj.optCd = arrInfo[1];
-					obj.goodsQty = $("#cartForm  input[name=ordQty]").val();
-					obj.afLinkCd =$("#cartForm  input[name=afLinkCd]").val();
-					obj.ithrCd =$("#cartForm  input[name=ithrCd]").val();
-					obj.contentsLoc =$("#cartForm  input[name=contentsLoc]").val();
-					obj.planDtlSq = $("#cartForm  input[name=planDtlSq]").val();
-					compsList.push(obj);
+					let ea = parseInt($(this).val());
 					
+					let targetItem = $(this).parent().parent().find('.bundle'); // 구성상품
+					targetItem.each(function() {
+						var obj = new Object();
+						obj.cartGb = btnType;
+						obj.goodsType = $("#cartForm  input[name=goodsType]").val();
+						obj.goodsCd = $("#cartForm  input[name=goodsCd]").val();
+						
+						obj.itemCd = $(this).find('input[name=selOption]').attr('goodsCd');
+						obj.optCd = $(this).find('input[name=selOption]').attr('optCd');
+						
+						obj.goodsQty = ea;
+						obj.afLinkCd =$("#cartForm  input[name=afLinkCd]").val();
+						obj.ithrCd =$("#cartForm  input[name=ithrCd]").val();
+						obj.contentsLoc =$("#cartForm  input[name=contentsLoc]").val();
+						obj.planDtlSq = $("#cartForm  input[name=planDtlSq]").val();
+						compsList.push(obj);
+					});
+					
+					goodsList.cartCompsList = compsList;
+					cartGoodsList.push(goodsList);
+
 				});
 				
-				goodsList.cartCompsList = compsList;
-				cartGoodsList.push(goodsList);
-				
 				// 장바구니담기
 				cfnAddCart(cartGoodsList);
 				
 			}
-			
-			
 		}
 	}
 

src/main/webapp/WEB-INF/views/mob/goods/GoodsDetailReviewFormMob.html

@@ -77,7 +77,7 @@
 					</dl> 
 				</div>
 				<div class="pa_body">
-					<dl>
+					<dl th:class="${(scoreSize1 >= scoreSize2 and scoreSize1 >= scoreSize3) ? 'on' : ''}">
 						<dt>작음</dt>
 						<dd>
 							<span class="ratio">
@@ -86,7 +86,7 @@
 							<span class="percent"><th:block th:text="${scoreSize1}"></th:block>%</span>
 						</dd>
 					</dl> 
-					<dl class="on">
+					<dl th:class="${(scoreSize2 >= scoreSize1 and scoreSize2 >= scoreSize3) ? 'on' : ''}">
 						<dt>딱맞음</dt>
 						<dd>
 							<span class="ratio">
@@ -95,7 +95,7 @@
 							<span class="percent"><th:block th:text="${scoreSize2}"></th:block>%</span>
 						</dd>
 					</dl>
-					<dl>
+					<dl th:class="${(scoreSize3 >= scoreSize1 and scoreSize3 >= scoreSize2) ? 'on' : ''}">
 						<dt>큼</dt>
 						<dd>
 							<span class="ratio">
@@ -128,7 +128,7 @@
 					</dl> 
 				</div>
 				<div class="pa_body">
-					<dl class="on">
+					<dl th:class="${(scoreColor1 >= scoreColor2 and scoreColor1 >= scoreColor3) ? 'on' : ''}">
 						<dt>밝음</dt>
 						<dd>
 							<span class="ratio">
@@ -137,7 +137,7 @@
 							<span class="percent"><th:block th:text="${scoreColor1}"></th:block>%</span>
 						</dd>
 					</dl> 
-					<dl>
+					<dl  th:class="${(scoreColor2 >= scoreColor1 and scoreColor2 >= scoreColor3) ? 'on' : ''}">
 						<dt>똑같음</dt>
 						<dd>
 							<span class="ratio">
@@ -146,7 +146,7 @@
 							<span class="percent"><th:block th:text="${scoreColor2}"></th:block>%</span>
 						</dd>
 					</dl>
-					<dl>
+					<dl th:class="${(scoreColor3 >= scoreColor1 and scoreColor3 >= scoreColor2) ? 'on' : ''}">
 						<dt>어두움</dt>
 						<dd>
 							<span class="ratio">
@@ -180,7 +180,7 @@
 					</dl> 
 				</div>
 				<div class="pa_body">
-					<dl class="on">
+					<dl th:class="${(scoreFit1 >= scoreFit2 and scoreFit1 >= scoreFit3) ? 'on' : ''}">
 						<dt>슬림</dt>
 						<dd>
 							<span class="ratio">
@@ -189,7 +189,7 @@
 							<span class="percent"><th:block th:text="${scoreFit1}"></th:block>%</span>
 						</dd>
 					</dl> 
-					<dl>
+					<dl th:class="${(scoreFit2 >= scoreFit1 and scoreFit2 >= scoreFit3) ? 'on' : ''}">
 						<dt>레귤러</dt>
 						<dd>
 							<span class="ratio">
@@ -198,7 +198,7 @@
 							<span class="percent"><th:block th:text="${scoreFit2}"></th:block>%</span>
 						</dd>
 					</dl>
-					<dl>
+					<dl th:class="${(scoreFit3 >= scoreFit1 and scoreFit3 >= scoreFit2) ? 'on' : ''}">
 						<dt>오버</dt>
 						<dd>
 							<span class="ratio">
@@ -231,7 +231,7 @@
 					</dl> 
 				</div>
 				<div class="pa_body">
-					<dl>
+					<dl th:class="${(scoreThick1 >= scoreThick2 and scoreThick1 >= scoreThick3) ? 'on' : ''}">
 						<dt>얇음</dt>
 						<dd>
 							<span class="ratio">
@@ -240,7 +240,7 @@
 							<span class="percent"><th:block th:text="${scoreThick1}"></th:block>%</span>
 						</dd>
 					</dl> 
-					<dl>
+					<dl th:class="${(scoreThick2 >= scoreThick1 and scoreThick2 >= scoreThick3) ? 'on' : ''}">
 						<dt>적당함</dt>
 						<dd>
 							<span class="ratio">
@@ -249,7 +249,7 @@
 							<span class="percent"><th:block th:text="${scoreThick2}"></th:block>%</span>
 						</dd>
 					</dl>
-					<dl class="on">
+					<dl th:class="${(scoreThick3 >= scoreThick1 and scoreThick3 >= scoreThick2) ? 'on' : ''}">
 						<dt>도톰함</dt>
 						<dd>
 							<span class="ratio">
@@ -284,7 +284,7 @@
 					</dl> 
 				</div>
 				<div class="pa_body">
-					<dl>
+					<dl th:class="${(scoreWeight1 >= scoreWeight2 and scoreWeight1 >= scoreWeight3) ? 'on' : ''}">
 						<dt>가벼움</dt>
 						<dd>
 							<span class="ratio">
@@ -293,7 +293,7 @@
 							<span class="percent"><th:block th:text="${scoreWeight1}"></th:block>%</span>
 						</dd>
 					</dl> 
-					<dl>
+					<dl th:class="${(scoreWeight2 >= scoreWeight1 and scoreWeight2 >= scoreWeight3) ? 'on' : ''}">
 						<dt>적당함</dt>
 						<dd>
 							<span class="ratio">
@@ -302,7 +302,7 @@
 							<span class="percent"><th:block th:text="${scoreWeight2"></th:block>%</span>
 						</dd>
 					</dl>
-					<dl class="on">
+					<dl th:class="${(scoreWeight3 >= scoreWeight1 and scoreWeight3 >= scoreWeight2) ? 'on' : ''}">
 						<dt>무거움</dt>
 						<dd>
 							<span class="ratio">
@@ -335,7 +335,7 @@
 					</dl> 
 				</div>
 				<div class="pa_body">
-					<dl>
+					<dl th:class="${(scoreBall1 >= scoreBall2 and scoreBall1 >= scoreBall3) ? 'on' : ''}">
 						<dt>작음</dt>
 						<dd>
 							<span class="ratio">
@@ -344,7 +344,7 @@
 							<span class="percent"><th:block th:text="${scoreBall1}"></th:block>%</span>
 						</dd>
 					</dl> 
-					<dl>
+					<dl th:class="${(scoreBall2 >= scoreBall1 and scoreBall2 >= scoreBall3) ? 'on' : ''}">
 						<dt>딱맞음</dt>
 						<dd>
 							<span class="ratio">
@@ -353,7 +353,7 @@
 							<span class="percent"><th:block th:text="${scoreBall2"></th:block>%</span>
 						</dd>
 					</dl>
-					<dl class="on">
+					<dl th:class="${(scoreBall3 >= scoreBall1 and scoreBall3 >= scoreBall2) ? 'on' : ''}">
 						<dt>큼</dt>
 						<dd>
 							<span class="ratio">
@@ -373,15 +373,15 @@
 				</div>
 			</div>
 			<script>
-				function averag(){
-					var averagBtn=$(".average .btn_group_flex button");
-					var averag=$(".average .pa_body");
-					averagBtn.on('click',function(e){
-						averag.slideToggle();
-						$(this).toggleClass("active")	
-					});  
-				}
-				averag();
+			 function averag(){
+				 var averagBtn=$(".average .btn_group_flex button");
+				 var averag=$(".average .pa_body");
+				 averagBtn.on('click',function(e){
+					 averag.slideToggle();
+					 $(this).toggleClass("active")	
+				 });  
+			 }
+			 averag();
 			</script>
 		</div>
 		</th:block>
@@ -478,7 +478,7 @@
 	<input type="hidden" name="reviewHeight" />
 	<input type="hidden" name="reviewWeight" />
 	
-		<h6>전체리뷰<span>(<span id="reviewCount" th:text="${(reviewCount <= 9999) ? #numbers.formatInteger(reviewCount, 0,'COMMA') : '9,999+'}">9,999+</span>)</span></h6>
+		<h6>전체리뷰<span id="reviewCount" th:text="|(${(reviewCount <= 9999) ? #numbers.formatInteger(reviewCount, 0,'COMMA') : '9,999+'})|">9,999+</span></h6>
 		<div class="selection">
 			<ul class="category_open">
 				<li data_name="grade"><span>평점 전체</span></li>
@@ -562,10 +562,12 @@
 	<!-- //등록리뷰 있을 시 -->
 </div>
 <script src="/ux/plugins/jquery/jquery.history.min.js"></script>
-<script src="/ux/plugins/gaga/gaga.infinite.scrollSession.js"></script>
+<script src="/ux/plugins/gaga/gaga.infinite.scrollLayer.js"></script>
 <script th:inline="javascript">
 /*<![CDATA[*/
 	
+	$(function() { gagaInfiniteScroll.getHistory(); });
+	
 	// 상품펴 검색
 	var fnGetInfiniteScrollDataList = function(pageNum) {
 	
@@ -588,6 +590,7 @@
 	}
 
 	var fnGoodsReviewListSearch = function() {
+		fnGoodsReviewInfiniteScrollInit();
 		gagaInfiniteScroll.getHistory();
 	}
 	
@@ -751,29 +754,21 @@
 	
 	// 인피니트 스크롤 초기화
 	var fnGoodsReviewInfiniteScrollInit = function(){
-		 sessionStorage.removeItem(document.location.href);
+		// sessionStorage.removeItem(document.location.href);
+		History.replaceState(null, null);
+		gagaInfiniteScroll.pageStatus = {
+				  pageNum : []      // [0,1,2...] 로드된 페이지 (Array)
+				, loadPage : 0      // 로드할 페이지
+				, loadAlign : 'not' // 로드 상태(prev, next, not)
+				, historyScroll : 0 //
+				, nowPage : null    // 현재 페이지
+				, pageUrl : {       // page url
+				}
+		}
 		//History 초기화
-		$("#listBox").html("");
+		$("#listBox").html("");;
 	}
 	
-	// 왜 안될가?
-	// 사파리 - event.persisted || 크롬 - window.performance.navigation.type 이 1이면 새로고침, 2면 페이지 이동을 통한 캐쉬페이징
-	$(window).on("pageshow", function(event) {
-		if ( (event.originalEvent && event.originalEvent.persisted) || (window.performance && window.performance.navigation.type == 2)) {
-			var historyData = sessionStorage.getItem(document.location.href);
-			if(historyData!=null){
-				historyData = JSON.parse(historyData);
-			}else{
-				historyData = {};
-			}
-			fnGoodsReviewListSearch();
-		}else{
-			fnGoodsReviewInfiniteScrollInit();
-			fnGoodsReviewListSearch();
-		}
-
-	});
-	
 	// 상품평 초기화
 	var fnReviewSearchInit = function(){
 		
@@ -836,8 +831,6 @@
 		});
 
 		
-		fnGoodsReviewListSearch();
-		
 	});
 	
 /*]]>*/

src/main/webapp/WEB-INF/views/mob/goods/GoodsReviewFormMob.html

@@ -34,7 +34,7 @@
 			<!-- //해당상품 -->
 		</div>
 		<div class="modal-body">
-			<div class="pop_cont" id="goodsDealReview">
+			<div class="pop_cont" id="goodsDealReview" data-id="layer_infinite_item" >
 			</div>
 		</div>
 	</div>

src/main/webapp/WEB-INF/views/web/goods/GoodsDealDetailFormWeb.html

@@ -730,8 +730,8 @@
 			let ea = parseInt($(this).val());
 			let goodsCd = $(this).parent().find('input[name="coption"]').attr('goodscd');
 			let optCd = $(this).parent().find('input[name="coption"]').val();
-			let addPrice = parseInt($(this).parent().find('input[name="coption"]').attr('addprice'));
-			let goodsPrice = parseInt($(this).parent().find('input[name="coption"]').attr('price'));
+			//let addPrice = parseInt($(this).parent().find('input[name="coption"]').attr('addprice'));
+			//let goodsPrice = parseInt($(this).parent().find('input[name="coption"]').attr('price'));
 			
 			var obj = new Object();
 			obj.cartGb = btnType;
@@ -739,6 +739,7 @@
 			obj.goodsCd = goodsCd;
 			obj.optCd = optCd;
 			obj.goodsQty = ea;
+			obj.dealGoodsCd = $("#cartForm  input[name=goodsCd]").val();
 			obj.afLinkCd =$("#cartForm  input[name=afLinkCd]").val();
 			obj.ithrCd =$("#cartForm  input[name=ithrCd]").val();
 			obj.contentsLoc =$("#cartForm  input[name=contentsLoc]").val();

src/main/webapp/ux/style24_link.js

@@ -776,7 +776,7 @@ function cfGoodsReview(goodsCd) {
 	var Param = new Object();
 	var str = '<div class="pd_pop full_pop pd_review_pop" id="layer_goods_review"></div>';
 	if ("P" != _frontGb){
-		str = '<div class="modal pop_full fade pd_pop pd_review_pop" id="layer_goods_review" tabindex="-1" role="dialog" aria-labelledby="exampleFullLabel" aria-hidden="true"></div>';
+		str = '<div class="modal pop_full fade pd_pop pd_review_pop"  data-id="layer_infinite"  id="layer_goods_review" tabindex="-1" role="dialog" aria-labelledby="exampleFullLabel" aria-hidden="true"></div>';
 	}
 	if ($('#layer_goods_review').length == 0) {
 		$('body').append(str);