eskim 5 лет назад
Родитель
Сommit
af207a7078

+ 1 - 1
src/main/java/com/style24/front/biz/web/TsfCallcenterController.java

@@ -326,7 +326,7 @@ public class TsfCallcenterController extends TsfBaseController {
 	public GagaResponse createGoodsQna(@RequestBody Counsel counsel) {
 		log.info("createGoodsQna counsel = {}", counsel);
 		counselService.createGoodsQna(counsel);
-		return super.ok(message.getMessage("SUCC_0001"));
+		return super.ok("상품 문의가 등록되었습니다. 빠른 시일 내에 답변드리겠습니다.");
 	}
 
 	/**

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

@@ -259,7 +259,7 @@ public class TsfGoodsController extends TsfBaseController {
 			}
 			
 		}
-
+		
 		// 상품 문의건수
 		Counsel counsel = new Counsel();
 		counsel.setRelGoodsCd(goods.getGoodsCd());

+ 3 - 3
src/main/webapp/WEB-INF/views/mob/goods/CardPrmtFormMob.html

@@ -77,18 +77,18 @@
 				</th:block>
 				<th:block th:each="cardInfo, status : ${cardInfoList}" >
 				<div class="benefit_blk"  th:if="${cardInfo.prmtGb == 'B' and not #strings.isEmpty(cardInfo.note) and cardInfo.rownum ==  1}">
-					<th:block >
 					<h6>부분 무이자 할부</h6>
 					<th:block th:utext="${#strings.unescapeJava(#strings.escapeJava(cardInfo.note))}"></th:block>
+				</div>
+				</th:block>
+				<div class="benefit_blk" >
 					<div class="info_txt">
 						<ul>
 							<li>무이자할부는 행사기간 동안 실 결제금액 기준으로 가능</li>
 							<li>법인, 체크, 기프트 카드는 부분 무이자 할부 제외</li>
 						</ul>
 					</div>
-					</th:block>
 				</div>
-				</th:block>
 			</div>
 		</div>
 	</div>

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

@@ -613,47 +613,26 @@
 			return false;
 		});
 		var opt_selecter02 = new sCombo('.pd .pop_option_select .item_opt2');
-
-		 /* 상품옵션변경 팝업 > 수량조절 */
-		 $(document).on('click','.number_count .minus',function(e){
-			 var $input = $(this).parent().find('input');
-				var count = parseInt($input.val()) - 1;
-				count = count < 1 ? 1 : count;
-				$input.val(count);
-				$input.change();
-				return false;
-		 }).on('click','.number_count .plus',function(e){
-			 var $input = $(this).parent().find('input');
-				$input.val(parseInt($input.val()) + 1);
-				$input.change();
-				return false;
-		 });
-
-		 //관심상품 등록
-		 $(document).on('click','.pd .itemLike',function(e){
-			 $(this).toggleClass('active');
-			 return false;
-		 });	
 			
-			//슬라이드 - 베스트리뷰
-			var riviewSwiper = new Swiper('.pd .riview_box .area_slider .swiper-container', {
-				slidesPerView: 1,
-				spaceBetween: 8,
-				loop: true,
-				pagination: {
-					el: '.swiper-pagination',
-					type: 'fraction',
-				},
-			});
-			
-			//슬라이드 - 제품사진
-			var thumbswiper = new Swiper('.pd .thumb_box .area_slider .swiper-container', {
-				slidesPerView:1,
-				pagination: {
-					el: '.swiper-pagination',
-					type: 'fraction',
-				},
-			});
+		//슬라이드 - 베스트리뷰
+		var riviewSwiper = new Swiper('.pd .riview_box .area_slider .swiper-container', {
+			slidesPerView: 1,
+			spaceBetween: 8,
+			loop: true,
+			pagination: {
+				el: '.swiper-pagination',
+				type: 'fraction',
+			},
+		});
+		
+		//슬라이드 - 제품사진
+		var thumbswiper = new Swiper('.pd .thumb_box .area_slider .swiper-container', {
+			slidesPerView:1,
+			pagination: {
+				el: '.swiper-pagination',
+				type: 'fraction',
+			},
+		});
 		 //슬라이드 - 함께하면 할인되는 다다익선 상품
 		 var togetherItemSwiper = new Swiper('.pd .pd_together .area_slider .swiper-container', {
 			 slidesPerView: 3,
@@ -667,28 +646,28 @@
 		 });			
 
 		 //슬라이드 - STYLE24의 스타일링 추천
-			var rcmdPicimgSwiper = new Swiper('.pd .pd_recommend .area_slider.pic_img .swiper-container', {
-				slidesPerView: 1,
-				spaceBetween: 0,
-				pagination: {
-					el: '.swiper-pagination',
-					type: 'fraction',
-				},
-			});
-			var rcmdPiclistSwiper = new Swiper('.pd .pd_recommend .area_slider.pic_list .swiper-container', {
-				observer: true,
-				observeParents: true,
-				slidesPerView: 3,
-				spaceBetween: 8,
-			});
+		var rcmdPicimgSwiper = new Swiper('.pd .pd_recommend .area_slider.pic_img .swiper-container', {
+			slidesPerView: 1,
+			spaceBetween: 0,
+			pagination: {
+				el: '.swiper-pagination',
+				type: 'fraction',
+			},
+		});
+		var rcmdPiclistSwiper = new Swiper('.pd .pd_recommend .area_slider.pic_list .swiper-container', {
+			observer: true,
+			observeParents: true,
+			slidesPerView: 3,
+			spaceBetween: 8,
+		});
 
+		$(".pic_list > div").hide();
+		$(".pic_list > div").eq(0).fadeIn();
+		rcmdPicimgSwiper.on('slideChange', function () {
+			var pic_index=this.activeIndex;
 			$(".pic_list > div").hide();
-			$(".pic_list > div").eq(0).fadeIn();
-			rcmdPicimgSwiper.on('slideChange', function () {
-				var pic_index=this.activeIndex;
-				$(".pic_list > div").hide();
-				$(".pic_list > div").eq(pic_index).fadeIn();
-			});
+			$(".pic_list > div").eq(pic_index).fadeIn();
+		});
 			
 			//슬라이드 - 동일브랜드 상품 추천
 		 var rcmdItemSwiper = new Swiper('.pd .pd_samebrand .area_slider .swiper-container', {
@@ -769,43 +748,6 @@
 			return false;
 		});
 
-			//팝업 - 배송교환반품 안내
-		 $(document).on('click','#btn_pdDelivery_Pop',function(e){
-			 $("#pdDeliveryPop").modal("show");
-			 return false;
-		 })
-
-		//팝업 - 리뷰
-		$(document).on('click','#btn_pdReview_pop',function(e){
-			 $("#pdReviewPop").modal("show");
-			 return false;
-		 })
-
-		//팝업 - 베스트리뷰
-		$(document).on('click','#btn_pdBestReview_pop a',function(e){
-			 $("#pdBestReviewPop").modal("show");
-			 return false;
-		 })
-			
-
-			//팝업 - 포토/영상 리뷰 (detail)
-		 $(document).on('click','.area_rv_photo .photo_list a, .area_rv_all .review_list .photo_list a, .pd_photoreviewlist_pop .photo_list ul li a',function(e){
-			 $("#pdPhotoReviewDetailPop").modal("show");
-			 return false;
-		 })
-
-			//팝업 - 포토/영상 리뷰 (list)
-		 $(document).on('click','#btn_more_photoreview',function(e){
-			 $("#pdPhotoReviewListPop").modal("show");
-			 return false;
-		 })
-
-			//팝업 - 제품상세
-			$(document).on('click','.pd_dealitem .itemLink',function(e){
-			 $("#pdDescrpPop").modal("show");
-				$('#pdDescrpPop .pop_cont').load('pd_descrp_pop.html');
-			 return false;
-		 })
 
 			//팝업 - 제품리뷰 > 카테고리팝오픈
 			// 오픈
@@ -838,50 +780,50 @@
 		 });
 
 
