|
|
@@ -45,7 +45,7 @@ class GoodsClass extends BaseClass
|
|
|
$val['freeSendDist'] = 5;
|
|
|
//多款式
|
|
|
$val['goodsStyleList'] = isset($val['goodsStyle']) && $val['goodsStyle'] == 1 ? GoodsStyleService::getStyle($id) : [];
|
|
|
- $val['createDate'] = date("Y-m-d", strtotime($val['createTime']));
|
|
|
+ $val['createDate'] = isset($val['createTime']) ? date("Y-m-d", strtotime($val['createTime'])) : '2020-1-9';
|
|
|
$merchantId = $val['merchantId'];
|
|
|
$val['merchantName'] = isset($merchantList[$merchantId]['merchantName']) ? $merchantList[$merchantId]['merchantName'] : '';
|
|
|
$list[$key] = $val;
|