Pull from origin gitea

This commit is contained in:
min.jiang 2024-08-26 23:26:35 +08:00 committed by Jet Li
parent 6c084fda22
commit d1142ecfc0
3 changed files with 11 additions and 3 deletions

View File

@ -218,4 +218,5 @@ export default {
'Didn\'t get the email? Check junk folder or': 'Didn\'t get the email? Check junk folder or ', 'Didn\'t get the email? Check junk folder or': 'Didn\'t get the email? Check junk folder or ',
'send again': 'send again', 'send again': 'send again',
'No content yet': 'No content yet' 'No content yet': 'No content yet'
} }

View File

@ -197,6 +197,11 @@ export default {
'Payment progress': '付款进度', 'Payment progress': '付款进度',
Goal: '项目目标', Goal: '项目目标',
Information: '项目信息', Information: '项目信息',
'Wait for completion': '待完成',
'Mission complete': '已完成',
'Wait for payment': '待支付',
'Wait for confirmation': '待确认',
'Confirm receipt': '确认收款',
'Quote from': '报价方', 'Quote from': '报价方',
'Days on Freeleaps': '用户活跃天数', 'Days on Freeleaps': '用户活跃天数',
'Number of projects fulfilled': '完成项目总数', 'Number of projects fulfilled': '完成项目总数',

View File

@ -6,7 +6,7 @@
<div v-for="(conversation, index) in conversations" :key="index" class="conversation-container" :class="{ <div v-for="(conversation, index) in conversations" :key="index" class="conversation-container" :class="{
selected: selConversation?.id === conversation?.id selected: selConversation?.id === conversation?.id
}" @click="selectConversation(conversation)"> }" @click="selectConversation(conversation)">
<img class="participant-portrait" alt="user portrait" src="@/assets/profile.png" /> <img class="participant-portrait" alt="user portrait" :src="conversation?.photo?.base64?conversation.photo.base64:profileUrl" />
<div class="conversation-summary-container"> <div class="conversation-summary-container">
<div class="conversation-summary-header-container"> <div class="conversation-summary-header-container">
<span class="participant-fullname"> <span class="participant-fullname">
@ -32,7 +32,7 @@
<div v-for="(item, index) in messages" :key="index" class="message-item-container" <div v-for="(item, index) in messages" :key="index" class="message-item-container"
:class="item.sender_id == userIdentityNote ? 'me' : ''"> :class="item.sender_id == userIdentityNote ? 'me' : ''">
<div class="message-item-header-container"> <div class="message-item-header-container">
<img class="message-item-sender-portrait" alt="user portrait" src="@/assets/profile.png" /> <img class="message-item-sender-portrait" alt="user portrait" :src="conversation?.sender_photo?.base64?conversation.sender_photo.base64:profileUrl" />
<span class="message-item-sender-fullname"> <span class="message-item-sender-fullname">
{{ item.sender_firstname }} {{ item.sender_firstname }}
{{ item.sender_lastname }} {{ item.sender_lastname }}
@ -59,6 +59,7 @@
import SvgIcon from '@/components/SvgIcon.vue' import SvgIcon from '@/components/SvgIcon.vue'
import { MessageHubApi, DateUtils, requestHubUtils } from '@/utils/index' import { MessageHubApi, DateUtils, requestHubUtils } from '@/utils/index'
import { userUtils } from '@/utils/store/index' import { userUtils } from '@/utils/store/index'
import profileUrl from '@/assets/profile.png'
export default { export default {
components: { SvgIcon }, components: { SvgIcon },
name: 'MessageHub', name: 'MessageHub',
@ -73,6 +74,7 @@ export default {
}, },
data() { data() {
return { return {
profileUrl,
userIdentityNote: this.mnx_getUserIdentity(), userIdentityNote: this.mnx_getUserIdentity(),
selConversation: null, selConversation: null,
messages: [], messages: [],
@ -87,7 +89,7 @@ export default {
}, },
watch: { watch: {
conversations(n_val) { conversations(n_val) {
console.log('nval', n_val, this.selConversation, n_val[0].messages) console.log('nval', n_val, this.selConversation, n_val[0]?.messages)
if (!this.selConversation && n_val[0]) { if (!this.selConversation && n_val[0]) {
this.selConversation = n_val[0] this.selConversation = n_val[0]
this.messages = n_val[0].messages || [] this.messages = n_val[0].messages || []