-			// 포토,베스트리뷰숨김
-			var review_open=$(".btn_review_open");
-			$(document).on('click','.btn_review_open',function(e){
-				$(this).toggleClass('active');
-				$(this).next(".review_list").toggleClass('active');
-				return false;
-			});
-			
-			
+		// 포토,베스트리뷰숨김
+		var review_open=$(".btn_review_open");
+		$(document).on('click','.btn_review_open',function(e){
+			$(this).toggleClass('active');
+			$(this).next(".review_list").toggleClass('active');
+			return false;
+		});
+		
+		
 			// =============구매하기팝업========================================================
 
-			// pop open
-			function popOpenScroll(){
-				$('html, body').css({'overflow': 'hidden', 'height': '100%'}); 
-				$('#element').on('scroll touchmove mousewheel', function(event) { // 터치무브, 휠 스크롤 방지
-					event.preventDefault();
-					event.stopPropagation();
-					return false;
-				});
-			}
-			// pop close
-			function popClsScroll(){
-				$('html, body').css({'overflow': 'auto', 'height': '100%'}); //n 해제
-				$('#element').off('scroll touchmove mousewheel'); // 터치무브, 휠 스크롤 가능
+		// pop open
+		function popOpenScroll(){
+			$('html, body').css({'overflow': 'hidden', 'height': '100%'}); 
+			$('#element').on('scroll touchmove mousewheel', function(event) { // 터치무브, 휠 스크롤 방지
+				event.preventDefault();
+				event.stopPropagation();
 				return false;
-			}
-			// pop close
-			function popClsScroll2(){
-				$('html, body').css({'overflow': 'auto', 'height': '100%'}); //n 해제
-				$('#element').off('scroll touchmove mousewheel'); // 터치무브, 휠 스크롤 가능
-				return false;
-			}
+			});
+		}
+		// pop close
+		function popClsScroll(){
+			$('html, body').css({'overflow': 'auto', 'height': '100%'}); //n 해제
+			$('#element').off('scroll touchmove mousewheel'); // 터치무브, 휠 스크롤 가능
+			return false;
+		}
+		// pop close
+		function popClsScroll2(){
+			$('html, body').css({'overflow': 'auto', 'height': '100%'}); //n 해제
+			$('#element').off('scroll touchmove mousewheel'); // 터치무브, 휠 스크롤 가능
+			return false;
+		}
 
