|
|
@@ -175,7 +175,7 @@ class MessageService extends BaseService
|
|
|
foreach($datas as &$item){
|
|
|
$item['title'] = isset($titles[$item['type']])? $titles[$item['type']] : '消息通知';
|
|
|
$data = $this->getNewMessage($item['type'],0, $userId);
|
|
|
- $item['description'] = isset($data['description']) && $data['description']? $data['description'] : (isset($data['content'])? mb_substr($data['content'],0,20,'utf-8'): lang('有新消息'));
|
|
|
+ $item['description'] = isset($data['description']) && $data['description']? $data['description'] : (isset($data['title'])? mb_substr($data['title'],0,30,'utf-8'): lang('有新消息'));
|
|
|
$item['create_time'] = isset($data['create_time']) && $data['create_time']? $data['create_time'] : '';
|
|
|
$item['time_text'] = isset($item['create_time']) && $item['create_time'] ? dateFormat($item['create_time']) : '';
|
|
|
$item['create_time'] = isset($item['create_time']) ? datetime($item['create_time'], 'Y-m-d H.i.s') : '';
|
|
|
@@ -291,7 +291,7 @@ class MessageService extends BaseService
|
|
|
if($userId){
|
|
|
$where['to_uid'] = $userId;
|
|
|
}
|
|
|
- $data = $this->model->where($where)->select('id','description','msg_type','content','create_time')
|
|
|
+ $data = $this->model->where($where)->select('id','title','description','msg_type','content','create_time')
|
|
|
->orderBy('create_time','desc')
|
|
|
->orderBy('id','desc')
|
|
|
->first();
|
