From 673080cda73d88427832ae0d4a072ea0972a35aa Mon Sep 17 00:00:00 2001
From: mutoe <mutoe@foxmail.com>
Date: Mon, 25 Feb 2019 13:55:06 +0800
Subject: [PATCH] =?UTF-8?q?fix(SPA):=20=E4=BF=AE=E5=A4=8D=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=95=B0=E6=8D=AE=E6=97=B6=E6=95=B0=E9=87=8F=E4=BC=A0?=
 =?UTF-8?q?=E5=87=BA10=E8=80=8C=E5=88=A4=E6=96=AD=E4=B8=BA15=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/spa/src/api/news.js                 |  2 +-
 resources/spa/src/api/questions.js            |  3 +-
 resources/spa/src/api/topic.js                |  4 +-
 resources/spa/src/api/user.js                 | 55 ++++++++++++++-----
 resources/spa/src/page/UserFans.vue           |  5 +-
 resources/spa/src/page/UserHome.vue           | 14 ++---
 .../spa/src/page/article/ArticleLikes.vue     | 10 ++--
 .../spa/src/page/article/ArticleRewards.vue   | 10 ++--
 resources/spa/src/page/feed/FeedList.vue      |  7 ++-
 resources/spa/src/page/find/FindNer.vue       |  5 +-
 resources/spa/src/page/find/FindNew.vue       |  8 ++-
 resources/spa/src/page/find/FindPop.vue       |  9 ++-
 resources/spa/src/page/find/FindRec.vue       |  7 ++-
 resources/spa/src/page/find/SearchUser.vue    |  9 +--
 .../spa/src/page/message/list/MyComments.vue  |  5 +-
 .../spa/src/page/message/list/MyLikes.vue     |  5 +-
 .../src/page/message/list/MyNotifications.vue |  5 +-
 resources/spa/src/page/topic/TopicDetail.vue  |  3 +-
 .../spa/src/page/topic/TopicParticipants.vue  |  5 +-
 .../topic/components/TopicSearchPanel.vue     |  7 ++-
 .../spa/src/stores/module/easemob/actions.js  |  3 +-
 21 files changed, 116 insertions(+), 65 deletions(-)

