Merge branch 'eskim' into develop

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

@@ -286,12 +286,12 @@ public class TsfGoodsController extends TsfBaseController {
 		}
 
 		// 상품 문의건수
-		Counsel counsel = new Counsel();
-		counsel.setRelGoodsCd(goods.getGoodsCd());
-		counsel.setSiteCd(TscConstants.Site.STYLE24.value());
-		counsel.setGoodsType(goods.getGoodsType());	 // 딜상품(G056_D)일 경우 구성상품의 상품평수 
-		int goodsQnaCnt = counselService.getGoodsQnaTotalCount(counsel);
-		mav.addObject("goodsQnaCnt", goodsQnaCnt);
+//		Counsel counsel = new Counsel();
+//		counsel.setRelGoodsCd(goods.getGoodsCd());
+//		counsel.setSiteCd(TscConstants.Site.STYLE24.value());
+//		counsel.setGoodsType(goods.getGoodsType());	 // 딜상품(G056_D)일 경우 구성상품의 상품평수 
+//		int goodsQnaCnt = counselService.getGoodsQnaTotalCount(counsel);
+//		mav.addObject("goodsQnaCnt", goodsQnaCnt);
 
 //		// 상품포인트사용방법
 //		mav.addObject("goodsPointMothod", envsetService.getPointMothod(TscConstants.Site.STYLE24.value())); // A:정액, R:정율

src/main/java/com/style24/persistence/mybatis/shop/TsfGoods.xml

@@ -171,6 +171,7 @@
 		     , GS.SCORE_BALL1
 		     , GS.SCORE_BALL2
 		     , GS.SCORE_BALL3
+		     , GS.GOODS_QNA_CNT
 		     , (SELECT TI.SIZE_GB FROM TB_ITEMKIND TI WHERE TI.ITEMKIND_CD = G.ITEMKIND_CD) AS SIZE_GB
 		FROM TB_GOODS G
 		INNER JOIN TB_GOODS_SUMMARY GS ON G.GOODS_CD = GS.GOODS_CD

src/main/resources/config/application-tsit.yml

@@ -35,7 +35,7 @@ upload:
         target.path: /TSIT/servers/files/data/style24/Upload/ProductImage
         max.size: 10
         allow.extension: jpg|gif|jpeg|png
-        view: //image.istyle24.com/Upload/ProductImage
+        view: //tdimage.style24.com/Upload/ProductImage
     image:
         target.path: /TSIT/servers/files/data/style24
         max.size: 10

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

@@ -183,8 +183,9 @@
 					<i class="ico ico_kcl"></i>
 				</div>
 				<div>
-					<p class="tit normal"  th:text="${goodsSafeNo.certDiv + ' / ' + goodsSafeNo.certOrganName}">
-					</p>
+					<th:block th:if="${not #strings.contains(goodsSafeNo.certNum, '해당')}" >
+					<p class="tit normal"  th:text="${goodsSafeNo.certDiv + ' / ' + goodsSafeNo.certOrganName}"></p>
+					</th:block>
 					<p class="normal">
 						<th:block th:if="${#strings.contains(goodsSafeNo.certNum, '해당')}" >
 						해당 없음 

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

@@ -377,7 +377,9 @@
 							<i class="ico ico_kcl"></i>
 						</div>
 						<div>
+							<th:block th:if="${not #strings.contains(goodsSafeNo.certNum, '해당')}" >
 							<p class="tit normal"  th:text="${goodsSafeNo.certDiv + ' / ' + goodsSafeNo.certOrganName}">
+							</
 							</p>
 								<p class="normal" >
 								<th:block th:if="${#strings.contains(goodsSafeNo.certNum, '해당')}" >
@@ -551,7 +553,7 @@
 					<li>
 						<div class="ex_qna">
 							<a href="javascript:void(0);" id="btn_pdQnaList_pop" th:onclick="cfGoodsQng([[${goodsInfo.goodsCd}]])">
