Merge branch 'master' of http://git.9026.com/roobe/miao

miaomiao/www/js/controllers/home.js

@@ -467,6 +467,13 @@
             focus: false,
             show:false
         };
+        $scope.showmore = function (index) {
+            if ($scope.dream.interactions[index].showmore) {
+                $scope.dream.interactions[index].showmore = false;
+            } else {
+                $scope.dream.interactions[index].showmore = true;
+            }
+        }
         $scope.replay = function ($event, name,index) {
             $event.stopPropagation();
             $scope.input.focus = true;

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

@@ -178,9 +178,13 @@
                             </video>
                         </div>
                         <div class="list" style="margin-left:50px">
-                            <div class="item" ng-repeat="c in interaction.comments">
-                                {{c.content}}
+                            <div class="item" ng-repeat="c in interaction.comments" ng-if="interaction.showmore||$index<2">
+                                <img class="head" ng-src="{{c.user_avatar | avator}}" />
+                                <span>{{c.content}}</span>                                
+                                <span class="utitle">{{c.user_nickname}}</span>
+                                <span class="utitle kz">{{c.updated_at}}</span>
                             </div>
+                            <p ng-click="showmore($index)" ng-if="interaction.comments.length>2" style="color: #00C3DA"> {{interaction.showmore?"关闭更多":"查看更多"}}</p>
                         </div>
                         <p ng-click="replay($event,dream.user.nickname,$index)" style="margin: 10px 0 0 50px; color: #00C3DA">评论</p>
                         <div class="item item-input" ng-if="input.show&&interaction.show">