From 107c463ff68be0df7a21fc3c5f3ef990771ad6d5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 13 一月 2025 16:27:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/waybill/waybillDetail.vue | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/h5/pages/waybill/waybillDetail.vue b/h5/pages/waybill/waybillDetail.vue
index 30dc2b4..c29ebfe 100644
--- a/h5/pages/waybill/waybillDetail.vue
+++ b/h5/pages/waybill/waybillDetail.vue
@@ -4,7 +4,11 @@
<map id="map" :latitude="latitude" :longitude="longitude" :polyline="polyline" :markers="markers" :scale="scale">
</map>
- <view class="main_content">
+ <view class="main_content">
+ <view class="stock_status" v-if="info.overStock && info.overStock == 1">
+ <image src="@/static/ic_tip@2x.png" mode=""></image>
+ <view class="">鍥犲簱瀛樹笉瓒筹紝璁㈠崟鏆傛椂鏃犳硶閰嶈浇</view>
+ </view>
<view class="info">
<view class="head">
<view class="code">{{info.contractNumber}}</view>
@@ -350,7 +354,24 @@
}
}
}
-
+ .stock_status{
+ background: #FFEEEE;
+ font-size: 26rpx;
+ color: #ED4545;
+ display: flex;
+ align-items: center;
+ border-radius: 8rpx 8rpx 0rpx 0rpx;
+ height: 80rpx;
+ position: relative;
+ z-index: 1;
+ padding: 0 30rpx 4rpx;
+ top: 8rpx;
+ image{
+ width: 28rpx;
+ height: 28rpx;
+ margin-right: 10rpx;
+ }
+ }
.info {
border-radius: 12rpx;
margin-bottom: 20rpx;
@@ -359,7 +380,6 @@
overflow: hidden;
position: relative;
z-index: 1;
-
.head {
display: flex;
justify-content: space-between;
--
Gitblit v1.9.3