From 2800fa4f32f3900509cb4d6eefaf2bfaf54efdd7 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 21 Apr 2025 18:29:09 +0800
Subject: [PATCH] fix: 天气显示
---
src/components/CommonTitle.vue | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/src/components/CommonTitle.vue b/src/components/CommonTitle.vue
index 935ee50..9066cc0 100644
--- a/src/components/CommonTitle.vue
+++ b/src/components/CommonTitle.vue
@@ -3,14 +3,21 @@
<div class="left">
{{ title }}
</div>
- <div class="right" v-if="show" @click="attrs.onDetails()">详情 ></div>
+ <div class="right" v-if="show && text!=='返回'" @click="attrs.onDetails()">{{ text }} ></div>
+ <div v-if="title=='机巢概况' && text=='返回'" class="do-return" @click="attrs.onDetails()">
+ <img src="@/assets/images/return.png" alt="" />
+ </div>
</div>
</template>
<script setup>
const props = defineProps({
title: {
type: String,
- default: '机巢概况',
+ default: '标题',
+ },
+ text: {
+ type: String,
+ default: '详情',
},
});
const attrs = useAttrs();
@@ -20,7 +27,7 @@
.overview-title {
position: relative;
width: 404px;
- height: hToV(43);
+ height: 43px;
background-image: url(@/assets/images/title-bg.png);
background-size: 100% 100%;
background-repeat: no-repeat;
@@ -30,7 +37,7 @@
.left {
position: absolute;
left: 49px;
- bottom: hToV(16);
+ bottom: 16px;
font-weight: 400;
font-size: 20px;
color: #ffffff;
@@ -39,8 +46,8 @@
font-style: normal;
text-transform: none;
font-family: YouSheBiaoTiHei, YouSheBiaoTiHei, serif;
- height: hToV(26);
- line-height: hToV(23);
+ height: 26px;
+ line-height: 23px;
}
.right {
@@ -48,15 +55,25 @@
font-weight: 500;
font-size: 14px;
color: #0be7f6;
- height: hToV(21);
- line-height: hToV(21);
+ height: 21px;
+ line-height: 21px;
font-family: Source Han Sans CN, Source Han Sans CN, serif;
text-align: right;
font-style: normal;
text-transform: none;
- bottom: hToV(16);
+ bottom: 16px;
right: 11px;
cursor: pointer;
}
+ .do-return {
+ position: absolute;
+ top: 3px;
+ right: -50px;
+ cursor: pointer;
+ img {
+ width: 60px;
+ height: 33px;
+ }
+ }
}
</style>
--
Gitblit v1.9.3