From f5028477ff21f0146206bfcac6e78cb92e81d90c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 15 一月 2025 17:37:20 +0800
Subject: [PATCH] ll

---
 h5/pages/waybill/waybillDetail.vue |   44 +++++++++++++++++++++++++++++++++++---------
 1 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/h5/pages/waybill/waybillDetail.vue b/h5/pages/waybill/waybillDetail.vue
index c3a8251..ad1d581 100644
--- a/h5/pages/waybill/waybillDetail.vue
+++ b/h5/pages/waybill/waybillDetail.vue
@@ -5,7 +5,11 @@
 
 		</map>
 		<view class="main_content">
-			<view class="info">
+			<view class="info">
+				<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="head">
 					<view class="code">{{info.contractNumber}}</view>
 					<view class="status">{{info.orderStatusDesc}}</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,6 @@
 				}
 			}
 		}
-
 		.info {
 			border-radius: 12rpx;
 			margin-bottom: 20rpx;
@@ -354,18 +361,37 @@
 			background-color: #fff;
 			overflow: hidden;
 			position: relative;
-			z-index: 1;
-
+			z-index: 1;
+			.stock_status{
+				background: #FFEEEE;
+				font-size: 26rpx;
+				color: #ED4545;
+				display: flex;
+				align-items: center;
+				border-radius: 8rpx 8rpx 0rpx 0rpx;
+				height: 80rpx;
+				margin: 0rpx -30rpx 0;
+				position: relative;
+				z-index: 1;
+				padding: 0 30rpx;
+				image{
+					width: 28rpx;
+					height: 28rpx;
+					margin-right: 10rpx;
+				}
+			}
 			.head {
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
 				padding: 0 30rpx;
-				width: 690rpx;
+				width: 690rpx;
+				border-radius: 8rpx 8rpx 0rpx 0rpx;
 				height: 84rpx;
 				margin: 0 -30rpx;
 				background: linear-gradient(270deg, #FEFEFF 0%, #E1F7FE 100%);
-
+				position: relative;
+				z-index: 11;
 				.code {
 					font-weight: 500;
 					font-size: 32rpx;

--
Gitblit v1.9.3