Merge branch 'dev' of http://git.bocai108.com:10180/Ethan/Customer-Service into dev

application/admin/controller/Messages.php

@@ -79,6 +79,14 @@ class Messages extends Base
             $accounts = db('accounts')->select();
             foreach($result as $key=>$vo){
 
+                $result[$key]['content'] = str_replace('>','&gt',$result[$key]['content']);
+                $result[$key]['content'] = str_replace('<','&lt',$result[$key]['content']);
+                $result[$key]['content'] = '<div style="overflow: hidden;text-overflow:ellipsis;white-space: nowrap;max-width: 120px;">'.$result[$key]['content'].'</div>';
+
+                $result[$key]['reply_content'] = str_replace('>','&gt',$result[$key]['reply_content']);
+                $result[$key]['reply_content'] = str_replace('<','&lt',$result[$key]['reply_content']);
+                $result[$key]['reply_content'] = '<div style="overflow: hidden;text-overflow:ellipsis;white-space: nowrap;max-width: 120px;">'.$result[$key]['reply_content'].'</div>';
+
                 if(!empty($result[$key]['image'])){
                     // 优化显示附件
                     $images = $result[$key]['image'];