|
@@ -55,7 +55,7 @@ class Article extends BaseModel
|
|
|
// else
|
|
// else
|
|
|
// $model = $model->where('mer_id', 0);
|
|
// $model = $model->where('mer_id', 0);
|
|
|
$model = $model->where('status', 1)->where('hide', 0)->where('mer_id',$where['mer_id'])->order('id desc');
|
|
$model = $model->where('status', 1)->where('hide', 0)->where('mer_id',$where['mer_id'])->order('id desc');
|
|
|
- self::page($model, function ($item) {
|
|
|
|
|
|
|
+ return self::page($model, function ($item) {
|
|
|
// var_dump($item);
|
|
// var_dump($item);
|
|
|
// if (!$item['mer_id'])
|
|
// if (!$item['mer_id'])
|
|
|
$item['admin_name'] = '总后台管理员---》' . SystemAdmin::where('id', $item['admin_id'])->value('real_name');
|
|
$item['admin_name'] = '总后台管理员---》' . SystemAdmin::where('id', $item['admin_id'])->value('real_name');
|
|
@@ -65,7 +65,7 @@ class Article extends BaseModel
|
|
|
$item['catename'] = ArticleCategory::where('id', $item['cid'])->value('title');
|
|
$item['catename'] = ArticleCategory::where('id', $item['cid'])->value('title');
|
|
|
$item['store_name'] = $item->profile->store_name ?? '';
|
|
$item['store_name'] = $item->profile->store_name ?? '';
|
|
|
}, $where);
|
|
}, $where);
|
|
|
- var_dump(self::getLastSql());
|
|
|
|
|
|
|
+// var_dump(self::getLastSql());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
