From c6a96d1162cb60d1bd30c8f5fde7a93985b79276 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 09 十月 2024 16:31:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
screen/src/views/PlatformCall.vue | 46 ++++++++++++++++++++++++++--------------------
1 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/screen/src/views/PlatformCall.vue b/screen/src/views/PlatformCall.vue
index 9d2a827..a3ed50c 100644
--- a/screen/src/views/PlatformCall.vue
+++ b/screen/src/views/PlatformCall.vue
@@ -106,7 +106,7 @@
var qr = new UQRCode()
// 璁剧疆浜岀淮鐮佸唴瀹�
qr.data = qrcode.value
- qr.size = 254
+ qr.size = 220
// 璋冪敤鍒朵綔浜岀淮鐮佹柟娉�
qr.make()
var canvas = document.getElementById("qrcode")
@@ -174,7 +174,7 @@
</div>
<div class="item">{{ item.platformName || '-' }}</div>
<div class="item">
- <div class="time_place">棰勮瀹屾垚鏃堕棿</div>
+ <div v-if="item.optTimeTemp" class="time_place">棰勮瀹屾垚鏃堕棿</div>
<div>{{ item.optTimeTemp || '-' }}</div>
</div>
</div>
@@ -203,7 +203,7 @@
</div>
<div class="qrcode_wrap">
<div class="qrcode">
- <canvas id="qrcode" width="254" height="254"></canvas>
+ <canvas id="qrcode" width="220" height="220"></canvas>
</div>
<div class="title">璇锋壂鐮佺鍒�</div>
</div>
@@ -218,16 +218,23 @@
</template>
<style lang="scss" scoped>
+div{
+ box-sizing: border-box;
+}
.main_app {
color: #fff;
+ position: fixed;
+ top: 0;
+ left: 0;
width: 100%;
height: 100vh;
+ overflow: hidden;
background-color: #092030;
position: relative;
z-index: -2;
display: flex;
flex-direction: column;
-
+ justify-content: space-between;
.main_header {
width: 100%;
height: 112px;
@@ -281,16 +288,15 @@
display: flex;
padding: 30px 20px;
position: relative;
-
.list {
flex: 5;
margin-right: 20px;
-
+ display: flex;
+ flex-direction: column;
.line {
display: flex;
align-items: center;
- height: 100px;
-
+ flex: 1;
&:nth-of-type(2n) {
background: rgba(255, 255, 255, 0);
}
@@ -307,13 +313,15 @@
font-weight: 500;
font-size: 36px;
flex: 10;
+ height: 100%;
.time_place{
font-weight: 500;
font-size: 24px;
}
.status {
- width: 174px;
- height: 76px;
+ /* padding: 0 28px; */
+ width: 170px;
+ height: 72%;
border-radius: 8px;
display: flex;
justify-content: center;
@@ -351,14 +359,13 @@
flex: 2;
display: flex;
flex-direction: column;
-
+ border: 1px solid red;
.tip_wrap {
margin-bottom: 20px;
width: 100%;
position: relative;
- flex-shrink: 0;
+ /* flex-shrink: 0; */
flex: 1;
-
.current_plat {
display: flex;
flex-direction: column;
@@ -369,18 +376,18 @@
.id_card {
font-weight: bold;
- font-size: 86px;
+ font-size: 68px;
}
.no {
margin: 10px 0;
font-weight: 500;
- font-size: 58px;
+ font-size: 52px;
}
.place {
font-weight: 500;
- font-size: 42px;
+ font-size: 36px;
}
.plat {
@@ -426,23 +433,22 @@
.qrcode_wrap {
width: 100%;
flex: 1;
- flex-shrink: 0;
+ /* flex-shrink: 0; */
background-color: #51b2ce;
- padding: 36px 0;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
.qrcode {
- padding: 12px;
+ padding: 6px;
background-color: #fff;
}
.title {
margin-top: 20px;
font-weight: bold;
- font-size: 38px;
+ font-size: 34px;
color: #111111;
}
}
--
Gitblit v1.9.3