diff --git a/resources/spa/src/api/news.js b/resources/spa/src/api/news.js
index d2bafabdc..ba83687c6 100644
--- a/resources/spa/src/api/news.js
+++ b/resources/spa/src/api/news.js
@@ -36,7 +36,7 @@ export function getNewsList (params) {
  * @param {number}   type [类型: 0: 已发布, 1: 待审核, 2: 已驳回]
  * @returns {Promise<NewsObject[]>}
  */
-export function getMyNews ({ type = 0, limit = 15, after = 0 }) {
+export function getMyNews ({ type = 0, after = 0 }) {
   const params = { type, limit, after }
   return api.get('/user/news/contributes', {
     params,
diff --git a/resources/spa/src/api/questions.js b/resources/spa/src/api/questions.js
index 97e70f3be..023f88de8 100644
--- a/resources/spa/src/api/questions.js
+++ b/resources/spa/src/api/questions.js
@@ -1,3 +1,4 @@
+import { limit } from './index'
 import api from './api'
 
 /**
@@ -27,6 +28,6 @@ export function queryList (params = {}) {
  * @return {Promise}
  * @author Seven Du <shiweidu@outlook.com>
  */
-export function list (type, offset = 0, limit = 15) {
+export function list (type, offset = 0) {
   return queryList({ type, limit, offset })
 }
diff --git a/resources/spa/src/api/topic.js b/resources/spa/src/api/topic.js
index 51d6a541a..1694aad1b 100644
--- a/resources/spa/src/api/topic.js
+++ b/resources/spa/src/api/topic.js
@@ -1,3 +1,4 @@
+import { limit } from './index'
 import api from './api'
 
 /**
@@ -7,13 +8,14 @@ import api from './api'
  * @export
  * @param {Object} params
  * @param {string} [params.q] 搜索关键字
- * @param {number} [params.limit=15]
+ * @param {number} [params.limit]
  * @param {string} [params.direction=desc]
  * @param {number} [params.index=0]
  * @param {string} [params.only] 是否热门 'hot'
  * @returns
  */
 export function getTopicList (params) {
+  if (!params.limit) params.limit = limit
   if (params.q === '') return Promise.resolve({ data: [] })
   const url = '/feed/topics'
   return api.get(url, { params, validateStatus: s => s === 200 })
diff --git a/resources/spa/src/api/user.js b/resources/spa/src/api/user.js
index b28c24949..42a292ab0 100644
--- a/resources/spa/src/api/user.js
+++ b/resources/spa/src/api/user.js
@@ -1,3 +1,4 @@
+import { limit } from './index'
 import api from './api'
 import store from '@/stores'
 import $Message from '@/plugins/message-box'
@@ -5,7 +6,8 @@ import lstore from '@/plugins/lstore/lstore.js'
 
 /**
  * 定义用户对象
- * @typedef {{id: number, name: string, ...more}} UserObject
+ * @typedef {Object} UserObject
+ * @property {number} id
  */
 
 const resArray = { data: [] }
@@ -89,34 +91,32 @@ export const findUserByType = (type, params) => {
  * 查找附近的人
  * @author jsonleex <jsonlseex@163.com>
  * @export
- * @param  {number} options.lng: longitude    经度
- * @param  {number} options.lat: latitude     纬度
- * @param  {number} page                      当前页
+ * @param {number} options.lng: longitude    经度
+ * @param {number} options.lat: latitude     纬度
+ * @param {number} page                      当前页
  * @returns {Promise<UserObject[]>}
  */
 export const findNearbyUser = ({ lng: longitude, lat: latitude }, page = 0) => {
   const params = {
-    limit: 10,
+    limit,
     longitude,
     latitude,
   }
   page > 0 && (params.page = page)
 
-  return api
-    .get('around-amap', { params })
-    .then(data => data)
+  return api.get('around-amap', { params })
     .catch(() => resArray)
 }
 
 /**
- * 获取用户基本信息
- * 优先返回本地数据
+ * 获取用户基本信息 优先返回本地数据
  * @author jsonleex <jsonlseex@163.com>
  * @export
- * @param  {number} id
+ * @param {number} id
+ * @param {boolean} [force=false]
  * @returns {Promise<UserObject>}
  */
-export const getUserInfoById = (id, force = false) => {
+export async function getUserInfoById (id, force = false) {
   const user = store.state.USERS[`user_${id}`]
   if (user && !force) return user
 
@@ -156,7 +156,7 @@ export function getUserList (params) {
  * @param  {number} options.offset
  * @returns {Promise<UserObject[]>}
  */
-export function getUserFansByType ({ uid, type, limit = 15, offset = 0 }) {
+export function getUserFansByType ({ uid, type, offset = 0 }) {
   const params = {
     limit,
     offset,
@@ -281,3 +281,32 @@ export function reportUser (userId, reason) {
   const url = `/report/users/${userId}`
   return api.post(url, { reason }, { validateStatus: s => s === 201 })
 }
+
+/**
+ * 获取用户标签
+ *
+ * @author mutoe <mutoe@foxmail.com>
+ * @export
+ * @param {number} userId
+ * @returns
+ */
+export function getUserTags (userId) {
+  const url = `/users/${userId}/tags`
+  return api.get(url, { validateStatus: s => s === 200 })
+}
+
+/**
+ * 获取好友列表
+ *
+ * @author mutoe <mutoe@foxmail.com>
+ * @export
+ * @param {Object} [params]
+ * @param {number} [params.offset]
+ * @param {number} [params.limit]
+ * @param {string} [params.keyword]
+ * @returns {UserObject[]}
+ */
+export function getUserFriends (params) {
+  const url = '/user/follow-mutual'
+  return api.get(url, { params, validateStatus: s => s === 200 })
+}
diff --git a/resources/spa/src/page/UserFans.vue b/resources/spa/src/page/UserFans.vue
index 6a2451ce0..576da2d30 100644
--- a/resources/spa/src/page/UserFans.vue
+++ b/resources/spa/src/page/UserFans.vue
@@ -47,8 +47,9 @@
 </template>
 
 <script>
-import UserItem from '@/components/UserItem'
+import { limit } from '@/api'
 import { getUserFansByType } from '@/api/user.js'
+import UserItem from '@/components/UserItem'
 
 const typeMap = ['followers', 'followings']
 export default {
@@ -73,7 +74,7 @@ export default {
     },
     param () {
       return {
-        limit: 15,
+        limit,
         type: this.type,
         uid: this.userId,
       }
diff --git a/resources/spa/src/page/UserHome.vue b/resources/spa/src/page/UserHome.vue
index 18e839273..b8d63b109 100644
--- a/resources/spa/src/page/UserHome.vue
+++ b/resources/spa/src/page/UserHome.vue
@@ -155,14 +155,14 @@
 
 <script>
 import _ from 'lodash'
-import uploadApi from '@/api/upload'
-import FeedCard from '@/components/FeedCard/FeedCard.vue'
 import HeadRoom from 'headroom.js'
-import wechatShare from '@/util/wechatShare.js'
-
+import { limit } from '@/api'
+import uploadApi from '@/api/upload'
+import * as api from '@/api/user'
+import wechatShare from '@/util/wechatShare'
+import { checkImageType } from '@/util/imageCheck'
 import { startSingleChat } from '@/vendor/easemob'
-import { checkImageType } from '@/util/imageCheck.js'
-import * as api from '@/api/user.js'
+import FeedCard from '@/components/FeedCard/FeedCard.vue'
 
 export default {
   name: 'UserHome',
@@ -456,7 +456,7 @@ export default {
       if (this.fetchFeeding) return
       this.fetchFeeding = true
       const params = {
-        limit: 15,
+        limit,
         type: 'users',
         user: this.userId,
       }
diff --git a/resources/spa/src/page/article/ArticleLikes.vue b/resources/spa/src/page/article/ArticleLikes.vue
index f6882f571..233ed695a 100644
--- a/resources/spa/src/page/article/ArticleLikes.vue
+++ b/resources/spa/src/page/article/ArticleLikes.vue
@@ -20,6 +20,7 @@
 </template>
 
 <script>
+import { limit } from '@/api'
 import UserItem from '@/components/UserItem.vue'
 
 export default {
@@ -73,28 +74,27 @@ export default {
     },
     onRefresh (callback) {
       //  名称    类型       描述
-      //  limit   Integer   获取条数，默认 20
       //  after   Integer   id 获取之后数据，默认 0
       this.$http
-        .get(this.url, { params: { limit: 15 } })
+        .get(this.url, { params: { limit } })
         .then(({ data = [] }) => {
           this.likes = data
           data.length > 0 && (this.maxId = data[data.length - 1].id)
-          this.$refs.loadmore.afterRefresh(data.length < 15)
+          this.$refs.loadmore.afterRefresh(data.length < limit)
         })
     },
     onLoadMore (callback) {
       this.$http
         .get(this.url, {
           params: {
-            limit: 15,
+            limit,
             after: this.maxId,
           },
         })
         .then(({ data = [] }) => {
           this.likes = [...this.likes, ...data]
           data.length > 0 && (this.maxId = data[data.length - 1].id)
-          this.$refs.loadmore.afterLoadMore(data.length < 15)
+          this.$refs.loadmore.afterLoadMore(data.length < limit)
         })
     },
   },
diff --git a/resources/spa/src/page/article/ArticleRewards.vue b/resources/spa/src/page/article/ArticleRewards.vue
index 4c82ecadc..d7a629efb 100644
--- a/resources/spa/src/page/article/ArticleRewards.vue
+++ b/resources/spa/src/page/article/ArticleRewards.vue
@@ -26,6 +26,8 @@
 </template>
 
 <script>
+import { limit } from '@/api'
+
 export default {
   name: 'ArticleRewards',
   data () {
@@ -84,10 +86,10 @@ export default {
             order_type    string      默认 date, amount 打赏金额 date 打赏时间
        */
       this.$http
-        .get(this.url, { params: { limit: 15 } })
+        .get(this.url, { params: { limit } })
         .then(({ data = [] }) => {
           this.rewards = data
-          this.$refs.loadmore.afterRefresh(data.length < 15)
+          this.$refs.loadmore.afterRefresh(data.length < limit)
         })
         .catch(() => {
           this.$refs.loadmore.afterRefresh(true)
@@ -95,10 +97,10 @@ export default {
     },
     onLoadMore () {
       this.$http
-        .get(this.url, { params: { limit: 15, offset: this.rewards.length } })
+        .get(this.url, { params: { limit, offset: this.rewards.length } })
         .then(({ data = [] }) => {
           this.rewards = [...this.rewards, ...data]
-          this.$refs.loadmore.afterLoadmore(data.length < 15)
+          this.$refs.loadmore.afterLoadmore(data.length < limit)
         })
         .catch(() => {
           this.$refs.loadmore.afterLoadmore(true)
diff --git a/resources/spa/src/page/feed/FeedList.vue b/resources/spa/src/page/feed/FeedList.vue
index a03eefa67..4d83c5f15 100644
--- a/resources/spa/src/page/feed/FeedList.vue
+++ b/resources/spa/src/page/feed/FeedList.vue
@@ -75,8 +75,9 @@
  * @typedef {{id: number, user, ...others}} FeedDetail
  */
 
-import FeedCard from '@/components/FeedCard/FeedCard.vue'
+import { limit } from '@/api'
 import { noop } from '@/util'
+import FeedCard from '@/components/FeedCard/FeedCard.vue'
 
 const feedTypesMap = ['new', 'hot', 'follow']
 
@@ -123,13 +124,13 @@ export default {
       const type = this.feedType.replace(/^\S/, s => s.toUpperCase())
       const action = `feed/get${type}Feeds`
       const data = await this.$store.dispatch(action, { refresh: true })
-      this.$refs.loadmore.afterRefresh(data.length < 15)
+      this.$refs.loadmore.afterRefresh(data.length < limit)
     },
     async onLoadMore () {
       const type = this.feedType.replace(/^\S/, s => s.toUpperCase())
       const action = `feed/get${type}Feeds`
       const data = await this.$store.dispatch(action, { after: this.after })
-      this.$refs.loadmore.afterLoadMore(data.length < 15)
+      this.$refs.loadmore.afterLoadMore(data.length < limit)
     },
   },
 }
diff --git a/resources/spa/src/page/find/FindNer.vue b/resources/spa/src/page/find/FindNer.vue
index 172adfec7..89d7dd0ce 100644
--- a/resources/spa/src/page/find/FindNer.vue
+++ b/resources/spa/src/page/find/FindNer.vue
@@ -16,8 +16,9 @@
 <script>
 import { mapState } from 'vuex'
 import { noop } from '@/util'
-import UserItem from '@/components/UserItem.vue'
+import { limit } from '@/api'
 import { findNearbyUser } from '@/api/user.js'
+import UserItem from '@/components/UserItem.vue'
 
 export default {
   name: 'FindNer',
@@ -59,7 +60,7 @@ export default {
         user && sortedUsers.push(user)
       }
       this.users = sortedUsers
-      const more = this.users.length < 15
+      const more = this.users.length < limit
       callback(more)
     },
     onRefresh (callback) {
diff --git a/resources/spa/src/page/find/FindNew.vue b/resources/spa/src/page/find/FindNew.vue
index caf8c8ccc..dbc2ac015 100644
--- a/resources/spa/src/page/find/FindNew.vue
+++ b/resources/spa/src/page/find/FindNew.vue
@@ -13,8 +13,10 @@
   </JoLoadMore>
 </template>
 <script>
-import UserItem from '@/components/UserItem.vue'
+import { limit } from '@/api'
 import { findUserByType } from '@/api/user.js'
+import UserItem from '@/components/UserItem.vue'
+
 export default {
   name: 'FindPop',
   components: {
@@ -32,7 +34,7 @@ export default {
     onRefresh () {
       findUserByType('latests').then(({ data: users } = {}) => {
         users && (this.users = users)
-        this.$refs.loadmore.afterRefresh(users.length < 15)
+        this.$refs.loadmore.afterRefresh(users.length < limit)
       })
     },
     onLoadMore () {
@@ -40,7 +42,7 @@ export default {
         offset: this.users.length,
       }).then(({ data: users }) => {
         this.users = [...this.users, ...users]
-        this.$refs.loadmore.afterLoadmore(users.length < 15)
+        this.$refs.loadmore.afterLoadmore(users.length < limit)
       })
     },
   },
diff --git a/resources/spa/src/page/find/FindPop.vue b/resources/spa/src/page/find/FindPop.vue
index c4e02ae09..8233c3b32 100644
--- a/resources/spa/src/page/find/FindPop.vue
+++ b/resources/spa/src/page/find/FindPop.vue
@@ -12,9 +12,12 @@
     />
   </JoLoadMore>
 </template>
+
 <script>
-import UserItem from '@/components/UserItem.vue'
+import { limit } from '@/api'
 import { findUserByType } from '@/api/user.js'
+import UserItem from '@/components/UserItem.vue'
+
 export default {
   name: 'FindPop',
   components: {
@@ -32,7 +35,7 @@ export default {
     onRefresh (callback) {
       findUserByType('populars').then(({ data: users } = {}) => {
         users && (this.users = users)
-        this.$refs.loadmore.afterRefresh(users.length < 15)
+        this.$refs.loadmore.afterRefresh(users.length < limit)
       })
     },
     onLoadMore (callback) {
@@ -40,7 +43,7 @@ export default {
         offset: this.users.length,
       }).then(({ data: users }) => {
         this.users = [...this.users, ...users]
-        this.$refs.loadmore.afterLoadMore(users.length < 15)
+        this.$refs.loadmore.afterLoadMore(users.length < limit)
       })
     },
   },
diff --git a/resources/spa/src/page/find/FindRec.vue b/resources/spa/src/page/find/FindRec.vue
index ac7b77a45..4ab8afc49 100644
--- a/resources/spa/src/page/find/FindRec.vue
+++ b/resources/spa/src/page/find/FindRec.vue
@@ -14,8 +14,9 @@
 </template>
 
 <script>
-import UserItem from '@/components/UserItem.vue'
+import { limit } from '@/api'
 import * as userApi from '@/api/user'
+import UserItem from '@/components/UserItem.vue'
 
 export default {
   name: 'FindRec',
@@ -43,7 +44,7 @@ export default {
         .findUserByType('find-by-tags')
         .then(({ data: users }) => {
           this.users = users
-          this.$refs.loadmore.afterRefresh(users.length < 15)
+          this.$refs.loadmore.afterRefresh(users.length < limit)
           return users.map(u => {
             u.searchFrom = 'tags'
             return u
@@ -64,7 +65,7 @@ export default {
         offset: this.users.length,
       })
       this.users = [...this.users, ...users]
-      this.$refs.loadmore.afterLoadMore(users.length < 15)
+      this.$refs.loadmore.afterLoadMore(users.length < limit)
     },
   },
 }
diff --git a/resources/spa/src/page/find/SearchUser.vue b/resources/spa/src/page/find/SearchUser.vue
index 0bdd13cb5..0f9291c6c 100644
--- a/resources/spa/src/page/find/SearchUser.vue
+++ b/resources/spa/src/page/find/SearchUser.vue
@@ -40,9 +40,10 @@
 
 <script>
 import _ from 'lodash'
+import { limit } from '@/api'
+import * as api from '@/api/user.js'
 import SearchBar from '@/components/common/SearchBar.vue'
 import UserItem from '@/components/UserItem.vue'
-import * as api from '@/api/user.js'
 
 export default {
   name: 'SearchUser',
@@ -90,13 +91,13 @@ export default {
     onRefresh (callback) {
       api.searchUserByKey(this.keyword).then(({ data }) => {
         this.users = data
-        this.$refs.loadmore.afterRefresh(data.length < 15)
+        this.$refs.loadmore.afterRefresh(data.length < limit)
       })
     },
     onLoadMore (callback) {
       api.searchUserByKey(this.keyword, this.users.length).then(({ data }) => {
         this.users = [...this.users, ...data]
-        this.$refs.loadmore.afterLoadMore(data.length < 15)
+        this.$refs.loadmore.afterLoadMore(data.length < limit)
       })
     },
     onFocus () {
@@ -109,7 +110,7 @@ export default {
     fetchRecs (callback) {
       api.findUserByType('recommends').then(({ data }) => {
         this.recs = data
-        this.$refs.loadmoreRecs.afterRefresh(data.length < 15)
+        this.$refs.loadmoreRecs.afterRefresh(data.length < limit)
       })
     },
   },
diff --git a/resources/spa/src/page/message/list/MyComments.vue b/resources/spa/src/page/message/list/MyComments.vue
index f4285076b..892ac1ffb 100644
--- a/resources/spa/src/page/message/list/MyComments.vue
+++ b/resources/spa/src/page/message/list/MyComments.vue
@@ -29,6 +29,7 @@
  * 消息-评论列表
  */
 import { mapState } from 'vuex'
+import { limit } from '@/api'
 import { resetUserCount } from '@/api/message.js'
 import feedItem from '../children/comments/feedItem'
 import newsItem from '../children/comments/newsItem'
@@ -104,7 +105,7 @@ export default {
             this.refreshData = data
           }
           this.$nextTick(() => {
-            this.$refs.loadmore.afterRefresh(data.length < 15)
+            this.$refs.loadmore.afterRefresh(data.length < limit)
           })
         })
     },
@@ -124,7 +125,7 @@ export default {
             data,
           })
           this.$nextTick(() => {
-            this.$refs.loadmore.afterLoadMore(data.length < 15)
+            this.$refs.loadmore.afterLoadMore(data.length < limit)
           })
         })
     },
diff --git a/resources/spa/src/page/message/list/MyLikes.vue b/resources/spa/src/page/message/list/MyLikes.vue
index b7a52d647..65ece1737 100644
--- a/resources/spa/src/page/message/list/MyLikes.vue
+++ b/resources/spa/src/page/message/list/MyLikes.vue
@@ -27,6 +27,7 @@
 
 <script>
 import { mapState } from 'vuex'
+import { limit } from '@/api'
 import { resetUserCount } from '@/api/message.js'
 import feedItem from '../children/likes/feedItem'
 import newsItem from '../children/likes/newsItem'
@@ -79,7 +80,7 @@ export default {
             this.refreshData = data
           }
           resetUserCount('liked')
-          this.$refs.loadmore.afterRefresh(data.length < 15)
+          this.$refs.loadmore.afterRefresh(data.length < limit)
         })
     },
 
@@ -98,7 +99,7 @@ export default {
             return false
           }
           this.$store.commit('SAVE_MY_LIKED', { type: 'more', data })
-          this.$refs.loadmore.afterLoadMore(data.length < 15)
+          this.$refs.loadmore.afterLoadMore(data.length < limit)
         })
     },
   },
diff --git a/resources/spa/src/page/message/list/MyNotifications.vue b/resources/spa/src/page/message/list/MyNotifications.vue
index 57f9fd3df..4a0d6ce87 100644
--- a/resources/spa/src/page/message/list/MyNotifications.vue
+++ b/resources/spa/src/page/message/list/MyNotifications.vue
@@ -22,6 +22,7 @@
 
 <script>
 import _ from 'lodash'
+import { limit } from '@/api'
 import { getNotifications } from '@/api/message.js'
 
 const prefixCls = 'notification'
@@ -48,7 +49,7 @@ export default {
     onRefresh () {
       getNotifications().then(({ data }) => {
         this.$http.put('/user/notifications/all')
-        this.$refs.loadmore.afterRefresh(data.length < 15)
+        this.$refs.loadmore.afterRefresh(data.length < limit)
         this.notifications = data
       })
     },
@@ -62,7 +63,7 @@ export default {
     onLoadMore () {
       const { length: offset = 0 } = this.notifications
       getNotifications(offset).then(({ data }) => {
-        this.$refs.loadmore.afterLoadMore(data.length < 15)
+        this.$refs.loadmore.afterLoadMore(data.length < limit)
         this.notifications = _.unionBy([...this.notifications, ...data])
       })
     },
diff --git a/resources/spa/src/page/topic/TopicDetail.vue b/resources/spa/src/page/topic/TopicDetail.vue
index 5910e7818..efbd323b8 100644
--- a/resources/spa/src/page/topic/TopicDetail.vue
+++ b/resources/spa/src/page/topic/TopicDetail.vue
@@ -83,6 +83,7 @@
 </template>
 
 <script>
+import { limit } from '@/api'
 import * as api from '@/api/topic'
 import * as userApi from '@/api/user'
 import PortalPanel from '@/components/PortalPanel'
@@ -162,7 +163,7 @@ export default {
       api.getTopicFeeds(this.topicId, params)
         .then(({ data }) => {
           this.fetching = false
-          this.$refs.portal.afterLoadMore(data.length < 15)
+          this.$refs.portal.afterLoadMore(data.length < limit)
           if (loadmore) this.feeds.push(...data)
           else this.feeds = data
         })
diff --git a/resources/spa/src/page/topic/TopicParticipants.vue b/resources/spa/src/page/topic/TopicParticipants.vue
index 7338a8784..a3da6ebd9 100644
--- a/resources/spa/src/page/topic/TopicParticipants.vue
+++ b/resources/spa/src/page/topic/TopicParticipants.vue
@@ -15,6 +15,7 @@
 </template>
 
 <script>
+import { limit } from '@/api'
 import * as api from '@/api/topic'
 import UserItem from '@/components/UserItem.vue'
 
@@ -39,14 +40,14 @@ export default {
     async onRefresh () {
       const { data: participants } = await api.getTopicParticipants(this.topicId)
       const users = await this.fetchUser(participants)
-      this.$refs.loadmore.afterRefresh(users.length < 15)
+      this.$refs.loadmore.afterRefresh(users.length < limit)
       this.participants = users
     },
     async onLoadMore () {
       const offset = this.participants.length
       const { data: participants } = await api.getTopicParticipants(this.topicId, { offset })
       const users = await this.fetchUser(participants)
-      this.$refs.loadmore.afterLoadMore(users.length < 15)
+      this.$refs.loadmore.afterLoadMore(users.length < limit)
       this.participants.push(...users)
     },
     async fetchUser (ids) {
diff --git a/resources/spa/src/page/topic/components/TopicSearchPanel.vue b/resources/spa/src/page/topic/components/TopicSearchPanel.vue
index 5e6204ff0..2536dd53d 100644
--- a/resources/spa/src/page/topic/components/TopicSearchPanel.vue
+++ b/resources/spa/src/page/topic/components/TopicSearchPanel.vue
@@ -36,8 +36,9 @@
 
 <script>
 import _ from 'lodash'
-import * as api from '@/api/topic'
 import { mapState } from 'vuex'
+import { limit } from '@/api'
+import * as api from '@/api/topic'
 import SearchBar from '@/components/common/SearchBar.vue'
 
 export default {
@@ -81,13 +82,13 @@ export default {
     onRefresh: _.debounce(async function () {
       const { data } = await api.getTopicList({ q: this.keyword })
       this.list = data
-      this.$refs.loadmore.afterRefresh(data.length < 15)
+      this.$refs.loadmore.afterRefresh(data.length < limit)
     }, 450),
     async onLoadMore () {
       const lastTopic = [...this.list].pop() || {}
       const { data } = await api.getTopicList({ q: this.keyword, index: lastTopic.id })
       this.list.push(...data)
-      this.$refs.loadmore.afterRefresh(data.length < 15)
+      this.$refs.loadmore.afterRefresh(data.length < limit)
     },
     highlight (name) {
       const regex = new RegExp(`(${this.keyword})`, 'ig')
diff --git a/resources/spa/src/stores/module/easemob/actions.js b/resources/spa/src/stores/module/easemob/actions.js
index 666ae0d78..0eb95b55d 100644
--- a/resources/spa/src/stores/module/easemob/actions.js
+++ b/resources/spa/src/stores/module/easemob/actions.js
@@ -1,3 +1,4 @@
+import { limit } from '@/api'
 import dataBase from '@/util/database.js'
 export default {
   // 初始化聊天列表
@@ -32,7 +33,7 @@ export default {
           .where('cid')
           .equals(ids[i])
           .desc()
-          .limit(15)
+          .limit(limit)
           .sortBy('time')
       })
       MESSAGES[`room_${ids[i]}`] = message