From 423155b8134694c2f2e68f6d3f5239ba0541b0cf Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 31 十二月 2024 18:10:35 +0800
Subject: [PATCH] ll
---
h5/pages/wdata/detail.vue | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/h5/pages/wdata/detail.vue b/h5/pages/wdata/detail.vue
index 04be1cd..f831583 100644
--- a/h5/pages/wdata/detail.vue
+++ b/h5/pages/wdata/detail.vue
@@ -81,7 +81,7 @@
<image v-else src="@/static/waybill/ic_dingdan@2x.png" mode=""></image>
</view>
<view class="content">
- <view class="name">{{item.receiveLocation}}</view>
+ <view class="name" :class="{primaryColor: (info.logisticsStatus == 1 && item.actualArrivedDate) || info.logisticsStatus == 2}">{{item.receiveLocation}}</view>
<view class="status">
<view v-if="info.logisticsStatus == 0" class="btn">鍒拌揣</view>
<view v-else-if="info.logisticsStatus == 1 && !item.actualArrivedDate" @click="startAri(item.stopNumber)"
@@ -95,7 +95,8 @@
</view>
<view class="top1">
<view class="left_icon"></view>
- <view class="time">鍒拌揣鏃堕棿锛歿{ item.actualArrivedDate || '-' }}</view>
+ <view class="time" v-if="item.actualArrivedDate">鍒拌揣鏃堕棿锛歿{ item.actualArrivedDate}}</view>
+ <view class="time" style="margin-top: -10rpx;" v-else>-</view>
</view>
</view>
</view>
@@ -143,7 +144,8 @@
optType: 0
}).then((ress) => {
if (ress.code == 200) {
- this.showToast('鍚繍鎴愬姛')
+ this.showToast('鍚繍鎴愬姛')
+ this.getDetail()
}
})
}
@@ -162,7 +164,8 @@
id: this.id
}).then(ress => {
if (ress.code == 200) {
- this.showToast('鍒拌揣鎴愬姛')
+ this.showToast('鍒拌揣鎴愬姛')
+ this.getDetail()
}
})
}
@@ -185,7 +188,6 @@
position: absolute;
top: 0;
left: 0;
- z-index: -1;
}
.info {
@@ -193,7 +195,8 @@
overflow: hidden;
margin-top: 30rpx;
background: #FFFFFF;
-
+ position: relative;
+ z-index: 1;
.head {
display: flex;
justify-content: space-between;
@@ -256,7 +259,7 @@
color: #222222;
.line {
- height: 68rpx;
+ min-height: 68rpx;
align-items: center;
display: flex;
border-bottom: 1px solid #E5E5E5;
@@ -297,7 +300,7 @@
border-radius: 16rpx;
padding: 30rpx;
margin-top: 20rpx;
-
+ margin-bottom: 20rpx;
.title {
font-weight: 500;
font-size: 32rpx;
@@ -308,7 +311,10 @@
.list {
.item {
position: relative;
-
+ padding-bottom: 24rpx;
+ &:nth-last-child(1){
+ padding-bottom: 0;
+ }
.dian {
border: 1rpx dashed #CCCCCC;
height: calc(100% - 48rpx);
@@ -320,7 +326,6 @@
.top1 {
display: flex;
-
.left_icon {
width: 78rpx;
@@ -334,7 +339,7 @@
flex: 1;
display: flex;
justify-content: space-between;
- align-items: center;
+ // align-items: center;
margin-bottom: 12rpx;
.name {
@@ -346,7 +351,7 @@
.status {
display: flex;
- align-items: center;
+ // align-items: center;
font-size: 26rpx;
.btn {
@@ -362,7 +367,8 @@
.pri {
color: #fff;
- background-color: $uni-color-primary;
+ background-color: $uni-color-primary;
+ border: 1rpx solid $uni-color-primary;
}
image {
--
Gitblit v1.9.3