gemercheung преди 2 години
родител
ревизия
7c85347a55
променени са 7 файла, в които са добавени 29 реда и са изтрити 12 реда
  1. 1 1
      .env
  2. 1 1
      .env.development
  3. 1 1
      .env.production
  4. 2 0
      src/App.vue
  5. 6 8
      src/components/chatRoom/controls/join.ts
  6. 10 1
      src/components/chatRoom/memberList.vue
  7. 8 0
      src/components/chatRoom/sceneList.vue

+ 1 - 1
.env

@@ -10,7 +10,7 @@ VITE_APP_SOCKET_URL=wss://ws.4dkankan.com
 VITE_APP_STATIC_DIR=viewer
 
 # 云存储环境
-VUE_APP_REGION_URL=aws
+VITE_APP_REGION_URL=aws
 
 # 接口请求地址
 VITE_APP_APIS_URL=https://testeur.4dkankan.com/

+ 1 - 1
.env.development

@@ -1,4 +1,4 @@
-VUE_APP_REGION_URL=''
+VITE_APP_REGION_URL=aws
 # 场景资源地址
 VITE_APP_RESOURCE_URL=https://4dkk.4dage.com/
 # 静态资源地址

+ 1 - 1
.env.production

@@ -10,7 +10,7 @@ VITE_APP_SOCKET_URL=wss://ws.4dkankan.com
 VITE_APP_STATIC_DIR=viewer
 
 # 云存储环境
-VUE_APP_REGION_URL=aws
+VITE_APP_REGION_URL=aws
 
 # 接口请求地址
 VITE_APP_APIS_URL=https://testeur.4dkankan.com/

+ 2 - 0
src/App.vue

@@ -320,4 +320,6 @@
       }
     }
   }
+  @media screen and (min-width: 768px) {
+  }
 </style>

+ 6 - 8
src/components/chatRoom/controls/join.ts

@@ -55,14 +55,7 @@ export function handleJoin(data: any) {
   } else {
     members && rtcStore.setMemberList(members);
   }
-  // const { currentScene } = useRoom();
-  // console.log('currentScene', unref(currentScene));
-  // if (rtcStore.isLeader) {
-  //   socket.emit('action', {
-  //     type: 'changeScene',
-  //     data: unref(currentScene),
-  //   });
-  // }
+
   rtcStore.setConnectStatus(1);
 
   setTimeout(() => {
@@ -80,6 +73,11 @@ export function handleJoin(data: any) {
         type: 'changeScene',
         data: unref(currentScene),
       });
+      socket.emit('action', {
+        type: 'users-muted',
+        muted: true,
+        userId: rtcStore.userId,
+      });
     }
   }, 1500);
 }

+ 10 - 1
src/components/chatRoom/memberList.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="layer" v-if="show" @click.self="closeMember">
+  <div class="layer member-list" v-if="show" @click.self="closeMember">
     <div class="memberContent animated" :class="animateActive ? 'fadeInUpBig' : 'fadeOutDownBig'">
       <div class="blurBox"></div>
       <div class="content">
@@ -123,4 +123,13 @@
 
 <style lang="scss">
   @import './chatroom.scss';
+  @media screen and (min-width: 768px) {
+    .member-list {
+      max-width: 11rem;
+      width: 11rem;
+      margin: 0 auto;
+      transform: translate(-50%, 0);
+      left: 50% !important;
+    }
+  }
 </style>

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

@@ -46,8 +46,10 @@
 <style scoped lang="scss">
   .scene-list {
     max-height: 80%;
+    // max-width: 11rem;
     background: rgba(0, 0, 0, 0.8);
     border-radius: 10px 10px 0px 0px;
+    margin: 0 auto;
     bottom: 0;
     left: 0;
     right: 0;
@@ -135,4 +137,10 @@
       }
     }
   }
+
+  @media screen and (min-width: 768px) {
+    .scene-list {
+      max-width: 11rem;
+    }
+  }
 </style>