From eb49564ab17c6695d8928d5a63a57c58b3cfd79c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 18:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pda/pages/index/center.vue | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/pda/pages/index/center.vue b/pda/pages/index/center.vue
index 5ab53fa..0bd09a4 100644
--- a/pda/pages/index/center.vue
+++ b/pda/pages/index/center.vue
@@ -48,7 +48,7 @@
</view>
<view class="line">
<text class="label">鎬昏繍杈撻噺</text>
- <text class="value">{{ item.totalNum }}涓囨敮</text>
+ <text class="value">{{ item.totalNum || item.ioQty}}涓囨敮</text>
</view>
<view class="line" v-if="item.carrierName">
<text class="label">杩愯緭鍏徃</text>
@@ -113,7 +113,7 @@
</view>
<view class="line">
<text class="label">鎬昏繍杈撻噺</text>
- <text class="value">{{ item.totalNum }}涓囨敮</text>
+ <text class="value">{{ item.totalNum || item.ioQty }}涓囨敮</text>
</view>
<view class="line" v-if="item.carrierName">
<text class="label">杩愯緭鍏徃</text>
@@ -284,7 +284,7 @@
this.getPlatformTask()
this.timer = setInterval(() => {
this.getPlatformTask()
- }, 60 * 1000)
+ }, 120 * 1000)
}
}
})
@@ -525,19 +525,20 @@
flex-wrap: wrap;
.item {
- width: 210rpx;
- height: 80rpx;
- display: flex;
- justify-content: center;
- align-items: center;
+ width: 220rpx;
+ height: 80rpx;
+ line-height: 80rpx;
+ text-align: center;
background: #ffffff;
border-radius: 8rpx;
border: 1rpx solid #999999;
font-size: 30rpx;
color: #222222;
- margin-bottom: 20rpx;
- margin-right: 30rpx;
-
+ margin-bottom: 15rpx;
+ margin-right: 15rpx;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
&:nth-of-type(3n) {
margin-right: 0;
}
--
Gitblit v1.9.3