update

src/api/room.ts

@@ -104,7 +104,7 @@ export const fetchLeaderRoomMiniCode = async (room: Room) => {
   })
 }
 interface RoomDetailType extends SRoom {
-  sceneData: SScene[]
+  sceneData: SScene[],
 }
 export const fetchRoomDetail = async (roomId: Room['id']) => {
   const res = await axios.get<RoomDetailType>(GET_ROOM, {

src/api/scene.ts

@@ -41,7 +41,7 @@ export const sceneStatusDesc = {
 
 export type Scenes = Scene[]
 
-const serverToLocal = (sscene: SScene): Scene => ({
+export const serverToLocal = (sscene: SScene): Scene => ({
   ...sscene,
   cover: sscene.thumb,
   status: sscene.status,
@@ -55,6 +55,7 @@ export const fetchScenes = async (): Promise<Scenes> => {
     pageSize: 1000,
     sceneName: ''
   }
+  
 
   const [kkScenes, kjScenes] = await Promise.all([
     axios.post<PageResult<SScene>>(GET_SCENE_LIST, { type: 0, ...params }),

src/components/data-list/index.vue

@@ -3,11 +3,11 @@
   <div v-else class="un-data">
     <img :src="unDataPng" class="icon" />
     <p v-if="keyword">{{ t('base.noSearchResult') }}</p>
-    <p v-if="!unSearchDesc">
+    <!-- <p v-if="!unSearchDesc"> -->
       <!-- 您还没有{{ name || '数据' }}，请先创建{{ name || '数据' }}～ -->
-      {{ t('base.unSearchDesc') }}
-    </p>
-    <p v-else>{{ unSearchDesc }}</p>
+      <!-- {{ t('base.unSearchDesc') }} -->
+    <!-- </p> -->
+    <!-- <p v-else>{{ unSearchDesc }}</p> -->
     <div class="undata">
       <slot name="undata"></slot>
     </div>

src/layout/header.vue

@@ -116,11 +116,12 @@ const menus = [
   { label: 'base.logout', key: 'logout' }
 ]
 const handlerMenuClick: MenuProps['onClick'] = async e => {
+  
   if (e.key === 'logout') {
     await postLogout()
-    location.replace(`${mainURL}/`)
+    location.replace(`${mainURL}/?lang=${currentLang.value.key}`)
   } else {
-    location.href = `${mainURL}/#/information`
+    location.href = `${mainURL}/#/information?lang=${currentLang.value.key}`
   }
 }
 

src/locales/lang/en/room.ts

@@ -31,5 +31,6 @@ export default {
   linkCopySuccess: 'Link copied successfully!',
   deletedScenes: 'Deleted scenes',
   deletedScenesWaring: 'Cannot recover from deletion, confirm to delete?',
-  projectLink: 'Project Link'
+  projectLink: 'Project Link',
+  nickNameRegrexError: 'The nickname is limited to 1 to 15 characters in Chinese, English, digits, or underscores.'
 }

src/store/modules/room.ts

@@ -9,7 +9,9 @@ import {
   insertRoom,
   updateRoom,
   deleteRoom,
-  fetchRoomScenes
+  fetchRoomScenes,
+  fetchRoomDetail,
+  serverToLocal
 } from '@/api'
 
 import { Room as SRoom, Scenes } from '@/api'
@@ -57,8 +59,8 @@ export const useRoomStore = defineStore('room', {
   getters: {
     getNums:
       () =>
-      <T extends Pick<Room, 'scenes'>>(room: T) =>
-        room.scenes.map(scene => scene.num),
+        <T extends Pick<Room, 'scenes'>>(room: T) =>
+          room.scenes.map(scene => scene.num),
     getShareUrl: () => (param: ShareLinkType) => {
       const search = new URLSearchParams()
       search.set('m', `${param.num}`)
@@ -101,8 +103,10 @@ export const useRoomStore = defineStore('room', {
       this.fetchList()
     },
     async setRoomScenes(room: Room) {
-      const scenes = await fetchRoomScenes(room.id)
-      room.scenes = scenes
+      const roomInfo = await fetchRoomDetail(room.id)
+      // const scenes = await fetchRoomScenes(room.id)
+      room.scenes = roomInfo.sceneData.map(serverToLocal)
+      return roomInfo
     },
     async setRoomMiniCode(room: Room) {
       const code = room.miniCode || (await fetchRoomMiniCode(room))

src/views/room/list.vue

@@ -175,8 +175,8 @@ const webSyncRoom = async (room: Room) => {
 
 const editRoom = async (room?: Room) => {
   if (room) {
-    await roomStore.setRoomScenes(room)
-    if (room.roomStatus === 1) {
+    const scenes = await roomStore.setRoomScenes(room)
+    if (scenes.roomStatus === 1) {
       message.error(t('room.roomOnfired'))
       return
     }