Authored by 郭成尧

scroll-handle

@@ -54,6 +54,6 @@ @@ -54,6 +54,6 @@
54 </div> 54 </div>
55 {{/isEqual}} 55 {{/isEqual}}
56 {{#isEqual module_type 'SknList'}} 56 {{#isEqual module_type 'SknList'}}
57 - <div class="goods-container" data-skns="{{../skns}}"></div> 57 + <div class="index-goods-container" data-skns="{{../skns}}"></div>
58 {{/isEqual}} 58 {{/isEqual}}
59 {{/each}} 59 {{/each}}
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 * @Author: Targaryen 2 * @Author: Targaryen
3 * @Date: 2017-03-24 13:43:55 3 * @Date: 2017-03-24 13:43:55
4 * @Last Modified by: Targaryen 4 * @Last Modified by: Targaryen
5 - * @Last Modified time: 2017-03-24 13:47:28 5 + * @Last Modified time: 2017-03-24 16:44:21
6 */ 6 */
7 7
8 /** ***************************** 8 /** *****************************
@@ -40,7 +40,8 @@ let navInfo = { @@ -40,7 +40,8 @@ let navInfo = {
40 order: 0, 40 order: 0,
41 reload: true, 41 reload: true,
42 page: 0, 42 page: 0,
43 - end: false 43 + end: false,
  44 + type: 'default'
44 }, 45 },
45 new: { 46 new: {
46 order: 0, 47 order: 0,
@@ -106,14 +107,22 @@ const getGoodsList = function() { @@ -106,14 +107,22 @@ const getGoodsList = function() {
106 // 去掉正在加载 107 // 去掉正在加载
107 $('.search-divide').remove(); 108 $('.search-divide').remove();
108 109
  110 + let noResult = !result || result.length < 1 || (result.list && result.list.length < 1);
  111 +
109 // 没有结果输出没有结果页面 112 // 没有结果输出没有结果页面
110 - if (!result || result.length < 1) { 113 + if (!isScrollLoad && noResult) {
111 $container.html(noResultHbs()); 114 $container.html(noResultHbs());
112 onSearching = false; 115 onSearching = false;
113 return false; 116 return false;
114 } 117 }
115 118
116 if (isScrollLoad) { 119 if (isScrollLoad) {
  120 + if (noResult) {
  121 + $container.append('<div class="search-divide">没有更多内容了...</div>');
  122 + onSearching = false;
  123 + return false;
  124 + }
  125 +
117 $container.append(result); 126 $container.append(result);
118 } else { 127 } else {
119 $container.html(result); 128 $container.html(result);
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 * @Author: Targaryen 2 * @Author: Targaryen
3 * @Date: 2017-03-23 11:31:51 3 * @Date: 2017-03-23 11:31:51
4 * @Last Modified by: Targaryen 4 * @Last Modified by: Targaryen
5 - * @Last Modified time: 2017-03-24 16:17:00 5 + * @Last Modified time: 2017-03-24 16:32:30
6 */ 6 */
7 /* 红人店铺首页 */ 7 /* 红人店铺首页 */
8 const Swiper2 = require('yoho-swiper2'); 8 const Swiper2 = require('yoho-swiper2');
@@ -11,7 +11,7 @@ let $shopIntroFolder = $('.shop-intro-folder'); @@ -11,7 +11,7 @@ let $shopIntroFolder = $('.shop-intro-folder');
11 let $shortIntro = $('#shortIntro'); 11 let $shortIntro = $('#shortIntro');
12 let $shopIntro = $('#shopIntro'); 12 let $shopIntro = $('#shopIntro');
13 let $shopIntrArrw = $('#shopIntrArrw'); 13 let $shopIntrArrw = $('#shopIntrArrw');
14 -let $goodsContainer = $('.goods-container'); 14 +let $goodsContainer = $('.index-goods-container');
15 15
16 /** 16 /**
17 * 店铺介绍展开收起 17 * 店铺介绍展开收起
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 * @Author: Targaryen 2 * @Author: Targaryen
3 * @Date: 2017-03-23 17:12:53 3 * @Date: 2017-03-23 17:12:53
4 * @Last Modified by: Targaryen 4 * @Last Modified by: Targaryen
5 - * @Last Modified time: 2017-03-24 16:13:11 5 + * @Last Modified time: 2017-03-24 16:31:36
6 */ 6 */
7 // 红人店铺首页 7 // 红人店铺首页
8 8
@@ -157,7 +157,11 @@ @@ -157,7 +157,11 @@
157 } 157 }
158 } 158 }
159 159
160 - .goods-container { 160 + .index-goods-container {
  161 + position: relative;
  162 + min-height: auto !important;
  163 + padding-left: 0.375rem;
  164 + padding-top: 0.2rem;
161 display: inline-block; 165 display: inline-block;
162 } 166 }
163 167