gemercheung 2 anni fa
parent
commit
d94ec85193

+ 5 - 4
src/components/basic/guide.vue

@@ -26,10 +26,11 @@
   const lang = computed(() => browser.getURLParam('lang') || 'zh');
 
   onMounted(() => {
-    const isGuide = localStorage.getItem('user_guide');
-    if (!isGuide) {
-      appStore.showUserGuide(true);
-    }
+    appStore.showUserGuide(true);
+    // const isGuide = localStorage.getItem('user_guide');
+    // if (!isGuide) {
+    //   appStore.showUserGuide(true);
+    // }
   });
 
   const onSet = () => {

+ 5 - 3
src/components/basic/title.vue

@@ -90,7 +90,7 @@
   // const showMusicPlaying = ref(false);
   // const showMusic = computed(() => sceneStore.metadata.music);
   const player = computed(() => appStore.player);
-
+  const flying = computed(() => appStore.flying);
   // const copy$ = ref(null);
   // const copyLink = ref(share_url);
   const showCopy = ref(false);
@@ -217,8 +217,10 @@
   // };
   const onChangeMode = () => {
     //   store.commit("setMode", "panorama");
-    if (unref(isLeader) || unref(isTourMode)) {
-      appStore.setMode('panorama');
+    if (!unref(flying)) {
+      if (unref(isLeader) || unref(isTourMode)) {
+        appStore.setMode('panorama');
+      }
     }
   };
 </script>

+ 17 - 17
src/components/chatRoom/dialog/password.vue

@@ -6,7 +6,7 @@
       <div class="content">
         <div class="dialog_title">请输入房间密码</div>
         <div class="pass_container">
-          <input v-model.trim="password" class="pass-input" type="password" maxlength="4"/>
+          <input v-model.trim="password" class="pass-input" type="password" maxlength="4" />
           <!-- <v-otp-input
             class="otp-input-container"
             ref="otpInput"
@@ -318,23 +318,24 @@
       -webkit-appearance: none;
       margin: 0;
     }
-    
-    input {
+
+
+    .pass-input {
+      font-size: 0.39rem;
+      width: 100%;
+      height: 100%;
       outline: none;
-      
-    }
-    input::placeholder {
-      font-size: 15px;
-      text-align: center;
-      font-weight: 600;
-    }
-    .pass-input{
-      background: rgba(255, 255, 255, 0.8);
-      width: 80%;
-      margin:  0 auto;
-      color: #000;
-      padding: 10px;
+      line-height: 1.11rem;
+      padding: 0 1.066667rem 0 0.28rem;
+      box-sizing: border-box;
+      background: rgba(0, 0, 0, 0.5);
       border-radius: 4px;
+      color: #fff;
+      border: none;
+      outline: none;
+      &::placeholder {
+        color: rgba(255, 255, 255, 0.3);
+      }
     }
   }
 </style>
@@ -342,5 +343,4 @@
   html:focus-within {
     margin: 0 !important;
   }
-
 </style>

+ 6 - 4
src/hooks/useRoom.ts

@@ -114,14 +114,15 @@ export const initialRoom = async () => {
 };
 
 export const enterRoom = async () => {
-  if (!isLeader) return;
+  // if (!isLeader) return;
   const rtcStore = useRtcStore();
   const userID = rtcStore.userId || browser.getURLParam('vruserId');
+  const role = rtcStore.role || browser.getURLParam('role');
   console.log('111', room.value);
   await shopAxios.get('/takelook/inOrOutRoom', {
     params: {
       type: 0,
-      role: 'leader',
+      role: role,
       roomId,
       userId: userID,
     },
@@ -129,13 +130,14 @@ export const enterRoom = async () => {
 };
 
 export const leaveRoom = async () => {
-  if (!isLeader) return;
+  // if (!isLeader) return;
   const rtcStore = useRtcStore();
   const userID = rtcStore.userId || browser.getURLParam('vruserId');
+  const role = rtcStore.role || browser.getURLParam('role');
   await shopAxios.get('/takelook/inOrOutRoom', {
     params: {
       type: 1,
-      role: 'leader',
+      role: role,
       roomId,
       userId: userID,
     },