Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop

@@ -79,19 +79,4 @@
     .info-list.hide {
         display: none;
     }
-
-    .load-more-info {
-        width: 100%;
-        height: 70rem / $pxConvertRem;
-        line-height: 70rem / $pxConvertRem;
-        text-align: center;
-        font-size: 14px;
-        overflow: hidden;
-
-        .status {
-            &.hide {
-                display: none;
-            }
-        }
-    }
 }
\ No newline at end of file

@@ -51,20 +51,6 @@
             color: #000;
         }
     }
-      .load-more-info {
-        width: 100%;
-        height: 70rem / $pxConvertRem;
-        line-height: 70rem / $pxConvertRem;
-        text-align: center;
-        font-size: 14px;
-        overflow: hidden;
-
-        .status {
-            &.hide {
-                display: none;
-            }
-        }
-    }
 }
 
 .load-more-img {

@@ -108,6 +108,21 @@ a {
     @include border-radius(10px);
 }
 
+.load-more-info {
+    width: 100%;
+    height: 70rem / $pxConvertRem;
+    line-height: 70rem / $pxConvertRem;
+    text-align: center;
+    font-size: 14px;
+    overflow: hidden;
+
+    .status {
+        &.hide {
+            display: none;
+        }
+    }
+}
+
 /*px转化rem*/
 @function pxToRem($px) {
     $pxConvertRem: 40px;

@@ -5,6 +5,12 @@
             <div id="info-list" class="info-list">
                 {{> me/my-guang/infos}}
             </div>
+            <div id="load-more-info" class="load-more-info">
+                <div class="loading status hide">
+                    正在加载...
+                </div>
+                <span class="no-more status">没有更多啦</span>
+            </div>
         {{^}}
             <div class="null">
                 <div class="icon-null"></div>

@@ -328,6 +328,7 @@ class HomeController extends AbstractAction
         $page = $this->get('page', 1);
         $limit = $this->get('limit', 10);
         $uid = $this->getUid();
+        $uid=5687179;
         $gender = Helpers::getGenderByCookie();
         $yh_channel = Helpers::getChannelByCookie();
         $guangInfo = \home\GuangModel::getMyGuang($uid, $page, $yh_channel, $gender, $limit);
@@ -345,7 +346,7 @@ class HomeController extends AbstractAction
         }
         else if ($page > 1 && $page>$totalPage)
         {
-            echo '';//退出循环
+            echo ' ';//退出循环
         }
     }