팝업관련 수정

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

@@ -338,7 +338,7 @@ public class TsfDisplayController extends TsfBaseController {
 		mav.addObject("preview", paramMap.get("preview"));
 		mav.addObject("viewDt", paramMap.get("viewDt"));
 		mav.addObject("viewPage", "G037_31");
-		mav.addObject("popupCateNo", paramMap.get("brandGroupNo"));
+		mav.addObject("popupBrandCd", paramMap.get("brandGroupNo"));
 		mav.addObject("brandGroupNo", paramMap.get("brandGroupNo"));
 
 		//log.info("brandMainLayoutList::{}", brandMainLayoutList);
@@ -518,6 +518,7 @@ public class TsfDisplayController extends TsfBaseController {
 		if (paramMap.get("cateNo") != null && paramMap.get("cateNo") != "") {
 			popup.setCateNo(Integer.parseInt(paramMap.get("cateNo")));
 		}
+		popup.setBrandCd(paramMap.get("brandCd"));
 		popup.setPlanSq(paramMap.get("planSq"));
 		popup.setPreview(paramMap.get("preview"));
 		popup.setViewDt(paramMap.get("viewDt"));
@@ -824,7 +825,7 @@ public class TsfDisplayController extends TsfBaseController {
 		mav.addObject("outletMainLayoutList", outletMainLayoutList);
 		mav.addObject("preview", cate.getPreview());
 		mav.addObject("viewDt", cate.getViewDt());
-		mav.addObject("viewPage", "G037_30");
+		mav.addObject("viewPage", "G037_32");
 		mav.addObject("popupCateNo", cate.getCate1No());
 
 		mav.addObject("params", cate);

src/main/java/com/style24/persistence/domain/Popup.java

@@ -30,6 +30,7 @@ public class Popup extends TscBaseDomain {
 	private String linkUrl15;
 	private String viewPage;
 	private Integer cateNo;
+	private String brandCd;
 	private String planSq;
 	private Integer dispOrd;
 	private String preview = "N";

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

@@ -551,6 +551,9 @@
 		               <if test='planSq != null and planSq !=""'>
 		               AND PLAN_SQ = #{planSq}
 		               </if>
+		                <if test='brandCd != null and brandCd !=""'>
+		               AND BRAND_CD = #{brandCd}
+		               </if>
 		             )
 		    </if>
 		         )

src/main/webapp/WEB-INF/views/web/common/fragments/FooterWeb.html

@@ -1386,9 +1386,10 @@
 	}
 	
 	// 팝업
-	let fnGetPopup = function(){
+	let fnGetPopup = function(){debugger;
 		let data = {viewPage : [[${viewPage}]]
 					,cateNo : [[${popupCateNo}]]
+					,brandCd : [[${popupBrandCd}]]
 					,planSq : [[${popupPlanSq}]]
 					,preview : [[${preview}]]
 					,viewDt : [[${viewDt}]]
@@ -1437,27 +1438,43 @@
 						}	
 					}
 					
-					/* SLIDE - 메인 공지 팝업 */
-					var popup_main_notice_slide = new Swiper ('.popup_main_notice .swiper-container', {
-						loop: false,
-						slidesPerView:'auto',
-						spaceBetween: 0,
-						speed:200,
-						autoplay: false,
-						navigation: {
-							nextEl: '.popup_main_notice .swiper-button-next',
-							prevEl: '.popup_main_notice .swiper-button-prev',
-						},
-					});	
-
-					/* 메인 공지 팝업 갯수체크 */
+					/* 메인 공지 팝업 갯수체크 210430_수정 */
 					var popNoticeCont = $('.popup_main_notice .swiper-slide');
 					var popNoticeLength = popNoticeCont.length;
-					if (popNoticeLength == 1) {
+					if (popNoticeLength < 4) {
 						popNoticeCont.parents('.popup_body').addClass('onlyNotice');
+						var popup_main_notice_slide = new Swiper ('.popup_main_notice .swiper-container', {
+							loop: false,
+							watchOverflow: true, //loop와 함께 사용 불가.
+							slidesPerView:'auto',
+							spaceBetween: 0,
+							speed:200,
+							autoplay: {
+								delay: 3000,
+								disableOnInteraction: false,
+							},
+							navigation: {
+								nextEl: '.popup_main_notice .swiper-button-next',
+								prevEl: '.popup_main_notice .swiper-button-prev',
+							},
+						});	
 					} else {
 						popNoticeCont.parents('.popup_body').removeClass('onlyNotice');
-					}
+						var popup_main_notice_slide = new Swiper ('.popup_main_notice .swiper-container', {
+							loop: true,
+							slidesPerView:'auto',
+							spaceBetween: 0,
+							speed:200,
+							autoplay: {
+								delay: 3000,
+								disableOnInteraction: false,
+							},
+							navigation: {
+								nextEl: '.popup_main_notice .swiper-button-next',
+								prevEl: '.popup_main_notice .swiper-button-prev',
+							},
+						});	
+					}	
 					
 				}
 			}