|
|
@@ -44,9 +44,9 @@ class Article extends BaseModel
|
|
|
// if($where['status'] !== '') $model = $model->where('status',$where['status']);
|
|
|
// if($where['access'] !== '') $model = $model->where('access',$where['access']);
|
|
|
if ($where['title'] !== '') $model = $model->where('title', 'LIKE', "%$where[title]%");
|
|
|
-// if (isset($where['mer_id'])&&$where['mer_id']!== ''){
|
|
|
-// $model = $model->where('mer_id', $where['mer_id']);
|
|
|
-// }
|
|
|
+ if (isset($where['mer_id'])&&$where['mer_id']!== ''){
|
|
|
+ $model = $model->where('mer_id', $where['mer_id']);
|
|
|
+ }
|
|
|
if ($where['cid'] !== '')
|
|
|
$model = $model->where('cid', 'in', $where['cid']);
|
|
|
else
|
|
|
@@ -56,9 +56,10 @@ class Article extends BaseModel
|
|
|
$model = $model->where('mer_id', 0);
|
|
|
$model = $model->where('status', 1)->where('hide', 0)->order('id desc');
|
|
|
self::page($model, function ($item) {
|
|
|
- var_dump($item);die();
|
|
|
+ var_dump($item);
|
|
|
if (!$item['mer_id']) $item['admin_name'] = '总后台管理员---》' . SystemAdmin::where('id', $item['admin_id'])->value('real_name');
|
|
|
else $item['admin_name'] = Merchant::where('id', $item['mer_id'])->value('mer_name') . '---》' . MerchantAdmin::where('id', $item['admin_id'])->value('real_name');
|
|
|
+ var_dump(114514); var_dump($item);die();
|
|
|
$item['content'] = ArticleContent::where('nid', $item['id'])->value('content');
|
|
|
$item['catename'] = ArticleCategory::where('id', $item['cid'])->value('title');
|
|
|
$item['store_name'] = $item->profile->store_name ?? '';
|
