gemercheung 2 年之前
父節點
當前提交
dcac449e7c
共有 6 個文件被更改,包括 15 次插入7 次删除
  1. 1 0
      .env
  2. 2 1
      .env.eur
  3. 1 0
      .env.production
  4. 3 4
      src/App.vue
  5. 5 0
      src/components/basic/miniMap.vue
  6. 3 2
      src/components/chatRoom/controls/join.ts

+ 1 - 0
.env

@@ -18,3 +18,4 @@ VITE_APP_APIS_URL=https://testeur.4dkankan.com/
 # VITE_TAKE_LOOK_API=https://testeur.4dkankan.com/
 VITE_USE_HTTPS=1
 VITE_PUBLIC_DIR='/livestream/'
+VITE_ROOM_MEMBER=3

+ 2 - 1
.env.eur

@@ -17,4 +17,5 @@ VITE_APP_APIS_URL=https://testeur.4dkankan.com/
 # VITE_APP_APIS_URL=https://v4-uat.4dkankan.com/
 # VITE_TAKE_LOOK_API=https://testeur.4dkankan.com/
 VITE_USE_HTTPS=1
-VITE_PUBLIC_DIR='/livestream/'
+VITE_PUBLIC_DIR='/livestream/'
+VITE_ROOM_MEMBER=3

+ 1 - 0
.env.production

@@ -18,3 +18,4 @@ VITE_APP_APIS_URL=https://testeur.4dkankan.com/
 # VITE_TAKE_LOOK_API=https://testeur.4dkankan.com/
 VITE_USE_HTTPS=1
 VITE_PUBLIC_DIR='/livestream/'
+VITE_ROOM_MEMBER=3

+ 3 - 4
src/App.vue

@@ -251,10 +251,11 @@
 
   // method
   const changeMode = (name: string) => {
-    if (!flying.value) {
+    if (!unref(flying)) {
       appStore.setMode(name);
     } else {
-      appStore.setMode(name);
+      console.log('正在飞', unref(flying));
+      // appStore.setMode(name);
     }
   };
 </script>
@@ -292,8 +293,6 @@
       <!-- panel start-->
       <GuidePanel v-if="isTourMode" />
       <!-- panel end -->
-
-     
     </template>
   </div>
   <BaseDialog />

+ 5 - 0
src/components/basic/miniMap.vue

@@ -39,10 +39,15 @@
           () => [props.show, props.to],
           () => {
             if (props.to?.length && props.show) {
+              console.log('小地图must show');
               ifShow.value = true;
               refMiniMap.value = props.to;
             }
           },
+          {
+            immediate: true,
+            deep: true,
+          },
         );
       });
 

+ 3 - 2
src/components/chatRoom/controls/join.ts

@@ -45,8 +45,9 @@ export function handleJoin(data: any) {
   members && rtcStore.setMemberList(members);
 
   console.log('gem', rtcStore.memberList.length, userExsit);
-
-  if (rtcStore.memberList.length > 10) {
+  const maxNumber = import.meta.env.VITE_ROOM_MEMBER || 10;
+  console.log('roomMaxNumber', maxNumber);
+  if (rtcStore.memberList.length > Number(maxNumber)) {
     if (rtcStore.role === 'customer') {
       rtcStore.showBaseDialog(
         {