From 98bc0d4c8c94a15c0e977c12305ed44f8fb38976 Mon Sep 17 00:00:00 2001
From: nyoung <nyoungo@qq.com>
Date: Mon, 23 Dec 2024 12:30:58 +0800
Subject: [PATCH] 1

---
 pages/index/index.vue           |  41 ++++++--
 pages/orderDetails/details.vue  | 171 ++++++++++++++++++++++++++++++--
 static/icons/currentDetails.png | Bin 0 -> 993 bytes
 3 files changed, 194 insertions(+), 18 deletions(-)
 create mode 100644 static/icons/currentDetails.png

diff --git a/pages/index/index.vue b/pages/index/index.vue
index a476927..0f012e3 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -71,12 +71,7 @@
 							<image src="../../static/images/htai.png" mode=""></image>
 						</view>
 						<view class="ja-you">{{item.rescuePosition || ''}}</view>
-						<view class="anniua" @click="GOdetails(item.id)" v-if="rescueStatus == 5">
-							<view class="shiwuimg">
-								<image src="../../static/images/cldd.png" mode=""></image>
-							</view>
-							<text>详情</text>
-						</view>
+
 					</view>
 					<view class="dix" style="margin: 10px auto;">
 						<view class="htzit">
@@ -142,6 +137,18 @@
 							</view>
 							<text>查看详情</text>
 						</view>
+					</view>
+					<view class="dis-tt" v-if="rescueStatus == 5">
+						<view class="caanniu" @click="GOrepair(item)" v-if="item.isWeiXiu!=='1'">
+							<uni-icons type="wallet" color="#e43d33" size="20"></uni-icons>
+							<text>转维修</text>
+						</view>
+						<view class="anniua" @click="GOdetails(item.id)" >
+							<view class="shiwuimg">
+								<image src="../../static/images/cldd.png" mode=""></image>
+							</view>
+							<text>查看详情</text>
+						</view>
 					</view>
 				</view>
 			</view>
@@ -327,7 +334,25 @@
 		components: {
 			tabBar,
 		},
