udpate

src/App.vue

@@ -145,7 +145,6 @@
 
 <template>
   <LoadingLogo :thumb="true" />
-  isTourMode:{{ isTourMode }}
   <!-- 引导页 -->
   <Title v-if="isLoaded && isTourMode" />
   <Guideline />

src/components/chatRoom/controls/join.ts

@@ -1,5 +1,5 @@
 import consolaGlobalInstance from 'consola';
-// import Dialog from '/@/components/basic/dialog';
+import Dialog from '/@/components/basic/dialog';
 // import { getApp } from '/@/hooks/userApp';
 import { useRoom } from '/@/hooks/useRoom';
 import { useSocket } from '/@/hooks/userSocket';
@@ -11,7 +11,7 @@ export function handleJoin(data: any) {
   // const app = getApp();
   const { socket } = useSocket();
   const members = data?.members as any as UserInfoType[];
-  // const user = data?.user as any as UserInfoType;
+  const user = data?.user as any as UserInfoType;
   enterRoom();
 
   const rtcStore = useRtcStore();
@@ -20,24 +20,24 @@ export function handleJoin(data: any) {
     message: data,
     tag: 'socket:enter',
   });
-  // if (user) {
-  //     console.log('sortList 1 ', rtcStore.userId)
-  //     console.log('sortList 2', rtcStore.memberList)
-  //     const userExsit = rtcStore.checkUserInMemberList(rtcStore.userId)
-  //     console.log('sortList3 ', userExsit)
-  //     console.log('sortList4', user.Id !== userExsit?.Id)
-  //     if (userExsit) {
-  //         Dialog.confirm({
-  //             showCloseIcon: false,
-  //             okText: '我知道了',
-  //             content: "<span style='font-size: 16px; line-height: 1.5;'>您已有登录端在登录，请不要重复登录<span/>",
-  //             title: '隱私條款：',
-  //             single: true,
-  //             func: (state) => {
-  //             },
-  //         });
-  //     }
-  // }
+  if (user) {
+    console.log('gem1', rtcStore.userId);
+    console.log('gem2', rtcStore.memberList);
+    const userExsit = rtcStore.checkUserInMemberList(rtcStore.userId);
+    console.log('gem3', userExsit, user.Id !== userExsit?.Id);
+    if (userExsit) {
+      // Dialog.confirm({
+      //   showCloseIcon: false,
+      //   okText: '我知道了',
+      //   content:
+      //     "<span style='font-size: 16px; line-height: 1.5;'>您已有登录端在登录，请不要重复登录<span/>",
+      //   title: '隱私條款：',
+      //   single: true,
+      //   func: (state) => {},
+      // });
+    }
+  } else {
+  }
 
   members && rtcStore.setMemberList(members);
   if (!rtcStore.isLeader) {

src/components/custom/panel.vue

@@ -10,7 +10,7 @@
       <Icon type="arrows" />
     </span>
   </div>
-  <SceneList v-if="showScenes" @close="showScenes = false" @changeScene="changeScene" />
+  <SceneList v-if="showScenes" @close="showScenes = false" @change-scene="changeScene" />
 </template>
 
 <script setup lang="ts">
@@ -18,12 +18,18 @@
   //import { useMusicPlayer } from "@/utils/sound";
   // import { changeScene } from "@/store/room";
   import Icon from '/@/components/basic/icon/index.vue';
-  import { ref, unref } from 'vue';
-
+  import { onMounted, ref, unref } from 'vue';
+  import { useRoom } from '/@/hooks/useRoom';
   import { useTourPlayer } from '/@/hooks/userTourPlayer';
 
+  const { initialRoom, changeScene } = useRoom();
+
   const show = ref(false);
 
+  onMounted(() => {
+    initialRoom();
+  });
+
   const showScenes = ref(false);
   const { hasTours } = useTourPlayer();
 
@@ -35,8 +41,6 @@
       player.pause();
     }
   }
-
-  const changeScene = () => {};
 </script>
 
 <style lang="scss" scoped>

src/hooks/useRoom.ts

@@ -9,6 +9,7 @@ interface roomDataType {
 }
 export interface SceneItemType {
   id: number;
+  roomId: number;
   buildObjStatus: number;
   createTime: string;
   name: string;

src/hooks/userSocket.ts

@@ -41,11 +41,11 @@ async function closeSocket() {
       isTour: 1,
       name: '',
       role: '',
-      roomId: '',
+      roomId: rtcStore.roomId,
       avatar: '',
     });
-    location.reload();
-  }, 300);
+    // location.reload();
+  }, 100);
 }
 
 export function useSocket(): ReturnUseSocketType {