Browse Source

修改用户主页的状态显示栏

reghao 3 years ago
parent
commit
a764f627a7

+ 6 - 0
src/api/mblog/status.js

@@ -3,6 +3,7 @@ import $axios from '../index'
 const statusApi = {
 const statusApi = {
   statusPubApi: '/api/mblog/status',
   statusPubApi: '/api/mblog/status',
   statusRecommendApi: '/api/mblog/status',
   statusRecommendApi: '/api/mblog/status',
+  userStatusApi: '/api/mblog/status/user',
   answerRecommendApi: '/api/mblog/answer'
   answerRecommendApi: '/api/mblog/answer'
 }
 }
 
 
@@ -16,6 +17,11 @@ export function statusRecommend(page) {
   return $axios.get(statusApi.statusRecommendApi + '/' + page)
   return $axios.get(statusApi.statusRecommendApi + '/' + page)
 }
 }
 
 
+// 用户状态获取接口
+export function userStatus(page) {
+  return $axios.get(statusApi.userStatusApi + '/' + page)
+}
+
 export function answerRecommend(page) {
 export function answerRecommend(page) {
   return $axios.get(statusApi.answerRecommendApi + '/' + page)
   return $axios.get(statusApi.answerRecommendApi + '/' + page)
 }
 }

+ 1 - 1
src/components/card/status-card.vue

@@ -87,7 +87,7 @@ export default {
       this.$viewerApi({
       this.$viewerApi({
         images: imgs,
         images: imgs,
         options: {
         options: {
-          movable: false,
+          movable: true,
           fullscreen: false,
           fullscreen: false,
           keyboard: true
           keyboard: true
         }
         }

+ 1 - 1
src/views/mblog/mblog.vue

@@ -38,7 +38,7 @@
                       max-file-size="10MB"
                       max-file-size="10MB"
                       accepted-file-types="image/png, image/jpeg, image/jpg, image/gif"
                       accepted-file-types="image/png, image/jpeg, image/jpg, image/gif"
                       :allow-multiple="true"
                       :allow-multiple="true"
-                      :max-files="12"
+                      :max-files="9"
                       :server="server"
                       :server="server"
                       :instant-upload="true"
                       :instant-upload="true"
                       @init="handleFilePondInit"
                       @init="handleFilePondInit"

+ 29 - 9
src/views/user/home.vue

@@ -91,13 +91,20 @@
           </v-col>
           </v-col>
         </v-row>
         </v-row>
       </div>
       </div>
-      <v-row>
+      <v-row v-if="cardType === 'video'">
+        <v-col
+          v-for="item in cardList"
+          :key="item.videoId"
+        >
+          <video-card :video="item" />
+        </v-col>
+      </v-row>
+      <v-row v-if="cardType === 'status'">
         <v-col
         <v-col
           v-for="item in cardList"
           v-for="item in cardList"
-          :key="item"
+          :key="item.statusId"
         >
         >
-          <video-card v-if="cardType === 'video'" :video="item" />
-          <status-card v-if="cardType === 'status'" :item="item" />
+          <status-card :item="item" />
         </v-col>
         </v-col>
       </v-row>
       </v-row>
       <v-row justify="center">
       <v-row justify="center">
@@ -115,6 +122,7 @@
 <script>
 <script>
 import { userVideoList } from '@/api/media/video'
 import { userVideoList } from '@/api/media/video'
 import { getUserInfo } from '@/api/user/user'
 import { getUserInfo } from '@/api/user/user'
+import { userStatus } from '@/api/mblog/status'
 import Power from '@/utils/check-power.vue'
 import Power from '@/utils/check-power.vue'
 import StatusCard from '@/components/card/status-card'
 import StatusCard from '@/components/card/status-card'
 import VideoCard from '@/components/card/video-card.vue'
 import VideoCard from '@/components/card/video-card.vue'
@@ -220,12 +228,24 @@ export default {
       })
       })
     },
     },
     getStatusList(page) {
     getStatusList(page) {
-      if (this.page === 1) {
-        this.cardList = []
-      }
+      userStatus(page).then(res => {
+        if (res.code === 0) {
+          this.cardType = 'status'
+          this.$vuetify.goTo(0)
 
 
-      this.cardType = 'status'
-      console.log('获取状态列表')
+          const pageList = res.data
+          this.cardList.splice(0, this.cardList.length)
+          for (const item of pageList.list) {
+            this.cardList.push(item)
+          }
+          this.currentPage = pageList.currentPage
+          this.length = pageList.totalPages
+        } else {
+          alert(res.data)
+        }
+      }).catch(error => {
+        console.error(error.message)
+      })
     },
     },
     getAnswerList(page) {
     getAnswerList(page) {
       if (this.page === 1) {
       if (this.page === 1) {