-			//팝업 - 구매하기 > 옵션선택 > 옵션셀렉트팝업
-			$(document).on('click','.Purchase_pop .option_result .option_open',function(e){
+		//팝업 - 구매하기 > 옵션선택 > 옵션셀렉트팝업
+		$(document).on('click','.Purchase_pop .option_result .option_open',function(e){
 			 $(".Purchase_pop .pop_option_select").show();
 			 return false;
 		 });
-			$(document).on('click','.Purchase_pop .close',function(e){
+		$(document).on('click','.Purchase_pop .close',function(e){
 			 $(".Purchase_pop .pop_option_select").hide();
 			 return false;
 		 })
 			//팝업 - 딜상세정보 옵션선택 > 옵션셀렉트팝업
-			$(document).on('click','.pd_dealitem .item_prod .btn_default',function(e){
+		$(document).on('click','.pd_dealitem .item_prod .btn_default',function(e){
 				$('.container').addClass('btPop_open');
 				$(".Purchase_pop .pop_option_select").show();
 				popOpenScroll();
@@ -889,55 +831,46 @@
 		 });
 
 			//팝업 - 딜상세팝업 구매하기버튼 > 옵션셀렉트팝업
-			$(document).on('click','#pdDescrpPop .modal-footer button',function(e){
-				$("#pdDescrpPop .close-modal ").click();
-				$('.container').addClass('btPop_open');
-				$(".Purchase_pop .pop_option_select").show();
-				popOpenScroll();
-			 return false;
+		$(document).on('click','#pdDescrpPop .modal-footer button',function(e){
+			$("#pdDescrpPop .close-modal ").click();
+			$('.container').addClass('btPop_open');
+			$(".Purchase_pop .pop_option_select").show();
+			popOpenScroll();
+		 return false;
 		 });
-			// ============================================================================//
+		// ============================================================================//
 			
 
 
-			// =============딜리스트팝업========================================================
-			//팝업 - 딜리뷰상품 리스트팝업
-			$(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").hide(); 
-				return false;
-			});
+		// =============딜리스트팝업========================================================
+		//팝업 - 딜리뷰상품 리스트팝업
+		$(document).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").hide(); 
-				return false;
-			});
+		$(document).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").hide(); 
-				return false;
-			});
+		$(document).on('click','#listDeliveryPop .close, #listDeliveryPop .deal_list_select ul > li',function(e){
+			$("#listDeliveryPop").hide(); 
+			return false;
+		});
 
-			//팝업 - 딜상세정보 리스트팝업
-			$(document).on('click','#pdDescrpPop .deal_listDescrp_open',function(e){
-				$(this).toggleClass("active");
+		//팝업 - 딜상세정보 리스트팝업
+	/* 	$(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){
-				$("#pdDescrpPop .deal_listDescrp_open").removeClass("active");
-				$("#listDescrpPop").hide(); 
-				return false;
-			});
+			$("#pdDescrpPop .deal_listDescrp_open").removeClass("active");
+			$("#listDescrpPop").hide(); 
+			return false;
+		}); */
 			// ============================================================================//
 
 
@@ -967,65 +900,12 @@
 			 }
 		 });
 
-			/* 210409_추가 : alert 모음 */
-			$(document).on("click", "#btn_deal_purchase", function(){
-				mcxDialog.alert("1일 구매한도 수량이 초과되었습니다.", {
-						//alert("해당 상품은 구매가 불가능합니다.) : 버튼 선택 시 구매가 불가능한 경우(등급, 신규회원 여부 등)
-					sureBtnText: "확인",
-				});
-			});
-			$(document).on("click", "#btn_gift", function(){
-				mcxDialog.alert("옵션을 선택해 주세요.", {
-						//alert("선물하기는 1개의 옵션만 선택하실 수 있습니다.") : 버튼 선택 시 옵션을 2개 이상 선택한 경우
-					sureBtnText: "확인",
-				});
-			});
-			$(document).on("click", "#btn_shoppingBag_pop", function(){
-				mcxDialog.alert("옵션을 선택해 주세요.", {
-						
-					sureBtnText: "확인",
-				});
-			});
-			$(document).on("click", "#btn_now_purchase", function(){
-				mcxDialog.alert("옵션을 선택해 주세요.", {
-						
-					sureBtnText: "확인",
-				});
-			});
-			$(document).on("click", "#btn_result_coupon", function(){
-				mcxDialog.alert("쿠폰이 발급되었습니다.", {
-						//alert("죄송합니다. 쿠폰이 모두 소진되었습니다.") : 각 개별 쿠폰 선택 시 해당 쿠폰이 선착순 조건에 걸리는 경우
-						//alert("죄송합니다. 해당 쿠폰은 다운로드가 불가합니다.") : 각 개별 쿠폰 선택 시 해당 쿠폰이 다운로드 불가능한 경우
-					sureBtnText: "확인",
-				});
-			});
-			$(document).on("click", "#btn_result_coupon2", function(){
-				mcxDialog.alert("쿠폰이 발급되었습니다.", {
-						//alert("죄송합니다. 쿠폰이 모두 소진되었습니다.") : 각 개별 쿠폰 선택 시 해당 쿠폰이 선착순 조건에 걸리는 경우
-						//alert("죄송합니다. 해당 쿠폰은 다운로드가 불가합니다.") : 각 개별 쿠폰 선택 시 해당 쿠폰이 다운로드 불가능한 경우
-					sureBtnText: "확인",
-				});
-			});
-			$(document).on("click", "#btn_all_coupon", function(){
-				mcxDialog.alert("00개 쿠폰이 발급되었습니다.", {
-						
-					sureBtnText: "확인",
-				});
-			});
-			$(document).on("click", "#btn_purchase", function(){
-				mcxDialog.alert("1일 구매한도 수량이 초과되었습니다.", {
-						//alert("해당 상품은 구매가 불가능합니다.) : 버튼 선택 시 구매가 불가능한 경우(등급, 신규회원 여부 등)
-					sureBtnText: "확인",
-				});
-			});
-			/* //210409_추가 : alert 모음 */
-
-			$('.Purchase_pop .btPop_close').click(function(){
-				$('html, body').css({'overflow': 'visible', 'height': '100%'});
-				$('.container').removeClass('btPop_open');
-				autome.style.top  = 100 + "%";
-				return false;
-			});
+		$('.Purchase_pop .btPop_close').click(function(){
+			$('html, body').css({'overflow': 'visible', 'height': '100%'});
+			$('.container').removeClass('btPop_open');
+			autome.style.top  = 100 + "%";
+			return false;
+		});
 			
 			
 			// 광고 스크립트용

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

@@ -27,7 +27,7 @@
 				<h3>배송비</h3>
 				<p class="dot">
 					<th:block th:if="${goodsInfo.delvFee <= 0}">무료배송</th:block>
-					<th:block th:if="${goodsInfo.delvFee > 0}" th:text="${#numbers.formatInteger(goodsInfo.delvFee, 0,'COMMA')}" ></th:block>
+					<th:block th:if="${goodsInfo.delvFee > 0}" th:text="|${#numbers.formatInteger(goodsInfo.delvFee, 0,'COMMA')}원|" ></th:block>
 					<th:block th:if="${goodsInfo.minOrdAmt > 0}">(<th:block th:text="${#numbers.formatInteger(goodsInfo.minOrdAmt, 0,'COMMA')}" ></th:block>원 이상 무료배송)</th:block>
 				</p>
 			</div>

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

@@ -795,10 +795,13 @@
 						<button class="gift">
 							<span><span>선물해보세요!</span></span>
 						</button>
-						<th:block  th:if="${goodsInfo.stockQty > 0}">
+						<th:block  th:if="${goodsInfo.stockQty > 0 and goodsInfo.goodsStat == 'G008_90'}">
 							<button type="button" class="cart" id="btnGoodsWish" onclick="fnAddCart('C');"><span>쇼핑백</span></button>
 							<button type="button" class="buyNow" id="btnGoodsCart" onclick="fnAddCart('O');"><span>바로구매</span></button>
 						</th:block>
+						<th:block  th:unless="${goodsInfo.stockQty > 0 and goodsInfo.goodsStat == 'G008_90'}">
+						<button class="cantbuying" style="display:block;">SOLD OUT</button>
+						</th:block>
 					</div>
 				</div>
 			</div>
@@ -817,11 +820,11 @@
 					th:attr="goodsCd=${params.goodsCd}, ithrCd=${params.ithrCd}, contentsLoc=${params.contentsLoc}, planDtlSq=${params.planDtlSq}">위시리스트</button>
 		</div>
 		<div class="prd_buy">
-			<th:block  th:if="${goodsInfo.stockQty > 0}">
+			<th:block  th:if="${goodsInfo.stockQty > 0 and goodsInfo.goodsStat == 'G008_90'}">
 			<button type="button" class="buying btPop_auto">구매하기</button>
 			</th:block>
-			<th:block  th:unless="${goodsInfo.stockQty > 0}">
-			<button type="button" class="cantbuying">SOLD OUT</button>
+			<th:block  th:unless="${goodsInfo.stockQty > 0 and goodsInfo.goodsStat == 'G008_90'}">
+			<button type="button" class="cantbuying" style="display:block;">SOLD OUT</button>
 			</th:block>
 		</div>
 	</div>
@@ -1332,7 +1335,7 @@
 		let maxOrdQty = 0;
 		if ("Y" == $("#cartForm  input[name=selfGoodsYn]").val() && "G056_N" == $("#cartForm  input[name=goodsType]").val()){
 			if(gagajf.isNull($("#cartForm  input[name=optCd2]").val())){
-				mcxDialog.alert("사이즈를 선택세요.");
+				mcxDialog.alert("사이즈를 선택해 주세요.");
 				return false;
 			}
 			minOrdQty = parseInt($("#cartForm  input[name=minOrdQty]").val());
@@ -1370,7 +1373,7 @@
 		let maxOrdQty = parseInt($("#cartForm  input[name=maxOrdQty]").val());
 		if ("Y" == $("#cartForm  input[name=selfGoodsYn]").val() && "G056_N" == $("#cartForm  input[name=goodsType]").val()){
 			if(gagajf.isNull($("#cartForm  input[name=optCd2]").val())){
-				mcxDialog.alert("사이즈를 선택세요.");
+				mcxDialog.alert("사이즈를 선택해 주세요.");
 				return false;
 			}
 		}else{
@@ -1383,12 +1386,12 @@
 		let alertMsg = '';
 		
 		if (ea < minOrdQty) {
-			alertMsg ="최소 주문 가능 수량은 "+minOrdQty+"개 입니다.";
+			alertMsg = minOrdQty+"개 부터 구매 가능합니다.";;
 			ea = minOrdQty;
 		}
 
 		if (ea > maxOrdQty) {
-			alertMsg = "최대 주문 가능 수량은 "+maxOrdQty+"개 입니다.";
+			alertMsg = maxOrdQty+"개 까지만 구매 가능합니다.";
 			ea = maxOrdQty;
 		}
 		
@@ -1471,7 +1474,7 @@
 
 		if (goodsType == 'G056_N' && selfGoodsYn == 'Y' ){
 			if (gagajf.isNull($("#cartForm  input[name=optCd2]").val())) {
-				mcxDialog.alert("사이즈를 선택세요.");
+				mcxDialog.alert("사이즈를 선택해 주세요.");
 				return;
 			}
 		

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

@@ -322,7 +322,7 @@
 	// 상품선택시 상품상세내용 변경
 	var fnOpenGoodsDealDetail = function(goodsCd, compsGoodsCd){
 		
-		// 콤보박스 선택 처리
+		/* // 콤보박스 선택 처리
 		let $selObj = $('#layer_goods_deal_detail').find('.select_custom.deal_opt_item');
 		
 		// 탭별 선택시 기본 상품 설정
@@ -340,10 +340,10 @@
 			selIdx ++;
 		});
 		
-		$selObj.find('.combo .list li').eq(selIdx).trigger("click");
+		$selObj.find('.combo .list li').eq(selIdx).trigger("click"); */
 		
 		// 상세노출
-		fnGoodsDealDesc(compsGoodsCd, currPrice, selfGoodsYn, soldoutYn);
+		fnGoodsDealDesc(compsGoodsCd);
 /* 		
 		if (!soldout){
 			// 옵션1 처리
@@ -351,21 +351,21 @@
 		}
  */		
 		
-		let $obj = $('.pd_detail .opt_result'); 
+	/* 	let $obj = $('.pd_detail .opt_result'); 
 		let $taget = $('.full_pop_fix_r .opt_result');
 		$taget.html($obj.html());
 		
 		fnSetTotalPrice();
 		
 		$('body').addClass('lock');
-		$("#layer_goods_deal_detail").show(); 
+		$("#layer_goods_deal_detail").show();  */
 		
 	}
 	
 	// 상세 레이어 창닫기
 	var fnCloseGoodsDealDetail = function(){
 		// 선택값 본창에 넘기기
-		let $obj = $('.full_pop_fix_r .opt_result');
+		/* let $obj = $('.full_pop_fix_r .opt_result');
 		let $taget = $('.pd_detail .opt_result');
 		$taget.html($obj.html());
 		
@@ -373,25 +373,30 @@
 		
 		$('body').removeClass('lock');
 		$('#goodsDealDetail').html('');
-		$("#layer_goods_deal_detail").hide();
+		$("#layer_goods_deal_detail").hide(); */
 	}
 	
 	// 구성 상품 상세 
 	var fnGoodsDealDetail2 = function(params) {
-		gagajf.ajaxSubmit("/goods/deal/detail/info/frame", "html", "goodsDealDetail", params);
+		
+		var Param = new Object();
+		var str = '<div class="modal pop_full fade pd_pop pd_descrp_pop" id="layer_goods_deal_desc" tabindex="-1" role="dialog" aria-labelledby="exampleFullLabel" aria-hidden="true"></div>';
+
+		if ($('#layer_goods_deal_desc').length == 0) {
+			$('body').append(str);
+		}
+
+		cfOpenLayer(_'/goods/deal/detail/info/frame', 'layer_goods_deal_desc' ,params );
+	
 	}
+
 	
 	// 레이어에서 상품선택시
-	var fnGoodsDealDesc = function(goodsCd, currPrice, selfGoodsYn , soldout){
+	var fnGoodsDealDesc = function(goodsCd){
 		var params = new Object();
 		params.goodsCd = goodsCd;
 		params.adminYn = "Y";
 		fnGoodsDealDetail2(params);  // ajax html
-		if (soldout == "N"){
-			// 옵션1 처리
-			fnOption1("layer", goodsCd, currPrice, selfGoodsYn);
-		}
-		
 	}
 	
 	$(document).ready( function() {

+ 3 - 3
src/main/webapp/WEB-INF/views/web/goods/CardPrmtFormWeb.html

@@ -84,18 +84,18 @@
 				</th:block>
 				<th:block th:each="cardInfo, status : ${cardInfoList}" >
 				<div class="benefit_blk"  th:if="${cardInfo.prmtGb == 'B' and not #strings.isEmpty(cardInfo.note) and cardInfo.rownum ==  1}">
-					<th:block >
 					<h6>부분 무이자 할부</h6>
 					<th:block th:utext="${#strings.unescapeJava(#strings.escapeJava(cardInfo.note))}"></th:block>
+				</div>
+				</th:block>
+				<div class="benefit_blk" >
 					<div class="info_txt">
 						<ul>
 							<li>무이자할부는 행사기간 동안 실 결제금액 기준으로 가능</li>
 							<li>법인, 체크, 기프트 카드는 부분 무이자 할부 제외</li>
 						</ul>
 					</div>
-					</th:block>
 				</div>
-				</th:block>
 			</div>
 		</div>
 	</div>

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

@@ -195,7 +195,7 @@
 									<div class="form_field">
 										<div class="select_custom deal_opt1" disabled>
 											<div class="combo">
-												<div class="select">선택</div>
+												<div class="select">옵션1</div>
 												<ul class="list" id="goodsDealOptUp1">
 													<!--  옵션 1 -->
 												</ul>
@@ -205,7 +205,7 @@
 									<div class="form_field">
 										<div class="select_custom deal_opt2" disabled>
 											<div class="combo">
-												<div class="select">선택</div>
+												<div class="select">옵션2</div>
 												<ul class="list" id="goodsDealOptUp2">
 													<!--  옵션 2 -->
 												</ul>
@@ -228,7 +228,7 @@
 							</div>
 							<div class="btn_box">
 								<div class="btn_group_block ui_row">
-								<th:block  th:if="${goodsInfo.stockQty > 0}">
+								<th:block  th:if="${goodsInfo.stockQty > 0 and goodsInfo.goodsStat == 'G008_90'}">
 									<div class="ui_col_6">
 										<button type="button" class="btn btn_dark btn_block" id="btnGoodsWish" onclick="fnAddCart('C');"><span>쇼핑백</span></button>
 									</div>
@@ -236,7 +236,7 @@
 										<button type="button" class="btn btn_primary btn_block" id="btnGoodsCart" onclick="fnAddCart('O');"><span>바로구매</span></button>
 									</div>
 								</th:block>
-								<th:block  th:unless="${goodsInfo.stockQty > 0}">
+								<th:block  th:unless="${goodsInfo.stockQty > 0 and goodsInfo.goodsStat == 'G008_90'}">
 									<div class="ui_col_12">
 										<button type="button" class="btn btn_dark btn_block" disabled=""><span>SOLD OUT</span></button>
 									</div>
@@ -657,12 +657,12 @@
 		let optCd =  $(obj).attr('optCd');
 		let alertMsg = '';
 		if (ea < minOrdQty) {
-			mcxDialog.alert("최소 주문 가능 수량은 "+minOrdQty+"개 입니다.");
+			alertMsg = minOrdQty+"개 부터 구매 가능합니다.";
 			ea = minOrdQty;
 		}
 
 		if (ea > maxOrdQty) {
-			mcxDialog.alert("최대 주문 가능 수량은 "+maxOrdQty+"개 입니다.");
+			alertMsg = maxOrdQty+"개 까지만 구매 가능합니다.";
 			ea = maxOrdQty;
 		}
 

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

@@ -39,7 +39,7 @@
 						</th>
 						<td>
 							<th:block th:if="${goodsInfo.delvFee <= 0}">무료배송</th:block>
-							<th:block th:if="${goodsInfo.delvFee > 0}" th:text="${#numbers.formatInteger(goodsInfo.delvFee, 0,'COMMA')}" ></th:block>
+							<th:block th:if="${goodsInfo.delvFee > 0}" th:text="|${#numbers.formatInteger(goodsInfo.delvFee, 0,'COMMA')}원|" ></th:block>
 							<th:block th:if="${goodsInfo.minOrdAmt > 0}">(<th:block th:text="${#numbers.formatInteger(goodsInfo.minOrdAmt, 0,'COMMA')}" ></th:block>원 이상 무료배송)</th:block>
 						</td>
 					</tr>

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

@@ -222,7 +222,7 @@
 										<div class="select_custom item_opt1"  th:classappend="${'item_opt1_'+status.count +' '+goodsCompose.compsGoodsCd}" 
 																			th:if="${goodsCompose.goodsOption1List != null and !goodsCompose.goodsOption1List.empty}" >
 											<div class="combo">
-												<div class="select">선택</div>
+												<div class="select">옵션1</div>
 												<ul class="list">
 													<th:block th:each="goodsOption, optionStatus : ${goodsCompose.goodsOption1List}" >
 													<li class="selected" th:id="|selfGoodsOpt1${goodsCompose.compsGoodsCd}|" th:if=${optionStatus.first}>선택</li> 
@@ -241,7 +241,7 @@
 									<div class="form_field">
 										<div class="select_custom item_opt2" th:classappend="${'item_opt2_'+status.count +' '+goodsCompose.compsGoodsCd}"  disabled>
 											<div class="combo">
-												<div class="select">선택</div>
+												<div class="select">옵션2</div>
 												<ul class="list" th:id="|goodsOpt2${goodsCompose.compsGoodsCd}|" >
 													<!-- 옵션2 -->
 												</ul>
@@ -262,7 +262,7 @@
 									<div class="form_field">
 										<div class="select_custom item_opt1 item_opt1_1" th:classappend="${goodsInfo.goodsCd}" >
 											<div class="combo">
-												<div class="select">선택</div>
+												<div class="select">옵션1</div>
 												<ul class="list">
 													<li class="selected" th:id="|selfGoodsOpt1${goodsInfo.goodsCd}|" >선택</li> 
 													<th:block th:each="goodsOption, optionStatus : ${goodsOption1List}" >
@@ -279,7 +279,7 @@
 									<div class="form_field">
 										<div class="select_custom item_opt2 item_opt2_1" th:classappend="${goodsInfo.goodsCd}"  disabled>
 											<div class="combo">
-												<div class="select">선택</div>
+												<div class="select">옵션2</div>
 												<ul class="list" th:id="|goodsOpt2${goodsInfo.goodsCd}|" >
 													<!-- 옵션2 -->
 												</ul>
@@ -298,14 +298,14 @@
 										<span class="title">수량</span>
 									</div>
 									<div class="number_count">
-										<span class="minus" onclick="fnAdjustOrderEa(this);" adjust="-"><em class="sr-only">감소</em></span>
-										<input type="text" name="cea" maxlength="3" style="ime-mode:disabled" th:value="${goodsInfo.minOrdQty}" onblur="fnChangeOrderEa(this)" data-valid-type="numeric">
+										<span class="minus min_val" onclick="fnAdjustOrderEa(this);" adjust="-"><em class="sr-only">감소</em></span>
+										<input type="text" name="cea" maxlength="3" style="ime-mode:disabled" th:value="${goodsInfo.minOrdQty}" readonly >
 										<input type="hidden" name="coption" value=""   th:attr="price=${goodsInfo.currPrice}">
 										<span class="plus" onclick="fnAdjustOrderEa(this);" adjust="+"><em class="sr-only">추가</em></span>
 									</div>
 								</div>
 							</div>
-							<div class="price_box">
+							<div class="price_box" style="display:none;">
 								<p class="number">
 									총&nbsp;<span id="goodsTotalQty">0</span>개
 								</p>
@@ -317,7 +317,7 @@
 							</div>
 							<div class="btn_box">
 								<div class="btn_group_block ui_row">
-								<th:block  th:if="${goodsInfo.stockQty > 0}">
+								<th:block  th:if="${goodsInfo.stockQty > 0 and goodsInfo.goodsStat == 'G008_90'}">
 									<div class="ui_col_6">
 										<button type="button" class="btn btn_dark btn_block" id="btnGoodsWish" onclick="fnAddCart('C');"><span>쇼핑백</span></button>
 									</div>
@@ -325,14 +325,14 @@
 										<button type="button" class="btn btn_primary btn_block" id="btnGoodsCart" onclick="fnAddCart('O');"><span>바로구매</span></button>
 									</div>
 								</th:block>
-								<th:block  th:unless="${goodsInfo.stockQty > 0}">
+								<th:block  th:unless="${goodsInfo.stockQty > 0 and goodsInfo.goodsStat == 'G008_90'}">
 									<div class="ui_col_12">
 										<button type="button" class="btn btn_dark btn_block" disabled=""><span>SOLD OUT</span></button>
 									</div>
 								</th:block>
 								</div>
 							</div>
-							<div class="npay_box">
+							<div class="npay_box" style="display:none;">
 								<a href="">네이버id로 간편구매~</a>
 							</div>
 							<div class="exinfo_box">
@@ -423,8 +423,8 @@
 					</div>
 					<div class="desc_character" th:if="${goodsInfo.goodsSpecialDesc != null  and !goodsInfo.goodsSpecialDesc.empty}"> <!-- 상품특징 -->
 						<span class="tit_desc">상품특징</span>
-						<p class="ptxt01" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsSpecialDesc))}">
-							- 지퍼플러 장식을 더해 완성도를 높여줌
+						<p class="ptxt01">
+							<th:block th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsSpecialDesc))}"></th:block>
 						</p>
 					</div>
 				</div>
@@ -803,6 +803,7 @@
 				$("#cartForm  input[name=cea]").attr("readonly",false);
 				$("#cartForm  input[name=stock]").val(itemCnt);
 	
+				$('.price_box').show();
 				fnSetTotalPrice();
 			}); 
 		}
