From 43942a545271345ce26e40d82bb97138c5ea7611 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 六月 2024 13:54:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/applicationRecord/applicationRecord.vue | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/h5/pages/applicationRecord/applicationRecord.vue b/h5/pages/applicationRecord/applicationRecord.vue
index ea490a1..a390d45 100644
--- a/h5/pages/applicationRecord/applicationRecord.vue
+++ b/h5/pages/applicationRecord/applicationRecord.vue
@@ -50,22 +50,26 @@
</view>
<view class="box_list_item_nr_item">
<text>杩涘巶鏃堕棿锛�</text>
- <text>{{ item.starttime }}</text>
+ <text v-if="item.starttime">{{ item.starttime.slice(5, 16) }}</text>
</view>
<view class="box_list_item_nr_item">
<text>绂诲洯鏃堕棿锛�</text>
- <text>{{ item.endtime }}</text>
+ <text v-if="item.endtime">{{ item.endtime.slice(5, 16) }}</text>
</view>
<view class="box_list_item_nr_item">
<text>鏉ヨ浜嬬敱锛�</text>
<text>{{ item.reason }}</text>
</view>
<view class="box_list_item_nr_x"></view>
- <view class="box_list_item_nr_text">{{ item.createDate }} 鎻愪氦</view>
+ <view v-if="item.createDate" class="box_list_item_nr_text">{{ item.createDate.slice(0, 16) }} 鎻愪氦</view>
</view>
</view>
- <view v-if="list.length === 0" style="text-align: center;">
- <image src="@/static/empty.png" style="width: 320rpx;margin: 120rpx auto 0" mode="widthFix" />
+ <view v-if="list.length === 0" style="text-align: center">
+ <image
+ src="@/static/empty.png"
+ style="width: 320rpx; margin: 120rpx auto 0"
+ mode="widthFix"
+ />
<view class="placeholder9 fs24">鏆傛棤鏁版嵁</view>
</view>
</view>
@@ -162,12 +166,14 @@
height: 100%;
display: flex;
align-items: center;
+ justify-content: space-between;
.active {
border: 1rpx solid $uni-color-primary !important;
color: $uni-color-primary !important;
}
.box_head_item {
- padding: 0 30rpx;
+ width: 156rpx;
+ text-align: center;
height: 60rpx;
line-height: 60rpx;
box-sizing: border-box;
@@ -176,7 +182,6 @@
font-size: 26rpx;
font-weight: 400;
color: #333333;
- margin-right: 20rpx;
}
}
}
@@ -212,7 +217,7 @@
text {
&:nth-child(1) {
font-size: 32rpx;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
&:nth-child(2) {
@@ -226,17 +231,17 @@
width: 100%;
box-sizing: border-box;
background-color: #ffffff;
- .box_list_item_nr_x {
+ /* .box_list_item_nr_x {
width: 100%;
height: 1rpx;
background-color: #e5e5e5;
- }
+ } */
.box_list_item_nr_text {
width: 100%;
font-size: 26rpx;
font-weight: 400;
color: #999999;
- margin-top: 32rpx;
+ /* margin-top: 32rpx; */
}
.box_list_item_nr_item {
width: 100%;
--
Gitblit v1.9.3