Browse Source

1.ws添加token校验

2.修复消息撤回异常bug
3.部分代码优化
master
xie.bx 3 years ago
parent
commit
a52ce96821
  1. 34
      im-ui/src/view/Home.vue

34
im-ui/src/view/Home.vue

@ -28,6 +28,12 @@
<span class="el-icon-setting"></span> <span class="el-icon-setting"></span>
</el-menu-item> </el-menu-item>
</el-menu> </el-menu>
<div class="gitee-box" title="gitee仓库,帮忙点点star哟">
<a href="https://gitee.com/bluexsx/box-im" target="_blank">
<el-image style="width: 30px; height: 30px" src="https://gitee.com/favicon.ico" fit="fit">
</el-image>
</a>
</div>
<div class="exit-box" @click="handleExit()" title="退出"> <div class="exit-box" @click="handleExit()" title="退出">
<span class="el-icon-circle-close"></span> <span class="el-icon-circle-close"></span>
</div> </div>
@ -38,15 +44,10 @@
<setting :visible="showSettingDialog" @close="closeSetting()"></setting> <setting :visible="showSettingDialog" @close="closeSetting()"></setting>
<user-info v-show="uiStore.userInfo.show" :pos="uiStore.userInfo.pos" :user="uiStore.userInfo.user" @close="$store.commit('closeUserInfoBox')"></user-info> <user-info v-show="uiStore.userInfo.show" :pos="uiStore.userInfo.pos" :user="uiStore.userInfo.user" @close="$store.commit('closeUserInfoBox')"></user-info>
<full-image :visible="uiStore.fullImage.show" :url="uiStore.fullImage.url" @close="$store.commit('closeFullImageBox')"></full-image> <full-image :visible="uiStore.fullImage.show" :url="uiStore.fullImage.url" @close="$store.commit('closeFullImageBox')"></full-image>
<chat-private-video ref="privateVideo" :visible="uiStore.chatPrivateVideo.show" <chat-private-video ref="privateVideo" :visible="uiStore.chatPrivateVideo.show" :friend="uiStore.chatPrivateVideo.friend"
:friend="uiStore.chatPrivateVideo.friend" :master="uiStore.chatPrivateVideo.master" :offer="uiStore.chatPrivateVideo.offer" @close="$store.commit('closeChatPrivateVideoBox')">
:master="uiStore.chatPrivateVideo.master"
:offer="uiStore.chatPrivateVideo.offer"
@close="$store.commit('closeChatPrivateVideoBox')" >
</chat-private-video> </chat-private-video>
<chat-video-acceptor ref="videoAcceptor" <chat-video-acceptor ref="videoAcceptor" v-show="uiStore.videoAcceptor.show" :friend="uiStore.videoAcceptor.friend"
v-show="uiStore.videoAcceptor.show"
:friend="uiStore.videoAcceptor.friend"
@close="$store.commit('closeVideoAcceptorBox')"> @close="$store.commit('closeVideoAcceptorBox')">
</chat-video-acceptor> </chat-video-acceptor>
</el-container> </el-container>
@ -131,12 +132,12 @@
}, },
insertPrivateMessage(friend, msg) { insertPrivateMessage(friend, msg) {
// webrtc // webrtc
if(msg.type >= this.$enums.MESSAGE_TYPE.RTC_CALL if (msg.type >= this.$enums.MESSAGE_TYPE.RTC_CALL &&
&& msg.type <= this.$enums.MESSAGE_TYPE.RTC_CANDIDATE){ msg.type <= this.$enums.MESSAGE_TYPE.RTC_CANDIDATE) {
// //
console.log(msg) console.log(msg)
if(msg.type == this.$enums.MESSAGE_TYPE.RTC_CALL if (msg.type == this.$enums.MESSAGE_TYPE.RTC_CALL ||
|| msg.type == this.$enums.MESSAGE_TYPE.RTC_CANCEL){ msg.type == this.$enums.MESSAGE_TYPE.RTC_CANCEL) {
this.$store.commit("showVideoAcceptorBox", friend); this.$store.commit("showVideoAcceptorBox", friend);
this.$refs.videoAcceptor.handleMessage(msg) this.$refs.videoAcceptor.handleMessage(msg)
} else { } else {
@ -293,6 +294,15 @@
} }
} }
.gitee-box {
position: absolute;
width: 60px;
bottom: 100px;
display: flex;
justify-content: center;
cursor: pointer;
}
.exit-box { .exit-box {
position: absolute; position: absolute;
width: 60px; width: 60px;

Loading…
Cancel
Save