@@ -811,9 +812,9 @@
 	// 수량 변경 클릭
 	var fnAdjustOrderEa = function(obj) {
 
-		if("G056_N" == $("#cartForm  input[name=goodsType]").val()){
+		if("G056_N" == $("#cartForm  input[name=goodsType]").val() && "Y" == $("#cartForm  input[name=selfGoodsYn]").val()){
 			if(gagajf.isNull($("#cartForm  input[name=optCd2]").val())){
-				mcxDialog.alert("사이즈를 선택세요.");
+				mcxDialog.alert("사이즈를 선택해 주세요.");
 				return false;
 			}
 		}else{
@@ -827,7 +828,7 @@
 			});
 			
 			if (targetSize != itemSize){
-				mcxDialog.alert("구성상품들의 옵션을 선택하세요.");
+				mcxDialog.alert("옵션을 선택해 주세요.");
 				return false;
 			}
 		}
@@ -854,9 +855,9 @@
 	//옵션 갯수 변경
 	var fnChangeOrderEa = function() {
 
-		if("G056_N" == $("#cartForm  input[name=goodsType]").val()){
+		if("G056_N" == $("#cartForm  input[name=goodsType]").val() && "Y" == $("#cartForm  input[name=selfGoodsYn]").val()){
 			if(gagajf.isNull($("#cartForm  input[name=optCd2]").val())){
-				mcxDialog.alert("사이즈를 선택세요.");
+				mcxDialog.alert("사이즈를 선택해 주세요.");
 				return false;
 			}
 		}else{
@@ -871,7 +872,7 @@
 			});
 			
 			if (targetSize != itemSize){
-				mcxDialog.alert("구성상품들의 옵션을 선택하세요.");
+				mcxDialog.alert("옵션을 선택해 주세요.");
 				return false;
 			}
 		}
