From 6d37dc93b40c6935f65ec4c68b7f6985c9d3bad5 Mon Sep 17 00:00:00 2001
From: jxmanxk <312142485@qq.com>
Date: 星期二, 23 一月 2024 17:44:14 +0800
Subject: [PATCH] Merge branch 'xio_dev'
---
src/components/xio_room_info_block/index.vue | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/components/xio_room_info_block/index.vue b/src/components/xio_room_info_block/index.vue
index a4486a5..a4a265d 100644
--- a/src/components/xio_room_info_block/index.vue
+++ b/src/components/xio_room_info_block/index.vue
@@ -1,6 +1,12 @@
<template>
<div class="room_info">
<div class="staff_box flex flex-ver flex-sb">
+ <div v-if="occupyInfoViewArr.length > 1" class="staff_box_item flex-1 flex flex-center">
+ <div>
+ <div class="staff_box_item__title">瀹㈡埛鍚嶇О</div>
+ <div class="staff_box_item__name">{{ occupyInfoView.appellationName || occupyInfoView.userName || '' }}</div>
+ </div>
+ </div>
<div class="staff_box_item flex-1 flex flex-center">
<div>
<div class="staff_box_item__title">鍒嗚瘖椤鹃棶</div>
@@ -30,12 +36,18 @@
<script>
export default {
- name: 'XioRoomStatusChg',
+ name: 'XioRoomInfoBlock',
props: {
occupyInfoView: {
type: [Object, Array],
default: () => {
return {}
+ }
+ },
+ occupyInfoViewArr: {
+ type: Array,
+ default: () => {
+ return []
}
}
},
@@ -81,14 +93,18 @@
height: 180px;
}
.room_info .staff_box_item:nth-child(1) {
- background-color: rgba(255,255,255,0.1);
+ background-color: rgba(255,255,255,0.3);
}
.room_info .staff_box_item:nth-child(2) {
- background-color: rgba(255,255,255,0.3);
+ background-color: rgba(255,255,255,0.1);
margin: 0 10px;
}
.room_info .staff_box_item:nth-child(3) {
+ background-color: rgba(255,255,255,0.3);
+}
+.room_info .staff_box_item:nth-child(4) {
background-color: rgba(255,255,255,0.1);
+ margin-left: 10px;
}
.room_info .staff_box_item__title {
line-height: 28px;
--
Gitblit v1.8.0