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 {