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

@@ -167,8 +167,8 @@ function _getShopData(channel, params, shopInfo) {
             });
 
             _.forEach(prodList, value => {
-                list[value.product_skn] = {
-                    img: value.default_images,
+                list[value.skn] = {
+                    img: value.default_images || value.thumb,
                     title: value.product_name,
                     price: `¥${value.sales_price}`
                 };

 {
   "name": "yohobuy-node",
-  "version": "6.1.14",
+  "version": "6.1.16",
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "repository": {