From 81e16742530ddcd86b368678bad74fc8eb471c63 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 28 十月 2024 18:44:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into test
---
src/views/profile/components/Timeline.vue | 15 +--------------
1 files changed, 1 insertions(+), 14 deletions(-)
diff --git a/src/views/profile/components/Timeline.vue b/src/views/profile/components/Timeline.vue
index 64100ce..b57178f 100644
--- a/src/views/profile/components/Timeline.vue
+++ b/src/views/profile/components/Timeline.vue
@@ -3,13 +3,11 @@
<el-timeline>
<el-timeline-item placement="top" :timestamp="userInfo.lastActiveTime">
<el-card>
- <h4>鏈�鍚庢椿鍔ㄦ椂闂�</h4>
<p>{{ userInfo.realName+'鍦ㄦ牎鑰冪郴缁熶腑鏈�鍚庢椿鍔ㄤ簡' }}</p>
</el-card>
</el-timeline-item>
<el-timeline-item placement="top" :timestamp="userInfo.createTime">
<el-card>
- <h4>鍔犲叆鏃堕棿</h4>
<p>{{ userInfo.realName+'鍔犲叆浜嗘牎鑰冪郴缁�' }}</p>
</el-card>
</el-timeline-item>
@@ -20,17 +18,6 @@
<script>
export default {
- props: {
- userInfo: {
- type: Object,
- default: () => {
- return {
- realName: '',
- lastActiveTime: '',
- createTime: ''
- }
- }
- }
- }
+ props: ['userInfo'],
}
</script>
--
Gitblit v1.8.0