|
@@ -54,17 +54,17 @@
|
|
|
></div>
|
|
|
<div v-if="role == 'leader'" class="members" @click="openMember"></div>
|
|
|
<template v-if="role == 'leader'">
|
|
|
- <div
|
|
|
- v-if="!disableMic"
|
|
|
- @click="handleMuteAduio"
|
|
|
- :class="{ mic_off: audioMuted, disabled: !audioDeviceId }"
|
|
|
- class="mic_on"
|
|
|
- ></div>
|
|
|
- <div
|
|
|
- v-if="disableMic"
|
|
|
- class="mic_no"
|
|
|
- :class="{ disabled: !audioDeviceId }"
|
|
|
- ></div>
|
|
|
+ <div
|
|
|
+ v-if="!disableMic"
|
|
|
+ @click="handleMuteAduio"
|
|
|
+ :class="{ mic_off: audioMuted, disabled: !audioDeviceId }"
|
|
|
+ class="mic_on"
|
|
|
+ ></div>
|
|
|
+ <div
|
|
|
+ v-if="disableMic"
|
|
|
+ class="mic_no"
|
|
|
+ :class="{ disabled: !audioDeviceId }"
|
|
|
+ ></div>
|
|
|
</template>
|
|
|
<!-- <div
|
|
|
v-if="role == 'leader'"
|
|
@@ -152,18 +152,19 @@
|
|
|
</div>
|
|
|
<div class="name">{{ i.Nickname }}</div>
|
|
|
</div>
|
|
|
- <!-- <div class="button" v-if="user_info.Role == 'leader'">
|
|
|
+ <div class="button" v-if="user_info.Role == 'leader'">
|
|
|
<div
|
|
|
class="micBtn"
|
|
|
:class="i.IsWords ? 'ban_speak_on' : 'ban_speak_off'"
|
|
|
+ :wo="i.IsWords"
|
|
|
@click="userCanSpeak(i)"
|
|
|
></div>
|
|
|
- <div
|
|
|
+ <!-- <div
|
|
|
class="micBtn"
|
|
|
:class="i.IsMuted ? 'mute_one_mic_off' : 'mute_one_mic_on'"
|
|
|
@click="onMemberMuted(i)"
|
|
|
- ></div>
|
|
|
- </div> -->
|
|
|
+ ></div> -->
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -257,6 +258,10 @@ let getUrl = (href, queryArr) => {
|
|
|
}
|
|
|
});
|
|
|
|
|
|
+ if (href.indexOf("customer") != -1) {
|
|
|
+ return href.replace("&sync=1", "");
|
|
|
+ }
|
|
|
+
|
|
|
return href;
|
|
|
};
|
|
|
const videoDeviceId = computed(() => store.getters["rtc/videoDeviceId"]);
|
|
@@ -421,7 +426,10 @@ const setUserJoin = async (res) => {
|
|
|
UserId: res.user.UserId,
|
|
|
text: "进入房间",
|
|
|
};
|
|
|
- chatList.value.push(data);
|
|
|
+ if(role.value == 'leader'){
|
|
|
+ chatList.value.push(data);
|
|
|
+ }
|
|
|
+
|
|
|
await nextTick();
|
|
|
try {
|
|
|
chatAutoScroll();
|
|
@@ -558,7 +566,10 @@ const onMemberLeave = async (res) => {
|
|
|
UserId: res.user.UserId,
|
|
|
text: "离开房间",
|
|
|
};
|
|
|
- chatList.value.push(data);
|
|
|
+ if(role.value == 'leader'){
|
|
|
+ chatList.value.push(data);
|
|
|
+ }
|
|
|
+
|
|
|
await nextTick();
|
|
|
try {
|
|
|
chatAutoScroll();
|
|
@@ -632,7 +643,7 @@ const startFollow = (app) => {
|
|
|
emit("closeSocket");
|
|
|
return;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
connectStatus.value = 1;
|
|
|
if (role.value == "customer") {
|
|
|
socket.value.emit("action", { type: "ask-currentscene" });
|
|
@@ -811,7 +822,7 @@ const startFollow = (app) => {
|
|
|
};
|
|
|
let onfollowData = (data) => {
|
|
|
if (isJoined.value) {
|
|
|
- socket.value.emit("sync", data);
|
|
|
+ socket.value.emit("sync", data);
|
|
|
}
|
|
|
};
|
|
|
|