Authored by yyq

Merge remote-tracking branch 'origin/master' into gray

@@ -167,8 +167,8 @@ function _getShopData(channel, params, shopInfo) { @@ -167,8 +167,8 @@ function _getShopData(channel, params, shopInfo) {
167 }); 167 });
168 168
169 _.forEach(prodList, value => { 169 _.forEach(prodList, value => {
170 - list[value.product_skn] = {  
171 - img: value.default_images, 170 + list[value.skn] = {
  171 + img: value.default_images || value.thumb,
172 title: value.product_name, 172 title: value.product_name,
173 price: ${value.sales_price}` 173 price: ${value.sales_price}`
174 }; 174 };
1 { 1 {
2 "name": "yohobuy-node", 2 "name": "yohobuy-node",
3 - "version": "6.1.14", 3 + "version": "6.1.16",
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": {