Showing
5 changed files
with
23 additions
and
30 deletions
@@ -79,19 +79,4 @@ | @@ -79,19 +79,4 @@ | ||
79 | .info-list.hide { | 79 | .info-list.hide { |
80 | display: none; | 80 | display: none; |
81 | } | 81 | } |
82 | - | ||
83 | - .load-more-info { | ||
84 | - width: 100%; | ||
85 | - height: 70rem / $pxConvertRem; | ||
86 | - line-height: 70rem / $pxConvertRem; | ||
87 | - text-align: center; | ||
88 | - font-size: 14px; | ||
89 | - overflow: hidden; | ||
90 | - | ||
91 | - .status { | ||
92 | - &.hide { | ||
93 | - display: none; | ||
94 | - } | ||
95 | - } | ||
96 | - } | ||
97 | } | 82 | } |
@@ -51,20 +51,6 @@ | @@ -51,20 +51,6 @@ | ||
51 | color: #000; | 51 | color: #000; |
52 | } | 52 | } |
53 | } | 53 | } |
54 | - .load-more-info { | ||
55 | - width: 100%; | ||
56 | - height: 70rem / $pxConvertRem; | ||
57 | - line-height: 70rem / $pxConvertRem; | ||
58 | - text-align: center; | ||
59 | - font-size: 14px; | ||
60 | - overflow: hidden; | ||
61 | - | ||
62 | - .status { | ||
63 | - &.hide { | ||
64 | - display: none; | ||
65 | - } | ||
66 | - } | ||
67 | - } | ||
68 | } | 54 | } |
69 | 55 | ||
70 | .load-more-img { | 56 | .load-more-img { |
@@ -108,6 +108,21 @@ a { | @@ -108,6 +108,21 @@ a { | ||
108 | @include border-radius(10px); | 108 | @include border-radius(10px); |
109 | } | 109 | } |
110 | 110 | ||
111 | +.load-more-info { | ||
112 | + width: 100%; | ||
113 | + height: 70rem / $pxConvertRem; | ||
114 | + line-height: 70rem / $pxConvertRem; | ||
115 | + text-align: center; | ||
116 | + font-size: 14px; | ||
117 | + overflow: hidden; | ||
118 | + | ||
119 | + .status { | ||
120 | + &.hide { | ||
121 | + display: none; | ||
122 | + } | ||
123 | + } | ||
124 | +} | ||
125 | + | ||
111 | /*px转化rem*/ | 126 | /*px转化rem*/ |
112 | @function pxToRem($px) { | 127 | @function pxToRem($px) { |
113 | $pxConvertRem: 40px; | 128 | $pxConvertRem: 40px; |
@@ -5,6 +5,12 @@ | @@ -5,6 +5,12 @@ | ||
5 | <div id="info-list" class="info-list"> | 5 | <div id="info-list" class="info-list"> |
6 | {{> me/my-guang/infos}} | 6 | {{> me/my-guang/infos}} |
7 | </div> | 7 | </div> |
8 | + <div id="load-more-info" class="load-more-info"> | ||
9 | + <div class="loading status hide"> | ||
10 | + 正在加载... | ||
11 | + </div> | ||
12 | + <span class="no-more status">没有更多啦</span> | ||
13 | + </div> | ||
8 | {{^}} | 14 | {{^}} |
9 | <div class="null"> | 15 | <div class="null"> |
10 | <div class="icon-null"></div> | 16 | <div class="icon-null"></div> |
@@ -328,6 +328,7 @@ class HomeController extends AbstractAction | @@ -328,6 +328,7 @@ class HomeController extends AbstractAction | ||
328 | $page = $this->get('page', 1); | 328 | $page = $this->get('page', 1); |
329 | $limit = $this->get('limit', 10); | 329 | $limit = $this->get('limit', 10); |
330 | $uid = $this->getUid(); | 330 | $uid = $this->getUid(); |
331 | + $uid=5687179; | ||
331 | $gender = Helpers::getGenderByCookie(); | 332 | $gender = Helpers::getGenderByCookie(); |
332 | $yh_channel = Helpers::getChannelByCookie(); | 333 | $yh_channel = Helpers::getChannelByCookie(); |
333 | $guangInfo = \home\GuangModel::getMyGuang($uid, $page, $yh_channel, $gender, $limit); | 334 | $guangInfo = \home\GuangModel::getMyGuang($uid, $page, $yh_channel, $gender, $limit); |
@@ -345,7 +346,7 @@ class HomeController extends AbstractAction | @@ -345,7 +346,7 @@ class HomeController extends AbstractAction | ||
345 | } | 346 | } |
346 | else if ($page > 1 && $page>$totalPage) | 347 | else if ($page > 1 && $page>$totalPage) |
347 | { | 348 | { |
348 | - echo '';//退出循环 | 349 | + echo ' ';//退出循环 |
349 | } | 350 | } |
350 | } | 351 | } |
351 | 352 |
-
Please register or login to post a comment