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

miaomiao/www/js/controllers/home.js

@@ -469,7 +469,18 @@
                 $scope.dream.interactions[index].showmore = true;
             }
         }
-        $scope.replay = function ($event, name, index,currentindex) {
+            $scope.replay = function ($event, name, index) {
+                $event.stopPropagation();
+                    $scope.input.focus = true;
+                    $scope.input.show = true;
+                    angular.forEach($scope.dream.interactions, function (item) {
+                        item.show = false;
+                    })
+                    $scope.dream.interactions[index].show = true;
+                    $scope.input.placeholder = "评论" + name+":";
+                    $scope.vm.title='';
+                }
+        $scope.replayOther = function ($event, name, index,currentindex) {
             $event.stopPropagation();
             if($scope.dream.interactions[index].comments[currentindex].user_id!=$scope.user.id){
                 $scope.input.focus = true;
@@ -482,12 +493,15 @@
                 $scope.vm.title='';
             }
             else {
-                msg.confirm("评论","是否删除评论").then(function(res){
-                    if(res)
+                msg.confirm("评论","是否删除评论").then(function(result){
+                    if(result==true)
                     {
-
-                    }else {
-
+                        homeService.deleteComment($scope.dream.interactions[index].comments[currentindex].id).then(function(result){
+                            msg.text("删除成功");
+                            $scope.load(id);
+                        },function(error){
+                            msg.error(error.data.message);
+                        })
                     }
                 });
             }

miaomiao/www/js/services/homeservice.js

@@ -113,6 +113,12 @@
                     method:"post",
                     data: { number:number,goods:1,type:type}
                 })
+            },
+            deleteComment:function(id){
+                return $http({
+                    url:config.server + "api/comment/delete?id=" + id,
+                    method:"get"
+                })
             }
         };
     }]);

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

@@ -158,8 +158,7 @@
                         </a>
                     </div>
                     <div class="item" style="border-bottom:15px solid #F2F2F2;" ng-click="add_comment()" ng-repeat="interaction in dream.interactions">
-                        <div>
-                        <!--<div ng-click="replay($event,dream.user.nickname,$index)">-->
+                        <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>-->
@@ -180,29 +179,7 @@
                             </div>
                         </div>
                         <div class="list">
-                            <div class="item" ng-repeat="c in interaction.comments" ng-click="replay($event,c.user_nickname,$parent.$parent.$index,$index)" ng-if="interaction.showmore||$index<4">
-<!--
-                                <div class="row">
-                                    <div class="col-20" style="text-align: right">
-                                        <img style="border: 1px solid black" class="head" ng-src="{{c.user_avatar | avator}}" />
-                                    </div>
-                                    <div class="col-80">
-                                        <div class="row">
-                                            <div class="col-50" style="color: #333333;">
-                                                {{c.user_nickname}}
-                                            </div>
-                                            <div class="col-50" style="text-align: right; color: #999999">
-                                                {{c.updated_at}}
-                                            </div>
-                                        </div>
-                                        <div class="row" style="border-bottom: 1px solid #E6E6E6; padding-bottom: 5px; margin-top: 3px">
-                                            <div class="col-100">
-                                                {{c.content}}
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
--->
+                            <div class="item" ng-repeat="c in interaction.comments" ng-click="replayOther($event,c.user_nickname,$parent.$parent.$index,$index)" ng-if="interaction.showmore||$index<4">
                                 <div class="row">
                                     <div class="col-20" style="text-align: right">
                                         <img class="head" ng-src="{{c.user_avatar | avator}}" />