Procházet zdrojové kódy

Merge branch 'develop' into bin2107

bin2107 před 4 roky
rodič
revize
be3949e9c9

+ 1 - 0
src/main/java/com/style24/persistence/domain/Goods.java

@@ -107,6 +107,7 @@ public class Goods extends TscBaseDomain {
 	private String logoFileNm;	//브랜드로고이미지
 	private int stockQty;		//재고
 	private int stockQtySum;		//재고
+	private int goodsStockQty;		//상품전시재고
 	private String soldoutYn;	//품절여부
 	private String wishYn;		//위시리스트여부
 	private String goodsComposeSearchYn;	//구성상품 조회여부

+ 1 - 0
src/main/java/com/style24/persistence/mybatis/shop/TsfGoods.xml

@@ -83,6 +83,7 @@
 		     , 100 - ROUND((CURR_PRICE / LIST_PRICE) * 100 ,0) AS DC_RATE 
 		     , ((PNT_RATE * CURR_PRICE) / 100) AS PNT_AMT
 		     , FN_GET_GOODS_NM(GOODS_NM,GOODS_GB,FOREIGN_BUY_YN,PARALLEL_IMPORT_YN,ORDER_MADE_YN) AS GOODS_FULL_NM /*상품FULL명*/
+		     , IFNULL((SELECT  STOCK_QTY FROM TB_GOODS_STOCK WHERE GOODS_CD = 'CPS1XAPT06'),0) AS GOODS_STOCK_QTY
 		FROM (
 		SELECT G.GOODS_CD
 		     , G.GOODS_NM

+ 10 - 2
src/main/webapp/WEB-INF/views/mob/app/NoticeFormMob.html

@@ -59,7 +59,7 @@
 				html += '            <dt class="tit">\n';
 				let title = '';
 				if (_osType === 'I') {
-					title = String.fromCharCode(parseInt(item.title),16);
+					title = fnDecodeUnicode(item.title.toLowerCase());
 				} else if(_osType === 'A') {
 					title = item.title;
 				}
@@ -68,7 +68,7 @@
 				html += '            <dd class="cont_txt">\n';
 				let content = '';
 				if (_osType === 'I') {
-					content = String.fromCharCode(parseInt(item.content),16);
+					content = fnDecodeUnicode(item.content.toLowerCase());
 				} else if(_osType === 'A') {
 					content = item.content;
 				}
@@ -106,6 +106,14 @@
 		return resultDate;
 	}
 
+
+	var fnDecodeUnicode = function(context) {
+		const regExp = /\\u([\d\w]{4})/gi;
+		context = context.replace(regExp, function (match, grp)
+		{ return String.fromCharCode(parseInt(grp, 16)); } );
+		return unescape(context);
+	}
+
 </script>
 
 </th:block>

+ 2 - 2
src/main/webapp/WEB-INF/views/mob/goods/GoodsDealDetailFormMob.html

@@ -1629,8 +1629,8 @@
 			$("meta[property='eg:brandName']").attr('content',[[${goodsInfo.brandGroupNm}]]);
 			$("meta[property='eg:regDate']").attr('content',[[${goodsInfo.regDt}]].toDate("YYYYMMDDHHmmss").format("YYYY-MM-DDTHH:mm:ssZ"));
 			$("meta[property='eg:updateDate']").attr('content',[[${goodsInfo.updDt}]].toDate("YYYYMMDDHHmmss").format("YYYY-MM-DDTHH:mm:ssZ"));
-			$("meta[property='eg:stock']").attr('content',"");
-			$("meta[property='eg:state']").attr('content',[[${goodsInfo.goodsStatNm}]]);
+			$("meta[property='eg:stock']").attr('content',[[${goodsInfo.goodsStockQty}]]);
+			$("meta[property='eg:state']").attr('content',[[${goodsInfo.goodsStat}]]);
 			$("meta[property='eg:description']").attr('content',null);
 			$("meta[property='eg:extraImage']").attr('content',null);
 			$("meta[property='eg:locale']").attr('content',"KR");

+ 2 - 2
src/main/webapp/WEB-INF/views/mob/goods/GoodsDetailFormMob.html

@@ -2854,8 +2854,8 @@
 		$("meta[property='eg:brandName']").attr('content',[[${goodsInfo.brandGroupNm}]]);
 		$("meta[property='eg:regDate']").attr('content',[[${goodsInfo.regDt}]].toDate("YYYYMMDDHHmmss").format("YYYY-MM-DDTHH:mm:ssZ"));
 		$("meta[property='eg:updateDate']").attr('content',[[${goodsInfo.updDt}]].toDate("YYYYMMDDHHmmss").format("YYYY-MM-DDTHH:mm:ssZ"));
-		$("meta[property='eg:stock']").attr('content',"");
-		$("meta[property='eg:state']").attr('content',[[${goodsInfo.goodsStatNm}]]);
+		$("meta[property='eg:stock']").attr('content',[[${goodsInfo.goodsStockQty}]]);
+		$("meta[property='eg:state']").attr('content',[[${goodsInfo.goodsStat}]]);
 		$("meta[property='eg:description']").attr('content',null);
 		$("meta[property='eg:extraImage']").attr('content',null);
 		$("meta[property='eg:locale']").attr('content',"KR");

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

@@ -464,7 +464,7 @@ if (notice.length>0) {
 	html += '	<div class="announce_list">';
 	html += '		<ul>';
 	$.each(notice, function(idx, item)  {
-	html += '			<li>' +item.itemVal+ '</li>';
+	html += '			<li>' +item.itemVal.escapeHtml();+ '</li>';
 	});
 	html += '		</ul>';
 	html += '	</div>';
@@ -931,23 +931,23 @@ if(template.length>0){
 			html += '			<ul>\n';
 			html += '                  <li>' + couponContent[0].cpnNote0 +'</li>\n';
 			if(couponContent[0].cpnNote1 != null && couponContent[0].cpnNote1 != '')
-				html += '                  <li>' + couponContent[0].cpnNote1 +'</li>\n';
+				html += '                  <li>' + couponContent[0].cpnNote1.escapeHtml(); +'</li>\n';
 			if(couponContent[0].cpnNote2 != null && couponContent[0].cpnNote2 != '')
-				html += '                  <li>' + couponContent[0].cpnNote2 +'</li>\n';
+				html += '                  <li>' + couponContent[0].cpnNote2.escapeHtml(); +'</li>\n';
 			if(couponContent[0].cpnNote3 != null && couponContent[0].cpnNote3 != '')
-				html += '                  <li>' + couponContent[0].cpnNote3 +'</li>\n';	
+				html += '                  <li>' + couponContent[0].cpnNote3.escapeHtml(); +'</li>\n';	
 			if(couponContent[0].cpnNote4 != null && couponContent[0].cpnNote4 != '')
-				html += '                  <li>' + couponContent[0].cpnNote4 +'</li>\n';
+				html += '                  <li>' + couponContent[0].cpnNote4.escapeHtml(); +'</li>\n';
 			if(couponContent[0].cpnNote5 != null && couponContent[0].cpnNote5 != '')
-				html += '                  <li>' + couponContent[0].cpnNote5 +'</li>\n';
+				html += '                  <li>' + couponContent[0].cpnNote5.escapeHtml(); +'</li>\n';
 			if(couponContent[0].cpnNote6 != null && couponContent[0].cpnNote6 != '')
-				html += '                  <li>' + couponContent[0].cpnNote6 +'</li>\n';
+				html += '                  <li>' + couponContent[0].cpnNote6.escapeHtml(); +'</li>\n';
 			if(couponContent[0].cpnNote7 != null && couponContent[0].cpnNote7 != '')
-				html += '                  <li>' + couponContent[0].cpnNote7 +'</li>\n';
+				html += '                  <li>' + couponContent[0].cpnNote7.escapeHtml(); +'</li>\n';
 			if(couponContent[0].cpnNote8 != null && couponContent[0].cpnNote8 != '')
-				html += '                  <li>' + couponContent[0].cpnNote8 +'</li>\n';
+				html += '                  <li>' + couponContent[0].cpnNote8.escapeHtml(); +'</li>\n';
 			if(couponContent[0].cpnNote9 != null && couponContent[0].cpnNote9 != '')
-				html += '                  <li>' + couponContent[0].cpnNote9 +'</li>\n';
+				html += '                  <li>' + couponContent[0].cpnNote9.escapeHtml(); +'</li>\n';
 			html += '			</ul>\n';
 			html += '		</div>\n';
 			html += '	</div>\n';

+ 2 - 2
src/main/webapp/WEB-INF/views/web/goods/GoodsDealDetailFormWeb.html

@@ -1567,8 +1567,8 @@
 	$("meta[property='eg:brandName']").attr('content',[[${goodsInfo.brandGroupNm}]]);
 	$("meta[property='eg:regDate']").attr('content',[[${goodsInfo.regDt}]].toDate("YYYYMMDDHHmmss").format("YYYY-MM-DDTHH:mm:ssZ"));
 	$("meta[property='eg:updateDate']").attr('content',[[${goodsInfo.updDt}]].toDate("YYYYMMDDHHmmss").format("YYYY-MM-DDTHH:mm:ssZ"));
-	$("meta[property='eg:stock']").attr('content',"");
-	$("meta[property='eg:state']").attr('content',[[${goodsInfo.goodsStatNm}]]);
+	$("meta[property='eg:stock']").attr('content',[[${goodsInfo.goodsStockQty}]]);
+	$("meta[property='eg:state']").attr('content',[[${goodsInfo.goodsStat}]]);
 	$("meta[property='eg:description']").attr('content',null);
 	$("meta[property='eg:extraImage']").attr('content',null);
 	$("meta[property='eg:locale']").attr('content',"KR");

+ 2 - 2
src/main/webapp/WEB-INF/views/web/goods/GoodsDetailFormWeb.html

@@ -2868,8 +2868,8 @@
 	$("meta[property='eg:brandName']").attr('content',[[${goodsInfo.brandGroupNm}]]);
 	$("meta[property='eg:regDate']").attr('content',[[${goodsInfo.regDt}]].toDate("YYYYMMDDHHmmss").format("YYYY-MM-DDTHH:mm:ssZ"));
 	$("meta[property='eg:updateDate']").attr('content',[[${goodsInfo.updDt}]].toDate("YYYYMMDDHHmmss").format("YYYY-MM-DDTHH:mm:ssZ"));
-	$("meta[property='eg:stock']").attr('content',"");
-	$("meta[property='eg:state']").attr('content',[[${goodsInfo.goodsStatNm}]]);
+	$("meta[property='eg:stock']").attr('content',[[${goodsInfo.goodsStockQty}]]);
+	$("meta[property='eg:state']").attr('content',[[${goodsInfo.goodsStat}]]);
 	$("meta[property='eg:description']").attr('content',null);
 	$("meta[property='eg:extraImage']").attr('content',null);
 	$("meta[property='eg:locale']").attr('content',"KR");

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

@@ -262,7 +262,7 @@ if(notice.length>0){
 	html += '            <div class="announce_list">\n';
 	html += '                <ul>\n';
 	$.each(notice, function(idx, item)  {
-		html += '				<li>' +item.itemVal+ '</li>\n';
+		html += '				<li>' +item.itemVal.escapeHtml();+ '</li>\n';
 	});
 	html += '                </ul>\n';
 	html += '            </div>\n';
@@ -777,23 +777,23 @@ if(template.length>0){
 			html += '               <ul>\n';
 			html += '                  <li>' + couponContent[0].cpnNote0 +'</li>\n';
 			if(couponContent[0].cpnNote1 != null && couponContent[0].cpnNote1 != '')
-				html += '                  <li>' + couponContent[0].cpnNote1 +'</li>\n';
+				html += '                  <li>' + couponContent[0].cpnNote1.escapeHtml(); +'</li>\n';
 			if(couponContent[0].cpnNote2 != null && couponContent[0].cpnNote2 != '')
-				html += '                  <li>' + couponContent[0].cpnNote2 +'</li>\n';
+				html += '                  <li>' + couponContent[0].cpnNote2.escapeHtml(); +'</li>\n';
 			if(couponContent[0].cpnNote3 != null && couponContent[0].cpnNote3 != '')
-				html += '                  <li>' + couponContent[0].cpnNote3 +'</li>\n';	
+				html += '                  <li>' + couponContent[0].cpnNote3.escapeHtml(); +'</li>\n';	
 			if(couponContent[0].cpnNote4 != null && couponContent[0].cpnNote4 != '')
-				html += '                  <li>' + couponContent[0].cpnNote4 +'</li>\n';
+				html += '                  <li>' + couponContent[0].cpnNote4.escapeHtml(); +'</li>\n';
 			if(couponContent[0].cpnNote5 != null && couponContent[0].cpnNote5 != '')
-				html += '                  <li>' + couponContent[0].cpnNote5 +'</li>\n';
+				html += '                  <li>' + couponContent[0].cpnNote5.escapeHtml(); +'</li>\n';
 			if(couponContent[0].cpnNote6 != null && couponContent[0].cpnNote6 != '')
-				html += '                  <li>' + couponContent[0].cpnNote6 +'</li>\n';
+				html += '                  <li>' + couponContent[0].cpnNote6.escapeHtml();+'</li>\n';
 			if(couponContent[0].cpnNote7 != null && couponContent[0].cpnNote7 != '')
-				html += '                  <li>' + couponContent[0].cpnNote7 +'</li>\n';
+				html += '                  <li>' + couponContent[0].cpnNote7.escapeHtml(); +'</li>\n';
 			if(couponContent[0].cpnNote8 != null && couponContent[0].cpnNote8 != '')
-				html += '                  <li>' + couponContent[0].cpnNote8 +'</li>\n';
+				html += '                  <li>' + couponContent[0].cpnNote8.escapeHtml(); +'</li>\n';
 			if(couponContent[0].cpnNote9 != null && couponContent[0].cpnNote9 != '')
-				html += '                  <li>' + couponContent[0].cpnNote9 +'</li>\n';
+				html += '                  <li>' + couponContent[0].cpnNote9.escapeHtml(); +'</li>\n';
 			html += '               </ul>\n';
 			html += '            </div>                                                                '; 
 			html += '        </div>                                                                    '; 

+ 0 - 397
src/main/webapp/ux/pc/js/common-ui_back210202.js

@@ -1,397 +0,0 @@
-/* *******************************************
-
- [1][ prefix ]
-	 uifn_ 
-
- [2][ index ]
-	 1. Variables (전역변수)
-	 2. Init    (초기설정)
-	 3. Utility (유틸리티)
-	 4. Custom  (라이브러리 커스텀)
-	 5. Content (컨텐츠)
-
- [3][ update ]
-	 2020.12.02  FOOT area - popup, family site, scrollTop
-	 2020.12.10  FORM - check-All, input-File-Add, Select Custom
-
-******************************************* */
-/* * * * * * * * * * * * * * * * * * * * * * 
-
-(1) Variables (전역변수)
-
-* * * * * * * * * * * * * * * * * * * * * */
-
-
-
-
-
-/* * * * * * * * * * * * * * * * * * * * * * * 
-
-2. Init    (초기설정)
-
-* * * * * * * * * * * * * * * * * * * * * */
-
-
-
-
-
-/* * * * * * * * * * * * * * * * * * * * * * * 
-
-3. Utility (유틸리티)
-
-* * * * * * * * * * * * * * * * * * * * * */
-
-
-// FORM
-// input-File-Add
-$(document).ready(function() {
-	if (window.File && window.FileList && window.FileReader) {
-		$("#fileAdd").on("change", function(e) {
-			var files = e.target.files,
-				filesLength = files.length;
-			for (var i = 0; i < filesLength; i++) {
-				var f = files[i]
-				var fileReader = new FileReader();
-				fileReader.onload = (function(e) {
-					var file = e.target;
-					$("<span class=\"pics\">" +
-						"<img class=\"picsThumbs\" src=\"" + e.target.result + "\" title=\"" + file.name + "\"/>" +
-						"<br/><span class=\"removes\">Removes image</span>" +
-						"</span>").insertAfter("#fileAdd");
-					$(".removes").click(function(){
-						$(this).parent(".pics").remove();
-					});
-				});
-			fileReader.readAsDataURL(f);
-			}
-		});
-	} else {
-		alert("브라우저가 File API를 지원하지 않습니다.")
-	}
-});
-// input-File-Adds
-$(document).ready(function() {
-	if (window.File && window.FileList && window.FileReader) {
-		$("#fileAdds").on("change", function(e) {
-			var files = e.target.files,
-				filesLength = files.length;
-			for (var i = 0; i < filesLength; i++) {
-				var f = files[i]
-				var fileReader = new FileReader();
-				fileReader.onload = (function(e) {
-					var file = e.target;
-					$("<span class=\"pics\">" +
-						"<img class=\"picsThumbs\" src=\"" + e.target.result + "\" title=\"" + file.name + "\"/>" +
-						"<br/><span class=\"removes\">Removes image</span>" +
-						"</span>").insertAfter("#fileAdds");
-					$(".removes").click(function(){
-						$(this).parent(".pics").remove();
-					});
-				});
-			fileReader.readAsDataURL(f);
-			}
-		});
-	} else {
-		alert("브라우저가 File API를 지원하지 않습니다.")
-	}
-});
-
-
-// check-All
-$( document ).ready(function() {
-	var $chkAll = $('.check-all');
-		$chkAll.change(function () {
-			var checked = $(this).prop('checked'); 
-			$('input[name="dd"]').prop('checked', checked);
-		});
-		
-	var ddChk = $('input[name="dd"]');
-	ddChk.change(function () {
-			var ddChkLength = ddChk.length;
-			var checkedLength = $('input[name="dd"]:checked').length;
-			var selectAll = (ddChkLength == checkedLength);
-			$chkAll.prop('checked', selectAll);
-		});
-});
-
-//Select Custom
-$( document ).ready(function() {
-	$('select').each(function(){
-		var $this = $(this), numberOfOptions = $(this).children('option').length;
-	
-		$this.addClass('select_hidden'); 
-		$this.wrap('<div class="select"></div>');
-		$this.after('<div class="select_dress"></div>');
-
-		var $dressSelect = $this.next('div.select_dress');
-		$dressSelect.text($this.children('option').eq(0).text());
-	
-		var $selList = $('<ul />', {
-			'class': 'select_options'
-		}).insertAfter($dressSelect);
-	
-		for (var i = 0; i < numberOfOptions; i++) {
-			$('<li />', {
-				text: $this.children('option').eq(i).text(),
-				rel: $this.children('option').eq(i).val()
-			}).appendTo($selList);
-		}
-	
-		var $selListItems = $selList.children('li');
-	
-		$dressSelect.click(function(e) {
-			e.stopPropagation();
-			$('div.select_dress.active').not(this).each(function(){
-				$(this).removeClass('active').next('ul.select_options').hide();
-			});
-			$(this).toggleClass('active').next('ul.select_options').toggle();
-		});
-	
-		$selListItems.click(function(e) {
-			e.stopPropagation();
-			$dressSelect.text($(this).text()).removeClass('active');
-			$this.val($(this).attr('rel'));
-			$selList.hide();
-			//console.log($this.val());
-		});
-	
-		$(document).click(function() {
-			$dressSelect.removeClass('active');
-			$selList.hide();
-		});
-
-	});
-});
-
-
-// selectBrand on/off
-$( document ).ready( function() {
-	$("#selectBrand .brandbox input").on("click", function() {
-		$("#selectBrand .brandbox input").removeClass("on");
-		$(this).addClass("on");
-	});
-});
-
-
-/* alert */
-$(function(){
-	$('.alertCls').click(function(){
-    setTimeout(function(){
-     $('.alert').css('animation', 'none');
-		$('.alert').css('display', 'none');
-    }, 300);
-    // uifn_currCallback();
-  });
-});
-
-
-
-/* * * * * * * * * * * * * * * * * * * * * * * 
-
-4. Custom  (라이브러리 커스텀)
-
-* * * * * * * * * * * * * * * * * * * * * */
-
-$( document ).ready(function() {
-//datepicker 
-$.datepicker.regional['kr'] = {
-	dateFormat: 'yy-mm-dd' // 날짜 포맷 설정
-};
-
-$.datepicker.setDefaults($.datepicker.regional['kr']);
-});
-
-
-
-/* * * * * * * * * * * * * * * * * * * * * * * 
-
-5. Content (컨텐츠)
-
-* * * * * * * * * * * * * * * * * * * * * */
-
-$( document ).ready(function() {
-
-	var footerH = $("#footer").outerHeight();
-	var fixedH = $(".fixed_btns").outerHeight();
-	var limitH = ((footerH+fixedH)-8);
-
-	uifn_bottomfloat($(".fixed_btns"), footerH);
-	$(window).on('scroll', function(){
-		uifn_bottomfloat($(".fixed_btns"), footerH);
-	});
-
-	uifn_popupCtr();
-	uifn_familyCtr();
-
-	//popup
-	function uifn_popupCtr() {
-		var popupArea = $(".popup-area");
-		
-		if(popupArea.css('display') == 'block'){
-			popupArea.show();
-			document.body.classList.add("stop-scroll");
-		};
-	
-		popupArea.find(".close").click(function(){
-			popupArea.css('display','none');
-			document.body.classList.remove("stop-scroll");
-		});
-	};
-	
-	// family site
-	function uifn_familyCtr(){
-		$('.family-area').click(function(e){
-			$('.family-area').toggleClass('on');
-		});
-	}
-});
-
-// scrollTop
-function uifn_bottomfloat(object, num) {
-	var bottom = $(document).height() - $(window).height() - $(document).scrollTop();
-
-	if (bottom > num) {
-		object.removeClass("off");
-	} else if (bottom <= num) {
-		object.addClass("off");
-	} else {
-		object.removeClass("off");
-	}
-}
-/* PANEL FUNCTIONS */
-function panel_collapse(panel,action,callback){
-
-    if(panel.hasClass("panel-toggled")){        
-        panel.removeClass("panel-toggled");
-        
-        panel.find(".panel-collapse .fa-angle-up").removeClass("fa-angle-up").addClass("fa-angle-down");
-
-        if(action && action === "shown" && typeof callback === "function")
-            callback();            
-
-        onload();
-                
-    }else{
-        panel.addClass("panel-toggled");
-                
-        panel.find(".panel-collapse .fa-angle-down").removeClass("fa-angle-down").addClass("fa-angle-up");
-
-        if(action && action === "hidden" && typeof callback === "function")
-            callback();
-
-        onload();        
-        
-    }
-}
-
-
-/* cs_acodian */
-$(document).ready( function() {
-	$('.cs .foldGroup .fold_head').on('click',function(e){
-		e.preventDefault();
-		$(this).parents('.foldGroup li').find('.fold_cont').slideToggle(100);
-		$(this).toggleClass('on');
-	});	
-});
-/* //cs_acodian */
-
-/* mb_acodian,mb_tapMenu */
-$(document).ready( function() {
-
-	$('.mb .foldGroup.checkcase').on('click','.fold_head',function(e){
-		e.preventDefault();
-		$(this).parents('.foldGroup li').find('.fold_cont').slideDown(100);
-		$(this).addClass('on');
-		$('.foldGroup.checkcase .fold_head').not(this).removeClass('on').next('.fold_cont').slideUp(100);
-	}).on('click','.fold_head.on',function(e){
-		e.preventDefault();
-		$(this).removeClass('on');
-		$(this).next('.fold_cont').slideUp(100);
-	});
-
-	function resetFold() {
-		$('.foldGroup.checkcase .fold_head').removeClass('on').next('.fold_cont').hide();
-	};	
-	var navTaps = $('.registration_nav ul li');
-	var	tapPanels = $('.registration_tap .form_group');
-	navTaps.click(function(){
-		resetFold();
-		$(this).addClass('active').siblings().removeClass('active');
-		tapPanels.hide();		
-		tapPanels.eq($(this).index()).show();
-	});
-	navTaps.eq(0).trigger('click');	
-
-});    
-/* //mb_acodian,mb_tapMenu */
-
-/* od_acodian */
-$(document).ready( function() {
-	$('.od .foldGroup .fold_head').on('click',function(e){
-		e.preventDefault();
-		$(this).parents('.foldGroup li').find('.fold_cont').slideToggle(100);
-		$(this).toggleClass('on');
-	});	
-});
-/* //od_acodian */
-
-/* dropDownMenu */
-$(document).ready(function(){
-	$(".tgl_dropdown").click(function(){
-		$(this).next(".dropdown_menu").slideToggle(300, function() {
-		});
-	$(this).toggleClass('on');
-	});
-});
-/* //dropDownMenu */
-
-/* 드래그 스크롤 */
-$(function(){
-	var x,left,down;
-	$(".bullet_sticky_nav ul").mousedown(function(e){
-	e.preventDefault();
-	down = true;
-	x = e.pageX;
-	left = $(this).scrollLeft();
-	});
-
-	$("body").mousemove(function(e){
-	if(down){
-		var newX = e.pageX;
-		$(".bullet_sticky_nav ul").scrollLeft(left - newX + x);
-	}
-	});
-	$("body").mouseup(function(e){down = false;});
-});
-/* //드래그 스크롤 */
-
-/* 전시 팝업 */
-$(function(){
-	$("#coupon_pop").click(function() {
-		$("#coupon_modal_01").modal("show");
-	});					 
-	$("#coupon_pop").click(function() {
-		$("#coupon_modal_01").modal("hide");
-	});
-	$("#coupon_pop2").click(function() {
-		$("#coupon_modal_02").modal("show");
-	});					 
-	$("#coupon_pop2").click(function() {
-		$("#coupon_modal_02").modal("hide");
-	});
-});
-/* //전시 팝업 */
-
-/* 같은 데이터 노출시 동일 영역끼리 병합 */
-$(document).ready( function() {
-	$(".merge_row").each(function() {
-		var txt = $(this).text();
-		var rows = $(this).parents("table").find(".merge_row:contains('" + txt + "')");
-		//var rows = $(".merge_row:contains('" + $(this).text() + "')");
-		if (rows.length > 1) {
-			rows.eq(0).attr("rowspan", rows.length);
-			rows.not(":eq(0)").remove();
-		}
-	});   
-});
-/* //같은 데이터 노출시 동일 영역끼리 병합 */