|
@@ -239,7 +239,7 @@
|
|
<!--邀请加群 我-->
|
|
<!--邀请加群 我-->
|
|
<div class="meUserMessage" v-if="item.action=='said'&&Number(item.msg_type)==6">
|
|
<div class="meUserMessage" v-if="item.action=='said'&&Number(item.msg_type)==6">
|
|
<div class="meUserMessageText">
|
|
<div class="meUserMessageText">
|
|
- <div class="messageGroupInvite" @click="openGroupInviteWindow">
|
|
|
|
|
|
+ <div class="messageGroupInvite" @click="openGroupInviteWindow(item)">
|
|
<div class="messageGroupInviteTop">
|
|
<div class="messageGroupInviteTop">
|
|
<div class="messageGroupInviteIcon">
|
|
<div class="messageGroupInviteIcon">
|
|
<img src="@/assets/chat/user/group.jpg">
|
|
<img src="@/assets/chat/user/group.jpg">
|
|
@@ -869,8 +869,8 @@
|
|
<div class="addGroupWindowImg">
|
|
<div class="addGroupWindowImg">
|
|
<img src="@/assets/chat/user/group.jpg" alt="">
|
|
<img src="@/assets/chat/user/group.jpg" alt="">
|
|
</div>
|
|
</div>
|
|
- <div class="addGroupWindowTitle">某某群聊</div>
|
|
|
|
- <div class="addGroupWindowText">某某好友"用户名称"邀请您加入"某某群聊",进入可查看群消息</div>
|
|
|
|
|
|
+ <div class="addGroupWindowTitle">{{groupInviteInfo.group_name}}</div>
|
|
|
|
+ <div class="addGroupWindowText">加入"{{groupInviteInfo.group_name}}"群聊,点击可查看该群消息</div>
|
|
<div class="footerButtonBox">
|
|
<div class="footerButtonBox">
|
|
<el-button type="info" @click="addGroupWindow = false">取消</el-button>
|
|
<el-button type="info" @click="addGroupWindow = false">取消</el-button>
|
|
<el-button type="primary" @click="joinGroup">确定</el-button>
|
|
<el-button type="primary" @click="joinGroup">确定</el-button>
|
|
@@ -1210,6 +1210,7 @@ export default {
|
|
shareGroupActive:'friend',//分享名片选项卡
|
|
shareGroupActive:'friend',//分享名片选项卡
|
|
shareGroupId:'',//要分享给谁
|
|
shareGroupId:'',//要分享给谁
|
|
useShareGroupInfo:{},//分享名片时选中的群组信息
|
|
useShareGroupInfo:{},//分享名片时选中的群组信息
|
|
|
|
+ groupInviteInfo:{},//群邀请信息
|
|
//4.群聊 end---------------------------------------->
|
|
//4.群聊 end---------------------------------------->
|
|
|
|
|
|
//6.名片 start---------------------------------------->
|
|
//6.名片 start---------------------------------------->
|
|
@@ -1947,12 +1948,17 @@ export default {
|
|
|
|
|
|
//2.4 加入群聊
|
|
//2.4 加入群聊
|
|
//2.4.1 打开群聊邀请窗口
|
|
//2.4.1 打开群聊邀请窗口
|
|
- openGroupInviteWindow(id){
|
|
|
|
|
|
+ openGroupInviteWindow(info){
|
|
this.addGroupWindow = true;
|
|
this.addGroupWindow = true;
|
|
|
|
+ //info.content.split(',')[0] 群名称
|
|
|
|
+ //info.content.split(',')[1] 群id
|
|
|
|
+ //获得要加入的群聊详情
|
|
|
|
+ this.groupInviteInfo.group_name = info.content.split(',')[0];
|
|
|
|
+ this.groupInviteInfo.group_id = info.content.split(',')[1];
|
|
},
|
|
},
|
|
//2.4.2 加入群聊
|
|
//2.4.2 加入群聊
|
|
joinGroup(){
|
|
joinGroup(){
|
|
- this.$store.dispatch('chat/joinGroup',{group_id:this.groupId}).then(res=> {
|
|
|
|
|
|
+ this.$store.dispatch('chat/joinGroup',{group_id:this.groupInviteInfo.group_id}).then(res=> {
|
|
this.$message.success('加入群聊成功!')
|
|
this.$message.success('加入群聊成功!')
|
|
this.addGroupWindow = false;
|
|
this.addGroupWindow = false;
|
|
}).catch(() => {
|
|
}).catch(() => {
|