1

miaomiao/www/js/controllers/home.js

@@ -468,7 +468,8 @@
                 $scope.dream.interactions[index].showmore = true;
             }
         }
-        $scope.replay = function ($event, name,index) {
+        $scope.replay = function ($event, name, index) {
+           
             $event.stopPropagation();
             $scope.input.focus = true;
             $scope.input.show = true;
@@ -498,7 +499,8 @@
             })
         };
             $scope.bigImage = false;
-            $scope.showBigImage  = function(imageName){
+            $scope.showBigImage = function ($event, imageName) {
+                $event.stopPropagation();
                 $scope.url = imageName;
                 $scope.bigImage = true;
             };
@@ -909,7 +911,8 @@
                 })
             };
             $scope.bigImage = false;
-            $scope.showBigImage  = function(imageName){
+            $scope.showBigImage = function ($event,imageName) {
+                $event.stopPropagation();
                 $scope.url = imageName;
                 $scope.bigImage = true;
             };

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

@@ -158,35 +158,36 @@
                         </a>
                     </div>
                     <div class="item" style="border-bottom:15px solid #F2F2F2;" ng-click="add_comment()" ng-repeat="interaction in dream.interactions">
-                        <img  class="head" ng-src="{{dream.user.avatar | avator}}" />
-                        <span  class="utitle">{{dream.user.nickname}}</span>
-                        <!--<span class="utitle kz">{{dream.end_time | lastDate}}</span>-->
-                        <span class="utitle kz">{{dream.created_at}}</span>
-                        <p class="subtile"  style="white-space:normal; color: #666666">{{interaction.title}}</p>
-                        <div class="picts item">
-                            <img class="slt" ng-click="showBigImage('{{interaction.pic1}}')" ng-src="{{interaction.pic1}}" ng-if="interaction.pic1"/>
-                            <img class="slt" ng-src="{{interaction.pic2}}" ng-if="interaction.pic2"/>
-                            <img class="slt" ng-src="{{interaction.pic3}}" ng-if="interaction.pic3"/>
-                            <img class="slt" ng-src="{{interaction.pic4}}" ng-if="interaction.pic4"/>
-                            <img class="slt" ng-src="{{interaction.pic5}}" ng-if="interaction.pic5"/>
-                            <img class="slt" ng-src="{{interaction.pic6}}" ng-if="interaction.pic6"/>
-                            <img class="slt" ng-src="{{interaction.pic7}}" ng-if="interaction.pic7"/>
-                            <img class="slt" ng-src="{{interaction.pic8}}" ng-if="interaction.pic8"/>
-                        </div>
-                        <div>
-                            <video ng-src="{{video.file | trustUrl}}" ng-show="video.isOK" poster="{{video.vpic}}" height="72px" width="72px" controls="controls">
-                            </video>
+                        <div ng-click="replay($event,dream.user.nickname,$index)">
+                            <img class="head" ng-src="{{dream.user.avatar | avator}}" />
+                            <span class="utitle">{{dream.user.nickname}}</span>
+                            <!--<span class="utitle kz">{{dream.end_time | lastDate}}</span>-->
+                            <span class="utitle kz">{{dream.created_at}}</span>
+                            <p class="subtile" style="white-space:normal; color: #666666">{{interaction.title}}</p>
+                            <div class="picts item">
+                                <img class="slt" ng-click="showBigImage($event,'{{interaction.pic1}}')" ng-src="{{interaction.pic1}}" ng-if="interaction.pic1" />
+                                <img class="slt" ng-src="{{interaction.pic2}}" ng-if="interaction.pic2" />
+                                <img class="slt" ng-src="{{interaction.pic3}}" ng-if="interaction.pic3" />
+                                <img class="slt" ng-src="{{interaction.pic4}}" ng-if="interaction.pic4" />
+                                <img class="slt" ng-src="{{interaction.pic5}}" ng-if="interaction.pic5" />
+                                <img class="slt" ng-src="{{interaction.pic6}}" ng-if="interaction.pic6" />
+                                <img class="slt" ng-src="{{interaction.pic7}}" ng-if="interaction.pic7" />
+                                <img class="slt" ng-src="{{interaction.pic8}}" ng-if="interaction.pic8" />
+                            </div>
+                            <div>
+                                <video ng-src="{{video.file | trustUrl}}" ng-show="video.isOK" poster="{{video.vpic}}" height="72px" width="72px" controls="controls"></video>
+                            </div>
                         </div>
                         <div class="list" style="margin-left:50px">
-                            <div class="item" ng-repeat="c in interaction.comments" ng-if="interaction.showmore||$index<2">
+                            <div class="item" ng-repeat="c in interaction.comments" ng-click="replay($event,c.user_nickname,$parent.$parent.$index)" ng-if="interaction.showmore||$index<4">
                                 <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>
+                            <p ng-click="showmore($index)" ng-if="interaction.comments.length>4" 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>
+                        <!--<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">
                             <textarea name="comment"  focus-me="input.focus" placeholder="{{input.placeholder}}" ng-model="vm.comment" style="padding: 0 20px;"></textarea>
                             <a class="button button-calm" style="margin-right:5px;line-height:35px;min-width:30px" ng-click="submitComment($index)">