fe / yohobuywap-node · Commits

Go to a project

Authored by 陈峰
Commit d2ab7f21f3683d3d45e28d1eb8f0cf592f9e7aa2 2 parents 89d106c3 8d75f65a

resolve conflicts

Inline Side-by-side
Showing 16 changed files with 99 additions and 84 deletions
@@ -128,6 +128,8 @@ const _getChannelResource = (params) => { @@ -128,6 +128,8 @@ const _getChannelResource = (params) => {
128 params.new_device = true; // eslint-disable-line 128 params.new_device = true; // eslint-disable-line
129 } 129 }
130 130
  131 + params.new_device = true;
  132 +
131 return api.get('operations/api/v5/resource/home', params, { 133 return api.get('operations/api/v5/resource/home', params, {
132 cache: true 134 cache: true
133 }).then(result => { 135 }).then(result => {
@@ -385,12 +385,12 @@ const orderList = (req, res) => { @@ -385,12 +385,12 @@ const orderList = (req, res) => {
385 title: '我的分期订单', 385 title: '我的分期订单',
386 orders: ((()=> { 386 orders: ((()=> {
387 // 处理数据,订单只包含第一条物品纪录 387 // 处理数据,订单只包含第一条物品纪录
388 - var list = result.data ? result.data.orderList : []; 388 + var list = result.data ? result.data.order_list : [];
389 389
390 if (list) { 390 if (list) {
391 list.forEach((item)=> { 391 list.forEach((item)=> {
392 - item.orderGoods = [  
393 - item.orderGoods[0] 392 + item.order_goods = [
  393 + item.order_goods[0]
394 ]; 394 ];
395 }); 395 });
396 } 396 }
@@ -422,16 +422,16 @@ const orderDetail = (req, res) => { @@ -422,16 +422,16 @@ const orderDetail = (req, res) => {
422 order: (()=> { 422 order: (()=> {
423 let refundStatusCount = 0, completeStatusCount = 0, listCount = 0; 423 let refundStatusCount = 0, completeStatusCount = 0, listCount = 0;
424 424
425 - if (result && result.data && result.data.orderGoods) {  
426 - result.data.orderGoods = [  
427 - result.data.orderGoods[0] 425 + if (result && result.data && result.data.order_goods) {
  426 + result.data.order_goods = [
  427 + result.data.order_goods[0]
428 ]; 428 ];
429 } 429 }
430 430
431 - if (result && result.data && result.data.packageList) {  
432 - listCount = result.data.packageList.length; 431 + if (result && result.data && result.data.package_list) {
  432 + listCount = result.data.package_list.length;
433 433
434 - result.data.packageList.forEach((item)=> { 434 + result.data.package_list.forEach((item)=> {
435 if (item.status === 2) { 435 if (item.status === 2) {
436 completeStatusCount++; 436 completeStatusCount++;
437 } else if (item.status === 4 || item.status === 5) { 437 } else if (item.status === 4 || item.status === 5) {
@@ -12,7 +12,6 @@ const helpers = global.yoho.helpers; @@ -12,7 +12,6 @@ const helpers = global.yoho.helpers;
12 const api = global.yoho.API; 12 const api = global.yoho.API;
13 const serviceAPI = global.yoho.ServiceAPI; 13 const serviceAPI = global.yoho.ServiceAPI;
14 const logger = global.yoho.logger; 14 const logger = global.yoho.logger;
15 -const camelCase = global.yoho.camelCase;  
16 const API_TIMEOUT = 10000; 15 const API_TIMEOUT = 10000;
17 16
18 // 处理还款列表数据 17 // 处理还款列表数据
@@ -278,7 +277,7 @@ const getSearchIntallment = (params) => { @@ -278,7 +277,7 @@ const getSearchIntallment = (params) => {
278 277
279 _.forEach(goods, (data) => { 278 _.forEach(goods, (data) => {
280 data.url = helpers.appUrlFormat(data.url, 'go.productDetail', { 279 data.url = helpers.appUrlFormat(data.url, 'go.productDetail', {
281 - product_skn: data.productSkn 280 + product_skn: data.product_skn
282 }); 281 });
283 }); 282 });
284 283
@@ -369,10 +368,10 @@ const getInstallmentOrders = (params) => { @@ -369,10 +368,10 @@ const getInstallmentOrders = (params) => {
369 }, { 368 }, {
370 timeout: API_TIMEOUT 369 timeout: API_TIMEOUT
371 }).then((result) => { 370 }).then((result) => {
372 - return Promise.resolve(camelCase(result)); 371 + return Promise.resolve(result);
373 }); 372 });
374 } else { 373 } else {
375 - return Promise.resolve(camelCase(response[method])); 374 + return Promise.resolve(response[method]);
376 } 375 }
377 }; 376 };
378 377
@@ -429,7 +428,7 @@ const getInstallmentOrderDetail = (params) => { @@ -429,7 +428,7 @@ const getInstallmentOrderDetail = (params) => {
429 }, { 428 }, {
430 timeout: API_TIMEOUT 429 timeout: API_TIMEOUT
431 }).then((result)=> { 430 }).then((result)=> {
432 - return Promise.resolve(camelCase(result)); 431 + return Promise.resolve(result);
433 }); 432 });
434 }; 433 };
435 434
@@ -450,7 +449,7 @@ const totalAmount = (params) => { @@ -450,7 +449,7 @@ const totalAmount = (params) => {
450 }, { 449 }, {
451 timeout: API_TIMEOUT 450 timeout: API_TIMEOUT
452 }).then((result)=> { 451 }).then((result)=> {
453 - return Promise.resolve(camelCase(result)); 452 + return Promise.resolve(result);
454 }); 453 });
455 }; 454 };
456 455
@@ -468,7 +467,7 @@ const checkVerifyCode = (uid, mobile, code) => { @@ -468,7 +467,7 @@ const checkVerifyCode = (uid, mobile, code) => {
468 }, { 467 }, {
469 timeout: API_TIMEOUT 468 timeout: API_TIMEOUT
470 }).then((result)=> { 469 }).then((result)=> {
471 - return Promise.resolve(camelCase(result)); 470 + return Promise.resolve(result);
472 }); 471 });
473 }; 472 };
474 473
1 <div class="installment-order-page yoho-page"> 1 <div class="installment-order-page yoho-page">
2 {{#order}} 2 {{#order}}
3 <div class="order-info"> 3 <div class="order-info">
4 - {{#greaterThanZero refundedAmt}} 4 + {{#greaterThanZero refunded_amt}}
5 <div class="refund-text"> 5 <div class="refund-text">
6 - 该订单已退款¥{{refundedAmt}} 6 + 该订单已退款¥{{refunded_amt}}
7 </div> 7 </div>
8 {{/greaterThanZero}} 8 {{/greaterThanZero}}
9 <div class="order-detail"> 9 <div class="order-detail">
10 - {{#orderGoods}} 10 + {{#order_goods}}
11 <div class="image-box"> 11 <div class="image-box">
12 - <img src="{{image goodsImage 90 120}}" alt="{{productName}}"> 12 + <img src="{{image goods_image 90 120}}" alt="{{product_name}}">
13 </div> 13 </div>
14 <div class="info-box"> 14 <div class="info-box">
15 - <h3>{{productName}}</h3>  
16 - <h4>订单编号: {{../orderCode}}</h4>  
17 - <div class="date-box">{{../createTime}}</div> 15 + <h3>{{product_name}}</h3>
  16 + <h4>订单编号: {{../order_code}}</h4>
  17 + <div class="date-box">{{../create_time}}</div>
18 </div> 18 </div>
19 - {{/orderGoods}} 19 + {{/order_goods}}
20 </div> 20 </div>
21 21
22 <div class="installment-summary"> 22 <div class="installment-summary">
23 23
24 <div class="installment-box"> 24 <div class="installment-box">
25 <div>分期本金</div> 25 <div>分期本金</div>
26 - <div>¥{{avgPrincipalAmt}}</div> 26 + <div>¥{{avg_principal_amt}}</div>
27 </div> 27 </div>
28 28
29 <div class="installment-box"> 29 <div class="installment-box">
30 <div>分期手续费</div> 30 <div>分期手续费</div>
31 - <div>¥{{avgFeeAmt}}</div> 31 + <div>¥{{avg_fee_amt}}</div>
32 </div> 32 </div>
33 33
34 <div class="installment-box"> 34 <div class="installment-box">
35 <div>分期总应还</div> 35 <div>分期总应还</div>
36 - <div>¥{{totalAmt}}</div> 36 + <div>¥{{total_amt}}</div>
37 </div> 37 </div>
38 </div> 38 </div>
39 </div> 39 </div>
40 - <div class="detail-list-container {{#greaterThanZero refundedAmt}}refunded-list{{/greaterThanZero}}"> 40 + <div class="detail-list-container {{#greaterThanZero refunded_amt}}refunded-list{{/greaterThanZero}}">
41 <ul class="installment-list repay-list"> 41 <ul class="installment-list repay-list">
42 - {{#each packageList}} 42 + {{#each package_list}}
43 <li> 43 <li>
44 {{#isPaymentIncomplete status}} 44 {{#isPaymentIncomplete status}}
45 <input id="sort-{{@index}}" type="checkbox" 45 <input id="sort-{{@index}}" type="checkbox"
46 class="installment-check-btn installment-term" 46 class="installment-check-btn installment-term"
47 - data-order-code="{{../orderCode}}"  
48 - data-curr-amt="{{currAmt}}"  
49 - data-sort-id="{{sortId}}"  
50 - data-fee="{{currFeeAmt}}"  
51 - data-delay-fee="{{currDealyFeeAmt}}"  
52 - data-amount="{{currPrincipalAmt}}"/> 47 + data-order-code="{{../order_code}}"
  48 + data-curr-amt="{{curr_amt}}"
  49 + data-sort-id="{{sort_id}}"
  50 + data-fee="{{curr_fee_amt}}"
  51 + data-delay-fee="{{curr_dealy_fee_amt}}"
  52 + data-amount="{{curr_principal_amt}}"/>
53 {{/isPaymentIncomplete}} 53 {{/isPaymentIncomplete}}
54 <label for="sort-{{@index}}"> 54 <label for="sort-{{@index}}">
55 {{#isPaymentComplete status}} 55 {{#isPaymentComplete status}}
56 - <span class="detail-index">{{sortId}}.</span> 56 + <span class="detail-index">{{sort_id}}.</span>
57 {{/isPaymentComplete}} 57 {{/isPaymentComplete}}
58 58
59 - <span class="amount">¥{{currAmt}}</span> 59 + <span class="amount">¥{{curr_amt}}</span>
60 <div class="fee"> 60 <div class="fee">
61 - {{currDate}}  
62 - 本金:¥{{currPrincipalAmt}} 61 + {{curr_date}}
  62 + 本金:¥{{curr_principal_amt}}
63 63
64 - {{#if currFeeAmt}}  
65 - 手续费:¥{{currFeeAmt}} 64 + {{#if curr_fee_amt}}
  65 + 手续费:¥{{curr_fee_amt}}
66 {{/if}} 66 {{/if}}
67 67
68 - {{#greaterThanZero currDealyFeeAmt}}  
69 - 逾期服务费:¥{{currDealyFeeAmt}} 68 + {{#greaterThanZero curr_dealy_fee_amt}}
  69 + 逾期服务费:¥{{curr_dealy_fee_amt}}
70 {{/greaterThanZero}} 70 {{/greaterThanZero}}
71 </div> 71 </div>
72 <div class="status"> 72 <div class="status">
@@ -90,4 +90,4 @@ @@ -90,4 +90,4 @@
90 {{#isRepaymentAllCompleted order.status}} 90 {{#isRepaymentAllCompleted order.status}}
91 <div class="all-completed">已还清</div> 91 <div class="all-completed">已还清</div>
92 {{/isRepaymentAllCompleted}} 92 {{/isRepaymentAllCompleted}}
93 -</div>  
  93 +</div>
1 {{#if orders}} 1 {{#if orders}}
2 {{#each orders}} 2 {{#each orders}}
3 <li> 3 <li>
4 - <a href="/home/installment/order/{{orderCode}}">  
5 - {{#orderGoods}} 4 + <a href="/home/installment/order/{{order_code}}">
  5 + {{#order_goods}}
6 <div class="image-box"> 6 <div class="image-box">
7 - <img src="{{image goodsImage 90 120}}" alt="{{productName}}"/> 7 + <img src="{{image goods_image 90 120}}" alt="{{product_name}}"/>
8 </div> 8 </div>
9 <div class="title-box"> 9 <div class="title-box">
10 - <div class="product-name">{{productName}}</div>  
11 - <div class="date-box">{{../createTime}}</div> 10 + <div class="product-name">{{product_name}}</div>
  11 + <div class="date-box">{{../create_time}}</div>
12 </div> 12 </div>
13 - {{/orderGoods}} 13 + {{/order_goods}}
14 </a> 14 </a>
15 15
16 <div class="right-box"> 16 <div class="right-box">
17 <div class="amount">¥{{amount}}</div> 17 <div class="amount">¥{{amount}}</div>
18 - <div class="status">{{installStatus}}</div> 18 + <div class="status">{{install_status}}</div>
19 </div> 19 </div>
20 <div class="clearfix"></div> 20 <div class="clearfix"></div>
21 </li> 21 </li>
@@ -10,7 +10,7 @@ const contentCodeConfig = require('../../../config/content-code'); @@ -10,7 +10,7 @@ const contentCodeConfig = require('../../../config/content-code');
10 10
11 const _ = require('lodash'); 11 const _ = require('lodash');
12 12
13 -const camelCase = global.yoho.camelCase; 13 +// const camelCase = global.yoho.camelCase;
14 const log = global.yoho.logger; 14 const log = global.yoho.logger;
15 const serviceApi = global.yoho.ServiceAPI; 15 const serviceApi = global.yoho.ServiceAPI;
16 const api = global.yoho.API; 16 const api = global.yoho.API;
@@ -75,7 +75,8 @@ const _convertNavData = (list) => { @@ -75,7 +75,8 @@ const _convertNavData = (list) => {
75 const formatData = []; 75 const formatData = [];
76 76
77 list = list || []; 77 list = list || [];
78 - list = camelCase(list); 78 +
  79 + // list = camelCase(list);
79 _.forEach(list, (item) => { 80 _.forEach(list, (item) => {
80 formatData.push({ 81 formatData.push({
81 id: item.id, 82 id: item.id,
@@ -209,7 +210,6 @@ const getContent = (categoryId, channel, code) => { @@ -209,7 +210,6 @@ const getContent = (categoryId, channel, code) => {
209 const p = [_getNavData(categoryId), _getOutletResource(channel, code), _getHomeActivity(params)]; 210 const p = [_getNavData(categoryId), _getOutletResource(channel, code), _getHomeActivity(params)];
210 211
211 return Promise.all(p).then(data => { 212 return Promise.all(p).then(data => {
212 -  
213 return { 213 return {
214 nav: data[0] || [], 214 nav: data[0] || [],
215 content: data[1] || [], 215 content: data[1] || [],
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 var api = global.yoho.API; 3 var api = global.yoho.API;
4 4
5 -const camelCase = global.yoho.camelCase; 5 +// const camelCase = global.yoho.camelCase;
6 const helpers = global.yoho.helpers; 6 const helpers = global.yoho.helpers;
7 const _ = require('lodash'); 7 const _ = require('lodash');
8 8
@@ -16,7 +16,7 @@ const getPreferenceData = (data) => { @@ -16,7 +16,7 @@ const getPreferenceData = (data) => {
16 16
17 let list = data.data || {}; 17 let list = data.data || {};
18 18
19 - list = camelCase(list); 19 + // list = camelCase(list);
20 20
21 let distGoods = []; 21 let distGoods = [];
22 22
@@ -27,20 +27,33 @@ const getPreferenceData = (data) => { @@ -27,20 +27,33 @@ const getPreferenceData = (data) => {
27 } 27 }
28 value.goodsId = value.goodsList[0].goodsId; 28 value.goodsId = value.goodsList[0].goodsId;
29 29
30 - let goods = value; 30 + // let goods = value;
  31 +
  32 + let goods = [];
  33 +
  34 + goods.push({
  35 + productSkn: value.product_skn,
  36 + productName: value.product_name,
  37 + defaultImages: value.default_images,
  38 + isSoonSoldOut: value.is_soon_sold_out,
  39 + url: helpers.urlFormat(`/product/pro_${value.product_id}_${value.goodsId}/${value.cn_alphabet}.html`),
  40 + marketPrice: value.market_price,
  41 + salesPrice: value.sales_price
  42 + });
  43 +
  44 + // goods.url = helpers.urlFormat(`/product/pro_${value.product_id}_${value.goodsId}/${value.cn_alphabet}.html`);
31 45
32 - goods.url = helpers.urlFormat(`/product/pro_${value.productId}_${value.goodsId}/${value.cnAlphabet}.html`);  
33 if (_.get(goods, 'tags[0]', null)) { 46 if (_.get(goods, 'tags[0]', null)) {
34 goods.tags = []; 47 goods.tags = [];
35 - if (goods.is_new === 'Y') { 48 + if (goods.isNew === 'Y') {
36 goods.tags.push({is_new: true}); 49 goods.tags.push({is_new: true});
37 - } else if (goods.isAdvance === 'Y') { 50 + } else if (goods.is_advance === 'Y') {
38 goods.tags.push({isAdvance: true}); 51 goods.tags.push({isAdvance: true});
39 - } else if (goods.isDiscount === 'Y') { 52 + } else if (goods.is_discount === 'Y') {
40 goods.tags.push({isDiscount: true}); 53 goods.tags.push({isDiscount: true});
41 - } else if (goods.isYohoood === 'Y') { 54 + } else if (goods.is_yohoood === 'Y') {
42 goods.tags.push({isYohoood: true}); 55 goods.tags.push({isYohoood: true});
43 - } else if (goods.isLimited === 'Y') { 56 + } else if (goods.is_limited === 'Y') {
44 goods.tags.push({isLimited: true}); 57 goods.tags.push({isLimited: true});
45 } 58 }
46 } 59 }
@@ -131,6 +131,7 @@ const _processBreakingSort = (list) => { @@ -131,6 +131,7 @@ const _processBreakingSort = (list) => {
131 const sub = []; 131 const sub = [];
132 132
133 list = list || []; 133 list = list || [];
  134 +
134 _.forEach(list, (data, index) => { 135 _.forEach(list, (data, index) => {
135 const allSub = []; 136 const allSub = [];
136 137
@@ -244,6 +245,7 @@ const _getBreakingSort = (yhChannel) => { @@ -244,6 +245,7 @@ const _getBreakingSort = (yhChannel) => {
244 cache: true 245 cache: true
245 }).then((result) => { 246 }).then((result) => {
246 if (result && result.code === 200) { 247 if (result && result.code === 200) {
  248 +
247 return _processBreakingSort(result.data); 249 return _processBreakingSort(result.data);
248 } else { 250 } else {
249 logger.error('api app.sale.getBreakingSort code no 200'); 251 logger.error('api app.sale.getBreakingSort code no 200');
@@ -269,6 +271,7 @@ const getSearchData = (params, uid) => { @@ -269,6 +271,7 @@ const getSearchData = (params, uid) => {
269 } 271 }
270 }), 272 }),
271 _getUserProfile(uid).then((result) => { 273 _getUserProfile(uid).then((result) => {
  274 +
272 if (result && result.code === 200) { 275 if (result && result.code === 200) {
273 return result.data.vip_info ? result.data.vip_info : {}; 276 return result.data.vip_info ? result.data.vip_info : {};
274 } else { 277 } else {
@@ -22,4 +22,4 @@ @@ -22,4 +22,4 @@
22 <div class="pagination-inner"> 22 <div class="pagination-inner">
23 </div> 23 </div>
24 </div> 24 </div>
25 -</div>  
  25 +</div>
@@ -19,4 +19,4 @@ @@ -19,4 +19,4 @@
19 {{/ list}} 19 {{/ list}}
20 </ul> 20 </ul>
21 </div> 21 </div>
22 -{{/data}}  
  22 +{{/data}}
1 {{#data}} 1 {{#data}}
2 {{> common/floor-header-more}} 2 {{> common/floor-header-more}}
3 <div class="fresh-only"> 3 <div class="fresh-only">
4 - {{# bannerImage}} 4 + {{# banner_image}}
5 <div class="fresh-swiper"> 5 <div class="fresh-swiper">
6 <a href="{{url}}"> 6 <a href="{{url}}">
7 <img class="lazy" data-original="{{image src 640 200}}"> 7 <img class="lazy" data-original="{{image src 640 200}}">
8 </a> 8 </a>
9 </div> 9 </div>
10 - {{/ bannerImage}} 10 + {{/ banner_image}}
11 <div class="fresh-list-swiper"> 11 <div class="fresh-list-swiper">
12 <ul class="clearfix swiper-wrapper"> 12 <ul class="clearfix swiper-wrapper">
13 {{# list}} 13 {{# list}}
14 - <li class="swiper-slide"> 14 + <li class="swiper-slide">
15 <div class="img-box"> 15 <div class="img-box">
16 <a href="{{url}}"> 16 <a href="{{url}}">
17 - <img class="swiper-lazy" data-src="{{image defaultImages 235 314}}" alt=""> 17 + <img class="swiper-lazy" data-src="{{image default_images 235 314}}" alt="">
18 </a> 18 </a>
19 <div class="swiper-lazy-preloader"></div> 19 <div class="swiper-lazy-preloader"></div>
20 </div> 20 </div>
21 <div class="fresh-info"> 21 <div class="fresh-info">
22 - <p class="fresh-name"><a href="{{url}}">{{productName}}</a></p> 22 + <p class="fresh-name"><a href="{{url}}">{{product_name}}</a></p>
23 <p class="price"> 23 <p class="price">
24 - <span class="cur-price">¥{{salesPrice}}</span>  
25 - {{# marketPrice}} 24 + <span class="cur-price">¥{{sales_price}}</span>
  25 + {{# market_price}}
26 <span class="old-price">¥{{.}}</span> 26 <span class="old-price">¥{{.}}</span>
27 - {{/marketPrice}} 27 + {{/market_price}}
28 </p> 28 </p>
29 <span class="fresh-icon">新人价</span> 29 <span class="fresh-icon">新人价</span>
30 </div> 30 </div>
31 </li> 31 </li>
32 {{/ list}} 32 {{/ list}}
33 </ul> 33 </ul>
34 - </div> 34 + </div>
35 </div> 35 </div>
36 -{{/data}}  
  36 +{{/data}}
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 <p class="title">{{title}}</p> 14 <p class="title">{{title}}</p>
15 <p class="time"> 15 <p class="time">
16 <span class="iconfont time-icon">&#xe603;</span> 16 <span class="iconfont time-icon">&#xe603;</span>
17 - <span>{{publishTime}}</span> 17 + <span>{{publish_time}}</span>
18 </p> 18 </p>
19 </div> 19 </div>
20 </a> 20 </a>
@@ -12,9 +12,9 @@ @@ -12,9 +12,9 @@
12 <h3 class="recommend-title">推荐搭配</h3> 12 <h3 class="recommend-title">推荐搭配</h3>
13 <div class="recommend-swiper"> 13 <div class="recommend-swiper">
14 <ul class="recommend-list swiper-wrapper clearfix"> 14 <ul class="recommend-list swiper-wrapper clearfix">
15 - {{# recommendCollocation}} 15 + {{# recommend_collocation}}
16 <li class="recommend-item swiper-slide"><a href="{{url}}"><img class="img" src="{{image src 140 140}}" alt="" /></a></li> 16 <li class="recommend-item swiper-slide"><a href="{{url}}"><img class="img" src="{{image src 140 140}}" alt="" /></a></li>
17 - {{/ recommendCollocation}} 17 + {{/ recommend_collocation}}
18 </ul> 18 </ul>
19 </div> 19 </div>
20 </div> 20 </div>
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 line-height: 1; 44 line-height: 1;
45 45
46 .sale-price { 46 .sale-price {
47 - display: block; 47 + /*display: block;*/
48 margin-right: 8px; 48 margin-right: 8px;
49 color: #d9134f; 49 color: #d9134f;
50 } 50 }
@@ -134,7 +134,6 @@ exports.processProductList = (list, options) => { @@ -134,7 +134,6 @@ exports.processProductList = (list, options) => {
134 134
135 if (options.showTags) { 135 if (options.showTags) {
136 product.tags = {}; 136 product.tags = {};
137 -  
138 product.tags.is_new = options.showNew && product.is_new === 'Y'; // 新品 137 product.tags.is_new = options.showNew && product.is_new === 'Y'; // 新品
139 product.tags.is_discount = options.showSale && product.is_discount === 'Y'; // 在售 138 product.tags.is_discount = options.showSale && product.is_discount === 'Y'; // 在售
140 product.tags.is_limited = product.is_limited === 'Y'; // 限量 139 product.tags.is_limited = product.is_limited === 'Y'; // 限量
@@ -211,7 +210,7 @@ exports.processFilter = (list, options) => { @@ -211,7 +210,7 @@ exports.processFilter = (list, options) => {
211 dataType: 'gender', 210 dataType: 'gender',
212 sortNum: '0' 211 sortNum: '0'
213 }, 212 },
214 - groupSort: { 213 + group_sort: {
215 name: '所有品类', 214 name: '所有品类',
216 title: '品类', 215 title: '品类',
217 dataId: 'relation_parameter', 216 dataId: 'relation_parameter',
@@ -254,13 +253,12 @@ exports.processFilter = (list, options) => { @@ -254,13 +253,12 @@ exports.processFilter = (list, options) => {
254 exclude: null // 需要排除的字段 253 exclude: null // 需要排除的字段
255 }, options); 254 }, options);
256 255
257 -  
258 _.forEach(list, (item, key) => { 256 _.forEach(list, (item, key) => {
259 let classify = { 257 let classify = {
260 subs: [] 258 subs: []
261 }; 259 };
262 260
263 - if (key === 'group_sort' || !filtersType[key]) { 261 + if (!filtersType[key]) {
264 return; 262 return;
265 } 263 }
266 264
@@ -49,7 +49,7 @@ module.exports = (list) => { @@ -49,7 +49,7 @@ module.exports = (list) => {
49 // 折扣专场 49 // 折扣专场
50 if (floor.discountActivity && floor.data && floor.data.list.length) { 50 if (floor.discountActivity && floor.data && floor.data.list.length) {
51 _.map(floor.data.list, (item) => { 51 _.map(floor.data.list, (item) => {
52 - Object.assign(item, processTime(item.leftTime)); 52 + Object.assign(item, processTime(item.left_time));
53 }); 53 });
54 } 54 }
55 55