Browse Source

테스트 수정

eskim 5 years ago
parent
commit
5d919416ac

+ 4 - 3
src/main/java/com/style24/front/biz/web/TsfGoodsController.java

@@ -1398,7 +1398,7 @@ public class TsfGoodsController extends TsfBaseController {
 		ModelAndView mav = new ModelAndView();
 		// 상품관련 기본값 설정(회원 등급, 앱, PC/모바일 등)
 		setGoods(paramsGoods);
-
+		paramsGoods.setAdminYn("Y"); //20210526 soldout된 상품도 정보 조회는 가능해야함
 		Goods goods = goodsService.getGoodsInfo(paramsGoods);
 
 		// 배송업체명, 반품비, 교환비, 주소
@@ -1446,6 +1446,7 @@ public class TsfGoodsController extends TsfBaseController {
 		ModelAndView mav = new ModelAndView();
 		// 상품관련 기본값 설정(회원 등급, 앱, PC/모바일 등)
 		setGoods(paramsGoods);
+		paramsGoods.setAdminYn("Y"); //20210526 soldout된 상품도 정보 조회는 가능해야함
 		Goods goods = goodsService.getGoodsInfo(paramsGoods);
 
 		// 상품 기본정보
@@ -1461,7 +1462,7 @@ public class TsfGoodsController extends TsfBaseController {
 		Review review = new Review();
 		review.setGoodsCd(goods.getGoodsCd());
 		review.setGoodsType(goods.getGoodsType());
-		log.info("review {}", review);
+		//log.info("review {}", review);
 		mav.addObject("reviewCount", reviewService.getReviewTotalCount(review));	// 전체상품평 건수
 
 		review.setRownum(1);
@@ -1484,7 +1485,7 @@ public class TsfGoodsController extends TsfBaseController {
 
 		// 키전체 
 		Collection<CommonCode> reviewHeightList = new ArrayList<CommonCode>();
-		log.info("goods.getItemkindCd().substring(0, 2) => {} ", goods.getItemkindCd().substring(0, 2));
+		//log.info("goods.getItemkindCd().substring(0, 2) => {} ", goods.getItemkindCd().substring(0, 2));
 		if (itemList.contains(goods.getItemkindCd().substring(0, 2))) {
 			reviewHeightList = rendererService.getAvailCommonCodeList("G091");
 		} else {

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

@@ -167,7 +167,7 @@
 									<div class="form_field">
 										<div class="select_custom option_open">
 											<div class="combo">
-												<div class="select">옵션을 선택해주세요</div>
+												<div class="select">옵션을 선택해주세요.</div>
 											</div>
 										</div>
 									</div>
@@ -302,7 +302,7 @@
 	<div class="product_floormenu"><!--  ☞☞ 제품이 품절되면 soldout클래스 추가 -->
 		<div class="share_like">
 			<button type="button" class="share">공유하기</button>
-			<button type="button" class="itemLike" th:classappend="${goodsInfo.wishYn == 'Y'}? 'active' : ''"  
+			<button type="button" class="itemLike" th:classappend="${goodsInfo.wishYn == 'Y'}? 'likeit active' : ''"  
 					onclick="cfnPutWishList(this);" 
 					th:attr="goodsCd=${params.goodsCd}, ithrCd=${params.ithrCd}, contentsLoc=${params.contentsLoc}, planDtlSq=${params.planDtlSq}">위시리스트</button>
 		</div>
@@ -861,7 +861,7 @@
 		});
 		
 		$('.Purchase_pop .pop_option_select').find('#form_field_item_Up .list li').eq(selIdx).trigger("click");
-        return false;
+		return false;
 	}	
 	
 	//팝업 - 딜상세정보 옵션선택 > 옵션셀렉트팝업
@@ -878,7 +878,7 @@
 		});
 		
 		$('.Purchase_pop .pop_option_select').find('#form_field_item_Up .list li').eq(selIdx).trigger("click");
