星潮bug修改

@@ -8,13 +8,18 @@ var $ = require('jquery'),
     tip = require('../plugin/tip'),
     tip = require('../plugin/tip'),
     loading = require('../plugin/loading'),
     loading = require('../plugin/loading'),
     lazyLoad = require('yoho.lazyload'),
     lazyLoad = require('yoho.lazyload'),
+    ellipsis = require('mlellipsis'),
     stopLoading = false;
     stopLoading = false;
 
 
 var page = 1;
 var page = 1;
 
 
+ellipsis.init();
+
 $('body').addClass('star-class-body');
 $('body').addClass('star-class-body');
 
 
 function massageAJAX(page) {
 function massageAJAX(page) {
+    var $this, $title, $cont;
+
     loading.showLoadingMask();
     loading.showLoadingMask();
     $.ajax({
     $.ajax({
         type: 'GET',
         type: 'GET',
@@ -32,6 +37,17 @@ function massageAJAX(page) {
             }
             }
 
 
             $('.collocation-list').append(data);
             $('.collocation-list').append(data);
+
+            // 限制标题字数
+            $('.cont-area').each(function() {
+                $this = $(this);
+                $title = $this.find('.title');
+                $cont = $this.find('.cont-txt');
+
+                $title[0].mlellipsis(2);
+                $cont[0].mlellipsis(2);
+            });
+
             loading.hideLoadingMask();
             loading.hideLoadingMask();
             lazyLoad($('img.lazy'));
             lazyLoad($('img.lazy'));
         },
         },
@@ -118,4 +134,4 @@ $(document).on('touchstart', '.collection', function(event) {
             tip.show('网络断开连接了~');
             tip.show('网络断开连接了~');
         }
         }
     });
     });
-});
+});

@@ -263,7 +263,9 @@ $('.pop-intimacy .pop-close, .classroom-mask').on('click', function() {
     //     overflow: 'visible'
     //     overflow: 'visible'
     // });
     // });
 
 
-    location.reload();
+    // location.reload();
+
+    history.go(0);
 });
 });
 
 
 function setAvatar() {
 function setAvatar() {

@@ -735,11 +735,6 @@
                 line-height: 46px;
                 line-height: 46px;
                 color: #b0b0b0;
                 color: #b0b0b0;
                 margin-top: 10px;
                 margin-top: 10px;
-                overflow : hidden;
-                text-overflow: ellipsis;
-                display: -webkit-box;
-                -webkit-line-clamp: 2;
-                -webkit-box-orient: vertical;
             }
             }
 
 
             img {
             img {
@@ -749,16 +744,8 @@
             .title {
             .title {
                 font-size: 40px;
                 font-size: 40px;
                 line-height: 48px;
                 line-height: 48px;
-
-                a {
-                    color: #fff;
-                    width: 100%;
-                    overflow: hidden;
-                    text-overflow: ellipsis;
-                    display: -webkit-box;
-                    -webkit-line-clamp: 2;
-                    -webkit-box-orient: vertical;
-                }
+                color: #fff;
+                width: 100%;
             }
             }
 
 
             .count-area {
             .count-area {

@@ -4,7 +4,7 @@
             <a href="{{url}}"><img class="lazy" src ="" data-original="{{img}}" /></a>
             <a href="{{url}}"><img class="lazy" src ="" data-original="{{img}}" /></a>
         {{/if}}
         {{/if}}
         <div class="cont-area">
         <div class="cont-area">
-            <h2 class="title"><a href="{{url}}">{{title}}</a></h2>
+            <a href="{{url}}"><h2 class="title">{{title}}</h2></a>
             <p class="cont-txt">{{content}}</p>
             <p class="cont-txt">{{content}}</p>
             <div class="count-area">
             <div class="count-area">
                 <span class="time"><i class="iconfont time-ico">&#xe603;</i>{{time}}</span>
                 <span class="time"><i class="iconfont time-ico">&#xe603;</i>{{time}}</span>