wesmiler

app/Services/Api/MessageService.php

@@ -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['message'])? mb_substr($data['message'],0,20,'utf-8'): lang('有新消息'));
+                $item['description'] = isset($data['description']) && $data['description']? $data['description'] : (isset($data['content'])? mb_substr($data['content'],0,20,'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') : '';
@@ -248,7 +248,7 @@ class MessageService extends BaseService
                 $item['from_user_avatar'] = isset($item['from_user_avatar']) && $item['from_user_avatar'] ? get_image_url($item['from_user_avatar']) : get_image_url('/images/member/logo.png');
                 $item['to_user_avatar'] = isset($item['to_user_avatar']) && $item['to_user_avatar'] ? get_image_url($item['to_user_avatar']) : get_image_url('/images/member/logo.png');
                 $data = $this->getNewMessage(0,$item['chat_key']);
-                $item['description'] = isset($data['description']) && $data['description']? $data['description'] : (isset($data['message'])? mb_substr($data['message'],0,20,'utf-8'):lang('有新消息'));
+                $item['description'] = isset($data['description']) && $data['description']? $data['description'] : (isset($data['content'])? mb_substr($data['content'],0,20,'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') : '';

app/Services/EmailService.php

@@ -213,6 +213,7 @@ class EmailService extends BaseService
                         'chat_type'=> 0,
                         'type'=> $type,
                         'title'=> $title,
+                        'description'=> $message? substr($message,0,30) : $title,
                         'content'=> $message,
                         'chat_key'=> "0{$userId}",
                         'create_time'=> time(),