add

miaomiao/www/js/controllers/home.js

@@ -164,7 +164,22 @@
                 $scope.filter.pageIndex++;
                 var more = (result.data.data.dreams.data.length >= $scope.filter.pageSize);
                 $scope.filter.hasMore = more;
-                $scope.index.dreams = $scope.index.dreams.concat(result.data.data.dreams.data);
+                var dreams_before = $scope.index.dreams.concat(result.data.data.dreams.data); 
+                var reportUser = storage.getObject('reportUser');
+                var result = [];
+                for(var i = 0; i < reportUser.length; i++){
+                    for(var j = 0; j < dreams_before.length ; j++){
+                        if(reportUser[i] == dreams_before[j].user_id){
+                            dreams_before.splice(j,1,undefined);
+                        }
+                    }
+                }
+                for(var i = 0; i < dreams_before.length; i++){
+                    if(dreams_before[i] != undefined){
+                        result.push(dreams_before[i]);
+                    }
+                }
+                $scope.index.dreams = result;
                 if (init) {
                     $scope.$broadcast('scroll.refreshComplete');
                 } else {
@@ -330,21 +345,53 @@
                 });
             };
 
-            // 举报或拉黑
+            // 举报或拉黑(互动页面)
             $scope.report = function(ev,dream_id,interaction_id,user_id){
                 ev.stopPropagation();
-                msg.confirm('举报或拉黑','','举报','拉黑').then(function(result){
+                if($scope.user.id != $scope.dream.user_id){
+                    msg.confirm('举报或拉黑该用户','','举报','拉黑').then(function(result){
+                        if(result==true){
+                            msg.confirm('确定拉黑？').then(function(result){
+                                if(result==true){
+                                    homeService.report(dream_id,interaction_id,user_id).then(function(result){
+                                        if(result.data.status_code==0){
+                                            msg.text('已拉黑');
+                                            $scope.load(dream_id);
+                                        }
+                                    },function(error){
+                                        
+                                    })
+                                }
+                            })
+                        }
+                        else {
+                            msg.confirm('确定举报？').then(function(result){
+                                if(result==true){
+                                    $state.go('app.homeContact');
+                                }
+                            })
+                        }
+                    })
+                }
+            };
+
+            // 举报或拉黑（主页）
+            $scope.reportUser = function(ev,user_id){
+                ev.stopPropagation();
+                msg.confirm('举报或拉黑该用户','','举报','拉黑').then(function(result){
                     if(result==true){
                         msg.confirm('确定拉黑？').then(function(result){
                             if(result==true){
-                                homeService.report(dream_id,interaction_id,user_id).then(function(result){
-                                    if(result.data.status_code==0){
-                                        msg.text('已拉黑');
-                                        $scope.load(dream_id);
-                                    }
-                                },function(error){
-                                    
-                                })
+                                var res = typeof(storage.getObject('reportUser'));
+                                if(res != 'object'){
+                                    var reportUser = storage.getObject('reportUser');
+                                }
+                                else{
+                                    var reportUser = [];
+                                }
+                                reportUser.push($scope.dream.user_id);
+                                storage.setObject('reportUser',reportUser);
+                                msg.text('已拉黑');
                             }
                         })
                     }
@@ -356,7 +403,7 @@
                         })
                     }
                 })
