Bladeren bron

修改bug

bill 2 jaren geleden
bovenliggende
commit
1f8b470342

+ 1 - 0
src/components/Controls/BottomControl.vue

@@ -12,6 +12,7 @@ import { ref } from 'vue'
 import FloorSwitch from './FloorSwitch'
 import LeftButtons from './LeftButtons'
 import RightButtons from './RightButtons'
+
 const store = useStore()
 const isHidden = ref(false)
 const bottom = computed(() => {

+ 7 - 2
src/components/Controls/Panel/scene-list.vue

@@ -7,13 +7,13 @@
       </span>
     </div>
     <div class="content">
-      <div class="sign" v-for="scene in sceneList" :key="scene.id" @click="emit('changeScene', scene)">
+      <div class="sign" v-for="scene in sceneList" :key="scene.id" @click="emit('changeScene', scene)" :class="{active: currentScene === scene}">
         <div class="info">
           <img :src="scene.thumb">
           <p>{{ scene.sceneName }}</p>
         </div>
         <span class="icon">
-          <Icon type="arrow@2x" />
+          <Icon type="arrow@2x" v-if="currentScene !== scene" />
         </span>
       </div>
     </div>
@@ -23,6 +23,7 @@
 <script setup>
 import { sceneList } from '@/store/room'
 import Icon from '@/components/icon/index.vue'
+import { currentScene } from '@/store/room'
 
 const emit = defineEmits(['close', 'changeScene']);
 </script>
@@ -96,6 +97,10 @@ const emit = defineEmits(['close', 'changeScene']);
       }
     }
 
+    &.active .info p {
+      color: #ed6155;
+    }
+
     .icon {
       flex: none;
       font-size: 10px;

+ 3 - 3
src/components/RTC/PageRtcLive.vue

@@ -94,7 +94,7 @@
         
         
         <div
-          v-if="user_info.Role == 'leader'"
+          v-if="user_info.Role == 'leader' && sceneList.length > 1"
           @click="showScenes = !showScenes"
           style="font-size: 0.65rem"
         >
@@ -210,7 +210,7 @@
   </teleport>
 
   <SceneList 
-    v-if="showScenes" 
+    v-if="showScenes && sceneList.length > 1" 
     @close="showScenes = false" 
     @changeScene="changeScene"
   />
@@ -229,7 +229,7 @@ import {
   watchEffect,
 } from "vue";
 import SceneList from '../Controls/Panel/scene-list.vue'
-import { enterRoom, changeScene as changeSceneRaw, currentScene } from '@/store/room'
+import { enterRoom, changeScene as changeSceneRaw, currentScene, sceneList } from '@/store/room'
 import { useApp, getApp } from "@/app";
 import { useStore } from "vuex";
 import { Dialog } from "@/global_components/";

+ 1 - 0
src/components/RTC/chat/chat.vue

@@ -3,6 +3,7 @@
     <div id="contents">
       <div class="chat-item" v-for="(i, index) in chatList" :key="index">
         <div class="chat-msg">
+          {{ user_info }}
           <span :class="{ my: i.UserId == user_info.UserId }" class="chat-name"> {{ i.Nickname }} &nbsp;</span>
           <span class="chat-content"> {{ i.text }}</span>
         </div>

+ 1 - 1
src/components/RTC/dialog/index.vue

@@ -33,7 +33,7 @@ const props = defineProps({
   },
   desc: {
     type: String,
-    default: "是否结束看?",
+    default: "是否结束看?",
   },
 });
 

+ 1 - 1
src/global_components/assets/scss/components/_button.scss

@@ -70,7 +70,7 @@
     &:hover {
         // opacity: 0.8;
         // background: var(--colors-primary-hover) !important;
-        background: #4DD8C7 !important;
+        // background: #4DD8C7 !important;
     }
     &:active {
         background-color: var(--colors-primary-active) !important;