fix(SPA): 修复获取数据时数量传出10而判断为15的问题

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,

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 <[email protected]>
  */
-export function list (type, offset = 0, limit = 15) {
+export function list (type, offset = 0) {
   return queryList({ type, limit, offset })
 }

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 })

resources/spa/src/api/user.js

@@ -1,11 +1,13 @@
+import { limit } from './index'
 import api from './api'
 import store from '@/stores'
 import $Message from '@/plugins/message-box'
 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 <[email protected]>
  * @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 <[email protected]>
  * @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 <[email protected]>
+ * @export
+ * @param {number} userId
+ * @returns
+ */
+export function getUserTags (userId) {
+  const url = `/users/${userId}/tags`
+  return api.get(url, { validateStatus: s => s === 200 })
+}
+
+/**
+ * 获取好友列表
+ *
+ * @author mutoe <[email protected]>
+ * @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 })
+}

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,
       }

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,
       }

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)
         })
     },
   },

resources/spa/src/page/article/ArticleRewards.vue

@@ -26,6 +26,8 @@
 </template>
 
 <script>
+import { limit } from '@/api'
+
 export default {
   name: 'ArticleRewards',
   data () {
@@ -84,21 +86,21 @@ 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)
         })
     },
     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)

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)
     },
   },
 }

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) {

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,15 +34,15 @@ 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 () {
       findUserByType('latests', {
         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)
       })
     },
   },

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,15 +35,15 @@ 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) {
       findUserByType('populars', {
         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)
       })
     },
   },