From fe97f78b9a343ee9fa45a3531d03d73dcd1df31b Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期三, 06 八月 2025 10:15:12 +0800
Subject: [PATCH] :测试提交“
---
pages/tjrecord/tjrecord.vue | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/pages/tjrecord/tjrecord.vue b/pages/tjrecord/tjrecord.vue
index 742e417..6e5e1e5 100644
--- a/pages/tjrecord/tjrecord.vue
+++ b/pages/tjrecord/tjrecord.vue
@@ -219,14 +219,24 @@
display: flex;
flex-direction: column;
align-items: center;
+<<<<<<< HEAD
border-radius: 16rpx 0px 0px 16rpx;
+=======
+ border-radius: 8px 0px 0px 8px;
+>>>>>>> master
background-color: #6FB7FE;
}
.card_right_txt4 {
+<<<<<<< HEAD
font-size: 24rpx;
color: #fff;
margin-top: 8rpx;
+=======
+ font-size: 12px;
+ color: #fff;
+ margin-top: 4px;
+>>>>>>> master
}
.warm {
--
Gitblit v1.8.0