-        return false;
+		return false;
 	}	
 	
 	// pop open
@@ -1180,27 +1180,27 @@
 		// =============딜리스트팝업========================================================
 			//팝업 - 딜리뷰상품 리스트팝업
 			$(document).on('click','.deal_listReview_open',function(e){
-                $("#listReviewPop").show();
-                return false;
-            }).on('click','#listReviewPop .close, #listReviewPop .deal_list_select ul > li',function(e){
+				$("#listReviewPop").show();
+				return false;
+			}).on('click','#listReviewPop .close, #listReviewPop .deal_list_select ul > li',function(e){
 				$("#listReviewPop").hide(); 
 				return false;
 			});
 
 			//팝업 - 딜문의상품 리스트팝업
 			$(document).on('click','.deal_listQna_open',function(e){
-                $("#listQnaPop").show();
-                return false;
-            }).on('click','#listQnaPop .close, #listQnaPop .deal_list_select ul > li',function(e){
+				$("#listQnaPop").show();
+				return false;
+			}).on('click','#listQnaPop .close, #listQnaPop .deal_list_select ul > li',function(e){
 				$("#listQnaPop").hide(); 
 				return false;
 			});
 
 			//팝업 - 딜배송상품 리스트팝업
 			$(document).on('click','.deal_listDelivery_open',function(e){
-                $("#listDeliveryPop").show();
-                return false;
-            }).on('click','#listDeliveryPop .close, #listDeliveryPop .deal_list_select ul > li',function(e){
+				$("#listDeliveryPop").show();
+				return false;
+			}).on('click','#listDeliveryPop .close, #listDeliveryPop .deal_list_select ul > li',function(e){
 				$("#listDeliveryPop").hide(); 
 				return false;
 			});
@@ -1208,9 +1208,9 @@
 			//팝업 - 딜상세정보 리스트팝업
 			$(document).on('click','#pdDescrpPop .deal_listDescrp_open',function(e){
 				$(this).toggleClass("active");
-                $("#listDescrpPop").toggle();
-                return false;
-            }).on('click','#listDescrpPop .deal_list_select ul > li',function(e){
+				$("#listDescrpPop").toggle();
+				return false;
+			}).on('click','#listDescrpPop .deal_list_select ul > li',function(e){
 				$("#pdDescrpPop .deal_listDescrp_open").removeClass("active");
 				$("#listDescrpPop").hide(); 
 				return false;
@@ -1251,14 +1251,14 @@
 		});
 			
 
-	      //관심상품 등록
-        $(document).on('click','.pd .itemLike',function(e){
-            $(this).toggleClass('active');
-            return false;
-        });   
-      
-	      
-      //pd전용 - 썸네일/헤더 블라인드 생성 : 210520_ 추가
+		  //관심상품 등록
+		$(document).on('click','.pd .itemLike',function(e){
+			$(this).toggleClass('active');
+			return false;
+		});   
+	  
+		  
+	  //pd전용 - 썸네일/헤더 블라인드 생성 : 210520_ 추가
 		$('.pd .thumb_box .thumb_list .swiper-slide').prepend('<span></span>');
 		// pd전용 - 스크롤 스크립트
 		//탭 - 딜상품 > 상세정보 탭 고정
@@ -1301,7 +1301,7 @@
 				lastScrollTop = st;
 			}
 		});
-	      
+		  
 			// 광고 스크립트용
 			var goodsNavigation = [[${goodsNavigation}]];
 			var cate1Nm = "";

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

@@ -1093,7 +1093,7 @@
 		<div class="share_like">
 			<button type="button" class="share">공유하기</button>
 			<!-- <th:block th:include="~{web/goods/GoodsIncludeFormMob :: goodsSnsForm}"></th:block> -->
