国际版

package.json

@@ -5,6 +5,7 @@
   "type": "module",
   "scripts": {
     "dev": "vite --mode development",
+    "dev:eur": "vite --mode eur",
     "build": "vue-tsc --noEmit && vite build  --mode production",
     "build-eur": "vue-tsc --noEmit && vite build  --mode eur",
     "preview": "vite preview",

src/api/room.ts

@@ -3,10 +3,12 @@ import {
   GET_ROOM_MINI_CODE,
   DEL_ROOM,
   SET_ROOM,
+  GET_ROOM,
   GET_ROOM_LEADER_MINI_CODE
 } from './constant'
 import axios from './instance'
 import type { PageResult, Scene } from './'
+import type { SScene } from './scene'
 
 type SRoom = {
   roomId: number
@@ -97,3 +99,12 @@ export const fetchLeaderRoomMiniCode = async (room: Room) => {
     params: { roomId: room.id }
   })
 }
+interface RoomDetailType extends SRoom {
+  sceneData: SScene[]
+}
+export const fetchRoomDetail = async (roomId: Room['id']) => {
+  const res = await axios.get<RoomDetailType>(GET_ROOM, {
+    params: { roomId }
+  })
+  return res
+}

src/api/scene.ts

@@ -2,7 +2,7 @@ import axios from './instance'
 import { GET_SCENE_LIST, GET_ROOM } from './constant'
 import type { PageResult, Room } from './'
 
-type SScene = {
+export type SScene = {
   id: number
   name: string
   num: string
@@ -13,6 +13,7 @@ type SScene = {
   createTime: string
 }
 
+
 export interface Scene {
   id: number
   num: string

src/store/room.ts

@@ -29,6 +29,7 @@ export interface ShareLinkType {
   role?: string
   lang?: string
   avatar?: string
+  userId?: string
 }
 
 export const createRoom = (room: Partial<Room>): Room => {
@@ -64,6 +65,7 @@ export const useRoomStore = defineStore('room', {
       search.set('roomId', `roomId_${param.roomId}`)
       param.avatar && search.set('avatar', param.avatar)
       param.lang && search.set('set', param.lang)
+      param.userId && search.set('vruserId', `user_${param.userId}`)
       search.set('isTour', '0')
       return liveStreamURL + '?' + search.toString()
     },

src/views/room/edit-room/index.vue

@@ -4,6 +4,9 @@
     :title="`${!room ? '创建' : '修改'}房间`"
     :after-close="onCancel"
     width="912px"
+    :style="{
+      top: '10px'
+    }"
     @cancel="visible = false"
   >
     <template #footer>
@@ -134,9 +137,11 @@ export default defineComponent({
       props.onSave && props.onSave(current)
       visible.value = false
     }
-    const startSync = () => {
-      window.open(roomStore.getShareUrl(current))
-    }
+    // const startSync = () => {
+    //   window.open(roomStore.getShareUrl({
+
+    //   }))
+    // }
 
     return {
       visible,
@@ -144,7 +149,7 @@ export default defineComponent({
       formRef,
       deleteScene,
       saveRoom,
-      startSync,
+      // startSync,
       mainURL,
       unScenePng
     }

src/views/room/list.vue

@@ -76,7 +76,7 @@ import MiniSync from './modal/mini-sync.vue'
 import DataList from '@/components/data-list/index.vue'
 
 import type { Room } from '@/store'
-import { fetchRoomScenes } from '@/api'
+import { fetchRoomDetail } from '@/api'
 
 defineOptions({ name: 'RoomList' })
 
@@ -100,8 +100,8 @@ const deleteRoom = (room: Room) => {
 }
 const shareRoom = async (room: Room) => {
   // await roomStore.setRoomMiniCode(room)
-  const scenes = await fetchRoomScenes(room.id)
-  const m = scenes[0].num
+  const scenes = await fetchRoomDetail(room.id)
+  const m = scenes.sceneData[0].num
   Modal.confirm({
     content: createVNode(Share, { room, num: m }),
     title: '分享',
@@ -144,16 +144,17 @@ const miniSyncRoom = async (room: Room, key?: 'leader') => {
 }
 const webSyncRoom = async (room: Room) => {
   // debugger
-  const scenes = await fetchRoomScenes(room.id)
-
+  const scenes = await fetchRoomDetail(room.id)
   const user = useUserStore().current
-  const m = scenes[0].num
+  console.log('scenes', scenes)
+  const m = scenes.sceneData[0].num
   const link = roomStore.getShareUrl({
     roomId: room.id,
     num: m,
     role: 'leader',
-    name: user.nickname,
-    avatar: user.avatar
+    name: scenes.roomHostName,
+    avatar: encodeURIComponent(user.avatar) || '',
+    userId: '1'
   })
   console.log('带看link', link)
   window.open(link, '_blank')