Flavionel 5 년 전
부모
커밋
57136cb74c
2개의 변경된 파일10개의 추가작업 그리고 9개의 파일을 삭제
  1. 1 1
      resources/js/components/partials/LobbyList.vue
  2. 9 8
      resources/js/components/widgets/CallBubble.vue

+ 1 - 1
resources/js/components/partials/LobbyList.vue

@@ -135,7 +135,7 @@ export default {
                         this.$eventBus.$emit("meetingRejoin")
                     } else {
                         lobby.selected_meeting.lobby = lobby.name;
-                        this.$store.commit("setCurrentMeeting", { lobby_uid: lobby.uid, ...lobby.selected_meeting });
+                        this.$store.commit("setCurrentMeeting", { lobby_uid: lobby.uid, lobby_name: lobby.name, ...lobby.selected_meeting });
                     }
                 },
                 error: jXhr => {},

+ 9 - 8
resources/js/components/widgets/CallBubble.vue

@@ -52,11 +52,6 @@
 import { mapState } from "vuex"
 
 export default {
-    props: {
-        call: {
-            type: Object
-        }
-    },
     data(){
         return {
             showCalleeDetails: false
@@ -66,10 +61,9 @@ export default {
         ...mapState(["lobbies","settings", "callWidget"]),
     },
     watch: {
-        call: {
-            deep: true,
+        'callWidget.active': {
             handler(newVal){
-                if(newVal.time_limit == 0){
+                if(!newVal){
                     let self = this
 
                     setTimeout(() => {
@@ -83,12 +77,17 @@ export default {
         handleCall(acceptCall) {
             if(acceptCall){
                 this.$socket.emit('callDecision', true)
+                let lobby_data = {}
                 let meeting = []
 
                 for(let lobby of this.lobbies){
                     meeting = lobby.meetings.filter((x) => x.uid == this.callWidget.callInfo.meeting_uid)
 
                     if(meeting.length){
+                        lobby_data = {
+                            name: lobby.name,
+                            uid: lobby.uid
+                        }
                         break
                     }
                 }
@@ -97,6 +96,8 @@ export default {
                     return
                 } else {
                     let data = {
+                        uid: lobby_data.uid,
+                        name: lobby_data.name,
                         selected_meeting: meeting[0]
                     }