1

miaomiao/www/js/controllers/home.js

@@ -73,7 +73,8 @@
                 $scope.dream = result.data.data
                 console.log();
                 var date = new Date();
-                var inter = (date.getTime() - new Date($scope.dream.created_at).getTime())/1000
+                var inter = (date.getTime() - new Date($scope.dream.created_at.replace(/-/g, "/")).getTime()) / 1000
+                
                 leftTimer($scope.dream.time-inter);
                 $scope.multi = {
                     a: $scope.dream.a,
@@ -120,6 +121,11 @@
         }
         $scope.timer = '';
         var leftTimer = function (countDown) {
+             
+            if (isNaN(countDown)) {
+                $scope.timer = '结束';
+                return;
+            }
             var day=parseInt(countDown/(24*60*60));
             var h=parseInt(countDown/(60*60)%24);
             var m=parseInt(countDown/60%60);