Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.front into develop

src/main/java/com/style24/front/biz/web/TsfGoodsController.java

@@ -160,8 +160,8 @@ public class TsfGoodsController extends TsfBaseController {
 		// 상품 기본정보
 		mav.addObject("goodsInfo", goods);
 		// 상품 네비정보
-//		paramsGoods.setCateGb("G032_101"); 		//by item
-//		mav.addObject("goodsNavigation", goodsService.getGoodsNavigation(paramsGoods));
+		paramsGoods.setCateGb("G032_101"); 		//by item
+		mav.addObject("goodsNavigation", goodsService.getGoodsNavigation(paramsGoods));
 		// 상품 이미지정보
 		mav.addObject("goodsImgList", goodsService.getGoodsImgList(paramsGoods));
 		// 상품 동영상정보

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

@@ -176,7 +176,7 @@
 									<ul >
 										<li th:each="goodsOption1, status : ${goodsOption1List}">
 											<a href="javascript:void(0);" th:class="${params.colorCd == goodsOption1.optCd1}? 'on':''" th:onclick="cfnGoToGoodsDetail([[${goodsInfo.goodsCd}]], [[${goodsOption1.optCd1}]])">  <!-- 해당 컬러 상품페이지로 이동 -->
-												<img th:src="${imgGoodsUrl+'/'+goodsOption1.sysImgNm +'?RS=64'}" alt="">
+												<img th:src="${imgGoodsUrl+'/'+goodsOption1.sysImgNm +'?RS=64'}" alt="" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'">
 											</a>
 										</li>
 									</ul>
@@ -632,9 +632,9 @@
 											<th:block th:if="${lookbook.lookbookGoodsList != null and !lookbook.lookbookGoodsList.empty}"
 														th:each="lookbookGoods, goodsStatus : ${lookbook.lookbookGoodsList}">
 											<div class="item_picker" th:style="${'left:'+lookbookGoods.xlim+'%; top:'+lookbookGoods.ylim+'%;'}">
-												<button type="button"><span class="ico ico_picker"></span></button>
-												<div class="pick_descr">
-													<a href="javascript:void(0);" ><th:block th:text="${lookbookGoods.goodsFullNm}"></th:block>
+												<button type="button" th:onclick="fnLookbookPicker(this,[[${lookbookGoods.goodsCd}]]);"><span class="ico ico_picker"></span></button>
+												<div class="pick_descr" >
+													<a href="javascript:void(0);" >
 													</a>
 												</div>
 											</div>
@@ -660,7 +660,7 @@
 																	<a href="javascript:void(0);" class="itemLink" th:onclick="cfnGoToGoodsDetail([[${lookbookGoods.goodsCd}]], '',[[${ithrCd}]],[[${contentsLoc}]] )">
 																	</th:block>
 																		<div class="itemPic">
-																			<img alt="" class="vLHTC pd_img"  th:src="${imgGoodsUrl+'/'+lookbookGoods.sysImgNm+'?RS=100'}">
+																			<img alt="" class="vLHTC pd_img"  th:src="${imgGoodsUrl+'/'+lookbookGoods.sysImgNm+'?RS=100'}" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'">
 																		</div>
 																		<p class="itemBrand" th:text="${lookbookGoods.brandGroupNm}">CURLYSUE 컬리수</p>
 																		<div class="itemName" th:text="${lookbookGoods.goodsFullNm}">[★2020 겨울신상★] 리버시블 경량점퍼 CPW0XQJM51 [겨울]</div>
@@ -762,6 +762,7 @@
 	</div>	
 	<!-- //EP 제휴쿠폰 팝업 -->
 
+
 	<!-- 바로구매 장바구니 등록 정보 저장을 위한 form -->
 	<form id="directOrderForm" method="POST" action="/order/noMember"></form>
 <script th:inline="javascript">
@@ -1269,6 +1270,84 @@
 		
 	}
 	
