Jelajahi Sumber

상품권 퍼블 변경 중간 커밋

sowon4187 5 tahun lalu
induk
melakukan
520b6f93ed

+ 7 - 7
src/main/java/com/style24/persistence/mybatis/shop/TsfCoupon.xml

@@ -375,7 +375,7 @@
 	</select>
 	
 	<select id="getMypageCouponList" resultType="Coupon" parameterType="Coupon">
-		/* TsfCoupon.getMypageCouponList -- custNo 변경 예정*/
+		/* TsfCoupon.getMypageCouponList */
 		SELECT T.*
 		FROM 
 		(
@@ -442,7 +442,7 @@
 											)A ON TC.CPN_ID = A.CPN_ID 
 				WHERE 1=1
 					AND TC.CPN_STAT = 'G232_11'  /*쿠폰 상태 - 진행*/
-					AND A.CUST_NO = 1000039
+					AND A.CUST_NO = #{custNo}
 					AND A.USED_DT IS NULL
 					AND NOW() BETWEEN A.AVAIL_STDT AND A.AVAIL_EDDT
 			)Z
@@ -510,7 +510,7 @@
 											)A ON TC.CPN_ID = A.CPN_ID 
 				WHERE 1=1
 					AND TC.CPN_STAT = 'G232_11'  /*쿠폰 상태 - 진행*/
-					AND A.CUST_NO = 1000039
+					AND A.CUST_NO = #{custNo}
 					AND A.USED_DT IS NULL
 					AND A.AVAIL_EDDT BETWEEN DATE_ADD(NOW(), INTERVAL -3 MONTH) AND A.AVAIL_EDDT
 			)F
@@ -519,27 +519,27 @@
 	</select>
 	
 	<select id="getMypageCouponInfo" resultType="Coupon" parameterType="Coupon">
-		/* TsfCoupon.getMypageCouponInfo -- custNo 변경 예정*/
+		/* TsfCoupon.getMypageCouponInfo*/
 		SELECT COUNT(*) AS ALL_COUPON_CNT
 			,(  SELECT COUNT(*) AS USE_COUPON
 				FROM tb_coupon A INNER JOIN tb_cust_coupon B ON A.CPN_ID = B.CPN_ID 
 				WHERE 1=1
 				  AND A.CPN_ID = B.CPN_ID 
-				  AND B.CUST_NO = 1000039
+				  AND B.CUST_NO = #{custNo}
 				  AND A.CPN_STAT = 'G232_11'
 				  AND NOW() BETWEEN A.AVAIL_STDT AND A.AVAIL_EDDT ) AS USE_COUPON_CNT
 		    ,(  SELECT COUNT(*) AS USE_COUPON
 				FROM tb_coupon A INNER JOIN tb_cust_coupon B ON A.CPN_ID = B.CPN_ID 
 				WHERE 1=1
 				  AND A.CPN_ID = B.CPN_ID 
-				  AND B.CUST_NO = 1000039
+				  AND B.CUST_NO = #{custNo}
 				  AND A.CPN_STAT = 'G232_11'
 				  AND NOW() BETWEEN A.AVAIL_STDT AND A.AVAIL_EDDT 
 				  AND NOW() BETWEEN DATE_ADD(A.AVAIL_EDDT , INTERVAL -7 DAY) AND A.AVAIL_EDDT ) AS EXPIRE_COUPON_CNT
 		FROM tb_coupon A INNER JOIN tb_cust_coupon B ON A.CPN_ID = B.CPN_ID 
 		WHERE 1=1
 		  AND A.CPN_ID = B.CPN_ID 
-		  AND B.CUST_NO = 1000039
+		  AND B.CUST_NO = #{custNo}
 		  AND A.CPN_STAT = 'G232_11'
 	</select>
 	

+ 6 - 6
src/main/java/com/style24/persistence/mybatis/shop/TsfGiftcard.xml

@@ -4,7 +4,7 @@
 
 	<!-- 상품권 기본정보  -->
 	<select id="getGiftcardInfo" parameterType="GiftCard" resultType="GiftCard">
