|
@@ -88,7 +88,7 @@
|
|
|
|
|
|
<teleport :to="`#app`">
|
|
|
<div v-if="showShare" @click="showShare = false" class="sharetip">
|
|
|
- <img @click.stop :style="`right:${isMP?'16%':'6%'}`" :src="require('@/assets/images/icon/img_scene_share.png')" alt="" />
|
|
|
+ <img @click.stop :style="`right:${isMP ? '16%' : '6%'}`" :src="require('@/assets/images/icon/img_scene_share.png')" alt="" />
|
|
|
</div>
|
|
|
</teleport>
|
|
|
</template>
|
|
@@ -206,11 +206,11 @@ const onClickShare = () => {
|
|
|
showShare.value = true;
|
|
|
|
|
|
if (res.miniprogram) {
|
|
|
- isMP.value = true
|
|
|
+ isMP.value = true;
|
|
|
//在小程序里
|
|
|
} else {
|
|
|
// 不在小程序里
|
|
|
- isMP.value = false
|
|
|
+ isMP.value = false;
|
|
|
}
|
|
|
});
|
|
|
} else {
|
|
@@ -243,11 +243,14 @@ const handleMuteVideo = () => {
|
|
|
|
|
|
const handleMuteAduio = () => {
|
|
|
audioMuted.value = !audioMuted.value;
|
|
|
+ if (role.value == "leader") {
|
|
|
+ socket.value.emit("action", { type: "users-muted", muted: audioMuted.value, userId: user_info.value.UserId });
|
|
|
+ }
|
|
|
};
|
|
|
|
|
|
const setUserMuted = (res) => {
|
|
|
if (res.userId) {
|
|
|
- if (res.userId == user_info.value.UserId) {
|
|
|
+ if (res.userId == user_info.value.UserId && role.value == "customer") {
|
|
|
user_info.value.IsMuted = res.muted;
|
|
|
Dialog.toast({ content: !user_info.value.IsMuted ? `主持人設置了開麥` : `主持人設置了靜音` });
|
|
|
disableMic.value = res.muted;
|
|
@@ -508,6 +511,10 @@ const startFollow = (app) => {
|
|
|
disableMic.value = true;
|
|
|
audioMuted.value = true;
|
|
|
}
|
|
|
+ } else {
|
|
|
+ if (data.user.IsMuted) {
|
|
|
+ audioMuted.value = true;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
isJoined.value = true;
|
|
@@ -627,9 +634,6 @@ const startFollow = (app) => {
|
|
|
} else if (data.type == "tagclick") {
|
|
|
if (role.value == "customer") {
|
|
|
let item = tags.value.find((item) => item.sid == data.data.sid);
|
|
|
-
|
|
|
- console.log(item, "itemitemitemitemitemitem");
|
|
|
-
|
|
|
if (item.type == "commodity") {
|
|
|
store.commit("tag/setTagClickType", {
|
|
|
type: "goodlist",
|