Browse Source

更新发现用户功能

reghao 2 năm trước cách đây
mục cha
commit
3ec734450f
3 tập tin đã thay đổi với 46 bổ sung40 xóa
  1. 5 0
      src/api/user.js
  2. 34 31
      src/components/card/UserCard.vue
  3. 7 9
      src/views/home/Discover.vue

+ 5 - 0
src/api/user.js

@@ -3,6 +3,7 @@ import { get, post } from '@/utils/request'
 const userApi = {
   myInfoApi: '/api/user/my',
   userInfoApi: '/api/user/info',
+  discoverUserApi: '/api/user/discover',
   updateProfileApi: '/api/user/profile/basic',
   updateAvatarApi: '/api/user/profile/avatar',
   followUserApi: '/api/user/relation/follow',
@@ -23,6 +24,10 @@ export function getUserInfo(userId) {
   return get(userApi.userInfoApi + '?userId=' + userId)
 }
 
+export function getUsers() {
+  return get(userApi.discoverUserApi)
+}
+
 // 更新用户资料
 export function updateProfile(data) {
   return post(userApi.updateProfileApi, data)

+ 34 - 31
src/components/card/UserCard.vue

@@ -1,35 +1,38 @@
 <template>
-  <el-row>
-    <el-col>
-      <router-link target="_blank" :to="`/user/` + user.userId">
-        <el-avatar>
-          <el-image :src="user.avatarUrl" />
-        </el-avatar>
-      </router-link>
-    </el-col>
-    <el-col>
-      <el-row>
-        <span>{{ user.screenName }}</span>
-      </el-row>
-      <el-row>
-        <span>关注 22</span>
-        <span v-html="'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'" />
-        <span>粉丝 33</span>
-      </el-row>
-      <el-row>
-        <span>生死有命</span>
-      </el-row>
-      <el-row>
-        <el-button
-          type="danger"
-          size="mini"
-          :icon="followButton.icon"
-          @click="followUser(user.userId)"
-        >
-          <span>{{followButton.text}}</span>
-        </el-button>
-      </el-row>
-    </el-col>
+  <el-row style="padding-right: 5px; padding-left: 5px; padding-bottom: 5px">
+    <el-card>
+      <el-col>
+        <router-link target="_blank" :to="`/user/` + user.userId">
+          <el-avatar>
+            <el-image :src="user.avatarUrl" />
+          </el-avatar>
+        </router-link>
+      </el-col>
+      <el-col>
+        <el-row>
+          <span>{{ user.screenName }}</span>
+        </el-row>
+        <el-row>
+          <span>关注 22</span>
+          <span v-html="'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'" />
+          <span>粉丝 33</span>
+        </el-row>
+        <el-row>
+          <span v-if="user.signature !== undefined">{{user.signature}}</span>
+          <span v-if="user.signature === undefined">无签名</span>
+        </el-row>
+        <el-row>
+          <el-button
+            type="danger"
+            size="mini"
+            :icon="followButton.icon"
+            @click="followUser(user.userId)"
+          >
+            <span>{{followButton.text}}</span>
+          </el-button>
+        </el-row>
+      </el-col>
+    </el-card>
   </el-row>
 </template>
 

+ 7 - 9
src/views/home/Discover.vue

@@ -27,18 +27,18 @@
         </el-col>
       </el-col>
     </el-row>
-    <el-row v-if="showEmpty" class="not-result">
+<!--    <el-row v-if="showEmpty" class="not-result">
       <el-col :span="12" :offset="6">
         <img src="@/assets/img/icon/not-result.png">
         <div>没有发现用户呢</div>
       </el-col>
-    </el-row>
+    </el-row>-->
   </div>
 </template>
 
 <script>
 import UserCard from '@/components/card/UserCard'
-import { getUserInfo } from "@/api/user";
+import { getUsers } from "@/api/user";
 
 export default {
   name: 'Discover',
@@ -55,15 +55,13 @@ export default {
   created() {
     document.title = '发现'
     this.currentPage = 1
-    /*videoRecommend(this.currentPage).then(res => {
+
+    getUsers().then(res => {
       if (res.code === 0) {
         const resData = res.data
-        this.userList = resData.list
+        this.userList = resData
       }
-    })*/
-    // this.showEmpty = false
-    // 当页面挂载时,页码变为1
-    this.$store.commit('updatePage', 1)
+    })
   },
   mounted() {
     // 当窗口宽度改变时获取屏幕宽度