-		<!-- TsfGiftcard.getGiftcardInfo -->
+		/*TsfGiftcard.getGiftcardInfo*/
 		SELECT SUM(CG.RM_GFCD_AMT) AS USE_GIFT/*사용가능한 보유 금액*/
 		      ,(SELECT COUNT(*) 
 		        FROM TB_CUST_GIFTCARD CG2 
@@ -12,7 +12,7 @@
 		          AND CUST_NO = #{custNo}
 		          AND CG2.RM_GFCD_AMT <![CDATA[>]]> 0
 		          AND NOW() BETWEEN CG2.USE_ST_DATE AND CG2.USE_EXP_DATE) AS TOTAL_COUNT /*총 상품권 수*/
-		      ,(SELECT COUNT(*)
+		      ,(SELECT SUM(CG3.RM_GFCD_AMT)
 				FROM TB_CUST_GIFTCARD CG3
 				WHERE NOW() BETWEEN CG3.USE_ST_DATE AND CG3.USE_EXP_DATE
 				  AND  NOW() BETWEEN DATE_ADD(CG3.USE_EXP_DATE, INTERVAL -1 MONTH) AND USE_EXP_DATE
@@ -26,7 +26,7 @@
 	</select>
 	
 	<select id="getGiftcardUseList" parameterType="GiftCard" resultType="GiftCard">
-		<!-- TsfGiftcard.getGiftcardUseList -->
+		/*TsfGiftcard.getGiftcardUseList*/
 		SELECT A.* 
 		      ,(CASE A.OCCUR_GB WHEN 'G074_11'THEN '+' 
 		                        WHEN 'G074_12'THEN '-'
@@ -67,7 +67,7 @@
 	</select>
 	
 	<select id="getGiftcardOwnList" parameterType="GiftCard" resultType="GiftCard">
-		<!-- TsfGiftcard.getGiftcardOwnList -->
+		/*TsfGiftcard.getGiftcardOwnList*/
 		 SELECT  CUST_GFCD_SQ
 				 , CUST_NO
 				 , GFCD_NO
@@ -87,7 +87,7 @@
 	</select>
 	
 	<insert id="saveGiftcardApi" parameterType="GiftCard">
-		<!-- TsfGiftcard.saveGiftcardApi -->
+		/*TsfGiftcard.saveGiftcardApi*/
 		INSERT INTO TB_GIFTCARD_API_HST
 		(
 		   GFCD_NO
@@ -108,7 +108,7 @@
 	</insert>
 	
 	<insert id="getGiftcardUseConfirm" parameterType="GiftCard">
-		<!-- TsfGiftcard.getGiftcardUseConfirm -->
+		/*TsfGiftcard.getGiftcardUseConfirm*/
 		INSERT INTO TB_CUST_GIFTCARD
 		(
 			CUST_NO

+ 166 - 111
src/main/webapp/WEB-INF/views/web/mypage/MypageGiftcardFormWeb.html

@@ -1,6 +1,5 @@
 <!DOCTYPE html>
-<html lang="ko"
-	xmlns:th="http://www.thymeleaf.org"
+<html lang="ko" xmlns:th="http://www.thymeleaf.org"
 	xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
 	layout:decorator="web/common/layout/MypageLayoutWeb">
 <!--
@@ -18,72 +17,98 @@
  -->
 <body>
 
-<th:block layout:fragment="content">
-<!--  container -->
-	<div class="my_cont">
-		<div class="sec_head">
-			<h3>STYLE24 상품권</h3>
-		</div>
-		<div class="sec_body">
-			<div class="save_area mypage_coupon">
-				<p>사용 가능한 보유 금액<strong th:text="${#numbers.formatInteger(giftcardInfo.useGift,0,'COMMA')}"></strong>원</p>
-				<ul>
-					<li>보유 상품권 <span th:text="${#numbers.formatInteger(giftcardInfo.totalCount,0,'COMMA')} + '장'"></span></li>
-					<li>한달 이내 소멸 예정 <span th:text="${#numbers.formatInteger(giftcardInfo.expireCount,0,'COMMA')} + '장'"></span></li>
-				</ul>
+	<th:block layout:fragment="content">
+		<!--  container -->
+		<div class="cont">
+			<div class="sec_head">
+				<h3 class="subH1">상품권</h3>
 			</div>
-			<div class="gift_search">
-				<div class="gift_sea_wrap clear">
-					<label for="gift_input">상품권 등록</label>
-					<input type="text" id="gift_input" placeholder="상품권 번호를 입력해주세요.">
-					<button type="button" class="btn btn_dark" onclick="giftcardSave()">등록</button>
+			<div class="sec_body">
+				<div class="highlight_area">
+					<div class="have_amount">
+						<div class="total_amount">
+							나의 보유 금액&nbsp;<span><em th:text="${#numbers.formatInteger(giftcardInfo.useGift,0,'COMMA')}"></em>원</span>
+						</div>
+						<dl>
+							<div>
+								<dt>보유 상품권</dt>
+								<dd>
+									<em th:text="${#numbers.formatInteger(giftcardInfo.totalCount,0,'COMMA')}"></em>장
+								</dd>
+							</div>
+							<div>
+								<dt>
+									<span class="tag primary_line">D-<em>30</em></span>한 달 이내 소멸 예정
+								</dt>
+								<dd>
+									<em th:text="${#numbers.formatInteger(giftcardInfo.expireCount,0,'COMMA')}"></em>원
+								</dd>
+							</div>
+						</dl>
+					</div>
 				</div>
-			</div>
-			<div class="com_info_txt">
-				<p class="tit">상품권 등록 안내</p>
-				<ul>
-					<li>상품권은 상품 구매시 현금과 동일하게 사용됩니다.</li>
-					<li>상품권은 등록한 해당 몰에서만 사용이 가능합니다.</li>
-					<li>사용 후 남은 잔액은 상품권 잔액으로 환불되며,유효기간 내에 사용 가능합니다.</li>
-					<li>유효기간이 지난 상품권의 잔액은 자동 소멸됩니다.</li>
-					<li>상품권은 현금성 결제 수단에 포함되어 주문시 포인트 적립이 가능합니다.</li>
-					<li>상품권으로 결제한 금액은 마이페이지>주문상세페이지에서 현금영수증을 발급 받으실 수 있습니다.</li>
-				</ul>
-			</div>
-			<div class="my_tab coupon_tab">
-				<ul>
-					<li><a href="javascript:void(0);" id="SearchUseGiftcard">사용내역</a></li>
-					<li><a href="javascript:void(0);" id="SearchOwnGiftcard">보유 상품권</a></li>
-				</ul>
-				<!-- <div class="form_field" id="dateField">
-					<select id="searchDt" onchange="fnChangeDate(this)">
-						
-					</select> 
-				</div> -->
-					<div class="form_field" id="dateField">
-						<div class="select_custom type1">
-							<div class="combo">
-								<div class="select"></div> <!-- 셀렉박스 -->
-									<ul id="searchDt" class="list" style="width:200px; margin:0 auto">
+				<div class="input_area">
+					<form class="form_wrap">
+						<div class="form_field">
+							<label class="input_label"><span>상품권 등록</span></label>
+							<div class="input_wrap">
+								<input type="text" class="form_control"	  id="gift_input" placeholder="상품권 번호를 입력해주세요">
+							</div>
+							<button type="button" class="btn btn_dark" onclick="giftcardSave()">
+								<span>등록</span>
+							</button>
+						</div>
+					</form>
+				</div>
+				<div class="com_info_txt">
+					<p class="tit">상품권 등록 안내</p>
+					<ul>
+						<li>상품권은 상품 구매시 현금과 동일하게 사용됩니다.</li>
+						<li>상품권은 등록한 해당 몰에서만 사용이 가능합니다.(YES24와 중복 사용불가)</li>
+						<li>사용 후 남은 잔액은 상품권 잔액으로 환불되며, 유효기간 내에 사용 가능합니다.</li>
+						<li>유효기간이 지난 상품권의 잔액은 자동 소멸됩니다.</li>
+						<li>상품권은 현금성 결제 수단에 포함되어 주문시 포인트 적립이 가능합니다.</li>
+						<li>상품권으로 결제한 금액은 마이페이지 > 주문상세페이지에서 현금영수증을 발급 받으실 수 있습니다.</li>
+					</ul>
+				</div>
+				<div class="content_area">
+					<div class="taps">
+						<div>
+							<ul>
+								<li><a href="javascript:void(0);" id="SearchUseGiftcard">사용내역</a></li>
+								<li><a href="javascript:void(0);" id="SearchOwnGiftcard">보유 상품권</a></li>
+							</ul>
+						</div>
+					</div>
+					<div class="select_box" id="dateField">
+						<div class="form_field">
+							<div class="select_custom month">
+								<div class="combo">
+									<div class="select"></div>
+									<ul class="list" id="searchDt">
 									</ul>
+								</div>
 							</div>
 						</div>
 					</div>
+					<!-- 데이터 있을 시 -->
+					<div class="list_box" id="giftcardList">
+						
+					</div>
+					<!-- //데이터 있을 시 -->
 				</div>
 			</div>
-			<div id="giftcardList">
-			</div>
 		</div>
-	</div>
-<!-- // CONT-BODY -->					
+		<!-- // CONT-BODY -->
 <script th:inline="javascript">
 var date = new Date();
 var year = date.getFullYear();
 var month = date.getMonth()+1;
 
+
 //동적으로 날짜 년도 append
 function appendYear(){
- 
+	
     for(var i=year; i<=year; i++){
        	for (var j= 1; j <=month; j++) {
        		$("#searchDt").prepend("<li onclick='fnChangeDate(this.value)' value='"+year+""+j+"'>"+i+"년"+j +"월 </li>");
@@ -97,8 +122,8 @@ appendYear($("#searchDt"));
 // 사용내역 조회
 $("#SearchUseGiftcard").click(function(){
 	// class제거 추가
-	$("#SearchOwnGiftcard").removeClass("on");
-	$("#SearchUseGiftcard").addClass("on");
+	$("#SearchOwnGiftcard").removeClass("active");
+	$("#SearchUseGiftcard").addClass("active");
 	$("#giftcardList").attr("class","order_list");
 	
 	// 날짜 필드 
@@ -128,50 +153,66 @@ function useGiftcard(result) {
 	let giftcardUseList = result.giftcardUseList;
 	
 	let tmtbHtml = "";
-	
-	tmtbHtml += '<section class="order_row mt30">';
-	tmtbHtml += '<div class="tbl track_tbl type2">';
+	tmtbHtml += '<div class="tbl type5">';
 	tmtbHtml += '<table>';
 	tmtbHtml += '<colgroup>';
-	tmtbHtml += '<col width="750px">';
-	tmtbHtml += '<col width="150px">';
-	tmtbHtml += '<col width="*">';
+	tmtbHtml += '<col width="10%">';	
+	tmtbHtml += '<col width="*">';		
+	tmtbHtml += '<col width="18%">';		
+	tmtbHtml += '<col width="18%">';		
 	tmtbHtml += '</colgroup>';
-	tmtbHtml += '<thead>';
-	tmtbHtml += '<tr>';
-	tmtbHtml +=	'<th>내용</th>';
-	tmtbHtml += '<th>증감/차감</th>';
-	tmtbHtml += '<th>일자</th>';
-	tmtbHtml += '</tr>';
-	tmtbHtml += '</thead>';
-	tmtbHtml += '<tbody>';
+	tmtbHtml += '<thead>';	
+	tmtbHtml += '<tr>';	
+	tmtbHtml += '<th scope="col"><span class="sr-only">차감</span></th>';		
+	tmtbHtml += '<th scope="col">내용</th>';				
+	tmtbHtml += '<th scope="col">사용금액</th>';			
+	tmtbHtml += '<th scope="col">일자</th>';			
+	tmtbHtml += '</tr>';				
+	tmtbHtml += '</thead>';		
 	
-	
-	for(let i=0; i<giftcardUseList.length; i++){
-		let useGiftcard = giftcardUseList[i];
-		tmtbHtml +='<tr>';
-		if(useGiftcard.goodsNm != null){
-			tmtbHtml +='<td class="t_l pl40">'+ useGiftcard.goodsNm + '</td>';	
-		}else{
-			tmtbHtml +='<td class="t_l pl40">'+ useGiftcard.balanceName + '</td>';	
+	if(giftcardUseList.length<=0){
+		tmtbHtml += '<tbody>';
+		tmtbHtml += '</tbody>';
+		tmtbHtml += '</table>';
+		tmtbHtml += '</div>';
+		tmtbHtml += '<div class="nodata">';
+		tmtbHtml += '<div class="txt_box">';
+		tmtbHtml += '<p>현재 노출 할 수 있는 이용내역이 없습니다.<br></p>';
+		tmtbHtml += '</div>';		
+		tmtbHtml += '</div>';	
+		
+	}else{
+		tmtbHtml += '<tbody>';
+		
+		for(let i=0; i<giftcardUseList.length; i++){
+			let useGiftcard = giftcardUseList[i];
+			tmtbHtml += '<tr>';
+			tmtbHtml += '<td><span class="tag deepgray">차감</span></td>';
+			tmtbHtml += '<td>';
+			if(useGiftcard.goodsNm.length>0){
+				tmtbHtml +='<div class="txt_content">'+ useGiftcard.goodsNm + '</div>';	
+			}else{
+				tmtbHtml +='<div class="txt_content">'+ useGiftcard.balanceName + '</div>';	
+			}
+			tmtbHtml += '</td>';
+			tmtbHtml += '<td><span class="amount_minus"> <em>'+ useGiftcard.balance + ' ' + useGiftcard.gfcdAmt.addComma() + '</em>원';
+			tmtbHtml += '</span></td>';					
+			tmtbHtml += '<td>'+useGiftcard.regDt +'</td>';					
+			tmtbHtml += '</tr>';		
 		}
-		tmtbHtml += '<td class="c_primary">'+ useGiftcard.balance + ' ' + useGiftcard.gfcdAmt.addComma() + '</td>';
-		tmtbHtml += '<td>'+ useGiftcard.regDt + '</td>';
-		tmtbHtml += '</tr>';
+		tmtbHtml += '</tbody>';
+		tmtbHtml += '</table>';
+		tmtbHtml += '</div>';
+		
 	}
-	
-	tmtbHtml += '</tbody>';
-	tmtbHtml += '</table>';
-	tmtbHtml += '</div>';
-	tmtbHtml += '</section>';
-	
+		
 	$("#giftcardList").html(tmtbHtml);
 }
 
 // 보유상품권 조회
 $("#SearchOwnGiftcard").click(function(){
-	$("#SearchUseGiftcard").removeClass("on");
-	$("#SearchOwnGiftcard").addClass("on");
+	$("#SearchUseGiftcard").removeClass("active");
+	$("#SearchOwnGiftcard").addClass("active");
 	$("#giftcardList").attr("class","gift_list");
 	
 	// 날짜 필드 
@@ -199,33 +240,47 @@ function ownGiftcard(result) {
 	let giftcardOwnList = result.giftcardOwnList;
 	
 	let tmtbHtml2 = "";
-	
-
-	tmtbHtml2 += '<ul class="clear">';
 
-	for(let i=0; i<giftcardOwnList.length; i++){
-		let ownGiftcard = giftcardOwnList[i];
+	if(giftcardOwnList == null){
+		tmtbHtml2 += '<div class="nodata">';
+		tmtbHtml2 += '<div class="txt_box">';
+		tmtbHtml2 += '<p>현재 노출 할 수 있는 상품권이 없습니다.<br></p>';
+		tmtbHtml2 += '</div>';		
+		tmtbHtml2 += '</div>';	
+	}else{
+		
+		tmtbHtml2 += '<div class="voucher_list">';
+		tmtbHtml2 += '<ul>';
+		
+		for(let i=0; i<giftcardOwnList.length; i++){
+			let ownGiftcard = giftcardOwnList[i];
 
-		if(ownGiftcard.rmGfcdAmt > 0){
 			tmtbHtml2 += '<li>';
-		}else{
-			tmtbHtml2 += '<li class="off">';
-		}	
-		tmtbHtml2 += '<div class="gift_shape">';
-		tmtbHtml2 += '<strong>' + ownGiftcard.gfcdNm + '</strong>';
-		tmtbHtml2 += '<div class="gift_price01">' +ownGiftcard.chgGfcdAmt.addComma() + ' 원권' +'</div>';
-		tmtbHtml2 += '<div class="gift_price02">';
-		tmtbHtml2 += '<span class="pr_t">잔액</span><span class="pr_num">'+ownGiftcard.rmGfcdAmt.addComma()+'</span>원'
-		tmtbHtml2 += '<div>';
-		tmtbHtml2 += '<div class="gift_price03">' +ownGiftcard.gfcdNo + '</div>';
-		tmtbHtml2 += '</div>';
-		tmtbHtml2 += '<div class="gift_date">';
-		tmtbHtml2 += '~ <span>' +ownGiftcard.useExpDate + '</span>';
+			if(ownGiftcard.rmGfcdAmt > 0){
+				tmtbHtml2 += '<div class="voucher">';
+			}else{
+				tmtbHtml2 += '<div class="voucher disable">';
+			}	
+			
+			tmtbHtml2 += '<div>';
+			tmtbHtml2 += '<p class="vch_name">'+ownGiftcard.gfcdNm +'</p>';
+			tmtbHtml2 += '<p class="vch_price"><span class="tag primary_line"><em>'+ownGiftcard.chgGfcdAmt.addComma() +'</em>원권</span></p>';
+			if(ownGiftcard.rmGfcdAmt > 0){
+				tmtbHtml2 += '<p class="vch_remain">'+ownGiftcard.rmGfcdAmt.addComma() +'</p>';
+			}else{
+				tmtbHtml2 += '<p class="vch_remain">전액소진</p>';
+			}
+			
+			tmtbHtml2 += '<p class="vch_code">'+ownGiftcard.gfcdNo +'</p>';
+			tmtbHtml2 += '</div>';
+			tmtbHtml2 += '<div class="vch_date">~&nbsp;<span>'+ownGiftcard.useExpDate+'</span></div>';
+			tmtbHtml2 += '</div>';
+			tmtbHtml2 += '<li>';
+		}
+		tmtbHtml2 += '</ul>';
 		tmtbHtml2 += '</div>';
-		tmtbHtml2 += '</li>';
+		
 	}
-	
-	tmtbHtml2 += '</ul>';		
 		
 	$("#giftcardList").html(tmtbHtml2);
 
@@ -291,12 +346,12 @@ $(document).ready(function() {
 	$("#SearchUseGiftcard").trigger('click');
 
 	// 셀렉트박스 활성화
-	$('.select_custom.type1').each(function(index) {
+	$('.select_custom.month').each(function(index) {
 		var selecter01 = new sCombo($(this));
 	});
 });
 </script>
-</th:block>
+	</th:block>
 
 </body>
 </html>

File diff ditekan karena terlalu besar
+ 377 - 526
src/main/webapp/ux/pc/css/layout.css


+ 95 - 59
src/main/webapp/ux/pc/js/common-ui.js

@@ -31,20 +31,30 @@
 * * * * * * * * * * * * * * * * * * * * * */
 $(document).ready(function(){
 
+
+	// history back
+	$(".back").on("click", function () {
+		history.back()
+	});
+
 	// header minify
 	$(function(){
 		$(window).scroll(function(){
 			//var scroll = $(this).scrollTop();
-			var headerH =  $('#header').outerHeight();
+			var headerH =  $('#header .hd_top_banner').outerHeight() + $('#header .area').outerHeight();
+			var miniGnbH = $('#header.minify .gnb').outerHeight();
 			if ($(window).scrollTop() > headerH){
 				//header minify
 				$("#header").addClass("minify");
 				$("#header .hd_top_banner,#header .common_header > .area").hide();
+				$("#container").css("padding-top",headerH + miniGnbH);
+				
 			}
 			else {
 				//header minify
 				$("#header").removeClass("minify");
 				$("#header .hd_top_banner,#header .common_header > .area").show();
+				$("#container").css("padding-top","0px");
 			}
 		});
 	});
@@ -57,65 +67,25 @@ $(document).ready(function(){
 			if ($(window).scrollTop() > brheaderH){
 				//header minify
 				$("#br_header").addClass("minify");
-				$("#br_header .hd_top_banner,#br_header .common_header.br_header .util_group").hide();
+				$("#br_header .hd_top_banner,#br_header .common_header.br_header .area").hide();
+				$(".common_header.br_header .gnb .nav #brd_nav .home").show();
 			}
 			else {
 				//header minify
 				$("#br_header").removeClass("minify");
-				$("#br_header .hd_top_banner,#br_header .common_header.br_header .util_group").show();
+				$("#br_header .hd_top_banner,#br_header .common_header.br_header .area").show();
+				$(".common_header.br_header .gnb .nav #brd_nav .home").hide();
 			}
 		});
 	});
 
-	// history back
-	$(".back").on("click", function () {
-		history.back()
-	});
-
-	//통합검색 - 레이어 열고닫기
-	$(document).on('click','.common_header .search .promotion_search, .common_header .search .btn_open_search',function(e){
-		$('body').addClass('lock');
-		$("#header .common_search").addClass('active'); 
-		return false;
-	}).on('click','.common_search .btn_close_search',function(e){
-		$("#header .common_search").removeClass('active'); 
-		$('body').removeClass('lock');
-		return false;
-	});		
-
-	//브랜드 통합검색 - 레이어 열고닫기
-	$(document).on('click','.common_header.br_header .search .promotion_search, .common_header.br_header .search .btn_open_search',function(e){
-		$('body').addClass('lock');
-		$("#br_header .common_search.schBrand").addClass('active'); 
-		return false;
-	}).on('click','.common_search .btn_close_search',function(e){
-		$("#br_header .common_search.schBrand").removeClass('active'); 
-		$('body').removeClass('lock');
-		return false;
-	});
-
-	//통합검색 - 검색어 입력 시 
-	$(document).on('keyup','.common_search .area_input input',function(e){
-		var searchValue = $(this).val();
-		if(searchValue.length > 0) {
-			$('.common_search .area_result .default_box').hide();	
-			$('.common_search .area_result .searching_box').show();	
-		} else if (searchValue.length == 0) {
-			$('.common_search .area_result .searching_box').hide();	
-			$('.common_search .area_result .default_box').show();	
-		}
+	// items like on/off
+	$(function(){ 
+		$(".itemLike").click(function () {
+		  $(this).toggleClass("likeit");
+		});
 	});
 
-	//통합검색 - 슬라이드 컨트롤러 > 지금 고객님들이 많이 보고 있어요 
-	$(document).on('click','.common_search .realtime_slider .btn_pause',function(e){
-		realtimeItemSwiper.autoplay.stop();
-		$(this).hide();
-		$('.common_search .realtime_slider .btn_play').show();
-	}).on('click','.common_search .realtime_slider .btn_play',function(e){
-		realtimeItemSwiper.autoplay.start();
-		$(this).hide();
-		$('.common_search .realtime_slider .btn_pause').show();
-	});
 
 });
 /* * * * * * * * * * * * * * * * * * * * * * * 
@@ -302,7 +272,6 @@ function sCombo(selector){
 };
 
 
-
 // selectBrand on/off
 $( document ).ready( function() {
 	$("#selectBrand .brandbox input").on("click", function() {
@@ -312,7 +281,12 @@ $( document ).ready( function() {
 });
 
 
-
+// dropDownMenu
+$(document).on('click','.tgl_dropdown',function(e){
+	$(this).next('.dropdown_menu').slideToggle(300);
+	$(this).toggleClass('on');
+	return false;
+});
 
 
 /* alert */
@@ -353,6 +327,57 @@ $.datepicker.setDefaults($.datepicker.regional['kr']);
 
 $(document).ready( function() {
 
+	$(function(){
+		if($(".content").hasClass("dp_hotdeal") || $(".content").hasClass("dp_Bulletship")){
+			$('.container').closest('div').addClass('omitt');
+		}
+	});
+
+	//통합검색 - 레이어 열고닫기
+	$(document).on('click','.common_header .search .promotion_search, .common_header .search .btn_open_search',function(e){
+		$('body').addClass('lock');
+		$("#header .common_search").addClass('active'); 
+		return false;
+	}).on('click','.common_search .btn_close_search',function(e){
+		$("#header .common_search").removeClass('active'); 
+		$('body').removeClass('lock');
+		return false;
+	});		
+
+	//브랜드 통합검색 - 레이어 열고닫기
+	$(document).on('click','.common_header.br_header .search .promotion_search, .common_header.br_header .search .btn_open_search',function(e){
+		$('body').addClass('lock');
+		$("#br_header .common_search.schBrand").addClass('active'); 
+		return false;
+	}).on('click','.common_search .btn_close_search',function(e){
+		$("#br_header .common_search.schBrand").removeClass('active'); 
+		$('body').removeClass('lock');
+		return false;
+	});
+
+	//통합검색 - 검색어 입력 시 
+	$(document).on('keyup','.common_search .area_input input',function(e){
+		var searchValue = $(this).val();
+		if(searchValue.length > 0) {
+			$('.common_search .area_result .default_box').hide();	
+			$('.common_search .area_result .searching_box').show();	
+		} else if (searchValue.length == 0) {
+			$('.common_search .area_result .searching_box').hide();	
+			$('.common_search .area_result .default_box').show();	
+		}
+	});
+
+	//통합검색 - 슬라이드 컨트롤러 > 지금 고객님들이 많이 보고 있어요 
+	$(document).on('click','.common_search .realtime_slider .btn_pause',function(e){
+		realtimeItemSwiper.autoplay.stop();
+		$(this).hide();
+		$('.common_search .realtime_slider .btn_play').show();
+	}).on('click','.common_search .realtime_slider .btn_play',function(e){
+		realtimeItemSwiper.autoplay.start();
+		$(this).hide();
+		$('.common_search .realtime_slider .btn_pause').show();
+	});
+
 	/* 고객센터_accordion */
 	$(document).on('click','.cs .foldGroup .fold_head',function(e){
 		$(this).parents('.foldGroup li').find('.fold_cont').slideToggle(100);
@@ -405,13 +430,6 @@ $(document).ready( function() {
 		return false;
 	});
 
-	/* dropDownMenu */
-	$(document).on('click','.tgl_dropdown',function(e){
-		$(this).next('.dropdown_menu').slideToggle(300);
-		$(this).toggleClass('on');
-		return false;
-	});
-
 	/* 전시 팝업 샘플팝업1 : 수정예정 */
 	$(document).on('click','#coupon_pop',function(e){
 		$("#coupon_modal_01").modal("show");
@@ -455,6 +473,24 @@ $(document).ready( function() {
 	$("body").mouseup(function(e){down = false;});
 	/* //드래그 스크롤 : 수정 예정 */
 	
+	//상품 리스트_필터
+	$('.filter_list ul li').click(function(){ 
+		$(".filter_list ul li").removeClass('on');
+		$(".dp_list .sort, .sch_result .sort").removeClass('on');
+		$(this).addClass('on');
+		$("."+$(this).data('id')).addClass('on');
+		$('.sort ul li').removeClass('on');
+		$('.sort ul li div').hide();
+		$('.container .dp_list .fillter, .container .sch_result .fillter').show();
+	});
+
+	// 카테고리
+	$('.tap_close').click(function(){ 
+		$(this).parent().removeClass('on');
+		$('.filter_content .sort ul li div').hide();
+		$('.filter_content .sort ul li, .container .filter_list ul li').removeClass('on');
+		$('.container .dp_list .sort, .container .sch_result .sort').removeClass('on');
+	});
 });
 
 

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini