wzq 5 rokov pred
rodič
commit
97a8935a55

+ 1 - 1
app/Helper/helper.php

@@ -124,7 +124,7 @@ function http($url, $param, $method = 'post')
 function subtext($text, $length)
 {
     if(mb_strlen($text, 'utf8') > $length) {
-        return mb_substr($text, 0, $length, 'utf8').'...';
+        return mb_substr($text, 0, $length - 1, 'utf8').'...';
     } else {
         return $text;
     }

+ 1 - 1
app/Transformers/FeedTransformer.php

@@ -27,7 +27,7 @@ class FeedTransformer extends TransformerAbstract {
             'id' => $feed['id'],
             'uid' => $feed['uid'],
             'follow_uid' => $feed['follow_uid'],
-            'follow_username' => $feed['follow_username'],
+            'follow_username' => subtext($feed['follow_username'], 10),
             'follow_avatar' => $feed['follow_avatar'],
            // 'follow_status' => $this->getFollowStatus($feed['uid'],$feed['follow_uid']),
             'type' => $feed['type'],

+ 3 - 3
app/Transformers/Post/CommentTransformer.php

@@ -21,9 +21,9 @@ class CommentTransformer extends TransformerAbstract
         foreach($replies as $val){
             $reply[] = [
                 'uid' => $val->uid,
-                'username' => $val->username,
+                'username' => subtext($val->username, 10),
                 'avatar' => $val->avatar,
-                'reply_username' => $val->reply_username,
+                'reply_username' => subtext($val->reply_username, 10),
                 'content' => $val->content,
                 'created_at' => Carbon::parse($val->created_at)->diffForHumans(),
             ];
@@ -31,7 +31,7 @@ class CommentTransformer extends TransformerAbstract
         return [
             'id' => $postComment['id'],
             'uid' => $postComment['uid'],
-            'username' => $postComment['username'],
+            'username' => subtext($postComment['username'], 10),
             'avatar' => $postComment['avatar'],
             'content' => $postComment['is_delete']?'该评论已被删除':$postComment['content'],
             'created_at' => Carbon::parse($postComment['created_at'])->diffForHumans(),

+ 1 - 1
app/Transformers/Post/DetailTransformer.php

@@ -48,7 +48,7 @@ class DetailTransformer extends TransformerAbstract
             'type' => $post['type'],
             'created_at' => Carbon::parse($post['created_at'])->diffForHumans(),
             'uid' => $post['uid'],
-            'username' => $post['username'],
+            'username' => subtext($post['username'], 10),
             'avatar' => $post['avatar'],
             'topic' => $topic,
             'title' => $post['title'],

+ 1 - 1
app/Transformers/Post/ListTransformer.php

@@ -23,7 +23,7 @@ class ListTransformer extends TransformerAbstract
             'id' => $post['id'],
             'type' => $post['type'],
             'uid' => $post['uid'],
-            'username' => $post['username'],
+            'username' => subtext($post['username'], 10),
             'avatar' => $post['avatar'],
             'title' => $post['title'],
             'img' => $post['img'],

+ 2 - 2
app/Transformers/Post/ReplyTransformer.php

@@ -19,8 +19,8 @@ class ReplyTransformer extends TransformerAbstract
         return [
             'id' => $postComment['id'],
             'uid' => $postComment['uid'],
-            'username' => $postComment['username'],
-            'reply_username' => $postComment['reply_username'],
+            'username' => subtext($postComment['username'], 10),
+            'reply_username' => subtext($postComment['reply_username'], 10),
             'avatar' => $postComment['avatar'],
             'content' => $postComment['is_delete']?'该回复已被删除':$postComment['content'],
             'created_at' => Carbon::parse($postComment['created_at'])->diffForHumans(),

+ 4 - 4
app/Transformers/Post/SuggestTransformer.php

@@ -38,14 +38,14 @@ class SuggestTransformer extends TransformerAbstract
             $reply = [];
             foreach($replies as $val){
                 $reply[] = [
-                    'username' => $val->username,
-                    'reply_username' => $val->reply_username,
+                    'username' => subtext($val->username, 10),
+                    'reply_username' => subtext($val->reply_username, 10),
                     'content' => $val->content,
                 ];
             }
             $comment[] = [
                 'id' => $item->id,
-                'username' => $item->username,
+                'username' => subtext($item->username, 10),
                 'content' => $item->content,
                 'reply_count' => $replyCount,
                 'reply' => $reply,
@@ -69,7 +69,7 @@ class SuggestTransformer extends TransformerAbstract
             'type' => $post['type'],
             'created_at' => Carbon::parse($post['created_at'])->diffForHumans(),
             'uid' => $post['uid'],
-            'username' => $post['username'],
+            'username' => subtext($post['username'], 10),
             'avatar' => $post['avatar'],
             'topic' => $topic,
             'title' => $post['title'],

+ 1 - 1
app/Transformers/Post/VideoTransformer.php

@@ -38,7 +38,7 @@ class VideoTransformer extends TransformerAbstract
             'id' => $post['id'],
             'type' => $post['type'],
             'uid' => $post['uid'],
-            'username' => $post['username'],
+            'username' => subtext($post['username'], 10),
             'avatar' => $post['avatar'],
             'title' => $post['title'],
             'content' => $post['content'],

+ 1 - 1
app/Transformers/Topic/TopicDetailTransformer.php

@@ -21,7 +21,7 @@ class TopicDetailTransformer extends TransformerAbstract
     {
         return [
             'id' => $topic['id'],
-            'name' => $topic['name'],
+            'name' => subtext($topic['name'], 5),
             'img' => $topic['img'],
             'follow_count' => $topic->follow->count() + (int) config('customer.add_topic_follow_count'),
             'is_follow' => $topic->follow->where('uid', $this->uid)->count()?1:0,

+ 1 - 1
app/Transformers/Topic/TopicListTransformer.php

@@ -17,7 +17,7 @@ class TopicListTransformer extends TransformerAbstract
     {
         return [
             'id' => $topic['id'],
-            'name' => $topic['name'],
+            'name' => subtext($topic['name'], 5),
             'img' => $topic['img'],
             'follow_count' => $topic->follow->count() + (int) config('customer.add_topic_follow_count'),
         ];

+ 6 - 6
app/Transformers/Topic/TopicPostTransformer.php

@@ -37,15 +37,15 @@ class TopicPostTransformer extends TransformerAbstract
             $reply = [];
             foreach($replies as $val){
                 $reply[] = [
-                    'username' => $val->username,
-                    'reply_username' => $val->reply_username,
+                    'username' => subtext($val->username, 10),
+                    'reply_username' => subtext($val->reply_username, 10),
                     'content' => $val->content,
                 ];
             }
             $comment[] = [
                 'id' => $item->id,
-                'username' => $item->username,
-                'content' => $item->content,
+                'username' => subtext($item->username, 10),
+                'content' => subtext($item->content, 10),
                 'reply_count' => $replyCount,
                 'reply' => $reply,
             ];
@@ -54,7 +54,7 @@ class TopicPostTransformer extends TransformerAbstract
         foreach($post->topic() as $key => $val){
             $topic[] = [
                 'id' => $key,
-                'name' => $val
+                'name' => subtext($val, 5)
             ];
         }
         $isFollow = 0;
@@ -67,7 +67,7 @@ class TopicPostTransformer extends TransformerAbstract
             'type' => $post['type'],
             'created_at' => Carbon::parse($post['created_at'])->diffForHumans(),
             'uid' => $post['uid'],
-            'username' => $post['username'],
+            'username' => subtext($post['username'], 10),
             'avatar' => $post['avatar'],
             'topic' => $topic,
             'title' => $post['title'],