@@ -882,12 +883,12 @@
 		let buymax = parseInt($("#cartForm  input[name=maxOrdQty]").val());
 		let alertMsg = '';
 		if (ea < buymin) {
-			alertMsg ="최소 주문 가능 수량은 "+buymin+"개 입니다.";
+			alertMsg = buymin+"개 부터 구매 가능합니다.";
 			ea = buymin;
 		}
 
 		if (ea > buymax) {
-			alertMsg = "최대 주문 가능 수량은 "+buymax+"개 입니다.";
+			alertMsg = buymax+"개 까지만 구매 가능합니다.";
 			ea = buymax;
 		}
 
@@ -918,13 +919,23 @@
 		$('input[name="cea"]').each(function() {
 			let ea = parseInt($(this).val());
 			let addPrice = 0;
-			let target=$('.select_custom.item_opt2');
-			target.each(function() {
-				if (typeof ($(this).find('input[name=opt2]').val()) != 'undefined' && !gagajf.isNull($(this).find('input[name=opt2]').val())){
-					addPrice += Number($(this).find('input[name=opt2]').attr('addPrice'));	
-				}
-			});	
 			
+			if("G056_N" == $("#cartForm  input[name=goodsType]").val() && "Y" == $("#cartForm  input[name=selfGoodsYn]").val()){
+				let target=$('.opt_size').find('input[name=opt]');
+				target.each(function() {
+					if ($(this).is(":checked")){
+						addPrice += Number($(this).attr('addPrice'));	
+					}
+				});	
+			}else{
+			
+				let target=$('.select_custom.item_opt2');
+				target.each(function() {
+					if (typeof ($(this).find('input[name=opt2]').val()) != 'undefined' && !gagajf.isNull($(this).find('input[name=opt2]').val())){
+						addPrice += Number($(this).find('input[name=opt2]').attr('addPrice'));	
+					}
+				});	
+			}
 			let goodsPrice = parseInt($(this).parent().find('input[name="coption"]').attr('price'));
 
 			totalEa += ea;
@@ -945,8 +956,14 @@
 
 		if (goodsType == 'G056_N'){
 			if (gagajf.isNull($("#cartForm  input[name=optCd2]").val())) {
-				mcxDialog.alert("사이즈를 선택하세요.");
-				return;
+				if("Y" == $("#cartForm  input[name=selfGoodsYn]").val()){
+					mcxDialog.alert("사이즈를 선택해 주세요.");
+					return false;	
+				}else{
+					mcxDialog.alert("옵션을 선택해 주세요.");
+					return false;
+				}
+				
 			}
 		
 			let compsList = [];
@@ -977,7 +994,7 @@
 			});
 			
 			if (targetSize != itemSize){
-				mcxDialog.alert("구성상품들의 옵션을 선택하세요.");
+				mcxDialog.alert("옵션을 선택해 주세요.");
 				return false;
 			}
 			
@@ -1149,7 +1166,7 @@
 					}
 					
 				}else{
-					var opt_selecter02 = new sCombo('.opt_select .select_custom.item_opt2.item_opt2_1');
+					var opt_selecter02 = new sCombo('.opt_select .select_custom.item_opt2.item_opt2_1'); 
 				}	
 			}
 			

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