-								<span class="tit">문의<em class="number">(<th:block  th:text="${(goodsQnaCnt <= 9999) ? #numbers.formatInteger(goodsQnaCnt, 0,'COMMA')  : '9,999+'}"></th:block>)</em></span>
+								<span class="tit">문의<em class="number">(<th:block  th:text="${(goodsInfo.goodsQnaCnt <= 9999) ? #numbers.formatInteger(goodsInfo.goodsQnaCnt, 0,'COMMA')  : '9,999+'}"></th:block>)</em></span>
 							</a>
 						</div>
 					</li>

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

@@ -191,9 +191,11 @@
 		</div>
 		<div class="area_kcl" th:if="${goodsSafeNo != null}">
 			<i class="ico ico_kcl"></i>
+			<th:block th:if="${not #strings.contains(goodsSafeNo.certNum, '해당')}" >
 			<p class="tit normal"  th:text="${goodsSafeNo.certDiv + ' / ' + goodsSafeNo.certOrganName}">
 				어린이제품 안전인증 / 한국건설생활시험연구원(KCL)
 			</p>
+			</th:block>
 			<p class="normal" >
 				<th:block th:if="${#strings.contains(goodsSafeNo.certNum, '해당')}" >
 				해당 없음 

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

@@ -444,7 +444,7 @@
 						$('.form_field .select_custom.deal_opt2').attr('disabled', false);	
 						//------
 						tag1 += '<div class="combo">\n';
-						tag1 += '<div class="select">옵션2</div>\n';
+						tag1 += '<div class="select">옵션2선택</div>\n';
 						tag1 += '<ul class="list">\n';
 						//------
 						//tag1 += '<li class="selected" id="goodsOpt2">옵션2</li>\n';	
@@ -482,19 +482,15 @@
 				if (flag == "layer"){
 					$objUp.prepend(tagUpS);
 					var pop_desc_option02 = new sCombo('.pd_descrp_pop .opt_select .select_custom.deal_opt2');
-					$('.pd_descrp_pop .opt_select .select_custom.deal_opt2').addClass('on');
-					$('.pd_descrp_pop .opt_select .select_custom.deal_opt2').find('.list').css('display','block');
+					$('.pd_descrp_pop .opt_select .select_custom.deal_opt2').find('.combo .select').trigger('click');
 				}else if (flag == "Up"){
 					$objUp.prepend(tagUpS);
 					var detail_deal_option03 = new sCombo('.pd_detail .opt_select .select_custom.deal_opt2');
-					$('.pd_detail .opt_select .select_custom.deal_opt2').addClass('on');
-					$('.pd_detail .opt_select .select_custom.deal_opt2').find('.list').css('display','block');
+					$('.pd_detail .opt_select .select_custom.deal_opt2').find('.combo .select').trigger('click');
 				}else{
 					$objDown.prepend(tagDownS);
 					var desc_option03 = new sCombo('.pd_desc_wrap .opt_select .select_custom.deal_opt2');
-					$('.pd_desc_wrap .opt_select .select_custom.deal_opt2').addClass('on');
-					$('.pd_desc_wrap .opt_select .select_custom.deal_opt2').find('.list').css('display','block');
-
+					$('.pd_desc_wrap .opt_select .select_custom.deal_opt2').find('.combo .select').trigger('click');
 				}
 			}
 			

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

@@ -123,7 +123,6 @@
 								<p>
 									<span class="tit">남은시간</span>
 									<span class="timer">
-										<em id="d-days" style="display:none;">0</em>
 										<em id="d-hours">0</em>
 										<em id="d-minutes">0</em>
 										<em id="d-seconds">0</em>
@@ -412,7 +411,7 @@
 									<li>
 										<div class="ex_qna">
 											<a href="javascript:void(0);" id="btn_pdQnaList_pop" th:onclick="cfGoodsQng([[${goodsInfo.goodsCd}]])" >
