Mike 8 years ago
parent
commit
3bdf6a063b

+ 1 - 1
miaomiao/www/chcp.json

@@ -1,5 +1,5 @@
 {
 {
   "update": "now",
   "update": "now",
   "content_url": "http://i.9026.com/miaomiao/",
   "content_url": "http://i.9026.com/miaomiao/",
-  "release": "2017.06.29-17.32.02"
+  "release": "2017.06.29-18.08.28"
 }
 }

+ 3 - 3
miaomiao/www/chcp.manifest

@@ -145,7 +145,7 @@
   },
   },
   {
   {
     "file": "js/controllers/home.js",
     "file": "js/controllers/home.js",
-    "hash": "5e0b2789590c65ccd9fe4a2b5a5dfb01"
+    "hash": "635f72e40518c4532f48768f96e2938e"
   },
   },
   {
   {
     "file": "js/controllers/my.js",
     "file": "js/controllers/my.js",
@@ -161,7 +161,7 @@
   },
   },
   {
   {
     "file": "js/filters/filter.js",
     "file": "js/filters/filter.js",
-    "hash": "89bc93d8cab12fef9133637e1bb48e2f"
+    "hash": "fc7ca5690d0da198a346f89c4190d92b"
   },
   },
   {
   {
     "file": "js/platformOverrides.js",
     "file": "js/platformOverrides.js",
@@ -461,7 +461,7 @@
   },
   },
   {
   {
     "file": "templates/home/dream-detail.html",
     "file": "templates/home/dream-detail.html",
-    "hash": "50a401172d8e701b877016061f345952"
+    "hash": "697a03229ef9e3e0e8c24673b8240ada"
   },
   },
   {
   {
     "file": "templates/home/index.html",
     "file": "templates/home/index.html",

+ 2 - 1
miaomiao/www/js/controllers/home.js

@@ -2,6 +2,7 @@
     app.controller('homeCtrl', ["$scope", "$http", 'config', "$state", "msg", "$ionicPopover", "homeService"
     app.controller('homeCtrl', ["$scope", "$http", 'config', "$state", "msg", "$ionicPopover", "homeService"
         , function ($scope, $http, config, $state, msg, $ionicPopover, homeService) {
         , function ($scope, $http, config, $state, msg, $ionicPopover, homeService) {
         $scope.type = 'hot';//tab切换
         $scope.type = 'hot';//tab切换
+ 
         $ionicPopover.fromTemplateUrl('my-popover.html', {
         $ionicPopover.fromTemplateUrl('my-popover.html', {
             scope: $scope
             scope: $scope
         }).then(function (popover) {
         }).then(function (popover) {
@@ -71,7 +72,7 @@
                 msg.hide();
                 msg.hide();
                 console.log(result);
                 console.log(result);
                 $scope.dream = result.data.data
                 $scope.dream = result.data.data
-                var end_time = new Date($scope.dream.end_time);
+                var end_time = new Date($scope.dream.end_time.replace(/-/g, "/"));
                 var date = new Date();
                 var date = new Date();
                 var inter = (end_time.getTime() - date.getTime()) / 1000
                 var inter = (end_time.getTime() - date.getTime()) / 1000
                 leftTimer(inter);
                 leftTimer(inter);

+ 5 - 3
miaomiao/www/js/filters/filter.js

@@ -62,16 +62,18 @@
     });
     });
     module.filter('lastDate', function () {
     module.filter('lastDate', function () {
         return function (end_time) {
         return function (end_time) {
-            var end_time = new Date(end_time);
+            var end_time = new Date(end_time.replace(/-/g, "/"));
             var date = new Date();
             var date = new Date();
             var inter = (end_time.getTime() - date.getTime()) / (1000*3600*24)
             var inter = (end_time.getTime() - date.getTime()) / (1000*3600*24)
-            number = Math.round(inter * 100) / 100
+            // number = Math.abs(inter * 100) / 100;
+            number = inter.toFixed(2);
             return number;
             return number;
         };
         };
     });
     });
     module.filter('Rouder', function () {
     module.filter('Rouder', function () {
         return function (inter) {
         return function (inter) {
-            number = Math.round(inter * 100) / 100
+            number = inter.toFixed(2);
+            // number = Math.round(inter * 100) / 100
             return number;
             return number;
         };
         };
     });
     });

+ 2 - 2
miaomiao/www/templates/home/dream-detail.html

@@ -82,8 +82,8 @@
         <div ng-if="type==2" class="hdcontent">
         <div ng-if="type==2" class="hdcontent">
             <div style="border-bottom:5px solid #FAF2F5;">
             <div style="border-bottom:5px solid #FAF2F5;">
                 <div class="list">
                 <div class="list">
-                    <div class="item itemjs" style="padding: 10px" ng-if="thisUser.id==dream.user.id">
-                    <!-- 梦想发布者可以发布梦想互动 -->
+                    <div class="item itemjs" style="padding: 10px" >
+                    <!-- 梦想发布者可以发布梦想互动 ng-if="thisUser.id==dream.user.id" -->
                         <a class="button button-outline button-block button-calm button-icon" ng-click="openModal()">
                         <a class="button button-outline button-block button-calm button-icon" ng-click="openModal()">
                         <i class="icon ion-plus"></i>
                         <i class="icon ion-plus"></i>
                         发布梦想互动 </a>
                         发布梦想互动 </a>