Authored by 周少峰

Merge branch 'hotfix/colorName'

@@ -367,7 +367,7 @@ const getOrders = (uid, page, limit, type, isPage)=> { @@ -367,7 +367,7 @@ const getOrders = (uid, page, limit, type, isPage)=> {
367 newGood.href = helpers.getUrlBySkc(good.product_id, good.goods_id, good.cn_alphabet); 367 newGood.href = helpers.getUrlBySkc(good.product_id, good.goods_id, good.cn_alphabet);
368 newGood.thumb = helpers.image(good.goods_image, 100, 100); 368 newGood.thumb = helpers.image(good.goods_image, 100, 100);
369 newGood.name = good.product_name; 369 newGood.name = good.product_name;
370 - newGood.color = good.color_name; 370 + newGood.color = good.factory_color_name;
371 newGood.size = good.size_name; 371 newGood.size = good.size_name;
372 newGood.price = good.goods_price; 372 newGood.price = good.goods_price;
373 373