fe / yohobuywap-node · Commits

Go to a project

Authored by 邱骏
Commit a3850605010943ad859461d4e489d0ad49b9bf53 1 parent 23a59d75

activity/individuation接口增加团购价格

Inline Side-by-side
Showing 1 changed file with 5 additions and 3 deletions
@@ -14,11 +14,12 @@ let _getProduct = function(o) { @@ -14,11 +14,12 @@ let _getProduct = function(o) {
14 brand_domain: o.brand_domain, 14 brand_domain: o.brand_domain,
15 brand_name: o.brand_name, 15 brand_name: o.brand_name,
16 product_id: o.product_id, 16 product_id: o.product_id,
  17 + collageprice: o.collage_price,
17 product_name: o.product_name, 18 product_name: o.product_name,
18 product_skn: o.product_skn, 19 product_skn: o.product_skn,
19 vip_price: o.vip_price, 20 vip_price: o.vip_price,
20 market_price: o.market_price, 21 market_price: o.market_price,
21 - sales_price: o.sales_price, 22 + sales_price: o.collage_price || o.sales_price, // 新需求，如果有拼团价则优先显示拼团价格
22 cn_alphabet: o.cn_alphabet, 23 cn_alphabet: o.cn_alphabet,
23 default_images: o.default_images, 24 default_images: o.default_images,
24 goods_id: Array.isArray(o.goods_list) && o.goods_list.length ? o.goods_list[0].goods_id : void 0 25 goods_id: Array.isArray(o.goods_list) && o.goods_list.length ? o.goods_list[0].goods_id : void 0
@@ -64,7 +65,8 @@ class individuationModel extends global.yoho.BaseModel { @@ -64,7 +65,8 @@ class individuationModel extends global.yoho.BaseModel {
64 }, params), 65 }, params),
65 param: {cache: true} 66 param: {cache: true}
66 }).then(res => { 67 }).then(res => {
67 - var data = [], 68 + console.log(res.data);
  69 + let data = [],
68 lst = (res && res.data && res.data.product_list) || []; 70 lst = (res && res.data && res.data.product_list) || [];
69 71
70 lst.forEach(function(o) { 72 lst.forEach(function(o) {
@@ -87,7 +89,7 @@ class individuationModel extends global.yoho.BaseModel { @@ -87,7 +89,7 @@ class individuationModel extends global.yoho.BaseModel {
87 }, 89 },
88 param: {cache: true} 90 param: {cache: true}
89 }).then(res => { 91 }).then(res => {
90 - var data = [], 92 + let data = [],
91 lst = (res && res.data && res.data.product_list) || []; 93 lst = (res && res.data && res.data.product_list) || [];
92 94
93 lst.forEach(function(o) { 95 lst.forEach(function(o) {