-		methods: {
+		methods: {
+			GOrepair(item){
+				let data ={
+					id: item.id
+				}
+				request({
+					url: '/app/rescueInfo/toRepair',
+					method: 'post',
+					params: data
+				}).then((res) => {
+					if (res.code == 200) {
+						uni.showToast({
+							title: '操作成功'
+						})
+						this.singleList = []
+						this.driverRescuePage()
+					}
+				})
+			},
 			jyPushStart() {
 				//  暂时只有安卓支持
 				jyJPush.registerSDKCallBack(sdkCallBack => {
@@ -1174,7 +1199,7 @@
 	}
 
 	.ja-you {
-		width: 60%;
+		width: 80%;
 		overflow: hidden;
 		display: -webkit-box;
 		-webkit-line-clamp: 2;
diff --git a/pages/orderDetails/details.vue b/pages/orderDetails/details.vue
index 3b2b14d..b69cf12 100644
--- a/pages/orderDetails/details.vue
+++ b/pages/orderDetails/details.vue
@@ -152,6 +152,18 @@
 						<text class="huiy">救援类型:</text>
 						<text>{{detailsData.rescueTypeStr || ''}}</text>
 
+					</view>
+					<view class="dix">
+					
+						<text class="huiy">是否扣车:</text>
+						<text>{{detailsData.isKouChe=='1'?'是' : '否'}}</text>
+					
+					</view>
+					<view class="dix">
+					
+						<text class="huiy">是否维修:</text>
+						<text>{{detailsData.isWeiXiu=='1'?'是' : '否'}}</text>
+					
 					</view>
 					<view style="position: absolute;bottom: 25px; right: 25px;text-align: center; "
 						@click="getrescueDetail(id)">
@@ -188,8 +200,42 @@
 					<view class="content-box">
 						<view class="dis-bb">
 							<view class="ja-you" style="margin: 0px;">救援进程</view>
-						</view>
-						<view class="lan-ga" v-for="(item,index) in detailList" :key="index">
+						</view>
+						
+						<view v-if="detailList && detailList.length > 0" class="c-box">
+							<view class="lan-ga" v-for="(item,index) in detailList" :key="index">
+								<view class="ga-top-box">
+									<view v-if="index === detailList.length - 1" class="gain">
+										<image class="gainIcon" src="@/static/icons/currentDetails.png" mode="aspectFit"></image>
+									</view>
+									<view v-else class="gain"></view>
+									<view class="ga-content">
+										<view class="ga-content-top">
+											<view class="ga-content-title">{{item.title}}</view>
+											<view class="xhui">
+												{{item.createTime}}
+											</view>
+										</view>
+										<view class="beizh">
+											{{item.remark}}
+										</view>
+										<view class="wrap-box" v-if="item.images">
+											<view class="img-box" v-for="(items,index) in item.images.split(',') " :key="index"
+												@click="lookimg(index,item.images.split(','))">
+												<image :src="baseImageUrl + items " mode=""></image>
+											</view>
+										</view>
+									</view>
+								</view>
+								<view v-if="index < detailList.length - 1" class="lan-ga-line"></view>
+							</view>
+						</view>
+						
+						
+						
+						
+						
+						<!-- <view class="lan-ga" v-for="(item,index) in detailList" :key="index">
 							<view class="ga-top">
 								<view class="gain">{{index + 1}}</view>
 								<view class="">{{item.title}}</view>
@@ -208,7 +254,7 @@
 									
 								</view>
 							</view>
-						</view>
+						</view> -->
 
 
 					</view>
@@ -606,13 +652,13 @@
 
 	}
 
-	.lan-ga {
-		width: 100%;
-		margin: 10px auto;
-		box-sizing: border-box;
-		padding-bottom: 15px;
-		border-bottom: 1px solid #EEEEEE;
-	}
+	// .lan-ga {
+	// 	width: 100%;
+	// 	margin: 10px auto;
+	// 	box-sizing: border-box;
+	// 	padding-bottom: 15px;
+	// 	border-bottom: 1px solid #EEEEEE;
+	// }
 
 	.ga-top {
 		display: flex;
@@ -1062,5 +1108,110 @@
 	.actbox {
 		background: #0D2E8D !important;
 		color: white;
+	}
+	
+	
+	.lan-ga {
+		width: 100%;
+		margin: 20rpx auto;
+		box-sizing: border-box;
+		padding-bottom: 40rpx;
+		position: relative;
+	
+		.lan-ga-line {
+			position: absolute;
+			width: 2rpx;
+			height: calc(100% - 56rpx);
+			background-color: #979797;
+			left: calc(56rpx / 2 - 2rpx);
+			transform: translate(-50%, 0);
+			top: calc(56rpx + 10rpx);
+		}
+	}
+	
+	.ga-top-box {
+		display: flex;
+		justify-content: space-between;
+	}
+	
+	.ga-content {
+		flex: 1;
+		width: 0;
+	
+		.ga-content-top {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			column-gap: 8rpx;
+			padding-bottom: 14rpx;
+		}
+	
+		.ga-content-title {
+			font-weight: bold;
+			flex: 1;
+			width: 0;
+			word-break: break-all
+		}
+	
+		.xhui {
+			font-size: 22rpx;
+			color: #929292;
+			flex-shrink: 0;
+		}
+	
+		.beizh {
+			font-size: 28rpx;
+			color: #000000;
+		}
+	}
+	
+	.ga-top {
+		display: flex;
+		align-items: center;
+		color: #000;
+		font-weight: bold;
+		font-size: 16px;
+	}
+	
+	.img-box {
+		width: 70px;
+		height: 70px;
+		border-radius: 6px;
+		overflow: hidden;
+		margin-top: 10px;
+		margin-right: 10px;
+	
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+	
+	.wrap-box {
+		width: 100%;
+		display: flex;
+		flex-wrap: wrap;
+	}
+	
+	
+	.gain {
+		box-sizing: border-box;
+		width: 52rpx;
+		height: 52rpx;
+		font-size: 34rpx;
+		color: #327DFB;
+		margin-right: 20rpx;
+		border: 2rpx solid #327DFB;
+		border-radius: 50%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		line-height: 1;
+		font-weight: bold;
+	
+		.gainIcon {
+			width: 100%;
+			height: 100%;
+		}
 	}
 </style>
diff --git a/static/icons/currentDetails.png b/static/icons/currentDetails.png
new file mode 100644
index 0000000000000000000000000000000000000000..feee510073be0dcebc53a7ec19e96ddabab24c7b
GIT binary patch
literal 993
zcmV<710MW|P)<h;3K|Lk000e1NJLTq001-q001-y1^@s6#dsU*00001b5ch_0Itp)
z=>Px&n@L1LRA@upnmuR~Q4q)Hzq@y&iA`z+#ShRTl8YD8C5V<bl61BSSlB2ifjf^2
z1O;sbh1l99*jW0(r3*Q8U<w64IKi~0@fy9`-I4e1Ho5P--F<s^>{eII%$wi6c{B4q
zKpMZ9RX$g%y7Mr2l9?`m=?oE_V9>Z2222$q`oo|yKwsI#ULt7}b~5;`%MFAzl+N>{
zW81fgvB<<HgV+OMpTHZYWxXn9u@}UKrxO@xI>%{toX1Q&7si2hT@bcln)i2eC<d|X
z8)!DiXREHW#>@*r22|Anu$eT>mF*mUsOreDRu!Jhu~l*HN5r_p#0gcsFmfQ&2>fi^
zupVsXV5`_t0!pv(g!9+gWafDlqq=1P6wEPmp}2yB<7^)bbS2N1T-$lW%pzkA?E_FY
zEc3?4EI#*hqA$>NwswsfubEh;-C=(qQ~<uYn@_y!<x5W>IWsk9dsJYK(lRPW!kq0j
zQ(b`?Yo<8tFzY!BK-nBK)7{oo2T(nmId6xR093<TB#LpvyxyMuI)GBy+7o8Ft7>?d
zasWLo<rDXseP{uaMbmM<464qA{WC<JN}A@y=HlA|l*-y0QFj1gAv#(mV6&9B7LSrf
z<Co~oT*uzgJ>Veh8KyPk^?rvll*-rz-Hm1tn5B6`s=X|@%Icz_Ev;Izi;+NL3t-pm
zPs$b|5)?4Y4WRXc>kG<CSeM1tLjsLLW^0D={x3gJUdF2fW$a%;H)lE~s~e24>kEjm
zUs|<Jp}uXlzv*x+hz%Vu-nfaRbske0XNkyN58_N%9i1?BUyNm>9@@{@<=bJM^Q*5P
zh6n~;U@B|BC+4eu9SS2K1&s6u_<&T#E;I4zFb?|BjSNQCAp8_SznOT#k5fTqqlBp!
zRUC+r`$x>lFixse_NZYRAy*9rq*~br0#jc@)xaUATG<B%<Aq$%q@d!cicHW@@1`e{
zLYTDO&tWm3*Jw5m?x&sc4J*@j$imtSs+%*B!ibQQg;hiAqXHE*%wg-Jt2yllH5eEo
z*_;Y8UE2rM%;$S;C@6?KCb@l(KpKy(RBMxhkG@1&Hh8+X;6cs>e0kqRxMd682)mIu
zBnbl6aY!PJ#O@fYzLsKi&?tancNDBU;{{m{esqpKtQW>&cby`jVs+u=O?j-YBt58D
zT^hH{R9vq0J*Zecyzro6^)#lrHpJ%fQhULR&GWK$u-H5R?AD@;!V}H^HB)&P;fryK
P00000NkvXXu0mjf;Udyh

literal 0
HcmV?d00001