|
@@ -18,11 +18,12 @@ class GoodLogic extends BaseLogic
|
|
|
if ($data['good_code'] !== '') $db->whereLike('good_code', '%' . $data['good_code'] . '%');
|
|
|
if ($data['good_name']) $db->whereLike('good_name', '%' . $data['good_name'] . '%');
|
|
|
if ($data['status'] != '') $db->where('status', $data['status']);
|
|
|
+ if ($data['type'] != '') $db->where('type', $data['type']);
|
|
|
|
|
|
$count = $db->count('id');
|
|
|
|
|
|
$list = $db
|
|
|
- ->field('id,good_cover_img,good_code,good_name,status,creater,addtime')
|
|
|
+ ->field('id,good_cover_img,good_code,good_name,status,type,creater,addtime')
|
|
|
->page($data['page'], $data['size'])
|
|
|
->order('addtime desc')
|
|
|
->select()
|
|
@@ -50,6 +51,7 @@ class GoodLogic extends BaseLogic
|
|
|
'good_name' => $data['good_name'],
|
|
|
'moq' => $data['moq'],
|
|
|
'step' => $data['step'],
|
|
|
+ 'type' => $data['type'],
|
|
|
'good_banner_img' => implode(',', $data['good_banner_img']),
|
|
|
'good_img' => implode(',', $data['good_img']),
|
|
|
'good_param' => json_encode($data['good_param'], JSON_UNESCAPED_UNICODE),
|