|
@@ -334,7 +334,7 @@ class Goods extends Controller
|
|
// 加载对应数据
|
|
// 加载对应数据
|
|
$query->where(['deleted' => 0])->where($admin_id);
|
|
$query->where(['deleted' => 0])->where($admin_id);
|
|
// 列表排序并显示
|
|
// 列表排序并显示
|
|
- $query->where('examine',0)->whereOr('examine',2)->like('code|name#name')->like('marks,cateids', ',');
|
|
|
|
|
|
+ $query->where('examine','in','0,2')->like('code|name#name')->like('marks,cateids', ',');
|
|
$list = $query->equal('status,vip_entry,truck_type,rebate_type')->order('sort desc,id desc')->select();
|
|
$list = $query->equal('status,vip_entry,truck_type,rebate_type')->order('sort desc,id desc')->select();
|
|
$list->page();
|
|
$list->page();
|
|
|
|
|
|
@@ -342,6 +342,7 @@ class Goods extends Controller
|
|
|
|
|
|
protected function _examine_page_filter(&$data)
|
|
protected function _examine_page_filter(&$data)
|
|
{
|
|
{
|
|
|
|
+
|
|
foreach ($data as &$v){
|
|
foreach ($data as &$v){
|
|
$arr = explode("|", $v['cover']);
|
|
$arr = explode("|", $v['cover']);
|
|
$v['cover'] = $arr[0];
|
|
$v['cover'] = $arr[0];
|