Merge branch 'sowon' into develop

src/main/webapp/WEB-INF/views/mob/planning/PlanningDetailFormMob.html

@@ -775,15 +775,15 @@ if(template.length>0){
 			html += '							<div class="best_review">\n';
 			if(item.reviewSysImg!= null){
 				if (item.bestYn == 'Y') {
-					html += '								<a href="javascript:void();" onclick="cfPlanningReviewDetail(\''+item.goodsCd+'\',\'Y\', \'Y\',\''+item.reviewSq+'\',0);">\n';
+					html += '								<a href="javascript:void();" onclick="cfPlanningReviewDetail(\''+item.goodsCd+'\',\'Y\', \'Y\',\''+item.reviewSq+'\',1);">\n';
 				}else{
-					html += '								<a href="javascript:void();" onclick="cfPlanningReviewDetail(\''+item.goodsCd+'\',\'N\', \'Y\',\''+item.reviewSq+'\',0);">\n';
+					html += '								<a href="javascript:void();" onclick="cfPlanningReviewDetail(\''+item.goodsCd+'\',\'N\', \'Y\',\''+item.reviewSq+'\',1);">\n';
 				}
 			}else{
 				if (item.bestYn == 'Y') {
-					html += '								<a href="javascript:void();" onclick="cfPlanningReviewDetail(\''+item.goodsCd+'\',\'Y\', \'N\',\''+item.reviewSq+'\',0);">\n';
+					html += '								<a href="javascript:void();" onclick="cfPlanningReviewDetail(\''+item.goodsCd+'\',\'Y\', \'N\',\''+item.reviewSq+'\',1);">\n';
 				}else{
-					html += '								<a href="javascript:void();" onclick="cfPlanningReviewDetail(\''+item.goodsCd+'\',\'N\', \'N\',\''+item.reviewSq+'\',0);">\n';
+					html += '								<a href="javascript:void();" onclick="cfPlanningReviewDetail(\''+item.goodsCd+'\',\'N\', \'N\',\''+item.reviewSq+'\',1);">\n';
 				}
 			}
 			html += '									<div class="lap">\n';

src/main/webapp/WEB-INF/views/web/planning/PlanningDetailFormWeb.html

@@ -62,29 +62,7 @@
 							</div>
 						</div>
 					</div>
-				<div class="coner_item01" th:if="${fsrcInfoTop != null}" th:utext="${#strings.replace(#strings.replace(fsrcInfoTop.fsrcPc,'&amplt;','<'),'&ampgt;','>')}">
-                    <!-- 프로모션배너 type1 --> 
-                    <!-- <div class="promotion_visual type1" th:if="${fsrcInfoTop != null and planInfo.planGb == 'P'}" th:utext="${#strings.replace(#strings.replace(fsrcInfoTop.fsrcPc,'&amplt;','<'),'&ampgt;','>')}"></div> -->
-                    <!-- <div class="promotion_visual type2" th:if="${fsrcInfoTop != null}" th:utext="${#strings.replace(#strings.replace(fsrcInfoTop.fsrcPc,'&amplt;','<'),'&ampgt;','>')}"></div> -->           
-                    <!-- 프로모션배너 type1 -->                    
-                    <!-- 프로모션배너 type2 --> 
-               <!-- <div class="promotion_visual type2">
-                        <div class="swiper-container">
-                            <div class="swiper-wrapper ">
-                                <div class="swiper-slide">
-                                    <img alt="" src="/images/pc/thumb/bigbanner_slide01.png">
-                                </div>
-                                <div class="swiper-slide">
-                                    <img alt="" src="/images/pc/thumb/bigbanner_slide02.png"> 
-                                </div>
-                            </div>
-                        </div>
-                        <div class="swiper-button-prev"></div>
-                        <div class="swiper-button-next"></div>
-                        <div class="swiper-pagination"></div>
-                    </div> -->
-                    <!-- 프로모션배너 type2 -->                    
-                </div>
+				<div class="coner_item01" th:if="${fsrcInfoTop != null}" th:utext="${#strings.replace(#strings.replace(fsrcInfoTop.fsrcPc,'&amplt;','<'),'&ampgt;','>')}"></div>
             </div>
             <!-- //상단 프로모션 배너 -->
             
@@ -96,7 +74,7 @@
 						 <div class="content wide dp_coupon" th:id="${a.tmplType}" style="display: none"></div>  <!-- //할인쿠폰 -->
 					</th:block>
 				<th:block th:if="${a.tmplType == 'G082_30'}">
-						<div class="content dp_mid_banner" th:id="${a.tmplType}" style="display: none"></div> <!-- //이미지-->
+						<div class="cont_body" th:id="${a.tmplType}" style="display: none"></div> <!-- //이미지-->
 					</th:block>
 				<th:block th:if="${a.tmplType == 'G082_50'}">
 						<div class="content dp_special" th:id="${a.tmplType + a.planContSq}" style="display: none"></div>
@@ -416,16 +394,16 @@ if(template.length>0){
 			html += '			<div class="best_review">\n';
 			if(item.reviewSysImg!= null){
 				if (item.bestYn == 'Y') {
-					html += '				<a href="javascript:void();" id="btn_pdBestReview_pop" onclick="cfPlanningReviewDetail(\''+item.goodsCd+'\',\'Y\', \'Y\',\''+item.reviewSq+'\',0);">\n';
+					html += '				<a href="javascript:void();" id="btn_pdBestReview_pop" onclick="cfPlanningReviewDetail(\''+item.goodsCd+'\',\'Y\', \'Y\',\''+item.reviewSq+'\',1);">\n';
 				}else{
-					html += '				<a href="javascript:void();" id="btn_pdBestReview_pop" onclick="cfPlanningReviewDetail(\''+item.goodsCd+'\',\'N\', \'Y\',\''+item.reviewSq+'\',0);">\n';
+					html += '				<a href="javascript:void();" id="btn_pdBestReview_pop" onclick="cfPlanningReviewDetail(\''+item.goodsCd+'\',\'N\', \'Y\',\''+item.reviewSq+'\',1);">\n';
 				}
 				
 			}else{
 				if (item.bestYn == 'Y') {
-					html += '				<a href="javascript:void();" id="btn_pdBestReview_pop" onclick="cfPlanningReviewDetail(\''+item.goodsCd+'\',\'Y\', \'N\',\''+item.reviewSq+'\',0);">\n';
+					html += '				<a href="javascript:void();" id="btn_pdBestReview_pop" onclick="cfPlanningReviewDetail(\''+item.goodsCd+'\',\'Y\', \'N\',\''+item.reviewSq+'\',1);">\n';
 				}else{
-					html += '				<a href="javascript:void();" id="btn_pdBestReview_pop" onclick="cfPlanningReviewDetail(\''+item.goodsCd+'\',\'N\', \'N\',\''+item.reviewSq+'\',0);">\n';
+					html += '				<a href="javascript:void();" id="btn_pdBestReview_pop" onclick="cfPlanningReviewDetail(\''+item.goodsCd+'\',\'N\', \'N\',\''+item.reviewSq+'\',1);">\n';
 				}
 				
 			}
@@ -488,8 +466,7 @@ if(image.length>0){
 		$("#G082_30").show();
 		var html = '';
 		
-		html += '<div class="cont_body">\n     ';
-		html += '    <div class="mid_banner">\n';
+		html += '    <div class="promotion_visual type2">\n';
 		html += '        <div class="swiper-container">\n';
 		html += '            <div class="swiper-wrapper">\n';
 		for (var i = 0; i < image.length; i++) {
@@ -508,7 +485,6 @@ if(image.length>0){
 		html += '        <div class="swiper-button-next"></div>\n';
 		html += '        <div class="swiper-pagination"></div>\n';
 		html += '    </div>\n';
-		html += '</div>\n';
 		
 		$("#G082_30").append(html);
 	}
@@ -1147,19 +1123,20 @@ $(document).ready( function() {
     });            
 
     /* SLIDE - 상단 프로모션 배너 */
-	var promotion_visual_slide = new Swiper ('.dp_detail_visual .promotion_visual.type2 .swiper-container', {
+	var promotion_visual_slide = new Swiper ('.promotion_visual.type2 .swiper-container', {
 		loop: true,
 		slidesPerView: 1,
-		speed : 1500,
+              autoHeight:true,
+		speed : 1000,
 		navigation: {
 			nextEl: '.promotion_visual.type2 .swiper-button-next',
 			prevEl: '.promotion_visual.type2 .swiper-button-prev',
 		},
-        pagination: {
+              pagination: {
 			el: '.promotion_visual.type2 .swiper-pagination',
 			clickable: true,
 		},
-	}); 
+	});
 
     /* SLIDE - 중간 배너 */
 	var mid_banner_slide = new Swiper ('.dp_mid_banner .mid_banner .swiper-container', {