Ver Fonte

테스트 수정

eskim há 5 anos atrás
pai
commit
ac2964360d

+ 1 - 1
src/main/webapp/WEB-INF/views/mob/common/fragments/FooterMob.html

@@ -209,7 +209,7 @@
 		};
 		$.getJSON('/display/popup/list', data, function(result, status) {
 			if (status === 'success') {
-				if(result.dataList.length>0){
+				if(result.dataList != null && result.dataList.length>0){
 					let pClass = "";
 					if ("H" == result.popupGb){
 						pClass = "half";

+ 4 - 2
src/main/webapp/WEB-INF/views/mob/goods/GoodsDealDetailFormMob.html

@@ -618,8 +618,10 @@
 			let tag = "";
 			tag += '<div class="result_item result_'+optCd+'">\n';
 			tag += '	<div class="opt_header">\n';
-			tag += '		<span class="item_name">'+goodsNm+'</span>\n';
-			tag += '		<span class="item_option">'+optCd1Nm+'/'+optCd2+'</span>\n';
+			tag += '		<div class="bundle">\n';
+			tag += '			<span class="item_name">'+goodsNm+'</span>\n';
+			tag += '			<span class="item_option">'+optCd1Nm+'/'+optCd2+'</span>\n';
+			tag += '		</div>\n';
 			tag += '	</div>\n';
 			tag += '	<div class="number_count">\n';
 			tag += '		<span class="minus min_val" onclick="fnAdjustOrderEa(this);" adjust="-"><em class="sr-only">감소</em></span>\n';

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

@@ -921,7 +921,7 @@
 									<span class="title">옵션선택</span>
 									<div class="check_excluding form_field">
 										<div>
-											<input id="soldoutSkipYn" name="soldoutSkipYn" type="checkbox" value="Y" th:onclick="fnOption1(this,[[${goodsInfo.goodsCd}]]);"><label for="soldoutSkipYn"><span>품절제외</span> </label>
+											<input id="soldoutSkipYn" name="soldoutSkipYn" type="checkbox" value="Y" th:onclick="fnOption1(1,[[${goodsInfo.goodsCd}]]);"><label for="soldoutSkipYn"><span>품절제외</span> </label>
 										</div>
 										<div class="guidance" >
 											<!--210409_ 추가 : .guidance에 .ontoast 추가 시, toast 팝업 작동 -->
@@ -1438,19 +1438,30 @@
 					};
 			let jsonData = JSON.stringify(data);
 			
-			fnOption1Display(ridx, jsonData );
+			$('.form_field .select_custom.item_opt2.' +goodsCd ).attr('disabled', true);
+			$('.form_field .select_custom.item_opt2.' +goodsCd ).find('.combo .select').html('선택');
+			
+			fnOption1Display(ridx, jsonData, goodsCd );
 			
 		}else if("G056_S" == $("#cartForm  input[name=goodsType]").val() ){ 
 
 			let idx = 1;
 			target=$('.select_custom.item_opt1');
-			target.each(function(){
+			
+			target.each(function(){ 
+				$('.form_field .select_custom.item_opt1.' +$(this).attr('id') ).find('.combo .select').html('선택');
+				$('.form_field .select_custom.item_opt2.' +$(this).attr('id') ).attr('disabled', true);
+				$('.form_field .select_custom.item_opt2.' +$(this).attr('id') ).find('.combo .select').html('선택');
+			});
+			
+			
+			target.each(function(){ 
 				let data = {goodsCd : $(this).attr('id')
 							,optionSoldoutSkip : optionSoldoutSkip 
 							};
 				let jsonData = JSON.stringify(data);
-				
-				fnOption1Display(idx, jsonData );
+				 
+				fnOption1Display(idx, jsonData, $(this).attr('id') );
 				
 				idx++;
 				
@@ -1460,15 +1471,15 @@
 	}
 	
 	// 옵션1 노출처리
-	var fnOption1Display = function(ridx, jsonData ){
+	var fnOption1Display = function(ridx, jsonData, goodsCd ){ 
 		
 		gagajf.ajaxJsonSubmit('/goods/detail/option1/list', jsonData, function(result) {
 			
-			if (result.dataList != null && result.dataList.length > 0) {
+			if (result.dataList != null && result.dataList.length > 0) { 
 				let tag = "";
 				let $obj = null;
 				let selfGoodsYn = 'N';
-				$.each(result.dataList, function(idx, item) {
+				$.each(result.dataList, function(idx, item) { 
 					if (idx == 0){
 						
 						//$('.form_field .select_custom.item_opt1.' +item.goodsCd ).attr('disabled', false)
@@ -1482,11 +1493,11 @@
 						selfGoodsYn = item.selfGoodsYn;
 					}
 					let soldoutYn = ""; 
-					let disabledYn = ""; 
+					let disabledYn = "";  
 					if (item.stockQty <= 0) soldoutYn = "true";
 					if (soldoutYn == "true" || item.goodsStat != 'G008_90') disabledYn = "true";
 					tag += '<li aria-disabled="'+disabledYn+'" data-soldout="'+soldoutYn +'" onclick="fnOption2('+ ridx+', \''+ item.goodsCd+'\' , \''+ item.optCd1+'\', \''+ item.minOrdQty+'\', \''+ item.maxOrdQty+'\' )">\n';	
-					tag += '<div>' +item.optCd1 +'</div>';
+					tag += '<div>' +item.optCd1Nm +'</div>';
 					tag += '<input type="hidden" name="opt" value="'+ item.goodsCd+'" optCd1="'+ item.optCd1 +'" qty="'+ item.qty +'" />\n';
 					tag += '</li>\n';
 				});
@@ -2251,7 +2262,28 @@
 				type: 'fraction',
 			},
 		});
+		
+		var bestCount = 0;
+		//팝업 - 상품문의 리스트	
+		$(document).on('click','#btn_pdQnaList_pop',function(e){
+			bestCount = 1;
+			return false;
+		});
 
+		//팝업 - 상품문의 작성
+		$(document).on('click','#btn_pdQnaWrite_pop',function(e){
+			bestCount = 2;
+			return false;
+		});
+		$(document).on('click','.pd_qnawrite_pop .close-modal',function(e){
+			if(bestCount === 2){
+				$('#layer_goods_qna').modal('show');
+				setTimeout(fnGoodsQnaList, 100);
+				bestCount = 1;
+			}
+            return false;
+        });
+		
 		$(document).on('click','.pd_detail .thumb_box',function(e){
 			$('#pdItemThumbPop').css("display", "block");
 			return false;

+ 2 - 1
src/main/webapp/WEB-INF/views/mob/goods/GoodsDetailQnaFormMob.html

@@ -68,7 +68,7 @@
 /*<![CDATA[*/
 	
 	var fnGoodsQnaList = function() {
-		$('#layer_goods_qna_reg').find('.close-modal').trigger("click");
+		//$('#layer_goods_qna_reg').find('.close-modal').trigger("click");
 		gagajf.ajaxFormSubmit($('#goodsQnaForm').prop('action'), '#goodsQnaForm', fnGetListCallback);
 	}
 
@@ -166,4 +166,5 @@
 	
 /*]]>*/
 </script>	
+<a href="javascript:void(0);" rel="modal:close" onclick="cfCloseLayer('layer_goods_qna')" class="close-modal">Close</a>
  </html>

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

@@ -787,7 +787,7 @@
 	}
 	
 	// 상품평 초기화
-	var fnReviewSearchInit = function(){debugger;
+	var fnReviewSearchInit = function(){
 		
 		$('#goodsReviewForm').find('#grade').find('ul li').eq(0).trigger('click');
 		$('#goodsReviewForm').find('#size').find('ul li').eq(0).trigger('click');

+ 5 - 1
src/main/webapp/WEB-INF/views/mob/goods/GoodsQnaDetailFormMob.html

@@ -113,9 +113,13 @@
 	}
 
 	var btnGoodsQnaSaveCallBack = function(){
-		setTimeout(fnGoodsQnaList, 100);
+		$('#layer_goods_qna_reg').find('.close-modal').trigger("click");
+		//$('#layer_goods_qna').modal('show');
+		//setTimeout(fnGoodsQnaList, 100);
 	}
 	
+	
+	
 /*]]>*/
 </script>
  </html>

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

@@ -303,7 +303,8 @@
 												<div class="select">옵션1선택</div>
 												<ul class="list">
 													<th:block th:each="goodsOption, optionStatus : ${goodsOption1List}" >
-													<li th:onclick="fnOption2([[${optionStatus.count}]], [[${goodsOption.goodsCd}]],[[${goodsOption.optCd1}]],1,[[${goodsInfo.minOrdQty}]], [[${goodsInfo.maxOrdQty}]])">
+													<li th:onclick="fnOption2([[${optionStatus.count}]], [[${goodsOption.goodsCd}]],[[${goodsOption.optCd1}]],1,[[${goodsInfo.minOrdQty}]], [[${goodsInfo.maxOrdQty}]])"
+														th:attr="aria-disabled=${(goodsOption.goodsStat != 'G008_90' or goodsOption.stockQty <= 0)? 'true':''}, data-soldout=${(goodsOption.stockQty <= 0)? 'true':''}">
 														<div th:text="${goodsOption.optCd1}">상품옵션</div>
 														<div th:if="${goodsOption.addPrice > 0}" th:text="|+${#numbers.formatInteger(goodsOption.addPrice, 0,'COMMA')}원|">0원</div>
 														<input type="hidden" name="opt" th:attr="addPrice=${goodsOption.addPrice}, optCd1=${goodsOption.optCd1},optCd2=${goodsOption.optCd2}, optCd=${goodsOption.optCd}"/>
@@ -1846,85 +1847,6 @@
 		params.contentsLoc = "tmtb";
 		fnGoodsLikeSearch(params);
 	
-		
-		// 상품 대표설명 > 좌측 상품썸네일 navi, 우측 상품정보 고정 
-		$(window).scroll(function(){
-			var scrollTop= $(window).scrollTop();
-			var firstFixed =  $('#header').outerHeight();
-			var thumbListWrap_h = $('.pd_detail .thumb_list_wrap').outerHeight();
-			var descWrap_h = $('.pd_detail .desc_wrap').outerHeight();
-			var secondFixed_left =  firstFixed + $('.pd_detail').outerHeight() - $('.pd_detail .thumb_nav_wrap').outerHeight();
-			var secondFixed_right =  firstFixed + $('.pd_detail .desc_wrap').outerHeight() - $(window).outerHeight();
-			var secondFixed_right2 =  firstFixed + $('.pd_detail').outerHeight() - $(window).outerHeight();
-
-			/* 좌측 상품썸네일 navi 고정 */
-			if (scrollTop > firstFixed){  
-				$('.pd_detail .area_pic .thumb_nav_wrap').removeClass('fixbottom').addClass('fixtop');
-			}
-			else if (scrollTop < firstFixed){
-				$('.pd_detail .area_pic .thumb_nav_wrap').removeClass('fixtop');
-			}
-			if (scrollTop > secondFixed_left){
-				$('.pd_detail .area_pic .thumb_nav_wrap').removeClass('fixtop').addClass('fixbottom');
-			} 
-			
-			/* 우측 상품정보 고정 */
-			if (thumbListWrap_h > descWrap_h && scrollTop > secondFixed_right) {
-				$('.pd_detail .area_desc .desc_wrap').removeClass('absbottom').addClass('fixbottom');
-			}
-			else if (thumbListWrap_h > descWrap_h && scrollTop < secondFixed_right) {
-				$('.pd_detail .area_desc .desc_wrap').removeClass('fixbottom');
-			}
-			if (thumbListWrap_h > descWrap_h && scrollTop > secondFixed_right2) {
-				$('.pd_detail .area_desc .desc_wrap').removeClass('fixbottom').addClass('absbottom');
-			}
-		});
-
-		//슬라이드 - 상품 대표설명 > 좌측 상품썸네일 navi
-		var thumbNavSwiper = new Swiper('.area_pic .thumb_nav_wrap .swiper-container', {
-			direction: 'vertical',
-			slidesPerView: 6,
-			slidesPerGroup : 6,
-			spaceBetween: 10,
-			navigation: {
-				nextEl: '.area_pic .thumb_nav_wrap .swiper-button-next',
-				prevEl: '.area_pic .thumb_nav_wrap .swiper-button-prev',
-			},
-		});
-
-		//상품 대표설명 > 상품썸네일 1개일때
-		var thumblist = $('.area_pic .thumb_list_wrap li');	
-		var thumblistLength = thumblist.length;
-		if (thumblistLength == 1) {
-			thumblist.parents('.area_pic').addClass('onlyitem');
-		} else {
-			thumblist.parents('.area_pic').removeClass('onlyitem');
-		}
-
-		//상품 대표설명 > 좌측 상품썸네일 6개 이하일때
-		var thumbnavSlide = $('.area_pic .thumb_nav_wrap .swiper-container .swiper-slide');	
-		var thumbnavLength = thumbnavSlide.length;
-		if (thumbnavLength < 7) {
-			thumbnavSlide.parents('.thumbnav').addClass('disabled');
-		} else {
-			thumbnavSlide.parents('.thumbnav').removeClass('disabled');
-		}
-
-		//상품 대표설명 > 좌측 상품썸네일 navi 선택시 해당 대표 썸네일 위치로 이동
-		$(document).on('click','.pd_detail .area_pic .thumbnav .swiper-slide a',function(e){
-			e.preventDefault();
-			var hdHeight = $('#header').outerHeight();
-			var targetThumb = $($(this).attr('href'));
-			var topThumb = targetThumb.offset().top - hdHeight;
-			$(this).parents('.thumbnav').find('.swiper-slide').removeClass('on');
-			$(this).parent('.swiper-slide').addClass('on');
-			targetThumb.siblings('li').removeClass('on');
-			targetThumb.addClass('on');
-			$('html,body').animate({scrollTop : topThumb}, 500);
-			return false;
-		});
-
-		
 		var opt_selecter01 = new sCombo('.opt_select .select_custom.item_opt1.item_opt1_1');
 		var opt_selecter01_1 = new sCombo('.opt_set_select .select_custom.item_opt1.item_opt1_1');
 		var opt_selecter01_2 = new sCombo('.opt_set_select .select_custom.item_opt1.item_opt1_2');
@@ -1964,17 +1886,15 @@
 			setInterval(function() { promotionTimer(); }, 1000);
 		}
 
-		
-		
-		//스타일링 추천 picker	
-		$(document).on('mouseenter','.pd_recommend .area_slider .item_picker button',function(e){
-			$(this).parents('.item_picker').find('.pick_descr').show();
-			return false;
-		}).on('mouseleave','.pd_recommend .area_slider .item_picker button', function(e){
-			$(this).parents('.item_picker').find('.pick_descr').hide();
-			return false;
-		});   
-
+		//스타일링 추천 picker 상품팝업
+/*         $(document).on('click','.pd_recommend .area_slider .item_picker button',function(e){
+            $("#pdLookbookPop").modal("show");
+            return false;
+        });
+        $("#pdLookbookPop_close").click(function() {
+            $("#pdLookbookPop").modal("hide");
+        });
+ */		
 		//상품상세정보 더보기   
 		$(document).on('click','.pd_descrp .btn_more_box button',function(e){
 			$('.pd_descrp .cont_body').toggleClass('on'); 

+ 1 - 1
src/main/webapp/WEB-INF/views/web/goods/GoodsDetailQnaFormWeb.html

@@ -119,7 +119,7 @@
 				tag += '	</div>\n';
 				tag += '	<div class="fold_cont" style="display: none;">\n';
 				tag += '		<div class="fold_detail">\n'; //문의 내용
-				tag += '			<div>\n'; debugger;
+				tag += '			<div>\n'; 
 				tag += '				<p>' + item.questContent.escapeHtml() + '</p>\n';
 				tag += '			</div>\n';
 				tag += '		</div>\n';

+ 2 - 2
src/main/webapp/ux/style24_link.js

@@ -519,11 +519,11 @@ function layerPop_resize(tgt) {
  * @param  : tgt - 숨길 레이어 ID(예, div 태크의 ID). 필수
  */
 function cfCloseLayer(tgt) {
-	if (_frontGb == "M"){
+	if (_frontGb == "P"){
 		$('#' + tgt).hide();
+		$('#' + tgt).remove();
 	}else{
 		$('#' + tgt).hide();
-		$('#' + tgt).remove();
 	}
 	return false;
 }