Merge branch 'gq' of ssh://git.9026.com:2212/roobe/miao into gq

miaomiao/www/chcp.json

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

miaomiao/www/chcp.manifest

@@ -29,7 +29,7 @@
   },
   {
     "file": "css/style.css",
-    "hash": "7832cbb107305c5195a0d3ec1085304c"
+    "hash": "03ab56135058b32cb788f1cd9763bb2b"
   },
   {
     "file": "img/alipay.png",
@@ -133,11 +133,11 @@
   },
   {
     "file": "js/config/router.js",
-    "hash": "b4c988a2b6829e80d48438f94f71b7ab"
+    "hash": "f7ad13bb968df8e14565a03089cd82ea"
   },
   {
     "file": "js/controllers/account.js",
-    "hash": "083e26f2a92b3bb793f12cff73a7ad24"
+    "hash": "5ce31f1998dd62efdd1df16c411e1aab"
   },
   {
     "file": "js/controllers/add.js",
@@ -145,7 +145,7 @@
   },
   {
     "file": "js/controllers/home.js",
-    "hash": "e6eab7933164bf536e89e48c31719a44"
+    "hash": "635f72e40518c4532f48768f96e2938e"
   },
   {
     "file": "js/controllers/my.js",
@@ -161,7 +161,7 @@
   },
   {
     "file": "js/filters/filter.js",
-    "hash": "4837cea3f7539adc487e1b075321bc98"
+    "hash": "fc7ca5690d0da198a346f89c4190d92b"
   },
   {
     "file": "js/platformOverrides.js",
@@ -453,19 +453,19 @@
   },
   {
     "file": "templates/account/login.html",
-    "hash": "a69ae39d69eac0856e08a221ae2e6dc4"
+    "hash": "bd4e91b4e93f8498bf1caba3e25c4ab1"
   },
   {
     "file": "templates/add/index.html",
-    "hash": "60d4ea439f0d730da51f1e540a9ee8d0"
+    "hash": "45bb6e9ea44f8a9aea6d62d8ad7b752d"
   },
   {
     "file": "templates/home/dream-detail.html",
-    "hash": "f18862ee66df64f91e79df6a8b97a75f"
+    "hash": "697a03229ef9e3e0e8c24673b8240ada"
   },
   {
     "file": "templates/home/index.html",
-    "hash": "597694367bf5af356bb005e239b21362"
+    "hash": "bfbced6842d6c0b1b5f14211a969e36a"
   },
   {
     "file": "templates/home/search.html",
@@ -481,7 +481,7 @@
   },
   {
     "file": "templates/my/my-dream.html",
-    "hash": "6810e83ed11d3a2a9d71c914121802a9"
+    "hash": "4730f050d2fcff1330fbdb4b8a4a49a7"
   },
   {
     "file": "templates/my/my-message-reply.html",

miaomiao/www/css/style.css

@@ -142,6 +142,7 @@ overflow:auto;
 }
     .mainitem img {
         width:100%;
+        max-height: 220px;
     }
     .mainitem .row .col img {
         max-width: 45px;

miaomiao/www/js/config/router.js

@@ -50,12 +50,12 @@
                     }
                 }
             })
-        .state('app.home_dream', {
-            url: '/home/dream',
+        .state('app.home_collect', {
+            url: '/home/collect',
             views: {
                 'app-home': {
-                    templateUrl: 'templates/my/my-dream.html',
-                    controller: 'homeDreamsCtrl'
+                    templateUrl: 'templates/my/my-collect.html',
+                    controller: 'collectCtrl'
                 }
             }
         })

miaomiao/www/js/controllers/account.js

@@ -16,7 +16,7 @@
                 $state.go('app.home');
             }, function (error) {
                 msg.hide();
-                msg.error(error.data.message);
+                // msg.error(error.data.message);
             });
         }
         //获取验证码
