fe / yohobuywap-node · Commits

Go to a project

Authored by 姜枫
Commit 5b0f9be0b7ff2df2581f95588d2d5ec67348582c 2 parents 6a88cd53 61663de7

Merge branch 'master' of http://git.yoho.cn/fe/yohobuywap-node

Inline Side-by-side
Showing 5 changed files with 20 additions and 11 deletions
@@ -117,8 +117,10 @@ const _pageArticleContent = (articleContent, isApp, gender) => { @@ -117,8 +117,10 @@ const _pageArticleContent = (articleContent, isApp, gender) => {
117 let arr = []; 117 let arr = [];
118 118
119 goods.list.forEach((mini) => { 119 goods.list.forEach((mini) => {
  120 + if (mini) {
120 skns.push(mini.id); 121 skns.push(mini.id);
121 arr[mini.id] = mini.src; 122 arr[mini.id] = mini.src;
  123 + }
122 }); 124 });
123 125
124 // 通过SKN获取商品信息 126 // 通过SKN获取商品信息
@@ -62,7 +62,12 @@ const cachePage = { @@ -62,7 +62,12 @@ const cachePage = {
62 62
63 // 品牌一览 63 // 品牌一览
64 '/brands': 5 * MINUTE, 64 '/brands': 5 * MINUTE,
65 - '/brands/search': 1 * MINUTE 65 + '/brands/search': 1 * MINUTE,
  66 +
  67 + //活动
  68 + '/activity/single-day': 1 * MINUTE,
  69 + '/activity/shopCollect': 1 * MINUTE,
  70 + '/activity/live': 1 * MINUTE
66 71
67 }; 72 };
68 73
1 { 1 {
2 "name": "m-yohobuy-node", 2 "name": "m-yohobuy-node",
3 - "version": "5.1.6", 3 + "version": "5.1.7",
4 "private": true, 4 "private": true,
5 "description": "A New Yohobuy Project With Express", 5 "description": "A New Yohobuy Project With Express",
6 "repository": { 6 "repository": {
@@ -7,8 +7,6 @@ @@ -7,8 +7,6 @@
7 "exec_mode": "cluster", 7 "exec_mode": "cluster",
8 "merge_logs": true, 8 "merge_logs": true,
9 "log_date_format": "YYYY-MM-DD HH:mm Z", 9 "log_date_format": "YYYY-MM-DD HH:mm Z",
10 - "out_file": "/Data/logs/node",  
11 - "error_file": "/Data/logs/node",  
12 "env": { 10 "env": {
13 "TZ": "Asia/Shanghai", 11 "TZ": "Asia/Shanghai",
14 "PORT": 6001 12 "PORT": 6001
@@ -19,7 +19,7 @@ var singleDay = { @@ -19,7 +19,7 @@ var singleDay = {
19 opt = { 19 opt = {
20 $productList: $('.product-list'), 20 $productList: $('.product-list'),
21 $swiper: $('.swiper-tab'), 21 $swiper: $('.swiper-tab'),
22 - getFlag: false, 22 + getFlag: [],
23 previousScrollTop: 0, 23 previousScrollTop: 0,
24 winH: $(window).height(), 24 winH: $(window).height(),
25 noResult: '<p class="no-result">未找到相关商品</p>', 25 noResult: '<p class="no-result">未找到相关商品</p>',
@@ -113,6 +113,7 @@ var singleDay = { @@ -113,6 +113,7 @@ var singleDay = {
113 113
114 for (i; i < data[1].length; i++) { 114 for (i; i < data[1].length; i++) {
115 self.$productList.append('<ul class="product-tab" data-page="0"></ul>'); 115 self.$productList.append('<ul class="product-tab" data-page="0"></ul>');
  116 + self.getFlag[i] = false;
116 } 117 }
117 118
118 self.$productTab = $('.product-tab'); 119 self.$productTab = $('.product-tab');
@@ -130,6 +131,9 @@ var singleDay = { @@ -130,6 +131,9 @@ var singleDay = {
130 131
131 if (self.$productTab.eq(index).find('li').length > 0) { 132 if (self.$productTab.eq(index).find('li').length > 0) {
132 self.$productTab.hide().eq(index).fadeIn(); 133 self.$productTab.hide().eq(index).fadeIn();
  134 + $('img.lazy').lazyload({
  135 + effect: 'fadeIn'
  136 + });
133 } else { 137 } else {
134 self.getProductData({ 138 self.getProductData({
135 index: index, 139 index: index,
@@ -154,12 +158,12 @@ var singleDay = { @@ -154,12 +158,12 @@ var singleDay = {
154 var page; 158 var page;
155 var curProductTab = self.$productTab.eq(params.index); 159 var curProductTab = self.$productTab.eq(params.index);
156 160
157 - if (self.getFlag) { 161 + if (self.getFlag[params.index]) {
158 return false; 162 return false;
159 } 163 }
160 164
161 page = +curProductTab.attr('data-page') + 1; 165 page = +curProductTab.attr('data-page') + 1;
162 - self.getFlag = true; 166 + self.getFlag[params.index] = true;
163 loading.showLoadingMask(); 167 loading.showLoadingMask();
164 168
165 $.ajax({ 169 $.ajax({
@@ -175,15 +179,15 @@ var singleDay = { @@ -175,15 +179,15 @@ var singleDay = {
175 curProductTab.find('.no-result').hide(); 179 curProductTab.find('.no-result').hide();
176 curProductTab.append(product(data)); 180 curProductTab.append(product(data));
177 curProductTab.attr('data-page', page); 181 curProductTab.attr('data-page', page);
178 - self.getFlag = false; 182 + self.getFlag[params.index] = false;
179 } else { 183 } else {
180 if (page === 1) { 184 if (page === 1) {
181 if (curProductTab.find('.no-result').length === 0) { 185 if (curProductTab.find('.no-result').length === 0) {
182 curProductTab.append(self.noResult); 186 curProductTab.append(self.noResult);
183 } 187 }
184 - self.getFlag = false; 188 + self.getFlag[params.index] = false;
185 } else { 189 } else {
186 - self.getFlag = true; 190 + self.getFlag[params.index] = true;
187 } 191 }
188 } 192 }
189 193
@@ -199,7 +203,7 @@ var singleDay = { @@ -199,7 +203,7 @@ var singleDay = {
199 error: function() { 203 error: function() {
200 tip.show('网络断开连接了~'); 204 tip.show('网络断开连接了~');
201 loading.hideLoadingMask(); 205 loading.hideLoadingMask();
202 - self.getFlag = false; 206 + self.getFlag[params.index] = false;
203 } 207 }
204 }); 208 });
205 } 209 }