+	//룩북 피커 선택시 레이어 노출
+	var fnLookbookPicker = function(obj,goodsCd){
+		let $obj = $(obj);
+		var str = '<div class="modal fade pd_pop pd_lookbook_pop" id="layer_lookbook_goods" tabindex="-1" role="dialog" aria-labelledby="pd_lookbook_label" aria-hidden="true">';
+		let $target = $obj.parent().parent().parent().find('.item_prod');
+		
+		let goodsImg = '';
+		let brandName = '';
+		let goodsName = '';
+		let currPrice = '';
+		let listPrice = '';
+		let dcRate = '';
+		let soldout = '';
+		
+		$target.each(function(){
+			if ($(this).attr('goodsCd') == goodsCd) {
+				
+				if ($(this).hasClass('unable')) soldout = 'sold_out';
+				
+				goodsImg = $(this).find('.itemPic').children('.pd_img').attr('src');
+				brandName = $(this).find('.itemBrand').text();
+				goodsName = $(this).find('.itemName').text();
+				currPrice = $(this).find('.itemBrand').text();
+				listPrice = $(this).find('.itemPrice_original').text();
+				dcRate = $(this).find('.itemPercent').text();
+			}
+		});
+		
+		if (gagajf.isNull(goodsName)){
+			return false;
+		}
+		
+		let tag = '';
+		tag += '	<div class="modal-dialog" role="document">\n';
+		tag += '		<div class="modal-content">\n';
+		tag += '			<div class="modal-header">\n';
+		tag += '				<h5 class="modal-title sr-only" id="layer_lookbook_goods">상품정보</h5>\n';
+		tag += '			</div>\n';
+		tag += '			<div class="modal-body">\n';
+		tag += '				<div class="itemsGrp">\n';
+		tag += '					<div class="item_prod '+ soldout+'"> <!-- 품절일때 sold_out 클래스 추가 요청 -->\n';
+		tag += '						<div class="item_state">\n';
+		tag += '							<div class="itemLink">\n';
+		tag += '								<div class="itemPic">\n';
+		tag += '									<img alt="BLACK-a" class=" vLHTC pd_img" src="'+goodsImg +'?RS=260"  onerror="this.src=\'/images/pc/thumb/bg_item_none.png\'">\n';
+		tag += '								</div>\n';
+		tag += '								<p class="itemBrand">'+brandName+'</p>\n';
+		tag += '								<div class="itemName">'+goodsName+'</div>\n';
+		if (listPrice != currPrice){
+			tag += '								<span class="itemPrice_original">'+listPrice+'</span>\n';	
+		}
+		tag += '								<p class="itemPrice">'+currPrice+'\n';
+		if (!gagajf.isNull(dcRate)){
+		tag += '									<span class="itemPercent">'+dcRate+'</span>\n';
+		}
+		tag += '								</p>\n';
+		if (gagajf.isNull(soldout)){
+			tag += '								<button type="button" class="btn btn_default" onclick="cfnGoToGoodsDetail(\''+goodsCd+'\',\'\',\'\')"><span>자세히 보기</span></button>\n';	
+		}
+		tag += '							</div>\n';
+		tag += '						</div>\n';
+		tag += '					</div>\n';
+		tag += '				</div>\n';
+		tag += '			</div>\n';
+		tag += '		</div>\n';
+		tag += '	</div>\n';
+		tag += '	<a href="javascript:void(0);" rel="modal:close" onclick="cfCloseLayer(\'layer_lookbook_goods\')" class="close-modal">Close</a>\n';
+
+		
+		if ($('#layer_lookbook_goods').length == 0) {
+			$('body').append(str+tag+'</div>');
+			$('#layer_lookbook_goods').modal("show");
+		}
+	}
+	
+	var fnGotoGoodsDetail = function(goodsCd){
+		
+	}
 	$(document).ready( function() {
 		
 		$('.timer_box').css('display', 'none');

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

@@ -1252,7 +1252,7 @@ input[type="file"] {
 .quick_menu_group .area > div:first-child span:first-child a{margin-left:0}
 .quick_menu_group .area > div:first-child span:first-child a:after{display:none}
 .quick_menu_group .area > div:first-child span a:after{position:absolute;top:13px;left:0;width:1px;height:13px;background:#959596;content:''}
-.quick_menu_group .inr a{margin-left:16px;color:#eeeeee;}
+.quick_menu_group .inr a{margin-left:16px;color:#eeeeee;}*/