gemercheung 2 年之前
父节点
当前提交
b8cc12dc8d

+ 6 - 2
src/api/room.ts

@@ -15,6 +15,7 @@ type SRoom = {
   roomTitle: string
   roomInfo: string
   roomHostName: string
+  roomStatus: number
   roomCoverUrl: string
   roomViewCount: number
   createTime: string
@@ -34,6 +35,7 @@ export interface Room {
   viewCount: number
   cover: string
   leaderName: string
+  roomStatus?: number
 }
 
 export type Rooms = Room[]
@@ -45,7 +47,8 @@ const serverToLocal = (sroom: SRoom): Room => ({
   time: sroom.createTime,
   viewCount: sroom.roomViewCount,
   cover: sroom.roomCoverUrl,
-  leaderName: sroom.roomHostName
+  leaderName: sroom.roomHostName,
+  roomStatus: sroom.roomStatus
 })
 const localToServer = (room: Room): SRoom => ({
   roomId: room.id,
@@ -54,7 +57,8 @@ const localToServer = (room: Room): SRoom => ({
   roomHostName: room.leaderName,
   roomCoverUrl: room.cover,
   roomViewCount: room.viewCount,
-  createTime: room.time
+  createTime: room.time,
+  roomStatus: room.roomStatus || 0
 })
 
 export const fetchRomms = async (): Promise<Rooms> => {

+ 1 - 1
src/layout/header.vue

@@ -5,7 +5,7 @@
         <a :href="mainURL"><img :src="logoPng" /></a>
       </h2>
 
-      <a-dropdown placement="bottomRight" trigger="click">
+      <a-dropdown placement="bottomRight">
         <template #overlay>
           <a-menu style="width: 100px" @click="handlerMenuClick">
             <a-menu-item

+ 4 - 2
src/store/room.ts

@@ -20,6 +20,8 @@ export type Room = SRoom & {
   miniCode?: string
   leaderMiniCode?: string
   scenes: Scenes
+
+
 }
 
 export interface ShareLinkType {
@@ -56,8 +58,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}`)

+ 7 - 2
src/views/room/edit-room/index.vue

@@ -6,7 +6,7 @@
     width="912px"
     :style="{
       top: '10px',
-      minWidth: '820px'
+      minWidth: '912px'
     }"
     @cancel="visible = false"
   >
@@ -167,6 +167,7 @@ export default defineComponent({
 <style lang="scss" scoped>
 .edit-room-layout {
   display: flex;
+  min-width: 864px;
 }
 .scene {
   flex: none;
@@ -190,7 +191,10 @@ export default defineComponent({
 
 .info {
   flex: 1;
-  min-width: 500px;
+  // min-width: 500px;
+  .ant-form-item {
+    width: 100%;
+  }
   h4 {
     font-size: 18px;
     color: #333;
@@ -205,6 +209,7 @@ export default defineComponent({
 
 <style lang="scss">
 .edit-room-layout {
+  min-width: 864px;
   .ant-form-item {
     margin-bottom: 16px;
   }

+ 5 - 0
src/views/room/list.vue

@@ -165,7 +165,12 @@ const webSyncRoom = async (room: Room) => {
 const editRoom = async (room?: Room) => {
   if (room) {
     await roomStore.setRoomScenes(room)
+    if (room.roomStatus === 1) {
+      message.error('房间直播中, 请先关闭直播再修改 !')
+      return
+    }
   }
+  // debugger
   renderModal(EditRoom, {
     room,
     async onSave(actionRoom) {

+ 1 - 1
src/views/room/sign.vue

@@ -160,7 +160,7 @@ defineEmits<RoomSignEmit>()
   max-width: 200px;
 }
 .room-card {
-  border-radius: 2pt;
+  border-radius: 4px;
 }
 
 .room-card,

文件差异内容过多而无法显示
+ 58 - 0
vite.config.ts.timestamp-1668659340338.mjs