-												<span class="tit">문의<em class="number">(<th:block  th:text="${(goodsQnaCnt <= 9999) ? #numbers.formatInteger(goodsQnaCnt, 0,'COMMA')  : '9,999+'}"></th:block>)</em></span>
+												<span class="tit">문의<em class="number">(<th:block  th:text="${(goodsInfo.goodsQnaCnt <= 9999) ? #numbers.formatInteger(goodsInfo.goodsQnaCnt, 0,'COMMA')  : '9,999+'}"></th:block>)</em></span>
 											</a>
 										</div>
 									</li>
@@ -498,8 +497,6 @@
 				</div>
 				</th:block>
 				
-				
-				
 				<!-- 관리자 에디터입력 내용 노출  상단 html -->
 				<th:block  th:if="${goodsInfo.goodsTopDesc != null  and !goodsInfo.goodsTopDesc.empty}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTopDesc))}"></th:block >
 				</div>	
@@ -626,9 +623,11 @@
 					</div>
 					<div class="area_kcl" th:if="${goodsSafeNo != null}">
 						<i class="ico ico_kcl"></i>
+						<th:block th:if="${not #strings.contains(goodsSafeNo.certNum, '해당')}" >
 						<p class="tit normal" th:text="${goodsSafeNo.certDiv + ' / ' + goodsSafeNo.certOrganName}">
 							어린이제품 안전인증 / 한국건설생활시험연구원(KCL)
 						</p>
+						</th:block>
 						<p class="normal" >
 							<th:block th:if="${#strings.contains(goodsSafeNo.certNum, '해당')}" >
 							해당 없음 
@@ -1238,7 +1237,7 @@
 						$('.form_field .select_custom.item_opt2.' +item.goodsCd ).attr('disabled', false)
 						//------
 						tag += '<div class="combo">\n';
-						tag += '<div class="select">옵션2</div>\n';
+						tag += '<div class="select">옵션2선택</div>\n';
 						tag += '<ul class="list">\n';
 						//------
 						//tag += '<li class="selected" id="goodsOpt2'+item.goodsCd+'">선택</li>\n';	
@@ -1288,7 +1287,7 @@
 					
 				}else{
 					var opt_selecter02 = new sCombo('.opt_select .select_custom.item_opt2.item_opt2_1');
-					$('.opt_set_select .select_custom.item_opt2.item_opt2_1').find('.combo .select').trigger('click');
+					$('.opt_select .select_custom.item_opt2.item_opt2_1').find('.combo .select').trigger('click');
 					
 				}	
 			}
@@ -1529,15 +1528,7 @@
 					if (hours < '10') { hours = '0' + hours; }
 					if (minutes < '10') { minutes = '0' + minutes; }
 					if (seconds < '10') { seconds = '0' + seconds; }
-	
-					console.log('days :' + days);
-					if (Number(days) > 0 ){
-						hours = Number(hours) + (Number(days) * 24);
-						$('#d-days').remove();
-					}else{
-						//$('#d-days').css('display','none');
-						$('#d-days').remove();
-					}
+					
 					$('#d-hours').html(hours);
 					$('#d-minutes').html(minutes);
 					$('#d-seconds').html(seconds);		

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

@@ -145,12 +145,12 @@
 		
 		// Create pagination
 		gagaPaging.createPagination(result.paging.pageable);
-		debugger;
-		if ('G056_N' == $('#cartForm input[name=goodsType]')){
+		
+		/* if ('G056_N' == $('#cartForm input[name=goodsType]')){
 			$('.ex_qna').find('.number').html('('+ result.paging.pageable.totalCount +')');	
 		}else{
 			$('.pd_qnalist').find('.select_custom.deal_opt_item').find('.combo .select').find('.itemPostCount').html('(문의 '+ result.paging.pageable.totalCount +')');	
-		}
+		} */
 		
 	}
 	

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

@@ -436,7 +436,7 @@
 						<div class="form_field">
 							<div class="select_custom deal_opt2" disabled>
 								<div class="combo">
-									<div class="select">옵션2</div>
+									<div class="select">옵션2선택</div>
 									<ul class="list"  id="goodsDealOptLayer2">
 										<!--  옵션 2 -->
 									</ul>