diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue
index e0dde7a..8e016b3 100644
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@@ -7,9 +7,9 @@
-
![]()
-

-
{{ props.currentItem.user.is_follow ? '私信' : '关注' }}
+
![]()
+

+
{{ props.currentItem.user.follow_status ? '私信' : '关注' }}
@@ -166,7 +166,7 @@
@@ -193,7 +193,7 @@ const props = defineProps({
default: {
user: DefaultUser,
isRequest: false,
- videos: [],
+ post: [],
}
},
active: {
@@ -286,7 +286,16 @@ watch(() => props.active,
let res = await api.user.profile()
console.log('res', res)
if (res.code === 200) {
- emit('update:currentItem', merge(props.currentItem, {user: res.data.user, isRequest: true}))
+ res.data.post = res.data.post.map(v => {
+ return {
+ cover: v.video.cover.url_list[0],
+ digg_count: v.statistics.digg_count,
+ create_time: v.create_time
+ }
+ })
+ //去年保存的老数据有id。现在去网页版复制数据没id了。。。
+ res.data.user.unique_id = props.currentItem.user.unique_id
+ emit('update:currentItem', merge(props.currentItem, {...res.data, isRequest: true}))
}
}
})
diff --git a/src/mock/index.js b/src/mock/index.js
index 78c9772..5dfffa4 100644
--- a/src/mock/index.js
+++ b/src/mock/index.js
@@ -2,6 +2,7 @@ import Mock from 'mockjs'
import globalMethods from '../utils'
import resource from "../assets/data/resource.js";
import users from '@/assets/data/users.json'
+import post from '@/assets/data/post.json'
import {sample, shuffle} from "lodash";
function getParams(options) {
@@ -28,13 +29,12 @@ let allRecommendVideos = resource.videos.map(v => {
})
for (let i = 0; i < 50; i++) {
- allRecommendVideos = allRecommendVideos.concat(
- shuffle(resource.videos)
- .slice(0, 10)
- .map(v => {
- v.type = 'recommend-video'
- return v
- }))
+ allRecommendVideos = allRecommendVideos.concat(shuffle(resource.videos)
+ .slice(0, 10)
+ .map(v => {
+ v.type = 'recommend-video'
+ return v
+ }))
}
Mock.mock(/recommended/, options => {
let page = getPage(options)
@@ -151,13 +151,16 @@ Mock.mock(/user\/friends/, options => {
Mock.mock(/user\/profile\/other/, options => {
return Mock.mock({
// data: sample(users), code: 200, msg: '',
- data: users[0], code: 200, msg: '',
+ data: {
+ user: users[0].user,
+ post: post
+ }, code: 200, msg: '',
})
})
Mock.mock(/aweme\/post/, options => {
return Mock.mock({
// data: sample(users), code: 200, msg: '',
- data: users[0], code: 200, msg: '',
+ data: post, code: 200, msg: '',
})
})
\ No newline at end of file
diff --git a/src/pages/home/components/FollowSetting.vue b/src/pages/home/components/FollowSetting.vue
index 674e6f8..0cd573f 100644
--- a/src/pages/home/components/FollowSetting.vue
+++ b/src/pages/home/components/FollowSetting.vue
@@ -6,13 +6,13 @@
:show-heng-gang="false"
maskMode="dark"
@cancel="cancel()"
- height="330rem"
+ height="480rem"
mode="light">
@@ -35,12 +35,24 @@
+
$emit('showChangeNote'))">
+
设置分组
+
+

+
+
$emit('showChangeNote'))">
设置备注名
+
在关注列表中置顶
@@ -53,14 +65,20 @@
+
$emit('cancelFollow'))">
+
取消关注
+
+

+
+