From f63d3a3be83fea258e7920efccd2567b6a511bb3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 16 一月 2025 16:52:46 +0800
Subject: [PATCH] 最新版本541200007

---
 h5/pages/waybill/waybillDetail.vue |   36 ++++++++++++++++++++++++++++++------
 1 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/h5/pages/waybill/waybillDetail.vue b/h5/pages/waybill/waybillDetail.vue
index c3a8251..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>
@@ -52,7 +56,8 @@
 							<image v-if="dri.key == 2 && k == 0" src="@/static/waybill/ic_cangku_sel@2x.png" class="icon"></image>
 							<image v-if="dri.key == 3 && k != 0" src="@/static/waybill/ic_yunshu@2x.png" class="icon"></image>
 							<image v-if="dri.key == 3 && k == 0" src="@/static/waybill/ic_yunshu_sel@2x.png" class="icon"></image>
-							<image v-if="dri.key == 4" src="@/static/waybill/ic_daohuo_sel@2x.png" class="icon"></image>
+							<image v-if="dri.key == 4 && k != 0" src="@/static/waybill/ic_dingdan@2x.png" class="icon"></image>
+							<image v-if="dri.key == 4 && k == 0" src="@/static/waybill/ic_daohuo_sel@2x.png" class="icon"></image>
 							<image v-if="dri.key == 5" src="@/static/waybill/ic_ruku.png" class="icon"></image>
 						</view>
 						<view class="" :class="{primaryColor: k == 0}">{{dri.name}}</view>
@@ -65,8 +70,11 @@
 							<view v-else class="icon_wrap"></view>
 							<view class="text" :class="{placeholder3: k==0 && i== 0}">
 								{{item.orderStatusDes}}
-								<text v-if="item.tel">锛屽彂璐т粨搴撶數璇濓細</text>
-								<text v-if="item.tel" @click="callPhone(item.tel)" class="primaryColor">{{item.tel}}</text>
+								<text v-if="item.tel">锛屽彂璐т粨搴撶數璇濓細</text>
+								<template v-if="item.tel">
+									<text v-for="phone,p in item.tel.split(',')" @click="callPhone(phone)" class="primaryColor">{{phone}}<text v-if="p < item.tel.split(',').length - 1">,</text></text>
+								</template>
+								
 							</view>
 						</view>
 						<view class="time">{{item.recordDate}}</view>
@@ -346,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;
@@ -355,7 +380,6 @@
 			overflow: hidden;
 			position: relative;
 			z-index: 1;
-
 			.head {
 				display: flex;
 				justify-content: space-between;

--
Gitblit v1.9.3