@@ -37,7 +37,7 @@
             }, function (error) {
                 $scope.vm.waitSeconds = "获取验证码";
                 wait(0);
-                msg.error(error.data.Message);
+                // msg.error(error.data.message);
             });
         };
         var wait = function (seconds) {

miaomiao/www/js/controllers/home.js

@@ -2,6 +2,7 @@
     app.controller('homeCtrl', ["$scope", "$http", 'config', "$state", "msg", "$ionicPopover", "homeService"
         , function ($scope, $http, config, $state, msg, $ionicPopover, homeService) {
         $scope.type = 'hot';//tab切换
+ 
         $ionicPopover.fromTemplateUrl('my-popover.html', {
             scope: $scope
         }).then(function (popover) {
@@ -63,14 +64,15 @@
     app.controller('dreamDetailCtrl', ["$scope", "$state", "storage","msg", "common", "config", "homeService", "$ionicTabsDelegate", "$stateParams", "$ionicModal", "$timeout", "$ionicScrollDelegate", "$interval"
         , function ($scope, $state, storage , msg, common, config, homeService, $ionicTabsDelegate, $stateParams, $ionicModal, $timeout, $ionicScrollDelegate, $interval) {
         var id = $stateParams.id;
-        id=5;
+        var top3user = '';
+        // id=5;
         $scope.load = function (id) {
             msg.loading();
             homeService.dreamDetail(id).then(function (result) {
                 msg.hide();
                 console.log(result);
                 $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 inter = (end_time.getTime() - date.getTime()) / 1000
                 leftTimer(inter);
@@ -78,19 +80,22 @@
                 $scope.multi.b = new Date($scope.dream.created_at.replace(/-/g, "/"));
                 $scope.multi.c  = $scope.dream.c;
                 $scope.multi.promise =  $scope.dream.a;
-                $top3user = storage.getObject('top3user');
-                if($scope.dream.top3user != $top3user&&$top3user != null){
+                var newtop3user = '' 
+                angular.forEach($scope.dream.top3user, function(user) {  
+                  newtop3user= newtop3user +user.id+","
+                });   
+                if(top3user!=''&&newtop3user!=top3user){
                     //测试动画切换
-                    if($scope.dream.top3user[0])$scope.sort.first = $scope.dream.top3user[0].avatar;
-                    if($scope.dream.top3user[1])$scope.sort.second = $scope.dream.top3user[1].avatar;
-                    if($scope.dream.top3user[2])$scope.sort.third = $scope.dream.top3user[2].avatar;
-                    $scope.sort.slide1 = 'list-grow-animation';
-                    $scope.sort.slide2 = 'slide-in-both-ways';
-                    $scope.sort.slide3 = 'bounce-animation';
-                    storage.setObject('top3user',$scope.dream.top3user)
+                    $timeout(function() {
+                        $scope.sort.slide1 = 'list-grow-animation';
+                        $scope.sort.slide2 = 'slide-in-both-ways';
+                        $scope.sort.slide3 = 'bounce-animation';
+                    }, 50);
                 }
-
-
+                top3user = newtop3user;
+                if($scope.dream.top3user[0])$scope.sort.first = $scope.dream.top3user[0].avatar;
+                if($scope.dream.top3user[1])$scope.sort.second = $scope.dream.top3user[1].avatar;
+                if($scope.dream.top3user[2])$scope.sort.third = $scope.dream.top3user[2].avatar;
                 $scope.calcmultiplier();
             }, function (error) {
                 msg.hide();
@@ -114,6 +119,10 @@
         $scope.cancelSupport = function () {
             $scope.tosupport = false;
         }
+        //实时排行
+        $scope.sort = {
+            slide: ''
+        }
         $scope.changeType = function (type) {
             $ionicScrollDelegate.scrollTop(true);
             $scope.type = type;
@@ -159,11 +168,7 @@
         $scope.changeIndex = function (index) {
             $scope.index = index;
             $scope.vm.coin = index*5;
-        }
-        //实时排行
-        $scope.sort = {
-            slide: ''
-        }
+        } 
         $scope.vidEnded = function () {
             alert('播放完毕');
         }

miaomiao/www/js/filters/filter.js

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

miaomiao/www/templates/account/login.html

@@ -8,7 +8,7 @@
                 <input type="tel" ng-model="vm.mobile" placeholder="手机号码">
             </div>
             <div class="item item-input">
-                <input type="text" ng-model="vm.verify_code" placeholder="短信验证码">
+                <input type="tel" ng-model="vm.verify_code" placeholder="短信验证码">
                 <button ng-click="getVerifyCode()" class="button button-calm" style="margin-right:5px">{{vm.waitSeconds}}</button>
             </div>
         </div>

miaomiao/www/templates/add/index.html

@@ -21,7 +21,6 @@
             <div class="item itemjs">
                 <a ng-repeat="item in imgs" ng-click="showImages(item)" class="img-file-up">
                     <b style="background-image:url({{item}});"><em ng-click="deletefile(item)" class="ion-ios-close-outline"></em></b>
-                }
                 </a>
                 <a class="btn-file-up" ng-click="addpict()"><i class="ion-image"></i>添加图片</a>
                 <video src="{{video.path}}" ng-show="video.isOK"  height="72px" width="72px" controls="controls">

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

@@ -22,11 +22,11 @@
             <ion-slides slider="data.slider">
                 <ion-slide-page ng-if="dream.video">
                     <div class="box banner">
-                        <video ng-src="{{dream.video}}" height="300px" width="300px"  class="centerme" controls="controls" autoplay></video>
+                        <video ng-src="{{dream.video | trustUrl}}" height="300px" width="100%"  class="centerme" controls="controls" ></video>
                     </div>
                 </ion-slide-page>
                 <ion-slide-page ng-repeat="img in dream.imgs" >
-                    <div class="box banner"><img ng-src="{{img.pic}}" /></div>
+                    <div class="box banner"><img ng-src="{{img.pic}}" style="max-height: 200px;width: 100%" /></div>
                 </ion-slide-page>
             </ion-slides>
             <div class="list detail-list">
@@ -82,8 +82,8 @@
         <div ng-if="type==2" class="hdcontent">
             <div style="border-bottom:5px solid #FAF2F5;">
                 <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()">
                         <i class="icon ion-plus"></i>
                         发布梦想互动 </a>

miaomiao/www/templates/home/index.html

@@ -55,7 +55,7 @@
                                 <span class="calm">{{item.care_num}}</span>
                                 <span>人关注</span>
                             </div>
-                            <div  class="mysecond">剩余{{item.time}}天</div>
+                            <div  class="mysecond">剩余{{item.end_time | lastDate}}天</div>
                         </div>
                     </div>
                         <img ng-src="{{item.img.pic}}" />
@@ -81,7 +81,7 @@
                      <i class="icon ion-android-person"></i>
                    个人中心
                  </a>
-                 <a class="item item-icon-left" ui-sref="app.home_dream">
+                 <a class="item item-icon-left" ui-sref="app.home_collect">
                      <i class="icon ion-ios-folder-outline"></i>
                      我的收藏
                  </a>

miaomiao/www/templates/my/my-dream.html

@@ -8,10 +8,10 @@
                    <p>{{dream.about}}</p>
                </div>
                <div class="reply-bar">
-                   <div style="width: {{dream.progress}}%;">
+                   <div style="width: {{100*dream.get_coin/dream.coin}}%;">
                    </div>
                </div>
-               <div class="reply-sx"><span class="calm">{{dream.progress}}%</span> 目前实现</div>
+               <div class="reply-sx"><span class="calm">{{100*dream.get_coin/dream.coin | Rouder}}%</span> 目前实现</div>
            </div>
            
        </div>