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

miaomiao/www/css/style.css

@@ -554,7 +554,7 @@ a:visited,a:link{
 
     .hdcontent .utitle {
         position:relative;
-        top:-28px;
+        top: -28px;
     }
     .hdcontent .kz{
         float: right;

miaomiao/www/js/controllers/home.js

@@ -482,7 +482,14 @@
                 $scope.vm.title='';
             }
             else {
-                msg.confirm("评论","是否删除评论");
+                msg.confirm("评论","是否删除评论").then(function(res){
+                    if(res)
+                    {
+
+                    }else {
+
+                    }
+                });
             }
 
         };

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

@@ -179,14 +179,48 @@
                                 <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="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">
-                                <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 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="row">
+                                    <div class="col-20" style="text-align: right">
+                                        <img class="head" ng-src="{{c.user_avatar | avator}}" />
+                                    </div>
+                                    <div class="col-80" style="border-bottom: 1px solid #E6E6E6">
+                                        <span style="margin-top: 10px; display: inline-block">{{c.user_nickname}}</span>
+                                        <span class="utitle kz">{{c.updated_at}}</span>
+                                        <p style="white-space:normal; color: #666666">{{c.content}}</p>
+                                    </div>
+                                </div>
+
+
+                            </div>
+                            <div class="row">
+                                <div class="col-offset-20 col-80">
+                                    <p ng-click="showmore($index)" ng-if="interaction.comments.length>4" style="color: #00C3DA; margin-top: 10px; margin-bottom: 10px"> {{interaction.showmore?"关闭更多":"查看更多评论"}}</p>
+                                </div>
                             </div>
-                            <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>-->
                         <div class="item item-input" ng-if="input.show&&interaction.show">