-			<button type="button" class="itemLike" th:classappend="${goodsInfo.wishYn == 'Y'}? 'active' : ''"  
+			<button type="button" class="itemLike" th:classappend="${goodsInfo.wishYn == 'Y'}? 'likeit active' : ''"  
 					onclick="cfnPutWishList(this);" 
 					th:attr="goodsCd=${params.goodsCd}, ithrCd=${params.ithrCd}, contentsLoc=${params.contentsLoc}, planDtlSq=${params.planDtlSq}">위시리스트</button>
 		</div>
@@ -2322,7 +2322,7 @@
 		$(document).on('click','.pd_qnawrite_pop .close-modal',function(e){
 			if(qnaCount === 2){
 				$('#layer_goods_qna').modal('show');
-				setTimeout(fnGoodsQnaList, 100);
+				setTimeout(fnGoodsQnaList, 100);    //일반상품상세 용
 				qnaCount = 1;
 			}
             return false;

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

@@ -151,7 +151,6 @@
 			<div class="deal_list_select">
 				<ul class="list">
 					<li th:each="goodsInfo, status : ${goodsDealComposeList}" 
-						th:attr="aria-disabled=${(goodsInfo.goodsStat != 'G008_90' or goodsInfo.stockQty <= 0)? 'true':''}, data-soldout=${(goodsInfo.stockQty <= 0)? 'true':''}"
 						th:onclick="fnSelGoodsDealReview([[${goodsInfo.compsGoodsCd}]])">
 						<div class="item_prod" th:attr="goodsCd=${goodsInfo.compsGoodsCd}">
 							<div class="item_state active">
@@ -186,7 +185,6 @@
 			<div class="deal_list_select">
 				<ul class="list">
 					<li th:each="goodsInfo, status : ${goodsDealComposeList}" 
-						th:attr="aria-disabled=${(goodsInfo.goodsStat != 'G008_90' or goodsInfo.stockQty <= 0)? 'true':''}, data-soldout=${(goodsInfo.stockQty <= 0)? 'true':''}"
 						th:onclick="fnSelGoodsDealQna([[${goodsInfo.compsGoodsCd}]])">
 						<div class="item_prod" th:attr="goodsCd=${goodsInfo.compsGoodsCd}">
 							<div class="item_state active">
@@ -221,7 +219,6 @@
 			<div class="deal_list_select">
 				<ul class="list">
 					<li th:each="goodsInfo, status : ${goodsDealComposeList}" 
-						th:attr="aria-disabled=${(goodsInfo.goodsStat != 'G008_90' or goodsInfo.stockQty <= 0)? 'true':''}, data-soldout=${(goodsInfo.stockQty <= 0)? 'true':''}"
 						th:onclick="fnSelGoodsDealDelivery([[${goodsInfo.compsGoodsCd}]])">
 						<div class="item_prod" th:attr="goodsCd=${goodsInfo.compsGoodsCd}">
 							<div class="item_state active">
@@ -282,7 +279,6 @@
 							<div class="deal_list_select">
 								<ul class="list">
 									<li th:each="goodsInfo, status : ${goodsDealComposeList}" 
-										th:attr="aria-disabled=${(goodsInfo.goodsStat != 'G008_90' or goodsInfo.stockQty <= 0)? 'true':''}, data-soldout=${(goodsInfo.stockQty <= 0)? 'true':''}"
 										th:onclick="fnOpenGoodsDealDetail([[${goodsInfo.goodsCd}]], [[${goodsInfo.compsGoodsCd}]])"
 										 class="selected">
 										<div class="item_prod" th:attr="goodsCd=${goodsInfo.compsGoodsCd}">
@@ -439,6 +435,10 @@
 		params.adminYn = "Y";
 		gagajf.ajaxSubmit("/goods/deal/detail/info/frame", "html", "goodsDealDetail", params);
 		$("#pdDescrpPop").modal("show");
+		
+		//개별 상품 상세에서 상품 선택 Select가 펼쳐진 상태에서 팝업을 닫은 다음 재진입한 경우 상품 선택 Select가 닫힌 상태로 노출
+		$("#pdDescrpPop .deal_listDescrp_open").removeClass("active");
+		$("#listDescrpPop").hide(); 
 	}
 	
 	//팝업 - 딜상세팝업 구매하기버튼

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

@@ -115,7 +115,7 @@
 	var btnGoodsQnaSaveCallBack = function(){
 		$('#layer_goods_qna_reg').find('.close-modal').trigger("click");
 		//$('#layer_goods_qna').modal('show');
-		//setTimeout(fnGoodsQnaList, 100);
+		setTimeout(fnGoodsQnaList, 100);  //딜상품상세 용
 	}
 	
 	

+ 2 - 5
src/main/webapp/WEB-INF/views/web/goods/GoodsIncludeFormWeb.html

@@ -140,7 +140,6 @@
 									</div>
 									<ul class="list" th:if="${goodsDealComposeList  != null and !goodsDealComposeList.empty}">
 										<li th:each="goodsInfo, status : ${goodsDealComposeList}" 
-											th:attr="aria-disabled=${(goodsInfo.goodsStat != 'G008_90' or goodsInfo.stockQty <= 0)? 'true':''}, data-soldout=${(goodsInfo.stockQty <= 0)? 'true':''}"
 											th:onclick="fnSelGoodsDealReview([[${goodsInfo.compsGoodsCd}]])" >
 											<div class="item_prod">
 												<div class="item_state">
@@ -190,7 +189,6 @@
 									</div>
 									<ul class="list" th:if="${goodsDealComposeList  != null and !goodsDealComposeList.empty}">
 										<li th:each="goodsInfo, status : ${goodsDealComposeList}" 
-											th:attr="aria-disabled=${(goodsInfo.goodsStat != 'G008_90' or goodsInfo.stockQty <= 0)? 'true':''}, data-soldout=${(goodsInfo.stockQty <= 0)? 'true':''}"
 											th:onclick="fnSelGoodsDealQna([[${goodsInfo.compsGoodsCd}]])" >
 											<div class="item_prod">
 												<div class="item_state">
@@ -240,7 +238,6 @@
 									</div>
 									<ul class="list" th:if="${goodsDealComposeList  != null and !goodsDealComposeList.empty}">
 										<li th:each="goodsInfo, status : ${goodsDealComposeList}" 
-											th:attr="aria-disabled=${(goodsInfo.goodsStat != 'G008_90' or goodsInfo.stockQty <= 0)? 'true':''}, data-soldout=${(goodsInfo.stockQty <= 0)? 'true':''}"
 											th:onclick="fnSelGoodsDealDelivery([[${goodsInfo.compsGoodsCd}]])" >
 											<div class="item_prod">
 												<div class="item_state">
@@ -393,8 +390,8 @@
 									</div>
 							</div>
 							<ul class="list" th:if="${goodsDealComposeList  != null and !goodsDealComposeList.empty}">
-								<li class="selected" th:each="goodsInfo, status : ${goodsDealComposeList}" th:attr="aria-disabled=${(goodsInfo.goodsStat != 'G008_90' or goodsInfo.stockQty <= 0)? 'true':''}, data-soldout=${(goodsInfo.stockQty <= 0)? 'true':''}">
-									<div class="item_prod"  th:classappend="${(goodsInfo.goodsStat != 'G008_90' or goodsInfo.stockQty <= 0)? 'soldout':'' }">
+								<li class="selected" th:each="goodsInfo, status : ${goodsDealComposeList}" >
+									<div class="item_prod" >
 										<div class="item_state">
 											<a href="javascript:void(0);" class="itemLink" th:onclick="fnGoodsDealDesc([[${goodsInfo.compsGoodsCd}]], [[${goodsInfo.currPrice}]], [[${goodsInfo.selfGoodsYn}]], [[${(goodsInfo.goodsStat != 'G008_90' or goodsInfo.stockQty <= 0)? 'Y':'N' }]])">
 												<div class="itemPic">