-            };
+            }
 
         $scope.load = function (id,dream_user_id,interaction_id) {
             homeService.dreamDetail(id,dream_user_id,interaction_id).then(function (result) {
@@ -635,7 +682,6 @@
             $scope.vm.comment='';
         };
         $scope.replayOther = function ($event, name, to_userid, index,currentindex) {
-            debugger;
             $event.stopPropagation();
             if($scope.dream.interactions[index].comments[currentindex].user_id!=$scope.user.id){
                 $scope.input.focus = true;

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

@@ -22,6 +22,7 @@
         </div>
     </div>
     <ion-content style="background: #fff" ng-click="cancelSupport()">
+        <!-- 新手引导 开始 -->
         <div ng-if="step==2" ng-click="changeStep()" style="background: #252525; z-index: 999999;">
             <img src="img/dream1.png" style="width: 100%;" alt="">
         </div>
@@ -31,6 +32,7 @@
         <div ng-if="step==4" ng-click="changeStep()" style="background: #252525; z-index: 999999;">
             <img src="img/dream3.png" style="width: 100%;" alt="">
         </div>
+        <!-- 新手引导 结束 -->
         <div ng-if="step!=2&&step!=3&&step!=4">
             <div ng-if="type==1 && user.id != dream.user_id" style="position: fixed; bottom: -8px; width: 100%; z-index: 5;background: #fff;border-top: 1px solid #ECF2F7;height: 68px">
                 <div class="row">
@@ -87,8 +89,12 @@
                             </ion-slide-page>
                         </ion-slides>
                     </div>
-                    <div class="item" style="padding: 0 16px">
-                        <p style="font-size: 17px; color: #000">{{dream.name}}</p>
+                    <div class="item" style="padding: 0 16px;">
+                        <p style="font-size: 17px; color: #000;">{{dream.name}}</p>
+                        <p style="text-align: right;">
+                            <span ng-if="user.id != dream.user_id" ng-click="reportUser($event)">举报或拉黑</span> 
+                            <!-- <span ng-click="reportUser($event)">{{dream.user_id}}举报或拉黑</span>  -->
+                        </p>
                         <p style="font-size: 13px;" ng-style="aboutStyle" ng-bind-html="dream.about | trustHtml">
                         </p>
                         <div style="text-align: center">
@@ -187,7 +193,6 @@
                                     <video ng-src="{{ interaction.video | trustUrl}}" poster="{{ interaction.video+'.jpg' | videoPoster | trustUrl}}" width="100%" style="max-height: 400px;" class="centerme" controls="controls"></video>
                                 </div>
                             </div>
-                            <div style="font-size: 12px; text-align: right; padding-right: 10px; color: #999999;" ng-if="interaction.showmore||$index<4">点击用户头像举报或拉黑该用户</div>
                             <div class="list">
                                 <div class="item" ng-repeat="c in interaction.comments" ng-click="replayOther($event,c.user_nickname,c.user_id,$parent.$parent.$index,$index)" ng-if="interaction.showmore||$index<4">
                                     <div class="row">
@@ -206,6 +211,7 @@
                                         </div>
                                     </div>
                                 </div>
+                                <div style="font-size: 12px; text-align: right; padding-right: 10px; color: #999999;" ng-if="interaction.showmore||$index<4">点击用户头像举报或拉黑该用户</div>
                                 <div class="row">
                                     <div class="col-offset-20 col-60">
                                         <p ng-click="showmore($index)" ng-if="interaction.comments.length>4" style="color: #00C3DA; margin-top: 10px; margin-bottom: 10px"> {{interaction.showmore?"只看最近评论":"查看更多评论"}}</p>

miaomiao/www/templates/home/index.html

@@ -29,12 +29,14 @@
     <ion-side-menus>
         <ion-side-menu-content drag-content="false">
             <ion-content>
+                <!-- 新手引导 开始 -->
                 <div ng-if="step==0" ng-click="changeStep()" ng-class="{'screenWidth2':screenWidth==2,'screenWidth1':screenWidth==1,'screenWidth0':screenWidth==0}" style="background: #252525; z-index: 999999;">
                     <img src="img/home1.png" style="width: 100%;" alt="">
                 </div>
                 <div ng-if="step==1" ng-click="changeStep()" ng-class="{'screenWidth2':screenWidth==2,'screenWidth1':screenWidth==1,'screenWidth0':screenWidth==0}" style="background: #252525; z-index: 999999;">
                     <img src="img/home2.png" style="width: 100%;" alt="">
                 </div>
+                <!-- 新手引导 结束 -->
                 <div ng-if="step!=0&&step!=1">
                     <!--下拉刷新-->
                     <ion-refresher pulling-text="下拉刷新" on-refresh="load(true)">