Commit 62313857 authored by jianghaiming's avatar jianghaiming

Merge branch 'develop' into test

parents 6dd1fb00 fe548a28
...@@ -1266,7 +1266,7 @@ class GoodsService ...@@ -1266,7 +1266,7 @@ class GoodsService
$info['original_price'] = empty($info['original_price']) ? 0 : $info['original_price'] / 100; $info['original_price'] = empty($info['original_price']) ? 0 : $info['original_price'] / 100;
$info['price'] = !empty($info['price']) ? $info['price'] / 100 : 0; $info['price'] = !empty($info['price']) ? $info['price'] / 100 : 0;
$info['desc_pic_url'] = !empty($info['desc_pic_url']) ? self::getUrlList($info['desc_pic_url']) : ''; $info['desc_pic_url'] = !empty($info['desc_pic_url']) ? self::getUrlList($info['desc_pic_url']) : '';
$info['introduce_pic_url'] = !empty($info['introduce_pic_url']) ? self::getUrlList($info['introduce_pic_url']) : ""; $info['introduce_pic_url'] = !empty($info['introduce_pic_url']) ? self::getUrlList($info['introduce_pic_url']) : [];
return $info; return $info;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment