Merge branch 'feature/xingchao' of http://git.dev.yoho.cn/web/yohobuy into feature/xingchao

@@ -21,9 +21,11 @@ function massageAJAX(page) {
         },
         dataType: 'html',
         success: function(data) {
+            stopLoading = false;
+
             if (data === '') {
                 stopLoading = true;
-                tip.show('没有更多了');
+                tip.show('没有更多内容了');
             }
 
             $('.collocation-list').append(data);
@@ -37,6 +39,7 @@ function massageAJAX(page) {
 
 function scrollHandler() {
     if (!stopLoading && ($(window).scrollTop() + $(window).height() > $('body').height() - 100)) {
+        stopLoading = true;
         page++;
         massageAJAX(page);
     }

@@ -2,6 +2,7 @@ body {
     width: 100%;
     background: #333;
     font: 12px/1.5 Arial,'黑体';
+    float: left
 }
 
 .star-classroom {
@@ -694,6 +695,7 @@ body {
 
     .collocation-list {
         width: 100%;
+        float: left;
 
         li {
             float: left;

 {{# trendClassCheckIn}}
     {{> layout/header}}
-    <div class="star-classroom">
+    <div class="star-classroom yoho-page">
         <div class="check-in">
             <div class="check-in-header">
                 <div class="head-cont">

 {{# trendClassCollocation}}
     {{> layout/header}}
-    <div class="star-classroom"> 
+    <div class="star-classroom yoho-page"> 
         {{> guang/head-tab}}
         <ul class="collocation-list">
             {{#each collocationList}}

 {{# trendClassHome}}
     {{> layout/header}}
-    <div class="star-classroom">
+    <div class="star-classroom yoho-page">
         {{> guang/head-tab}}
         {{#each resources}}
             {{#if bannerTop}}

 {{# trendClassSubject}}
     {{> layout/header}}
-    <div class="star-classroom"> 
+    <div class="star-classroom yoho-page"> 
         {{> guang/head-tab}}
         <ul class="subject-list">
-            {{#each subjectList}}
-                <li>
-                    <a href="{{url}}">
-                        <img src="{{img}}" />
-                        <p>{{title}}</p>
-                    </a>            
-                </li>
+            {{#each resources}}
+                {{#if subject}}
+                    <li>
+                        <a href="{{url}}">
+                            <img src="{{img}}" />
+                            <p>{{title}}</p>
+                        </a>            
+                    </li>
+                {{/if}}
             {{/each}}
         </ul>
     </div>

 {{# trendClassThings}}
-<div class="star-classroom">
+<div class="star-classroom yoho-page">
     {{> guang/head-tab}}
     <div class="things-list">
         {{> guang/things-article}}