La123123.
/
im-backed
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修复发送图文、文件时切换会话导致异常的bug

master
xsx 12 months ago
parent
01067a3afd
commit
5feb7179dc
6 changed files with 38 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      im-uniapp/pages/chat/chat-box.vue
  2. 21
      im-uniapp/pages/common/user-info.vue
  3. 4
      im-uniapp/pages/mine/mine-edit.vue
  4. 33
      im-uniapp/pages/mine/mine.vue
  5. 10
      im-web/src/components/chat/ChatBox.vue
  6. 2
      im-web/src/components/setting/Setting.vue

10
im-uniapp/pages/chat/chat-box.vue
View File

@ -418,6 +418,7 @@ export default {
this.moveChatToTop(); this.moveChatToTop();
// 借助file对象保存 // 借助file对象保存
file.msgInfo = msgInfo; file.msgInfo = msgInfo;
file.chat = this.chat;
// 滚到最低部 // 滚到最低部
this.scrollToBottom(); this.scrollToBottom();
return true; return true;
@ -430,13 +431,13 @@ export default {
msgInfo.loadStatus = 'ok'; msgInfo.loadStatus = 'ok';
msgInfo.id = m.id; msgInfo.id = m.id;
this.isReceipt = false; this.isReceipt = false;
this.chatStore.insertMessage(msgInfo, this.chat); this.chatStore.insertMessage(msgInfo, file.chat);
}) })
}, },
onUploadImageFail(file, err) { onUploadImageFail(file, err) {
let msgInfo = JSON.parse(JSON.stringify(file.msgInfo)); let msgInfo = JSON.parse(JSON.stringify(file.msgInfo));
msgInfo.loadStatus = 'fail'; msgInfo.loadStatus = 'fail';
this.chatStore.insertMessage(msgInfo, this.chat); this.chatStore.insertMessage(msgInfo, file.chat);
}, },
onUploadFileBefore(file) { onUploadFileBefore(file) {
// 检查是否被封禁 // 检查是否被封禁
@ -469,6 +470,7 @@ export default {
this.moveChatToTop(); this.moveChatToTop();
// 借助file对象保存 // 借助file对象保存
file.msgInfo = msgInfo; file.msgInfo = msgInfo;
file.chat = this.chat;
// 滚到最低部 // 滚到最低部
this.scrollToBottom(); this.scrollToBottom();
return true; return true;
@ -486,13 +488,13 @@ export default {
msgInfo.loadStatus = 'ok'; msgInfo.loadStatus = 'ok';
msgInfo.id = m.id; msgInfo.id = m.id;
this.isReceipt = false; this.isReceipt = false;
this.chatStore.insertMessage(msgInfo, this.chat); this.chatStore.insertMessage(msgInfo, file.chat);
}) })
}, },
onUploadFileFail(file, res) { onUploadFileFail(file, res) {
let msgInfo = JSON.parse(JSON.stringify(file.msgInfo)); let msgInfo = JSON.parse(JSON.stringify(file.msgInfo));
msgInfo.loadStatus = 'fail'; msgInfo.loadStatus = 'fail';
this.chatStore.insertMessage(msgInfo, this.chat); this.chatStore.insertMessage(msgInfo, file.chat);
}, },
onDeleteMessage(msgInfo) { onDeleteMessage(msgInfo) {
uni.showModal({ uni.showModal({

21
im-uniapp/pages/common/user-info.vue
View File

@ -8,28 +8,18 @@
<view class="info-item"> <view class="info-item">
<view class="info-primary"> <view class="info-primary">
<text class="info-username"> <text class="info-username">{{ userInfo.nickName }}</text>
{{ userInfo.nickName }}
</text>
<text v-show="userInfo.sex == 0" class="iconfont icon-man" color="darkblue"></text> <text v-show="userInfo.sex == 0" class="iconfont icon-man" color="darkblue"></text>
<text v-show="userInfo.sex == 1" class="iconfont icon-girl" color="darkred"></text> <text v-show="userInfo.sex == 1" class="iconfont icon-girl" color="darkred"></text>
</view> </view>
<view class="info-text"> <view class="info-text">
<text class="label-text"> <text class="label-text">用户名:</text>
用户名: <text class="content-text"> {{ userInfo.userName }}</text>
</text>
<text class="content-text">
{{ userInfo.userName }}
</text>
</view> </view>
<view class="info-text"> <view class="info-text">
<view> <view>
<text class="label-text"> <text class="label-text">签名:</text>
签名: <text class="content-text"> {{ userInfo.signature }} </text>
</text>
<text class="content-text">
{{ userInfo.signature }}
</text>
</view> </view>
</view> </view>
</view> </view>
@ -183,6 +173,7 @@ export default {
.content-text { .content-text {
font-size: $im-font-size-small; font-size: $im-font-size-small;
color: $im-text-color-light; color: $im-text-color-light;
margin-left: 10rpx;
} }
.info-primary { .info-primary {

4
im-uniapp/pages/mine/mine-edit.vue
View File

@ -9,7 +9,7 @@
</image-upload> </image-upload>
</view> </view>
<view class="form-item"> <view class="form-item">
<view class="label">账号</view> <view class="label">用户名</view>
<view class="value">{{userInfo.userName}}</view> <view class="value">{{userInfo.userName}}</view>
</view> </view>
<view class="form-item"> <view class="form-item">
@ -25,7 +25,7 @@
</view> </view>
<view class="form-item"> <view class="form-item">
<view class="label">个性签名</view> <view class="label">个性签名</view>
<textarea class="signature" maxlength="128" auto-height v-model="userInfo.signature" <textarea class="signature" maxlength="64" auto-height v-model="userInfo.signature"
:style="{'text-align': signTextAlign}" @linechange="onLineChange" :style="{'text-align': signTextAlign}" @linechange="onLineChange"
placeholder="编辑个性签名,展示我的独特态度"></textarea> placeholder="编辑个性签名,展示我的独特态度"></textarea>
</view> </view>

33
im-uniapp/pages/mine/mine.vue
View File

@ -6,31 +6,24 @@
<head-image :name="userInfo.nickName" :url="userInfo.headImage" :size="160"></head-image> <head-image :name="userInfo.nickName" :url="userInfo.headImage" :size="160"></head-image>
<view class="info-item"> <view class="info-item">
<view class="info-primary"> <view class="info-primary">
<text class="info-username"> <text class="nick-name">
{{ userInfo.userName }} {{ userInfo.nickName }}
</text> </text>
<text v-show="userInfo.sex == 0" class="iconfont icon-man" color="darkblue"></text> <text v-show="userInfo.sex == 0" class="iconfont icon-man" color="darkblue"></text>
<text v-show="userInfo.sex == 1" class="iconfont icon-girl" color="darkred"></text> <text v-show="userInfo.sex == 1" class="iconfont icon-girl" color="darkred"></text>
</view> </view>
<view class="info-text"> <view class="info-text">
<text class="label-text"> <text class="label-text">用户名:</text>
昵称: <text class="content-text"> {{ userInfo.userName }} </text>
</text>
<text class="content-text">
{{ userInfo.nickName }}
</text>
</view> </view>
<view class="info-text"> <view class="info-text">
<view> <view>
<text class="label-text"> <text class="label-text">签名:</text>
签名: <text class="content-text"> {{ userInfo.signature }}</text>
</text>
<text class="content-text">
{{ userInfo.signature }}
</text>
</view> </view>
</view> </view>
</view> </view>
<uni-icons class="info-arrow" type="right" size="16"></uni-icons>
</view> </view>
</uni-card> </uni-card>
<bar-group> <bar-group>
@ -75,19 +68,18 @@ export default {
return this.userStore.userInfo; return this.userStore.userInfo;
} }
} }
} }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.mine { .mine {
.content { .content {
//height: 200rpx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
padding: 20rpx; padding: 10rpx;
padding-right: 30rpx;
overflow: hidden;
.info-item { .info-item {
display: flex; display: flex;
@ -110,6 +102,9 @@ export default {
.content-text { .content-text {
font-size: $im-font-size-small; font-size: $im-font-size-small;
color: $im-text-color-light; color: $im-text-color-light;
margin-left: 10rpx;
word-break: break-all;
overflow: hidden;
} }
.info-primary { .info-primary {
@ -117,7 +112,7 @@ export default {
align-items: center; align-items: center;
margin-bottom: 10rpx; margin-bottom: 10rpx;
.info-username { .nick-name {
font-size: $im-font-size-large; font-size: $im-font-size-large;
font-weight: 600; font-weight: 600;
} }

10
im-web/src/components/chat/ChatBox.vue
View File

@ -162,13 +162,13 @@ export default {
msgInfo.loadStatus = 'ok'; msgInfo.loadStatus = 'ok';
msgInfo.id = m.id; msgInfo.id = m.id;
this.isReceipt = false; this.isReceipt = false;
this.$store.commit("insertMessage", [msgInfo, this.chat]); this.$store.commit("insertMessage", [msgInfo, file.chat]);
}) })
}, },
onImageFail(e, file) { onImageFail(e, file) {
let msgInfo = JSON.parse(JSON.stringify(file.msgInfo)); let msgInfo = JSON.parse(JSON.stringify(file.msgInfo));
msgInfo.loadStatus = 'fail'; msgInfo.loadStatus = 'fail';
this.$store.commit("insertMessage", [msgInfo, this.chat]); this.$store.commit("insertMessage", [msgInfo, file.chat]);
}, },
onImageBefore(file) { onImageBefore(file) {
// 被封禁提示 // 被封禁提示
@ -204,6 +204,7 @@ export default {
this.scrollToBottom(); this.scrollToBottom();
// 借助file对象保存 // 借助file对象保存
file.msgInfo = msgInfo; file.msgInfo = msgInfo;
file.chat = this.chat;
}, },
onFileSuccess(url, file) { onFileSuccess(url, file) {
let data = { let data = {
@ -219,13 +220,13 @@ export default {
msgInfo.id = m.id; msgInfo.id = m.id;
this.isReceipt = false; this.isReceipt = false;
this.refreshPlaceHolder(); this.refreshPlaceHolder();
this.$store.commit("insertMessage", [msgInfo, this.chat]); this.$store.commit("insertMessage", [msgInfo, file.chat]);
}) })
}, },
onFileFail(e, file) { onFileFail(e, file) {
let msgInfo = JSON.parse(JSON.stringify(file.msgInfo)); let msgInfo = JSON.parse(JSON.stringify(file.msgInfo));
msgInfo.loadStatus = 'fail'; msgInfo.loadStatus = 'fail';
this.$store.commit("insertMessage", [msgInfo, this.chat]); this.$store.commit("insertMessage", [msgInfo, file.chat]);
}, },
onFileBefore(file) { onFileBefore(file) {
// 被封禁提示 // 被封禁提示
@ -261,6 +262,7 @@ export default {
this.scrollToBottom(); this.scrollToBottom();
// 借助file对象透传 // 借助file对象透传
file.msgInfo = msgInfo; file.msgInfo = msgInfo;
file.chat = this.chat;
}, },
onCloseSide() { onCloseSide() {
this.showSide = false; this.showSide = false;

2
im-web/src/components/setting/Setting.vue
View File

@ -21,7 +21,7 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="个性签名"> <el-form-item label="个性签名">
<el-input type="textarea" v-model="userInfo.signature" :rows="3"></el-input> <el-input type="textarea" v-model="userInfo.signature" :rows="3" maxlength="64"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>

Write Preview
Loading…
Cancel
Save