From 908dadf0c21eba4a08d44c915079b726519b0728 Mon Sep 17 00:00:00 2001
From: long <515897141@qq.com>
Date: 星期三, 31 一月 2024 15:53:18 +0800
Subject: [PATCH] 样式调整
---
src/components/xio_room_guest_info_box/index.vue | 9 +++++----
src/assets/css/common.css | 32 ++++++++++++++++++++++++--------
src/components/xio_room_guest_box/index.vue | 4 ++--
src/pages/room/detail.vue | 3 +++
4 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index f9ac968..c3ebe0f 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -209,7 +209,7 @@
height: 900px; */
background-color: rgba(34,123,235,1);
box-sizing: border-box;
- padding: 0 23px 42px 23px;
+ padding: 0 23px 23px 23px;
}
/* 閬垮厤Chrome娴忚鍣ㄧ湅鍒癝afari榛戝 */
@supports (-webkit-touch-callout: none) {
@@ -273,19 +273,35 @@
}
.btn_ani {
- animation-name: anim_scale;
- animation-duration: 1.1s;
- animation-iteration-count: infinite;
+ -webkit-animation: anim_scale 1.1s;
+ animation: anim_scale 1.1s;
+ -webkit-animation-iteration-count: infinite;
+ animation-iteration-count: infinite;
+ /* animation-name: anim_scale;
+ animation-duration: 1.1s; */
+ /* animation-iteration-count: infinite; */
+}
+
+@-webkit-keyframes anim_scale {
+ 0% {
+ transform: scale(1);
+ }
+ 50% {
+ transform: scale(1.1);
+ }
+ 100% {
+ transform: scale(1);
+ }
}
@keyframes anim_scale {
0% {
- scale: 1;
+ transform: scale(1);
}
50% {
- scale: 1.1;
+ transform: scale(1.1);
}
100% {
- scale: 1;
+ transform: scale(1);
+ }
}
-}
\ No newline at end of file
diff --git a/src/components/xio_room_guest_box/index.vue b/src/components/xio_room_guest_box/index.vue
index 1622d41..b2e72cb 100644
--- a/src/components/xio_room_guest_box/index.vue
+++ b/src/components/xio_room_guest_box/index.vue
@@ -133,9 +133,9 @@
width: 12.54%;
}
.guest_box {
- margin-top: 65px;
+ margin-top: 55px;
width: 100%;
- height: 345px;
+ height: 340px;
background-color: #fff;
overflow: hidden;
}
diff --git a/src/components/xio_room_guest_info_box/index.vue b/src/components/xio_room_guest_info_box/index.vue
index 2d9ce6c..a9cac51 100644
--- a/src/components/xio_room_guest_info_box/index.vue
+++ b/src/components/xio_room_guest_info_box/index.vue
@@ -1,7 +1,7 @@
<template>
- <div class="guest_info_box">
+ <div class="guest_info_box flex flex-col">
<div v-if="roomInfo && roomInfo.roomNo" class="room_title">{{ roomInfo.roomNo }}</div>
- <div class="room_content">
+ <div class="room_content flex-1">
<div class="tip">璇婄枟瀹夋帓</div>
<!-- <div class="name">{{ occupyInfoView.userName }}</div> appellationName -->
<div v-show="isShowAppellationName" class="flex flex-center">
@@ -34,7 +34,7 @@
<div v-if="occupyInfoView.ciq" class="ciq">({{ occupyInfoView.ciq }})</div>
<div v-if="occupyInfoView.startTime" class="time">瀹夋帓娌荤枟鏃堕棿锛歿{ occupyInfoView.startTime }} 寮�濮�</div>
</div>
- <div v-show="occupyInfoView" class="room_left_btn_box flex flex-ver" style="margin-top: 105px;">
+ <div v-show="occupyInfoView" class="room_left_btn_box flex flex-ver">
<div v-show="occupyInfoView.treatRoomStatus == 0" class="room_left_btn_box__item flex flex-1 flex-center b-green btn_ani" @click="setStatus('鏁烽夯涓�', 4, occupyInfoView)">寮�濮嬫暦楹�</div>
<div v-show="occupyInfoView.treatRoomStatus == 0" class="room_left_btn_box__item flex flex-1 flex-center green btn_ani" style="margin-right: 0;" @click="setStatus('浣跨敤涓�', 1, occupyInfoView)">寮�濮嬫不鐤�</div>
<div v-show="occupyInfoView.treatRoomStatus == 4" class="room_left_btn_box__item flex flex-center green btn_ani" @click="setStatus('浣跨敤涓�', 1, occupyInfoView)">寮�濮嬫不鐤�</div>
@@ -213,7 +213,8 @@
}
.guest_info_box .room_left_btn_box {
padding: 0 23px;
- margin-top: 163px;
+ /* margin-top: 163px; */
+ margin-bottom: 40px;
}
.guest_info_box .room_left_btn_box__item {
width: 500px;
diff --git a/src/pages/room/detail.vue b/src/pages/room/detail.vue
index 032c3b9..9d3a35f 100644
--- a/src/pages/room/detail.vue
+++ b/src/pages/room/detail.vue
@@ -744,6 +744,9 @@
}
.page_header_placeholer {
height: 100px;
+ width: 100%;
+ display: block;
+ flex-shrink: 0;
}
.page_header {
position: fixed;
--
Gitblit v1.8.0