Merge branch 'sowon' into develop

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

@@ -960,6 +960,7 @@
 		     , Z.CPN_CNT                               /*보유쿠폰수*/
 		     , Z.EXPIRE_YN                             /*만료여부*/
 		     , GROUP_CONCAT(Z.TGT_CONDITION) AS TGT_CONDITION
+		     , Z.CUST_CPN_SQ
 		FROM
 		(
 		WITH TAB_COUPON AS (
@@ -987,6 +988,7 @@
 		         , CC.AVAIL_EDDT                      /*유효종료일자*/
 		         , CC.CPN_CNT                         /*보유쿠폰수*/
 		         , CC.EXPIRE_YN                       /*만료여부*/
+		         , CC.CUST_CPN_SQ 
 		    FROM   (
 		            SELECT CC.CPN_ID
 		                 , DATE_FORMAT(CC.AVAIL_STDT,'%Y.%m.%d %H:%i') AS AVAIL_STDT  /*유효시작일자*/
@@ -995,6 +997,7 @@
 		                 , MAX(CASE WHEN NOW() > CC.AVAIL_EDDT THEN 'Y'
 		                            ELSE 'N'
 		                       END)                              AS EXPIRE_YN /*만료여부*/
+		                 , MAX(CC.CUST_CPN_SQ) AS CUST_CPN_SQ
 		            FROM   TB_CUST_COUPON CC
 		            WHERE  1 = 1
 		            GROUP  BY CC.CPN_ID, DATE_FORMAT(CC.AVAIL_STDT,'%Y.%m.%d %H:%i'), DATE_FORMAT(CC.AVAIL_EDDT,'%Y.%m.%d %H:%i')
@@ -1058,6 +1061,7 @@
 		                              WHEN CR.CPN_TARGET = 'G260_13' AND CR.CNT > 1 THEN ' 외'
 		                              ELSE ''
 		                         END) AS TGT_CONDITION /*대상조건*/
+		     , C.CUST_CPN_SQ
 		FROM   TAB_COUPON C
 		     , TAB_COUPON_REFVAL2 CR
 		WHERE  C.CPN_ID = CR.CPN_ID
@@ -1076,6 +1080,7 @@
 		        , Z.AVAIL_EDDT                            /*유효종료일자*/
 		        , Z.CPN_CNT                               /*보유쿠폰수*/
 		        , Z.EXPIRE_YN                             /*만료여부*/
+		        , Z.CUST_CPN_SQ
 	</select>
 	
 	<select id="getPlanCouponDetailInfo" resultType="Coupon" parameterType="Coupon">

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

@@ -72,16 +72,15 @@
                         </div>
                     </div>
                 </div>
-				<div class="inner wide">
-					<div class="dp_listItems_cont type1">
-						<!-- 210415_드롭박스 위치수정 -->
+				<div class="inner" id="cornerInner">
+					<div class="dp_listItems_wrap typeSelector">
 						<div class="items_option">
 							<div class="open_categori" style="position: relative; width: 100%; z-index: 0;">
 								<a id="filter"></a> 
 							</div>
 						</div>
 					</div>
-                </div>
+				</div>
                 <div id="cornerList"></div>
 			</section>
 
@@ -334,6 +333,15 @@ var fnCornerClick = function (result1,result2) {
 	
 }
 
+
+
+//팝업_닫기
+$('.popup_close').on("click",function(){
+    $('.popup_box').hide().removeClass('active');
+    $("body").css({"overflow":"visible"});
+});
+
+
 $(document).ready(function(){
 	shotBody();
 	$("#filter").text(planCornerList[0].cornerNm);
@@ -346,14 +354,14 @@ $(document).ready(function(){
 	
 	$(window).scroll(function(){
 		var scrollTop= $(window).scrollTop();
-		var itemTop=$('.dp .dp_listItems_cont').offset().top;
-
-        if (scrollTop >= itemTop){
-            $('.dp .dp_listItems_cont .items_option').addClass('fix');
-        } else {
-            $('.dp .dp_listItems_cont .items_option').removeClass('fix');
-        }
+		var itemTop=$('.dp .dp_listItems_wrap.type1').offset().top;
+		console.log(itemTop);
 
+	    if (scrollTop >= itemTop){
+	        $('.dp .dp_listItems_wrap .items_option').addClass('fix');
+	    } else {
+	        $('.dp .dp_listItems_wrap .items_option').removeClass('fix');
+	    }
 	});
 	
 	// 아이템스라이드(리스트갯수1)
@@ -388,7 +396,26 @@ $(document).ready(function(){
     
     $("#bulletShipPop_close").click(function() {
         $.modal.close();
- });	
+ 	});
+    
+  //카테고리
+    function category(){
+        var categoryOpen=$(".open_categori .select_dress");
+        var categoryClose=$(".category_box .category_close");
+        var categoryPop=$(".category_box");
+
+        categoryOpen.on("click",function(){
+            categoryPop.show();
+            categoryPop.addClass("active");
+            $("body").css({"overflow":"hidden"});
+        });
+
+        categoryClose.on("click",function(){
+            categoryPop.hide();
+            $("body").css({"overflow":"visible"});
+        });
+    }
+    category();
 
 });
 </script>