Commit f0098244 authored by yaya's avatar yaya

feat: bugfix

parent 9de8444f
...@@ -110,7 +110,11 @@ export default { ...@@ -110,7 +110,11 @@ export default {
messageList: [], // 历史消息 messageList: [], // 历史消息
userId: '', userId: '',
totalUnreadMessageCount: 0, // 为读总数 totalUnreadMessageCount: 0, // 为读总数
chatUserInfo: {} chatUserInfo: {
user: {
remark: ''
}
}
} }
}, },
computed: { computed: {
...@@ -241,7 +245,11 @@ export default { ...@@ -241,7 +245,11 @@ export default {
handleClear() { handleClear() {
this.currentConversationItem = {} this.currentConversationItem = {}
this.conversationList = [] this.conversationList = []
this.chatUserInfo = false this.chatUserInfo = {
user: {
remark: ''
}
}
this.nextReqMessageID = '' this.nextReqMessageID = ''
this.messageList = [] this.messageList = []
this.messageContent = '' this.messageContent = ''
...@@ -466,7 +474,11 @@ export default { ...@@ -466,7 +474,11 @@ export default {
this.messageList = [] this.messageList = []
this.currentConversationItem = item this.currentConversationItem = item
this.nextReqMessageID = '' this.nextReqMessageID = ''
this.chatUserInfo = {} this.chatUserInfo = {
user: {
remark: ''
}
}
this.handleGetHistory() this.handleGetHistory()
this.handleFindChatUserInfo() this.handleFindChatUserInfo()
} }
...@@ -661,6 +673,14 @@ export default { ...@@ -661,6 +673,14 @@ export default {
font-weight: 500; font-weight: 500;
color: #17191C; color: #17191C;
line-height: 20px; line-height: 20px;
max-width: 150px;
overflow: hidden;
text-overflow: ellipsis;
word-wrap: break-word;
white-space: normal;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
display: -webkit-box;
} }
.conversation-item-image__num { .conversation-item-image__num {
background: #FA5151; background: #FA5151;
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
border border
fit fit
highlight-current-row> highlight-current-row>
<el-table-column align="center" width="100px" label="会话ID" prop="fromAccount" sortable /> <el-table-column align="center" label="序号" width="100px" type="index" />
<el-table-column align="center" label="用户昵称" prop="fromAccountName" /> <el-table-column align="center" label="用户昵称" prop="fromAccountName" />
......
...@@ -65,7 +65,7 @@ export default { ...@@ -65,7 +65,7 @@ export default {
margin-left:auto; margin-left:auto;
} }
.message-self-info_time { .message-self-info_time {
font-size: 12px; font-size: 11px;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #6A6E7A; color: #6A6E7A;
...@@ -101,7 +101,7 @@ export default { ...@@ -101,7 +101,7 @@ export default {
line-height: 20px; line-height: 20px;
} }
.message-other-info_time { .message-other-info_time {
font-size: 12px; font-size: 11px;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #6A6E7A; color: #6A6E7A;
......
...@@ -19,15 +19,14 @@ ...@@ -19,15 +19,14 @@
</div> </div>
<div class="info flex"> <div class="info flex">
<div class="info-title">备注:</div> <div class="info-title">备注:</div>
<div v-if="!chatUserInfo || !chatUserInfo.user || !chatUserInfo.user.remark">-</div> <div v-if="chatUserInfo && chatUserInfo.user">
<div v-if="chatUserInfo && chatUserInfo.user && chatUserInfo.user.remark">
<el-input <el-input
v-model="chatUserInfo.user.remark" v-model="chatUserInfo.user.remark"
:autosize="{ minRows: 6, maxRows: 12}" :autosize="{ minRows: 10}"
:style="textAreaStyle"
maxlength="100" maxlength="100"
type="textarea" type="textarea"
show-word-limit show-word-limit
style="border: 1px solid #DCDFE6; border-radius: 4px;margin: 0; width: 230px"
placeholder="请输入备注" placeholder="请输入备注"
@blur="handleBlur"/> @blur="handleBlur"/>
</div> </div>
...@@ -53,6 +52,10 @@ export default { ...@@ -53,6 +52,10 @@ export default {
} }
} }
} }
},
textAreaStyle: {
type: String,
default: 'border: 1px solid #DCDFE6; border-radius: 4px;margin: 0; width: 230px'
} }
}, },
data() { data() {
...@@ -67,9 +70,9 @@ export default { ...@@ -67,9 +70,9 @@ export default {
user: this.chatUserInfo.user.id, user: this.chatUserInfo.user.id,
remark: this.chatUserInfo.user.remark remark: this.chatUserInfo.user.remark
} }
setChatUserRemark(params).then(response => { setChatUserRemark(params).then((response) => {
this.preRemark = this.chatUserInfo.user.remark this.preRemark = this.chatUserInfo.user.remark
}).catch(response => { }).catch((response) => {
this.closeLoading() this.closeLoading()
this.$notify.error({ this.$notify.error({
title: '失败', title: '失败',
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<HistoryMessageList :from-account="fromAccount" :to-account="toAccount"/> <HistoryMessageList :from-account="fromAccount" :to-account="toAccount"/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="会话信息" name="2"> <el-tab-pane label="会话信息" name="2">
<ChatUserInfo :chat-user-info="chatUserInfo" /> <ChatUserInfo :chat-user-info="chatUserInfo" :text-area-style="textAreaStyle"/>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
...@@ -32,7 +32,8 @@ export default { ...@@ -32,7 +32,8 @@ export default {
data() { data() {
return { return {
activeIndex: '1', activeIndex: '1',
chatUserInfo: {} chatUserInfo: {},
textAreaStyle: 'border: 1px solid #DCDFE6; border-radius: 4px;margin: 0; width: 400px'
} }
}, },
created() { created() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment