wesmiler 报恩寺项目提交

app/Services/EnshrineNoticeService.php

@@ -48,15 +48,18 @@ class EnshrineNoticeService extends BaseService
         $isHide = isset($params['is_hide'])? $params['is_hide'] : 1;
 
         $dataList = $this->model::from('enshrine_notices as a')
+            ->leftJoin('member as m','m.id','=','a.user_id')
             ->where(['a.type'=> $type,'a.is_hide'=> $isHide,'a.mark'=>1,'a.user_id'=> $userId,'a.status'=> 1])
-            ->select(['a.*'])
+            ->select(['a.*','m.avatar','m.nickname'])
             ->orderBy('a.create_time', 'desc')
             ->paginate($pageSize);
 
         $dataList = $dataList ? $dataList->toArray() : [];
         if ($dataList) {
             foreach ($dataList['data'] as &$item) {
+                $item['avatar'] = $item['avatar']? get_image_url($item['avatar']) : '';
                 $item['create_time'] = $item['create_time'] ? datetime($item['create_time'],'Y-m-d H:i:s') : '';
+                $item['time'] = $item['create_time']? format_time(strtotime($item['create_time'])) : '';
                 $item['description'] = $item['description']? str_replace("\n",'<br>', $item['description']) : '';
             }
             unset($item);