gemercheung 2 jaren geleden
bovenliggende
commit
e43b0255d5
3 gewijzigde bestanden met toevoegingen van 24 en 5 verwijderingen
  1. 5 4
      src/components/chatRoom/controls/join.ts
  2. 17 0
      src/components/chatRoom/sceneList.vue
  3. 2 1
      src/style.css

+ 5 - 4
src/components/chatRoom/controls/join.ts

@@ -25,12 +25,11 @@ export function handleJoin(data: any) {
     tag: 'socket:enter',
   });
 
-  members && rtcStore.setMemberList(members);
-
   console.log('lala', user);
   const maxNumber = import.meta.env.VITE_ROOM_MEMBER || 10;
-  console.log('roomMaxNumber', maxNumber);
-  if (rtcStore.memberList.length > Number(maxNumber)) {
+  // console.log('roomMaxNumber', maxNumber);
+  console.log('roomMaxNumber', maxNumber, rtcStore.memberList.length, Number(maxNumber));
+  if (rtcStore.memberList.length >= Number(maxNumber)) {
     if (rtcStore.role === 'customer') {
       rtcStore.showBaseDialog(
         {
@@ -52,6 +51,8 @@ export function handleJoin(data: any) {
       // }, 1500);
       // return;
     }
+  } else {
+    members && rtcStore.setMemberList(members);
   }
   const { currentScene } = useRoom();
   if (rtcStore.isLeader) {

+ 17 - 0
src/components/chatRoom/sceneList.vue

@@ -23,6 +23,7 @@
         </span>
       </div>
     </div>
+    <div class="scene-list-bg" @click="handleClose"></div>
   </div>
 </template>
 
@@ -36,6 +37,10 @@
   console.log('sceneList', unref(sceneList));
 
   const emit = defineEmits(['close', 'changeScene']);
+
+  const handleClose = () => {
+    emit('close');
+  };
 </script>
 
 <style scoped lang="scss">
@@ -51,6 +56,18 @@
     z-index: 99999;
     position: absolute;
   }
+  .scene-list-bg {
+    height: 100%;
+    background: rgba(0, 0, 0, 0);
+    border-radius: 10px 10px 0px 0px;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    display: flex;
+    flex-direction: column;
+    z-index: 99998;
+    position: fixed;
+  }
 
   .header {
     flex: none;

+ 2 - 1
src/style.css

@@ -63,7 +63,8 @@ button:focus-visible {
 #app {
   /* max-width: 1280px; */
   margin: 0 auto;
-  padding: 2rem;
+  /* padding: 2rem; */
+  padding: 0;
   text-align: center;
 }