@@ -66,7 +66,10 @@
 /*<![CDATA[*/
 	
 	var fnGetList = function() {
-
+		
+		// 상품문의창 닫기
+		cfCloseLayer('layer_goods_qna_reg')
+	
 		$('#goodsQnaForm  input[name="secretYn"]').val('');
 		if ($("#goodsQnaForm input:checkbox[name=except_secret]").is(':checked')){
 			$('#goodsQnaForm  input[name="secretYn"]').val('N');

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

@@ -582,7 +582,9 @@
 				$('#ulGoodsReview').append(tag);
 			});
 		} else {
-			$('#goodsReviewForm').find('.nodata').show();
+			if ([[${reviewCount}]] > 0){
+				$('#goodsReviewForm').find('.nodata').show();	
+			}
 			$('#goodsReviewForm').find('.ui_row').hide();
 		}
 

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

@@ -347,7 +347,7 @@
 					</div>
 					<div class="btn_box">
 						<div class="btn_group_block ui_row">
-						<th:block  th:if="${goodsInfo.stockQty > 0}">
+						<th:block  th:if="${goodsInfo.stockQty > 0 and goodsInfo.goodsStat == 'G008_90'}">
 							<div class="ui_col_6">
 								<button type="button" class="btn btn_dark btn_block" id="btnGoodsWish" onclick="fnAddCart('C');"><span>쇼핑백</span></button>
 							</div>
