Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.front.git into develop

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

@@ -8,8 +8,8 @@
 		     , A.SOCIAL_TYPE
 		     , A.SITE_CD
 		     , A.FRONT_GB
-		     , A.SOCIAL_STDT
-		     , A.SOCIAL_EDDT
+		     , DATE_FORMAT(A.SOCIAL_STDT, '%Y%m%d') AS SOCIAL_STDT
+		     , DATE_FORMAT(A.SOCIAL_EDDT, '%Y%m%d') AS SOCIAL_EDDT
 		     , A.SOCIAL_TNM
 		     , A.USE_YN
 		     , A.APPLY_GB

src/main/webapp/WEB-INF/views/mob/social/SocialMainFormMob.html

@@ -193,20 +193,17 @@ $(function(){
 	fnSocialListSearch();
     /* 핫딜 countDown */
     function hotdealTimer() {
-        var endTime = new Date(socialInfo.socialEddt); // 남은시간 지정
-
-            endTime = (Date.parse(endTime) / 1000);
-
+    		var endTime = socialInfo.socialEddt.toDate("YYYYMMDD");
+   
+            endTime = (Date.parse(endTime) / 1000); // nan
             var now = new Date();
             now = (Date.parse(now) / 1000);
-
             var timeLeft = endTime - now;
-
-            var days = Math.floor(timeLeft / 86400); 
+            var days = Math.floor(timeLeft / 86400);
             var hours = Math.floor((timeLeft - (days * 86400)) / 3600);
             var minutes = Math.floor((timeLeft - (days * 86400) - (hours * 3600 )) / 60);
             var seconds = Math.floor((timeLeft - (days * 86400) - (hours * 3600) - (minutes * 60)));
-
+	
             if (hours < '10') { hours = '0' + hours; }
             if (minutes < '10') { minutes = '0' + minutes; }
             if (seconds < '10') { seconds = '0' + seconds; }
@@ -217,6 +214,7 @@ $(function(){
             $('#h-seconds').html(seconds);		
     }
     setInterval(function() { hotdealTimer(); }, 1000);
+    
     /* countDown */
 });
 </script>

src/main/webapp/WEB-INF/views/web/social/SocialMainFormWeb.html

@@ -197,7 +197,8 @@ $(function(){
        /* 핫딜 countDown */
     
        function hotdealTimer() {
-           var endTime = new Date(socialInfo.socialEddt); // 남은시간 지정
+    	   		var endTime = socialInfo.socialEddt.toDate("YYYYMMDD");
+           //var endTime = new Date(socialInfo.socialEddt); // 남은시간 지정
 
                endTime = (Date.parse(endTime) / 1000);