|
6 | 6 | <div class="comments"> |
7 | 7 | <div class="comment-container"> |
8 | 8 | <div class="comment" v-for="comment in userNotes.data" :key="comment.id"> |
9 | | - <div class="avatar circle"> |
10 | | -<!-- <img ng-style="usernotesvm.avatarHighlight(comment.author_highlight_color)" ng-src="{{comment.author_avatar || $webConfigs.default_avatar }}" /> --> |
| 9 | + <div class="avatar" :class="defaultAvatarShape"> |
| 10 | + <img :src="comment.author_avatar || defaultAvatar" @error="$event.target.src=defaultAvatar" :style="avatarHighlight(comment.author_highlight_color)"> |
11 | 11 | </div> |
12 | 12 | <div class="content"> |
13 | 13 | <div class="title"> |
@@ -75,6 +75,7 @@ import Modal from '@/components/layout/Modal.vue' |
75 | 75 | import { reactive, toRefs, inject, onBeforeMount, onBeforeUpdate } from 'vue' |
76 | 76 | import { cloneDeep } from 'lodash' |
77 | 77 | import humanDate from '@/composables/filters/humanDate' |
| 78 | +import { avatarHighlight } from '@/composables/utils/userUtils' |
78 | 79 | import { usersApi } from '@/api' |
79 | 80 | import { AuthStore } from '@/composables/stores/auth' |
80 | 81 |
|
@@ -131,13 +132,15 @@ export default { |
131 | 132 | userNotes: {}, |
132 | 133 | note: '', |
133 | 134 | errorMessage: '', |
| 135 | + defaultAvatar: window.default_avatar, |
| 136 | + defaultAvatarShape: window.default_avatar_shape, |
134 | 137 | accessControl: { |
135 | 138 | delete: true, |
136 | 139 | update: true |
137 | 140 | } |
138 | 141 | }) |
139 | 142 |
|
140 | | - return { ...toRefs(v), leaveNote, editUserNote, pullPage, humanDate, close } |
| 143 | + return { ...toRefs(v), leaveNote, editUserNote, pullPage, avatarHighlight, humanDate, close } |
141 | 144 | } |
142 | 145 | } |
143 | 146 | </script> |
|
0 commit comments