@@ -355,7 +355,7 @@
 								<button type="button" class="btn btn_primary btn_block" id="btnGoodsCart" onclick="fnAddCart('O');"><span>바로구매</span></button>
 							</div>
 						</th:block>
-						<th:block  th:unless="${goodsInfo.stockQty > 0}">
+						<th:block  th:unless="${goodsInfo.stockQty > 0 and goodsInfo.goodsStat == 'G008_90'}">
 							<div class="ui_col_12">
 								<button type="button" class="btn btn_dark btn_block" disabled=""><span>SOLD OUT</span></button>
 							</div>

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

@@ -106,9 +106,7 @@
 			sureBtnClick: function() {
 				gagajf.ajaxFormSubmit($('#goodsQnaDetailForm').prop('action')
 						, $('#goodsQnaDetailForm')
-						, function() {
-							mcxDialog.alert("상품 문의가 등록되었습니다. 빠른 시일 내에 답변드리겠습니다.");
-						}
+						, fnGetList()
 				);
 			}
 		});

+ 1 - 0
src/main/webapp/biz/goods.js

@@ -61,6 +61,7 @@ var fnViewStock = function(obj, goodsCd, optCd, optCd1, optCd2,  minOrdQty, maxO
 			$("#cartForm  input[name=cea]").attr("readonly",false);
 			$("#cartForm  input[name=stock]").val(itemCnt);
 
+			$('.price_box').show();
 			fnSetTotalPrice();
 			
 			// 모바일에서 작업해야함

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

@@ -963,6 +963,7 @@ function cfnPutWishList(a) {
 				//		}
 				//	});
 				}
+				fnGetWishList();
 			} else if (result.status == "중복") {
 				Msg = '이미 등록 되어있습니다.';
 			} else {
@@ -984,6 +985,7 @@ function cfnPutWishList(a) {
 			if (result.status == "200") {
 				Msg = '삭제 되었습니다.';
 				$(a).removeClass('active');
+				fnGetWishList();
 			} else {
 				Msg = '오류로 인해 처리되지 않았습니다.';
 			}