Merge remote-tracking branch 'origin/develop' into jsh77b

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

@@ -123,15 +123,7 @@ public class TsfGoodsController extends TsfBaseController {
 		ModelAndView mav = new ModelAndView();
 
 		String afLinkCd = paramsGoods.getAfLinkCd();
-		if (StringUtils.isBlank(paramsGoods.getGoodsCd())) {
-			if (StringUtils.isBlank(afLinkCd)) {
-				mav.setViewName("redirect:/display/mall/main/form");
-			} else {
-				mav.setViewName("redirect:/display/mall/main/form?af=" + afLinkCd);
-			}
-			return mav;
-		}
-
+		
 		// 상품관련 기본값 설정(회원 등급, 앱, PC/모바일 등)
 		setGoods(paramsGoods);
 
@@ -140,12 +132,33 @@ public class TsfGoodsController extends TsfBaseController {
 			paramsGoods.setFrontGb("M");
 		}
 
+		
+		if (StringUtils.isBlank(paramsGoods.getGoodsCd())) {
+//			if (StringUtils.isBlank(afLinkCd)) {
+//				mav.setViewName("redirect:/display/mall/main/form");
+//			} else {
+//				mav.setViewName("redirect:/display/mall/main/form?af=" + afLinkCd);
+//			}
+			if ("Y".equals(mobileYn)) {
+				mav.setViewName("mob/goods/Goods404FormMob");
+			} else {
+				mav.setViewName(super.getDeviceViewName("goods/Goods404Form"));
+			}
+			return mav;
+		}
+
+		
 		Goods goods = goodsService.getGoodsInfo(paramsGoods);
 		if (goods == null || goods.getGoodsCd().isEmpty()) {
-			if (StringUtils.isBlank(afLinkCd)) {
-				mav.setViewName("redirect:/display/mall/main/form");
+//			if (StringUtils.isBlank(afLinkCd)) {
+//				mav.setViewName("redirect:/display/mall/main/form");
+//			} else {
+//				mav.setViewName("redirect:/display/mall/main/form?af=" + afLinkCd);
+//			}
+			if ("Y".equals(mobileYn)) {
+				mav.setViewName("mob/goods/Goods404FormMob");
 			} else {
-				mav.setViewName("redirect:/display/mall/main/form?af=" + afLinkCd);
+				mav.setViewName(super.getDeviceViewName("goods/Goods404Form"));
 			}
 			return mav;
 		}
@@ -1062,7 +1075,7 @@ public class TsfGoodsController extends TsfBaseController {
 
 		// 상품관련 기본값 설정(회원 등급, 앱, PC/모바일 등)
 		setGoods(paramsGoods);
-		log.info("createGoodsCoupon  paramsGoods {}", paramsGoods);
+		//log.info("createGoodsCoupon  paramsGoods {}", paramsGoods);
 
 		// 일반상품과 딜상품 구분
 		Goods goods = goodsService.getGoodsInfo(paramsGoods);
@@ -1073,7 +1086,7 @@ public class TsfGoodsController extends TsfBaseController {
 			return result;
 		}
 
-		log.info("createGoodsCoupon  goods {}", goods);
+		//log.info("createGoodsCoupon  goods {}", goods);
 		if (TscConstants.GoodsType.DEAL.value().equals(goods.getGoodsType())) {
 			Collection<Goods> goodsDealComposeList = goodsService.getGoodsDealComposeList(paramsGoods);
 			// 상품쿠폰

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

@@ -1841,8 +1841,7 @@
 		         , G.GOODS_TNM          /*상품타이틀명*/
 		         , G.MAIN_COLOR_CD      /*대표색상코드*/
 		         , G.LIST_PRICE         /*정상가(최초판매가)*/
-		, G.CURR_PRICE         /*현재판매가*/
-		         , G.REG_DT             /*등록일시*/
+		         , G.CURR_PRICE         /*현재판매가*/
 		    FROM   (
 		            SELECT DISTINCT CASE WHEN BG.DISP_NM_LANG = 'EN' THEN
 		                            BG.BRAND_GROUP_ENM
@@ -1860,9 +1859,23 @@
 		                 , G.MAIN_COLOR_CD                                          /*대표색상코드*/
 		                 , G.LIST_PRICE                                             /*정상가(최초판매가)*/
 		                 , G.CURR_PRICE                                             /*현재판매가*/
-		                 , G.REG_DT                                                 /*등록일시*/
+		                <choose>
+		                	<when test="brandGroupNo != null and brandGroupNo != ''">
+		                		, G.REG_DT                                                 /*등록일시*/
+		                	</when>
+		                	<otherwise>
+		                		, CG.REG_DT
+		                	</otherwise>
+		                </choose>
 		            FROM   TB_CATE_4SRCH C4
-		                 , TB_CATE_GOODS CG
+		            <choose>
+		                <when test="brandGroupNo != null and brandGroupNo != ''">
+		                , TB_CATE_GOODS CG
+		                </when>
+		                <otherwise>
+		                , TB_CATE_GOODS_RECENT CG
+		                </otherwise>
+		            </choose>
 		                 , TB_GOODS G
 		                 , TB_GOODS_STOCK GS
 		                 , TB_BRAND B
@@ -1878,16 +1891,11 @@
 		            <if test="cate1No != null and cate1No != ''">
 		            AND    C4.CATE1_NO = #{cate1No}
 		            </if>
-		            <choose>
-		                <when test="brandGroupNo != null and brandGroupNo != ''">
+		            <if test="brandGroupNo != null and brandGroupNo != ''">
 		            AND    B.BRAND_GROUP_NO = #{brandGroupNo}
-		                </when>
-		                <otherwise>
-		            AND    CG.BRAND_GROUP_NO = 0 /*브랜드메인에서 접근한 것이 아니면*/
-		                </otherwise>
-		            </choose>
+		            </if>
 		            <if test="exceptGoodsArr != null and exceptGoodsArr.length > 0">
-		            AND	   CG.GOODS_CD NOT IN
+		            AND	   G.GOODS_CD NOT IN
 		                <foreach collection="exceptGoodsArr" item="item" index="index"  open="(" close=")" separator=",">
 		                #{item}
 		                </foreach>
@@ -1899,7 +1907,14 @@
 		            AND    GS.STOCK_QTY <![CDATA[>]]> 0 /*재고있는상품*/
 		            AND    B.USE_YN = 'Y'
 		            AND    BG.USE_YN = 'Y'
-		            ORDER BY G.REG_DT DESC, G.GOODS_CD
+		        <choose>
+		        	<when test="brandGroupNo != null and brandGroupNo != ''">
+		        		ORDER BY G.REG_DT DESC, G.GOODS_CD
+		        	</when>
+		        	<otherwise>
+		        		ORDER BY CG.REG_DT DESC
+		        	</otherwise>
+		        </choose>
 		            <if test="maxRow != null and maxRow !=''">
 		            LIMIT #{maxRow}
 		            </if>

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

@@ -1776,87 +1776,96 @@
 		        ,(CASE WHEN RNK.LIST_PRICE > 0 THEN 100 - ROUND((RNK.CURR_PRICE / RNK.LIST_PRICE) * 100 ,0) ELSE 0 END ) AS DC_RATE
 		      FROM
 		         (
-		          SELECT  ROW_NUMBER() OVER (PARTITION BY GOODS.BRAND_GROUP_NO ORDER BY GOODS.DISP_ORD DESC) AS RNUM
+		          SELECT  ROW_NUMBER() OVER (PARTITION BY GOODS.BRAND_GROUP_NO ORDER BY GOODS.DISP_ORD DESC, GOODS.DIS) AS RNUM
 		                 , GOODS.*
 		            FROM 
 		                (
-		                 SELECT 
-		                    CASE WHEN BG.DISP_NM_LANG = 'EN' THEN
-		                             BG.BRAND_GROUP_ENM
-		                         ELSE
-		                             BG.BRAND_GROUP_KNM
-		                    END                                    AS BRAND_NM /*브랜드그룹명*/
-		                  , SDB.BRAND_GROUP_NO 
-		                  , SDB.DISP_ORD
-		                  , G.GOODS_CD 
-		                  , G.GOODS_NM 
-		                  , G.GOODS_GB                                               /*상품구분*/
-		                  , G.FOREIGN_BUY_YN                                         /*해외구매대행여부*/
-		                  , G.PARALLEL_IMPORT_YN                                     /*병행수입여부*/
-		                  , G.ORDER_MADE_YN                                          /*주문제작여부*/
-		                  , G.GOODS_TNM                                              /*상품타이틀명*/
-		                  , G.MAIN_COLOR_CD                                          /*대표색상코드*/
-		                  , G.LIST_PRICE                                             /*정상가(최초판매가)*/
-		                  , G.CURR_PRICE                                             /*현재판매가*/
-		                FROM   TB_SHOT_DELV_BRAND SDB
-		                                 INNER JOIN TB_SHOT_DELV_GOODS SDG
-		                        ON SDB.BRAND_GROUP_NO = SDG.BRAND_GROUP_NO
-		                                 INNER JOIN TB_GOODS G
-		                        ON SDG.GOODS_CD = G.GOODS_CD 
-		                          		  INNER JOIN TB_BRAND B
-		                        ON G.BRAND_CD = B.BRAND_CD 
-		                                 INNER JOIN TB_BRAND_GROUP BG 
-		                        ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO 
-		                                 INNER JOIN TB_GOODS_STOCK GS
-		                        ON SDG.GOODS_CD = GS.GOODS_CD 
-		                WHERE  1=1  
-		                AND    G.GOODS_CD NOT IN (SELECT GOODS_CD FROM TB_GOODS_SHOT_DELV_SKIP GSDS)
-		                AND    G.SELF_GOODS_YN = 'Y'
-		                AND    G.SELF_MALL_YN = 'Y'
-		                AND    SDG.DEL_YN = 'N'
-		                AND    G.GOODS_STAT = 'G008_90' /*승인완료상품*/
-		                AND    NOW() BETWEEN G.SELL_STDT AND G.SELL_EDDT /*현재 판매되는 상품*/
-		                AND    B.USE_YN = 'Y' /*사용하는 브랜드*/
-		                AND    BG.USE_YN = 'Y' /*사용하는 브랜드그룹*/
-		                AND    GS.STOCK_QTY  <![CDATA[>]]>  0 /*재고있는상품*/
-		                UNION 
-		                SELECT 
-		                       CASE WHEN BG.DISP_NM_LANG = 'EN' THEN
-		                                BG.BRAND_GROUP_ENM
-		                            ELSE
-		                                BG.BRAND_GROUP_KNM
-		                       END                                    AS BRAND_NM /*브랜드그룹명*/
-		                     , SDB.BRAND_GROUP_NO 
-		                     , SDB.DISP_ORD
-		                     , G.GOODS_CD 
-		                     , G.GOODS_NM 
-		                     , G.GOODS_GB                                               /*상품구분*/
-		                     , G.FOREIGN_BUY_YN                                         /*해외구매대행여부*/
-		                     , G.PARALLEL_IMPORT_YN                                     /*병행수입여부*/
-		                     , G.ORDER_MADE_YN                                          /*주문제작여부*/
-		                     , G.GOODS_TNM                                              /*상품타이틀명*/
-		                     , G.MAIN_COLOR_CD                                          /*대표색상코드*/
-		                     , G.LIST_PRICE                                             /*정상가(최초판매가)*/
-		                     , G.CURR_PRICE                                             /*현재판매가*/
-		                FROM   TB_SHOT_DELV_BRAND SDB
-		                                  INNER JOIN TB_BRAND_GROUP BG 
-		                        ON SDB.BRAND_GROUP_NO = BG.BRAND_GROUP_NO 
-		                                  INNER JOIN TB_BRAND B
-		                        ON BG.BRAND_GROUP_NO = B.BRAND_GROUP_NO 
-		                                 INNER JOIN TB_GOODS G
-		                        ON B.BRAND_CD = G.BRAND_CD 
-		                                 INNER JOIN TB_GOODS_STOCK GS
-		                        ON G.GOODS_CD = GS.GOODS_CD 
-		                WHERE  1=1  
-		                AND    G.GOODS_CD NOT IN (SELECT GOODS_CD FROM TB_GOODS_SHOT_DELV_SKIP GSDS)
-		                AND    G.SELF_GOODS_YN = 'Y'
-		                AND    G.SELF_MALL_YN = 'Y'
-		                AND    G.GOODS_STAT = 'G008_90' /*승인완료상품*/
-		                AND    NOW() BETWEEN G.SELL_STDT AND G.SELL_EDDT /*현재 판매되는 상품*/
-		                AND    B.USE_YN = 'Y' /*사용하는 브랜드*/
-		                AND    BG.USE_YN = 'Y' /*사용하는 브랜드그룹*/
-		                AND    GS.STOCK_QTY  <![CDATA[>]]>  0 /*재고있는상품*/
+		                  SELECT AA.*
+		                        ,COUNT(*) OVER(PARTITION BY GOODS_CD) AS GOODS_CD_CNT
+		                  FROM 		                 
+		                       (	                
+		                        SELECT 
+		                           CASE WHEN BG.DISP_NM_LANG = 'EN' THEN
+		                                    BG.BRAND_GROUP_ENM
+		                                ELSE
+		                                    BG.BRAND_GROUP_KNM
+		                           END                                    AS BRAND_NM /*브랜드그룹명*/
+		                         , SDB.BRAND_GROUP_NO 
+		                         , SDB.DISP_ORD
+		                         , G.GOODS_CD 
+		                         , G.GOODS_NM 
+		                         , G.GOODS_GB                                               /*상품구분*/
+		                         , G.FOREIGN_BUY_YN                                         /*해외구매대행여부*/
+		                         , G.PARALLEL_IMPORT_YN                                     /*병행수입여부*/
+		                         , G.ORDER_MADE_YN                                          /*주문제작여부*/
+		                         , G.GOODS_TNM                                              /*상품타이틀명*/
+		                         , G.MAIN_COLOR_CD                                          /*대표색상코드*/
+		                         , G.LIST_PRICE                                             /*정상가(최초판매가)*/
+		                         , G.CURR_PRICE                                             /*현재판매가*/
+		                         , 1 AS DIS
+		                        FROM   TB_SHOT_DELV_BRAND SDB
+		                                        INNER JOIN TB_SHOT_DELV_GOODS SDG
+		                               ON SDB.BRAND_GROUP_NO = SDG.BRAND_GROUP_NO
+		                                        INNER JOIN TB_GOODS G
+		                               ON SDG.GOODS_CD = G.GOODS_CD 
+		                            	        INNER JOIN TB_BRAND B
+		                               ON G.BRAND_CD = B.BRAND_CD 
+		                                        INNER JOIN TB_BRAND_GROUP BG 
+		                               ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO 
+		                                        INNER JOIN TB_GOODS_STOCK GS
+		                               ON SDG.GOODS_CD = GS.GOODS_CD 
+		                        WHERE  1=1  
+		                        AND    G.GOODS_CD NOT IN (SELECT GOODS_CD FROM TB_GOODS_SHOT_DELV_SKIP GSDS)
+		                        AND    G.SELF_GOODS_YN = 'Y'
+		                        AND    G.SELF_MALL_YN = 'Y'
+		                        AND    SDG.DEL_YN = 'N'
+		                        AND    G.GOODS_STAT = 'G008_90' /*승인완료상품*/
+		                        AND    NOW() BETWEEN G.SELL_STDT AND G.SELL_EDDT /*현재 판매되는 상품*/
+		                        AND    B.USE_YN = 'Y' /*사용하는 브랜드*/
+		                        AND    BG.USE_YN = 'Y' /*사용하는 브랜드그룹*/
+		                        AND    GS.STOCK_QTY  <![CDATA[>]]>  0 /*재고있는상품*/
+		                        UNION ALL
+		                        SELECT 
+		                              CASE WHEN BG.DISP_NM_LANG = 'EN' THEN
+		                                       BG.BRAND_GROUP_ENM
+		                                   ELSE
+		                                       BG.BRAND_GROUP_KNM
+		                              END                                    AS BRAND_NM /*브랜드그룹명*/
+		                            , SDB.BRAND_GROUP_NO 
+		                            , SDB.DISP_ORD
+		                            , G.GOODS_CD 
+		                            , G.GOODS_NM 
+		                            , G.GOODS_GB                                               /*상품구분*/
+		                            , G.FOREIGN_BUY_YN                                         /*해외구매대행여부*/
+		                            , G.PARALLEL_IMPORT_YN                                     /*병행수입여부*/
+		                            , G.ORDER_MADE_YN                                          /*주문제작여부*/
+		                            , G.GOODS_TNM                                              /*상품타이틀명*/
+		                            , G.MAIN_COLOR_CD                                          /*대표색상코드*/
+		                            , G.LIST_PRICE                                             /*정상가(최초판매가)*/
+		                            , G.CURR_PRICE                                             /*현재판매가*/
+		                            , 2 AS DIS
+		                        FROM   TB_SHOT_DELV_BRAND SDB
+		                                         INNER JOIN TB_BRAND_GROUP BG 
+		                               ON SDB.BRAND_GROUP_NO = BG.BRAND_GROUP_NO 
+		                                         INNER JOIN TB_BRAND B
+		                               ON BG.BRAND_GROUP_NO = B.BRAND_GROUP_NO 
+		                                        INNER JOIN TB_GOODS G
+		                               ON B.BRAND_CD = G.BRAND_CD 
+		                                        INNER JOIN TB_GOODS_STOCK GS
+		                               ON G.GOODS_CD = GS.GOODS_CD 
+		                        WHERE  1=1  
+		                        AND    G.GOODS_CD NOT IN (SELECT GOODS_CD FROM TB_GOODS_SHOT_DELV_SKIP GSDS)
+		                        AND    G.SELF_GOODS_YN = 'Y'
+		                        AND    G.SELF_MALL_YN = 'Y'
+		                        AND    G.GOODS_STAT = 'G008_90' /*승인완료상품*/
+		                        AND    NOW() BETWEEN G.SELL_STDT AND G.SELL_EDDT /*현재 판매되는 상품*/
+		                        AND    B.USE_YN = 'Y' /*사용하는 브랜드*/
+		                        AND    BG.USE_YN = 'Y' /*사용하는 브랜드그룹*/
+		                        AND    GS.STOCK_QTY  <![CDATA[>]]>  0 /*재고있는상품*/
+		                       )AA
+		                       ORDER BY AA.BRAND_GROUP_NO, AA.DISP_ORD DESC, AA.DIS
 		               )GOODS 
+		          WHERE CASE WHEN GOODS.GOODS_CD_CNT>1 THEN GOODS.DIS = 1 ELSE GOODS.DIS = 2 END  
 		        )RNK
 		   WHERE RNK.RNUM <![CDATA[<=]]> 100
 		)
@@ -1924,12 +1933,12 @@
 		      , C.COLOR_CHIPS                                                                                                      /*컬러칩*/
 		      , GB.ICON                                                                                                            /*혜택아이콘*/
 		       <choose>
-	                 <when test="custNo != null and custNo > 0"> <!-- 로그인 했으면 -->
-	             , IF(W.GOODS_CD IS NULL,'','likeit')                                                                AS LIKE_IT       /*위시리스트담긴상품*/
-	                 </when>
-	                 <otherwise>
-	             , ''                                                                                                AS LIKE_IT       /*위시리스트담긴상품*/
-	                 </otherwise>
+		                 <when test="custNo != null and custNo > 0"> <!-- 로그인 했으면 -->
+		             , IF(W.GOODS_CD IS NULL,'','likeit')                                                                AS LIKE_IT       /*위시리스트담긴상품*/
+		                 </when>
+		                 <otherwise>
+		             , ''                                                                                                AS LIKE_IT       /*위시리스트담긴상품*/
+		                 </otherwise>
 		      </choose>
 		FROM   TAB_BRAND_GOODS BG
 		LEFT OUTER JOIN TAB_GOODS_IMG GI ON BG.GOODS_CD = GI.GOODS_CD

src/main/webapp/WEB-INF/views/mob/cart/CartListFormMob.html

@@ -72,7 +72,7 @@
 												<img alt="BLACK-a" class=" vLHTC pd_img" th:src="${cart.imageUrl}" src="">
 											</div>
 											<div class="itemName" th:text="${cart.itemName}"></div>
-											<div class="viewComment" th:text="${cart.count + '명 보는중'}"></div>
+											<div class="viewComment" th:text="${cart.count < 10 ? '10명 미만' : cart.count + '명 보는중'}"></div>
 										</a>
 									</div>
 								</div>

src/main/webapp/WEB-INF/views/mob/order/OrderFormMob.html

@@ -18,7 +18,6 @@
 
 <link rel="stylesheet" type="text/css" href="/ux/pc/css/swiper.min.css">
 <script type="text/javascript" src="/ux/pc/js/swiper.min.js"></script>
-<script type="text/javascript" src="/ux/pc/js/slick.min.js"></script>
 <script type="text/javascript" src="/ux/pc/js/jquery-ui.js"></script>
 
 <!-- payment.js -->

src/main/webapp/WEB-INF/views/web/cart/CartListFormWeb.html

@@ -114,7 +114,7 @@
 													</th:block>
 												</p>
 												<div class="itemViewCount">
-													<span th:text="${cart.count}"></span>명 보는중
+													<span th:text="${cart.count < 10 ? '10명 미만' : cart.count + '명 보는중'}"></span>
 												</div>
 											</a>
 										</div>

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

@@ -1172,7 +1172,11 @@
 							quickShoppingBagHtml += '					<span class="itemPrice_original">' + Number(item.originalPrice).toLocaleString() + '</span>';
 						}
 						quickShoppingBagHtml += '				</p>';
-						quickShoppingBagHtml += '				<div class="viewCount"><span>' + item.count + '</span>명 보는중</div>';
+						if(item.count < 10) {
+							quickShoppingBagHtml += '				<div class="viewCount"><span>10명 미만</span></div>';
+						} else {
+							quickShoppingBagHtml += '				<div class="viewCount"><span>' + item.count + '</span>명 보는중</div>';
+						}
 						quickShoppingBagHtml += '			</a>';
 						quickShoppingBagHtml += '		</div>';
 						quickShoppingBagHtml += '	</div>';

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

@@ -138,6 +138,7 @@
 // 				}
 // 		});
 // 	}
+	var bannerCloseYn = 'Y';
 	
 	// GNB탭 > 카테고리
 	let fnGetGnbCategory = function(cate1) {
@@ -420,7 +421,7 @@
 							let tag = '';
 
 							if(item.contentsType == 'OPEN'){
-								tag +='<div class="bnrtype_open" style="background-color:#'+item.strVar5+';">';
+								tag +='<div class="bnrtype_open" style="background-color:#'+item.strVar5.replaceAll('#','')+';">';
 								if(item.strVar7=='IMG'){
 									tag +=' 	<a href="'+item.strVar1+'" target="">';
 									tag +=' 		<img src="'+bannerImgUrl+''+item.imgPath1+'" alt="">';
@@ -449,8 +450,19 @@
 									tag+=' 	<button id="btn_close_bnr" class="btn_close" onclick="fnGnbTobBannerClose(1);"><span>닫기</span></button>';
 									tag+='</div>';
 								// }
+								if($(".open_bnr_area").text() == '열기'){
+									$('.close_bnr_area').show();
+								}else{
+									if(item.strVar8=='Y'){
+										$('.close_bnr_area').show();
+										bannerCloseYn = 'Y';
+									}else{
+										$('.close_bnr_area').hide();
+										bannerCloseYn = 'N';
+									}
+								}
 							}else if(item.contentsType == 'IMG'){
-								tag+='<div class="bnrtype_img" style="background-color:#'+item.strVar5+';">';
+								tag+='<div class="bnrtype_img" style="background-color:#'+item.strVar5.replaceAll('#','')+';">';
 								tag+=' 	<a href="'+item.strVar1+'" target="">';
 								tag+=' 		<img src="'+bannerImgUrl+''+item.imgPath1+'" alt=""/>';
 								tag+=' 	</a>';
@@ -568,7 +580,16 @@
 			$('body').toggleClass('lock');
 			$('.bnrtype_open').toggleClass('fixed');
 			$(this).text($(this).text() == '열기' ? '닫기' : '열기');
-			$(this).text() == '열기' ? $('.close_bnr_area').show() : $('.close_bnr_area').hide();
+			// $(this).text() == '열기' ? $('.close_bnr_area').show() : $('.close_bnr_area').hide();
+			if(bannerCloseYn == 'N'){
+				if($(this).text() == '열기'){
+					$('.close_bnr_area').show();
+				}else{
+					$('.close_bnr_area').hide();
+				}
+			}else{
+				$('.close_bnr_area').show();
+			}
 		});
 		
 		// GNB toggle

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

@@ -73,7 +73,6 @@
 	<script src="/ux/pc/js/swiper.min.js"></script>
 	<script src="/ux/pc/js/ion.rangeSlider.min.js"></script>
 	<script src="/ux/pc/js/jquery.modal.min.js"></script>
-	<script src="/ux/pc/js/slick.min.js"></script>
 	<script src="/ux/pc/js/jquery-ui.js"></script>
 	<script src="/ux/plugins/jquery.serializeObject.min.js"></script>
 	<script src="/ux/pc/js/mcxdialog_ui.js"></script>

src/main/webapp/WEB-INF/views/web/order/OrderFormWeb.html

@@ -18,7 +18,6 @@
 
 <link rel="stylesheet" type="text/css" href="/ux/pc/css/swiper.min.css">
 <script type="text/javascript" src="/ux/pc/js/swiper.min.js"></script>
-<script type="text/javascript" src="/ux/pc/js/slick.min.js"></script>
 <script type="text/javascript" src="/ux/pc/js/jquery-ui.js"></script>
 
 <!-- payment.js -->

src/main/webapp/WEB-INF/views/web/order/OrderFormWeb_2021031801.html

@@ -18,7 +18,6 @@
 
 <link rel="stylesheet" type="text/css" href="/ux/pc/css/swiper.min.css">
 <script type="text/javascript" src="/ux/pc/js/swiper.min.js"></script>
-<script type="text/javascript" src="/ux/pc/js/slick.min.js"></script>
 <script type="text/javascript" src="/ux/pc/js/jquery-ui.js"></script>
 
 <!-- payment.js -->