From 7a0b33a5f2e0ba589bf35a1b8d896700a21f94a4 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 30 四月 2026 16:00:55 +0800
Subject: [PATCH] 支付宝支付dddadd

---
 small-program/pages/delivery-order-detail/delivery-order-detail.vue |  775 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 681 insertions(+), 94 deletions(-)

diff --git a/small-program/pages/delivery-order-detail/delivery-order-detail.vue b/small-program/pages/delivery-order-detail/delivery-order-detail.vue
index c87f17d..0388a60 100644
--- a/small-program/pages/delivery-order-detail/delivery-order-detail.vue
+++ b/small-program/pages/delivery-order-detail/delivery-order-detail.vue
@@ -1,23 +1,33 @@
 <template>
 	<view class="detail">
-		<view class="head" :style="{ height: statusbarHeight + navHeight + 'px' }">
+		<view :class="info.type === 1?'head head1':'head head0'" :style="{ height: statusbarHeight + navHeight + 'px' }">
 			<view :style="{width: '100%', height: statusbarHeight + 'px'}"></view>
 			<view class="head-nav" :style="{width: '100%', height: navHeight + 'px'}">
-				<image src="/static/icon/nav_ic_back.png" mode="widthFix"></image>
+				<image src="/static/icon/nav_ic_back.png" mode="widthFix"  @click="goBack"></image>
 				<text>瀵勫瓨璁㈠崟</text>
-				<image src="/static/icon/nav_ic_back.png" mode="widthFix" style="opacity: 0;"></image>
+				<image src="/static/icon/nav_ic_back.png" @click="goBack" mode="widthFix" style="opacity: 0;"></image>
 			</view>
 		</view>
 		<view :style="{ width: '100%', height: statusbarHeight + navHeight + 'px' }"></view>
-		<view class="nr">
+		<view :class="info.type === 1?'nr head1':'nr head0'">
 			<view class="nr-status">
-				<text>寰呴厤閫�</text>
-				<view class="nr-status-type">瀵勯��</view>
-				<view class="nr-status-type1">瀵勯��</view>
+				<text>{{info.statusName|| ''}}</text>
+				<view class="nr-status-type1" v-if="info.type === 0">灏卞湴瀵勫瓨</view>
+				<view class="nr-status-type"  v-if="info.type === 1">鍚屽煄瀵勯��</view>
+				<view class="nr-status-type1"  v-if="info.type === 1 && info.isUrgent === 0">鏍囬�熻揪</view>
+				<view class="nr-status-type1"  v-if="info.type === 1 && info.isUrgent === 1">鏋侀�熻揪</view>
 			</view>
-			<view class="nr-desc">闂ㄥ簵宸叉帴鍗曪紝姝e湪涓烘偍瀹夋帓閰嶉�佸徃鏈猴綖</view>
-			<view class="item" style="padding: 10rpx;">
-				<map name="mapAddr"></map>
+			<view class="nr-desc" v-if="info.statusDesc">{{info.statusDesc || ''}}</view>
+			<view class="item" style="padding: 10rpx;" v-if="info.type ===1 && info.status===4">
+				<map 
+					name="mapAddr"
+					:latitude="mapLat" 
+					:longitude="mapLng" 
+					:scale="mapScale" 
+					:markers="markers" 
+					:polyline="polyline"
+					style="width: 100%; height: 362rpx;"
+				></map>
 			</view>
 			<view class="item">
 				<view class="addr">
@@ -25,107 +35,134 @@
 						<view class="ji bg">瀵�</view>
 						<view class="xiantiao"></view>
 						<view class="addr-item-top">
-							<text>瀹夊窘鐪佸悎鑲ュ競铚�灞卞尯鑾茶姳绉戞妧浜т笟鍥璅401</text>
+							<text>{{info.depositShopName || ''}}</text>
 							<image src="/static/icon/ar_jicundian@2x.png" mode="widthFix"></image>
 						</view>
-						<text>寮犳捣娑� 18733987653</text>
+						<text>{{info.depositShopAddress || ''}} </text>
 					</view>
-					<view class="addr-item">
+					<view class="addr-item" v-if="info.type === 1">
 						<view class="ji bg1">鏀�</view>
 						<view class="addr-item-top">
-							<text>瀹夊窘鐪佸悎鑲ュ競铚�灞卞尯鑾茶姳绉戞妧浜т笟鍥璅401</text>
+							<text>{{info.takeShopName || info.takeLocation || ''}}</text>
 							<image src="/static/icon/ar_jicundian@2x.png" mode="widthFix"></image>
 						</view>
-						<text>寮犳捣娑� 18733987653</text>
+						<text>{{info.takeShopAddress || ''}}</text>
 					</view>
 				</view>
-				<view class="item-qrcode">
-					<image src="/static/image/btn_upload@2x.png" mode="widthFix"></image>
-					<text>767889</text>
-					<text>鍙栦欢鐮�</text>
+				<view class="item-qrcode" v-if=" (info.type ===0 && info.status >=1 &&info.status <7) || (info.type ===1 && (info.status ===1 || (info.takeShopId && info.status ===5)))">
+					<!-- <image src="/static/image/btn_upload@2x.png" mode="widthFix"></image> -->
+					<view style="width: 360rpx; height: 360rpx;">
+						<canvas canvas-id="qrcodeCanvas" id="qrcodeCanvas":style="'width: '+width+'px; height:'+height+'px;'"></canvas>
+						<image class="qrcode-image" :src="qrcodeImage" mode="widthFix"></image>
+					</view>
+					<text>{{info.memberVerifyCode || ''}}</text>
+					<text @tap="copyCode(info.memberVerifyCode||'')">鏍搁攢鐮�</text>
 				</view>
 				<view class="item-x"></view>
 				<view class="item-list">
 					<view class="item-list-row">
+						<view class="item-form-label">鏀朵欢浜�</view>
+						<view class="item-form-val">{{info.takeUser || ''}}</view>
+					</view>
+					<view class="item-list-row">
+						<view class="item-form-label">鏀朵欢浜虹數璇�</view>
+						<view class="item-form-val">{{info.takePhone || ''}}</view>
+					</view>
+					<view class="item-list-row">
 						<view class="item-form-label">棰勮鍒板簵鏃堕棿</view>
-						<view class="item-form-val">2026-04-12 12:00</view>
+						<view class="item-form-val">{{info.expectedDepositTime || ''}}</view>
 					</view>
 					<view class="item-list-row">
 						<view class="item-form-label">棰勮鍙栦欢鏃堕棿</view>
-						<view class="item-form-val">2026-04-14 12:00</view>
+						<view class="item-form-val">{{info.expectedTakeTime || ''}}</view>
 					</view>
 					<view class="item-list-row">
 						<view class="item-form-label">鐗╁搧鍚嶇О</view>
-						<view class="item-form-val">琛f湇</view>
+						<view class="item-form-val">{{info.goodTypeName || ''}}</view>
 					</view>
 					<view class="item-list-row">
 						<view class="item-form-label">鐗╁搧鐓х墖</view>
-						<view class="item-form-list">
-							<view class="item-form-list-row">
-								<image src="/static/image/tx@2x.png" mode="widthFix"></image>
-							</view>
+						<view class="item-form-list" v-if="info.orderImages && info.orderImages.length">
+							<view class="item-form-list-row" v-for="(item,index) in info.orderImages" key="item">
+								<image :src="item" mode="widthFix" @click="previewImage(info.orderImages,index)"></image>
+							</view> 
 						</view>
 					</view>
 				</view>
 			</view>
-			<view class="item">
+			<!-- <view class="item" v-if="info.refundInfo">
 				<view class="tuikuan">
 					<view class="tuikuan-top">
 						<text>閫�娆鹃噾棰�</text>
-						<text>115.00</text>
+						<text>楼{{((info.refundInfo.refundAmount || 0)/100).toFixed(2)}}</text>
 					</view>
 					<view class="tuikuan-bottom">
-						<text>宸查��鍥炴偍鐨勬敮浠樿处鎴�</text>
-						<text>2026-04-12 12:32:00</text>
+						<text v-if="info.refundInfo.status === 0">閫�娆句腑</text>
+						<text v-if="info.refundInfo.status  === 1">宸查��鍥炴偍鐨勬敮浠樿处鎴�</text>
+						<text v-if="info.refundInfo.status  === 2">閫�娆惧け璐�</text>
+						<text v-if="info.refundInfo.status  === 1">{{info.refundInfo.refundTime || ''}}</text>
+						<text v-if="info.refundInfo.status  !== 1">{{info.refundInfo.createTime || ''}}</text>
+					</view>
+				</view>
+			</view> -->
+			<view class="item" v-if="info.commentStatus === 1">
+				<view class="comment">
+					<view class="comment-top">
+						<text>瀹㈡埛宸茶瘎浠凤細</text>
+					</view>
+					<view class="comment-score">
+						<view class="score-item" v-if="info.depositScore">瀵勪欢闂ㄥ簵: <text style="color:#ffc533;font-size: 38rpx;margin-right: 10rpx;">鈽�</text>{{info.depositScore || 1}} </view>
+						<view class="score-item"  v-if="info.driverScore">閰嶉�佸徃鏈�: <text style="color:#ffc533;font-size: 38rpx;margin-right: 10rpx;">鈽�</text>{{info.driverScore || 1}} </view>
+						<view  class="score-item" v-if="info.takeScore">鏀朵欢闂ㄥ簵: <text style="color:#ffc533;font-size: 38rpx;margin-right: 10rpx;">鈽�</text>{{info.takeScore || 1}} </view>
+					</view>
+					<view class="comment-row" v-if="info.commentImages && info.commentImages.length" >
+						<view class="comment-image"  v-for="(item,index) in info.commentImages" key="item">
+							<image :src="item" mode="widthFix" @click="previewImage(info.commentImages,index)"></image>
+						</view> 
 					</view>
 				</view>
 			</view>
-			<view class="item">
+			<view class="item" v-if="info.refundInfo">
+				<view class="tuikuan">
+					<view class="tuikuan-top">
+						<text>閫�娆鹃噾棰�</text>
+						<text>{{((info.refundInfo.refundAmount || 0)/100).toFixed(2)}}</text>
+					</view>
+					<view class="tuikuan-bottom">
+						<text v-if="info.refundInfo.status === 0">閫�娆句腑</text>
+						<text v-if="info.refundInfo.status  === 1">宸查��鍥炴偍鐨勬敮浠樿处鎴�</text>
+						<text v-if="info.refundInfo.status  === 2">閫�娆惧け璐�</text>
+						<text v-if="info.refundInfo.status  === 1">{{info.refundInfo.refundTime || ''}}</text>
+						<text v-if="info.refundInfo.status  !== 1">{{info.refundInfo.createTime || ''}}</text>
+					</view>
+				</view>
+			</view>			
+			<view class="item" v-if="info.detailList">
 				<view class="xl">
-					<view class="xl-item">
+					<view v-for="goods in info.detailList " :key="goods.luggageName" class="xl-item">
 						<view class="xl-item-top">
-							<text>澶т欢琛屾潕绠�</text>
-							<text>楼35</text>
+							<text>{{ goods.luggageName ||'' }}</text>
+							<text>楼{{((goods.subtotal || 0)/100).toFixed(2) }}</text>
 						</view>
 						<view class="xl-item-bottom">
-							<text>24-28瀵�</text>
-							<text>x1</text>
+							<text>{{ goods.luggageDetail || '' }}</text>
+							<text>x{{ goods.num || 1}}</text>
 						</view>
-					</view>
-					<view class="xl-item">
-						<view class="xl-item-top">
-							<text>涓欢琛屾潕绠�</text>
-							<text>楼35</text>
-						</view>
-						<view class="xl-item-bottom">
-							<text>24-28瀵�</text>
-							<text>x1</text>
-						</view>
-					</view>
-					<view class="xl-item">
-						<view class="xl-item-top">
-							<text>灏忎欢琛屾潕绠�</text>
-							<text>楼35</text>
-						</view>
-						<view class="xl-item-bottom">
-							<text>24-28瀵�</text>
-							<text>x1</text>
-						</view>
-					</view>
+					</view> 
 				</view>
 				<view class="item-x"></view>
 				<view class="item-list">
 					<view class="item-list-row">
-						<view class="item-form-label" style="color: #333333; font-size: 28rpx;">閰嶉�佽垂</view>
-						<view class="item-form-val" style="color: #333333; font-size: 24rpx;">楼105.00</view>
+						<view class="item-form-label" style="color: #333333; font-size: 28rpx;">淇濅环閲戦</view>
+						<view class="item-form-val" style="color: #333333; font-size: 24rpx;">楼{{((info.declaredAmount || 0)/100).toFixed(2)}}</view>
 					</view>
 					<view class="item-list-row">
 						<view class="item-form-label" style="color: #333333; font-size: 28rpx;">琛屾潕淇濊垂</view>
-						<view class="item-form-val" style="color: #333333; font-size: 24rpx;">楼10.00</view>
+						<view class="item-form-val" style="color: #333333; font-size: 24rpx;">楼{{((info.declaredFee || 0)/100).toFixed(2)}}</view>
 					</view>
 					<view class="item-list-row">
 						<view class="item-form-label" style="color: #222222; font-size: 30rpx; font-weight: 600;">瀹炰粯娆�</view>
-						<view class="item-form-val price" style="color: #FE2C2E; font-size: 36rpx;">115.00</view>
+						<view class="item-form-val price" style="color: #FE2C2E; font-size: 36rpx;">{{((info.actualPayAmount || 0)/100).toFixed(2)}}</view>
 					</view>
 				</view>
 			</view>
@@ -135,20 +172,20 @@
 					<view class="item-infos-item">
 						<view class="item-infos-item-left">璁㈠崟缂栧彿锛�</view>
 						<view class="item-infos-item-right">
-							<text>202107131742520001</text>
-							<image src="/static/icon/ic_cppy@2x.png" mode="widthFix"></image>
+							<text>{{info.code ||''}}</text>
+							<image src="/static/icon/ic_cppy@2x.png" mode="widthFix" @tap="copyCode(info.code||'')"></image>
 						</view>
 					</view>
 					<view class="item-infos-item">
 						<view class="item-infos-item-left">鍒涘缓鏃堕棿锛�</view>
 						<view class="item-infos-item-right">
-							<text>2026-04-12 12:00:00</text>
+							<text>{{info.createTime ||''}}</text>
 						</view>
 					</view>
-					<view class="item-infos-item">
+					<view class="item-infos-item" v-if="info.payTime">
 						<view class="item-infos-item-left">鏀粯鏃堕棿锛�</view>
 						<view class="item-infos-item-right">
-							<text>2026-04-12 12:00:00</text>
+							<text>{{info.payTime ||''}}</text>
 						</view>
 					</view>
 					<view class="item-infos-item">
@@ -157,56 +194,152 @@
 							<text>寰俊鏀粯</text>
 						</view>
 					</view>
-					<view class="item-infos-item">
-						<view class="item-infos-item-left">浜ゆ槗鍙凤細</view>
+					<view class="item-infos-item" v-if="info.outTradeNo">
+						<view class="item-infos-item-left">浜ゆ槗鍗曞彿锛�</view>
 						<view class="item-infos-item-right">
-							<text>2025080698723178237189237123</text>
+							<text>{{info.outTradeNo || ''}}</text>
 						</view>
 					</view>
 					<view class="item-infos-item">
 						<view class="item-infos-item-left">璁㈠崟澶囨敞锛�</view>
 						<view class="item-infos-item-right">
-							<text>-</text>
+							<text>{{info.remark || ''}}</text>
 						</view>
 					</view>
-					<view class="item-infos-item">
+					<view class="item-infos-item" v-if="info.refundTime">
 						<view class="item-infos-item-left">鐢宠閫�娆撅細</view>
 						<view class="item-infos-item-right">
-							<text>2026-04-12 12:30:00</text>
+							<text>{{info.refundTime || ''}}</text>
 						</view>
 					</view>
-					<view class="item-infos-item">
+					<view class="item-infos-item" v-if="info.refundInfo">
 						<view class="item-infos-item-left">閫�娆鹃噾棰濓細</view>
 						<view class="item-infos-item-right">
-							<text>楼115.00</text>
+							<text>楼{{((info.refundInfo.refundAmount || 0)/100).toFixed(2)}}</text>
 						</view>
 					</view>
-					<view class="item-infos-item">
+					<view class="item-infos-item"  v-if="info.refundRemark">
 						<view class="item-infos-item-left">閫�娆惧師鍥狅細</view>
 						<view class="item-infos-item-right">
-							<text>鍗忓晢涓�鑷撮��娆�</text>
+							<text>{{info.refundInfo.refundRemark || ''}}</text>
 						</view>
 					</view>
 				</view>
 			</view>
 			<view style="width: 100%; height: calc(210rpx + env(safe-area-inset-bottom));"></view>
 		</view>
-		<view class="tips">
+		<view class="tips" v-if="info.overdueStatus !==0 && info.overdueStatus !==2">
 			<image src="/static/icon/ic_waring@2x.png" mode="widthFix"></image>
-			<text>宸茶秴杩囧彇浠舵椂闂达紝瓒呮椂璐圭敤锛毬�10.00</text>
-		</view>
-		<view class="footer">
+			<text  v-if="info.overdueStatus ===1">宸茶秴杩囧彇浠舵椂闂达紝宸蹭骇鐢熻秴鏃惰垂鐢細楼{{((info.overdueFee || 0)/100).toFixed(2)}}鍏�</text> 
+			<text  v-if="info.overdueStatus ===3">宸茶秴杩囧彇浠舵椂闂达紝闇�瑕佹敮浠樿秴鏃惰垂鐢細楼{{((info.overdueFee || 0)/100).toFixed(2)}}鍏�</text>
+			<text  v-if="info.overdueStatus ===4">瓒呰繃鍙栦欢鏃堕棿锛屽凡鏀粯瓒呮椂璐圭敤锛毬{((info.overdueFee || 0)/100).toFixed(2)}}鍏�</text>
+		</view> 
+		<view class="footer" v-if="info.type===0">
 			<view class="footer-btns">
-				<view class="btn kong">鍒犻櫎璁㈠崟</view>
-				<view class="btn you">璇勪环璁㈠崟</view>
+				<view class="btn kong" @click="contactPhone(info,0)" v-if="info.status ===1 || info.status==2 || info.status===98">鑱旂郴闂ㄥ簵</view>
+				<view class="btn kong" v-if="info.status ===0 || info.status ===1"  @click="cancelOrder(info)">鍙栨秷璁㈠崟</view>
+				<view class="btn kong" @click="deleteOrder(info)" v-if="info.status ===7 || info.status===96 || info.status == 99">鍒犻櫎璁㈠崟</view>
+				<view class="btn you"  @click="payOrder(info)" v-if="info.status ===0">绔嬪嵆鏀粯</view>
+<!-- 				<view class="btn you" v-if="info.status >=1 &&info.status <7 " @click="openQrcode(info)" >鏍搁攢鐮�</view>
+ -->			<view class="btn you" @click="evaluateOrder(info)" v-if="info.status ===7 && !info.commentStatus ">璇勪环璁㈠崟</view>
+				<view class="btn you" @click="payOrderFee(info)" v-if="info.status ===5 && info.overdueStatus===3 ">绔嬪嵆鏀粯</view>
 			</view>
-			<view style="width: 100%; height: env(safe-area-inset-bottom);"></view>
 		</view>
+		<view class="footer" v-if="info.type===1">
+			<view class="footer-btns">
+				<view class="btn kong" @click="contactPhone(info,0)" v-if="info.status ===1 || info.status ==2">鑱旂郴闂ㄥ簵</view> 
+				<view class="btn kong" @click="contactPhone(info,2)" v-if="info.status ===3 || info.status ===4 ">鑱旂郴楠戞墜</view>
+				<view class="btn kong" @click="contactPhone(info,1)" v-if="info.status ===5">鑱旂郴闂ㄥ簵</view>
+				<view class="btn kong" v-if="info.status ===0"  @click="cancelOrder(info)">鍙栨秷璁㈠崟</view>
+				<view class="btn you" @click="payOrder(info)" v-if="info.status ===0">绔嬪嵆鏀粯</view>
+				<view class="btn kong" @click="deleteOrder(info)" v-if="info.status ===7 || info.status===96 || info.status == 99">鍒犻櫎璁㈠崟</view>
+				<view class="btn you" @click="cancelOrder(info)" v-if="info.status ===1">鐢宠閫�娆�</view>
+<!-- 				<view class="btn you" v-if="info.status ===1 || (info.takeShopId && info.status ===5)" @click="openQrcode(info)" >鏍搁攢鐮�</view>
+ -->				<view class="btn you"  @click="doneOrder(info)"  v-if="!info.takeShopId && info.status ===5">纭鏀惰揣</view>
+				<view class="btn you"  @click="evaluateOrder(info)" v-if="info.status ===7 && !info.commentStatus ">璇勪环璁㈠崟</view>
+				<view class="btn you" @click="payOrderFee(info)" v-if="info.status ===5 && info.overdueStatus ===3">绔嬪嵆鏀粯</view>
+			</view>
+		</view>
+		<u-popup :show="showPhone" round="15" mode="bottom" :safeAreaInsetBottom="true"  @close="contactPhone()" :closeable="true" :closeOnClickOverlay="true">
+			<view class="phone">
+				<view class="phone-head">
+					<view></view>
+					<text>{{linkItem.title}}</text> 
+				</view>
+				 <view class="phone-item" >
+				 	<view  @click="contactPhoneDo()" >
+						<image src="/static/icon/ic_call@2x.png" mode="widthFix"></image>
+						<text>{{linkItem.linkname||''}} </text> 
+						<text style="margin-left: 10px;"> {{linkItem.linkphone||''}}</text> 
+					</view> 
+				 </view>  
+				 <view style="width: 100%; height: 30rpx;"></view>
+			</view>
+		</u-popup>
+		<!-- 纭鏀惰揣 -->
+		<u-popup :show="showDone" round="15" :safeAreaInsetBottom="false" mode="center">
+			<view class="tc">
+				<view class="tc-contemt">
+					<view class="tc-contemt-title">纭鏀惰揣鎻愰啋</view>
+					<view class="tc-contemt-nr">
+						鎮ㄧ‘璁ゅ凡缁忔敹鍒版偍鐨勮鏉庝簡鍚楋紵
+					</view>
+				</view>
+				<view class="tc-btn">
+					<view class="tc-btn-item" @click="showDone = false;currentOrder=null;">鍙栨秷</view>
+					<view class="tc-btn-item" style="color: #004096;" @click="doneOrderDo()">纭鏀惰揣</view>
+				</view>
+			</view>
+		</u-popup>
+		<u-popup :show="showCancel" round="15" :safeAreaInsetBottom="false" mode="center">
+			<view class="tc">
+				<view class="tc-contemt">
+					<view class="tc-contemt-title">纭畾鍙栨秷鎻愰啋</view>
+					<view class="tc-contemt-nr">
+						鎮ㄧ‘璁ゅ彇娑堣璁㈠崟鍚楋紵
+					</view>
+				</view>
+				<view class="tc-btn">
+					<view class="tc-btn-item" @click="showCancel = false;currentOrder=null;">鎴戝啀鎯虫兂</view>
+					<view class="tc-btn-item" style="color: red;" @click="cancelOrderDo">纭鍙栨秷</view>
+				</view>
+			</view>
+		</u-popup>
+		<!-- 鍒犻櫎璁㈠崟 -->
+		<u-popup :show="showDelete" round="15" :safeAreaInsetBottom="false" mode="center">
+			<view class="tc">
+				<view class="tc-contemt">
+					<view class="tc-contemt-title">纭鍒犻櫎鎻愰啋</view>
+					<view class="tc-contemt-nr">
+						鎮ㄧ‘璁ゅ垹闄よ璁㈠崟鍚楋紵
+					</view>
+				</view>
+				<view class="tc-btn">
+					<view class="tc-btn-item" @click="showDelete = false;currentOrder=null;">鎴戝啀鎯虫兂</view>
+					<view class="tc-btn-item" style="color: red;" @click="deleteOrderDo">纭鍒犻櫎</view>
+				</view>
+			</view>
+		</u-popup>
+		<!-- <u-popup :show="showQrcode" round="15" @close="openQrcode()"   :safeAreaInsetBottom="false" mode="bottom"  :closeable="true" :closeOnClickOverlay="false">
+			<view class="tc" style="height: 700rpx;width: 100%; ">
+				<view class="tc-contemt" style="text-align: center;">
+					<view class="tc-contemt-title" style="text-align: center;">鏍搁攢鐮�</view>
+					<view class="qrcode-box">
+						<canvas canvas-id="qrcodeCanvas1" id="qrcodeCanvas1" style="width: 100px; height: 100px;"></canvas>
+						<image class="qrcode-image" :src="qrcodeImage" mode="widthFix"></image>
+					</view>
+					<text class="pickup-code">{{ info.memberVerifyCode||'' }}</text>
+					<text class="pickup-tip" @tap="copyCode(info.memberVerifyCode||'')">鐐瑰嚮澶嶅埗鑷彁鐮�</text>
+				</view>
+			</view>
+		</u-popup> -->
 	</view>
 </template>
 
 <script>
 	import { mapState } from 'vuex'
+	import drawQrcode from 'weapp-qrcode'
+	var amapFile = require('@/utils/amap-wx.130.js')
 
 	export default {
 		computed: {
@@ -214,11 +347,398 @@
 		},
 		data() {
 			return {
-				
+				id:null,
+				height:180,
+				width:180,
+				info:{},
+				showDone:false,
+				showCancel:false,
+				showDelete:false,
+				showQrcode:false,
+				showPay:false,
+				showPhone:false,
+				linkItem:{title:'',linkname:'',linkphone:''},
+				qrcodeImage:null,
+				mapLat: 0,
+				mapLng: 0,
+				mapScale: 10,
+				markers: [],
+				polyline: []
 			}
 		},
-		methods: {
-			
+		onShow() {
+		},
+		onLoad(options) {
+			this.id = options.id
+			this.info={}
+			this.showDone=false
+			this.showCancel=false
+			this.showDelete=false
+			this.showQrcode=false
+			this.showPay=false
+			this.showPhone=false
+			this.getUserDetail() 
+			this.width = this.rpxToPx(360)
+			this.height = this.rpxToPx(360)
+			this.linkItem={title:'',linkname:'',linkphone:''}
+		},
+		methods:{
+			previewImage(images,index = 0) {
+				uni.previewImage({
+					current: index, 
+					urls: images  
+				});
+			},
+			rpxToPx(rpx) {
+			  return rpx * wx.getSystemInfoSync().windowWidth / 750
+			},
+			payOrder(){
+				var that = this;
+				uni.showLoading({ title: '鍙戣捣鏀粯涓�...', mask: true })
+				this.$u.api.continuePayOrder({
+					orderId: this.id
+				}).then(res => {
+					uni.hideLoading()
+					if (res.code === 200 && res.data) {
+						let paymentData = res.data.response
+						uni.requestPayment({
+							provider: 'wxpay',
+							timeStamp: paymentData.timeStamp || '',
+							nonceStr: paymentData.nonceStr || '',
+							package: paymentData.package || '',
+							signType: paymentData.signType || 'MD5',
+							paySign: paymentData.paySign || '',
+							success: (res) => {
+								that.getUserDetail()
+							},
+							fail: (err) => {
+								if (err.errMsg.includes('cancel')) {
+									uni.showToast({ title: '宸插彇娑堟敮浠�', icon: 'none' })
+								} else {
+									uni.showToast({ title: '鏀粯澶辫触', icon: 'none' })
+								}
+							}
+						})
+					} else {
+						uni.showToast({ title: res.msg || '鏀粯澶辫触', icon: 'none' })
+					}
+				}).catch(err => {
+					uni.hideLoading()
+					uni.showToast({ title: '鏀粯澶辫触', icon: 'none' })
+				})
+			},
+			payOrderFee(){
+				var that = this;
+				uni.showLoading({ title: '鍙戣捣鏀粯涓�...', mask: true })
+				this.$u.api.payOverdueFee({
+					orderId: this.id
+				}).then(res => {
+					uni.hideLoading()
+					if (res.code === 200 && res.data) {
+						let paymentData = res.data.response
+						uni.requestPayment({
+							provider: 'wxpay',
+							timeStamp: paymentData.timeStamp || '',
+							nonceStr: paymentData.nonceStr || '',
+							package: paymentData.package || '',
+							signType: paymentData.signType || 'MD5',
+							paySign: paymentData.paySign || '',
+							success: (res) => {
+								that.getUserDetail()
+							},
+							fail: (err) => {
+								if (err.errMsg.includes('cancel')) {
+									uni.showToast({ title: '宸插彇娑堟敮浠�', icon: 'none' })
+								} else {
+									uni.showToast({ title: '鏀粯澶辫触', icon: 'none' })
+								}
+							}
+						})
+					} else {
+						uni.showToast({ title: res.msg || '鏀粯澶辫触', icon: 'none' })
+					}
+				}).catch(err => {
+					uni.hideLoading()
+					uni.showToast({ title: '鏀粯澶辫触', icon: 'none' })
+				})
+			},
+			doneOrder(item){
+				this.showDone = !this.showDone
+			},
+			async  doneOrderDo(){
+				var that =this
+				let res = await this.$u.api.confirmReceipt({ orderId: this.id  });
+				if (res.code === 200 ) { 
+					that.showDone = false
+					that.getUserDetail()
+				} 
+			},
+			contactPhone(item,type){
+				 this.showPhone = !this.showPhone
+				 this.linkItem = {title:'鑱旂郴楠戞墜',linkname:'',linkphone:''}
+				 if(type == 0){
+				 	this.linkItem = {title:'鑱旂郴闂ㄥ簵',linkname:this.info.depositShopName,linkphone:this.info.depositShopPhone}
+				 }else if(type ==2){
+				 	this.linkItem = {title:'鑱旂郴楠戞墜',linkname:this.info.driverName,linkphone:this.info.driverPhone}
+				 }else if(type ==1){
+				 	this.linkItem = {title:'鑱旂郴闂ㄥ簵',linkname:this.info.takeShopName,linkphone:this.info.takeShopPhone}
+				 }
+				  console.log("==================================",this.showPhone)
+			},
+			contactPhoneDo(){ 
+				if(this.linkItem.linkphone !=null && this.linkItem.linkphone!=''){
+					uni.makePhoneCall({
+					   phoneNumber: this.linkItem.linkphone  
+					})
+				}
+			},
+			cancelOrder(item){
+				this.showCancel = !this.showCancel
+			},
+			deleteOrder(item){
+				this.showDelete = !this.showDelete
+			},
+			async cancelOrderDo(){
+				var that =this
+				let res = await that.$u.api.cancelOrder({ orderId: this.id });
+				if (res.code === 200 ) { 
+					this.showCancel = false
+					uni.$emit('updateOrder',{info:this.info,delete:0})
+					that.getUserDetail()
+				} 
+			},
+			async deleteOrderDo(){
+				if( this.currentOrder==null || this.currentOrder.id == null) {
+					return
+				}
+				var that =this
+				let res = await that.$u.api.deleteOrder({ orderId: this.currentOrder.id  });
+				if (res.code === 200 ) { 
+					this.showDelete = false
+					uni.$emit('updateOrder',{info:this.info,delete:1})
+					this.goBack()
+				} 
+			},
+			copyCode(txt) {
+				if (!txt) {
+					return
+				}
+				uni.setClipboardData({
+					data: txt,
+					success: () => {
+						uni.showToast({
+							title: '宸插鍒跺埌绮樿创鏉�',
+							icon: 'none'
+						})
+					}
+				})
+			},
+			async openQrcode(){
+				this.qrcodeImage=null
+				var that =this
+				if(!this.showQrcode){
+					this.showQrcode =true
+					drawQrcode({
+						canvasId: 'qrcodeCanvas1',
+						text: this.info.memberVerifyCode,
+						width: this.rpxToPx(360),
+						height: this.rpxToPx(360),
+						correctLevel: 2
+					})
+					setTimeout(() => {
+						uni.canvasToTempFilePath({
+							canvasId: 'qrcodeCanvas',
+							success: (res) => {
+								that.qrcodeImage = res.tempFilePath
+							}
+						}, this)
+					}, 100)
+				}else{
+					this.showQrcode = false
+				}
+			},
+			async showQrcodeImg(){
+				console.log("showQrcodeImg")
+				if((this.info.type ===0 && this.info.status >=1 &&this.info.status <7) 
+				|| (this.info.type ===1 && (this.info.status ===1 || (this.info.takeShopId && this.info.status ===5)))){
+					console.log("showQrcodeImg-------杩涘叆")
+					if(this.qrcodeImage){
+						return
+					}
+					this.qrcodeImage=null
+					var that =this
+					drawQrcode({
+						canvasId: 'qrcodeCanvas',
+						text: this.info.memberVerifyCode,
+						width: this.rpxToPx(360),
+						height: this.rpxToPx(360),
+						correctLevel: 2
+					})
+					setTimeout(() => {
+						uni.canvasToTempFilePath({
+							canvasId: 'qrcodeCanvas',
+							success: (res) => {
+								console.log("showQrcodeImg-------鎴愬姛",res)
+								that.qrcodeImage = res.tempFilePath
+							},
+							fail: (err) => {
+								console.log("showQrcodeImg-------澶辫触",err)
+							}
+						}, this)
+					}, 100)
+				}
+				 
+			},
+			evaluateOrder(){
+				uni.navigateTo({
+					url:"/pages/evaluate/evaluate?id="+this.info.id
+				})
+			},
+			goBack(){
+				uni.navigateBack({delta:-1})
+			},
+			async  getUserDetail(){
+				var that =this 
+				let res = await this.$u.api.getOrderDetail( this.id  )
+				if (res.code === 200) { 
+					this.info = res.data 
+					uni.$emit('updateOrder',{info:this.info,delete:0})
+					this.showQrcodeImg()
+					if (this.info.type === 1 && this.info.status === 4) {
+						this.getRoutePlanning()
+					}
+				} 
+			},
+			getRoutePlanning() {
+				var that = this
+				var driverLat = this.info.driverLat
+				var driverLng = this.info.driverLng
+				var depositShopLat = this.info.depositShopLat
+				var depositShopLng = this.info.depositShopLng
+				
+				if (!driverLat || !driverLng || !depositShopLat || !depositShopLng) {
+					return
+				}
+				
+				this.mapLat = driverLat
+				this.mapLng = driverLng
+				
+				var myAmapFun = new amapFile.AMapWX({ key: this.$gaodeMapKey })
+				myAmapFun.getDrivingRoute({
+					origin: driverLng + ',' + driverLat,
+					destination: depositShopLng + ',' + depositShopLat,
+					success: function(data) {
+						var points = []
+						var duration = 0
+						console.log("data",data)
+						if (data.paths && data.paths.length > 0) {
+							var path = data.paths[0]
+							duration = path.duration || 0
+							for (var i = 0; i < path.steps.length; i++) {
+								var step = path.steps[i]
+								var polylineStr = step.Polyline || step.polyline
+								if (!polylineStr) continue
+								var stepPoints = polylineStr.split(';')
+								for (var j = 0; j < stepPoints.length; j++) {
+									if (!stepPoints[j]) continue
+									var point = stepPoints[j].split(',')
+									points.push({
+										latitude: point[1],
+										longitude: point[0]
+									})
+								}
+							}
+						}
+						
+						var expectedTime = ''
+						if (duration > 0) {
+							var now = new Date()
+							var arrivalTime = new Date(now.getTime() + duration * 1000)
+							var month = arrivalTime.getMonth() + 1
+							var day = arrivalTime.getDate()
+							var hours = arrivalTime.getHours()
+							var minutes = arrivalTime.getMinutes()
+							expectedTime = month + '.' + (day < 10 ? '0' + day : day) + ' ' + (hours < 10 ? '0' + hours : hours) + ':' + (minutes < 10 ? '0' + minutes : minutes)
+						}
+						
+						console.log("points", points)
+						
+						that.polyline = [{
+							points: points,
+							color: '#10c27b',
+							width: 10,
+							arrowLine: true
+						}]
+						
+						that.markers = [
+							{
+								id: 1,
+								latitude: driverLat,
+								longitude: driverLng,
+								iconPath: '/static/icon/start.png',
+								width: 35,
+								height: 40,
+								anchor: { x: 0.5, y: 1 }
+							},
+							{
+								id: 2,
+								latitude: depositShopLat,
+								longitude: depositShopLng,
+								iconPath: '/static/icon/end.png',
+								width: 35,
+								height: 40,
+								anchor: { x: 0.5, y: 1 }
+							},
+							{
+								id: 3,
+								latitude: driverLat,
+								longitude: driverLng,
+								iconPath: '/static/icon/dizhi.png',
+								width: 30,
+								height: 30,
+								anchor: { x: 0.5, y: 0.5 },
+								callout: {
+									content: '棰勮鍒板簵鏃堕棿\n' + expectedTime,
+									color: '#222222',
+									fontSize: 14,
+									borderRadius: 4,
+									padding: 8,
+									display: 'ALWAYS',
+									bgColor: 'rgba(255, 255, 255, 0.95)'
+								}
+							}
+						]
+						
+						if (points.length > 0) {
+							that.mapLat = points[Math.floor(points.length / 2)].latitude
+							that.mapLng = points[Math.floor(points.length / 2)].longitude
+						}
+					},
+					fail: function(err) {
+						console.error('鑾峰彇璺緞瑙勫垝澶辫触', err)
+						that.markers = [
+							{
+								id: 1,
+								latitude: driverLat,
+								longitude: driverLng,
+								iconPath: '/static/icon/start.png',
+								width: 30,
+								height: 40,
+								anchor: { x: 0.5, y: 1 }
+							},
+							{
+								id: 2,
+								latitude: depositShopLat,
+								longitude: depositShopLng,
+								iconPath: '/static/icon/end.png',
+								width: 30,
+								height: 40,
+								anchor: { x: 0.5, y: 1 }
+							}
+						]
+					}
+				})
+			}
 		}
 	}
 </script>
@@ -237,7 +757,7 @@
 			box-sizing: border-box;
 			background: #FFE9E9;
 			position: fixed;
-			bottom: calc(100rpx + env(safe-area-inset-bottom));
+			bottom: calc(30rpx + env(safe-area-inset-bottom));
 			left: 0;
 			display: flex;
 			align-items: center;
@@ -292,15 +812,20 @@
 				}
 			}
 		}
+		.head0{
+			background: #1ba8fa;
+		}
+		.head1{
+			background: #E4730B;
+		}
 		.head {
 			width: 100%;
-			background: #E4730B;
 			padding: 0 30rpx;
 			box-sizing: border-box;
 			position: fixed;
 			top: 0;
 			left: 0;
-			z-index: 9;
+			z-index: 99999;
 			.head-nav {
 				width: 100%;
 				display: flex;
@@ -322,7 +847,7 @@
 			height: 264rpx;
 			padding: 22rpx 30rpx;
 			box-sizing: border-box;
-			background-color: #E4730B;
+			// background-color: #E4730B;
 			.nr-status {
 				display: flex;
 				align-items: baseline;
@@ -333,7 +858,7 @@
 					margin-right: 16rpx;
 				}
 				.nr-status-type {
-					width: 64rpx;
+					width: 154rpx;
 					height: 38rpx;
 					display: flex;
 					align-items: center;
@@ -345,7 +870,7 @@
 					color: #FA8010;
 				}
 				.nr-status-type1 {
-					width: 88rpx;
+					width: 158rpx;
 					height: 38rpx;
 					display: flex;
 					align-items: center;
@@ -372,8 +897,6 @@
 				border-radius: 16rpx;
 				margin-top: 30rpx;
 				map {
-					width: 100%;
-					height: 362rpx;
 					border-radius: 16rpx;
 				}
 				.addr {
@@ -470,6 +993,63 @@
 						}
 					}
 				}
+				.comment{
+					width: 100%;
+					display: flex;
+					flex-direction: column;
+					.comment-top {
+						width: 100%;
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+						text {
+							&:nth-child(1) {
+								font-weight: 600;
+								font-size: 30rpx;
+								color: #222222;
+							}
+							&:nth-child(2) {
+								font-weight: 500;
+								font-size: 36rpx;
+								color: #FE2C2E;
+								&:before {
+									content: "锟�";
+									font-weight: 500;
+									font-size: 24rpx;
+									color: #FE2C2E;
+								}
+							}
+						}
+					}
+					.comment-score{
+						// font-weight: 600;
+						font-size: 28rpx;
+						color: #333333;
+						margin: 10rpx 0;
+						display: flex;
+						width: 100%;
+						.score-item{
+							flex:1;
+							margin: 20rpx 0;
+						}
+					}
+					.comment-row{
+						display: flex;
+						flex-wrap: wrap;
+						.comment-image {
+							margin: 10rpx;
+							width: 100rpx;
+							height: 100rpx;
+							border-radius: 8rpx;
+							border:1px solid #f2f2f2;
+							overflow: hidden;
+							image {
+								width: 100%;
+							}
+						}
+					}
+					
+				}
 				.tuikuan {
 					width: 100%;
 					display: flex;
@@ -521,6 +1101,12 @@
 					image {
 						width: 360rpx;
 						height: 360rpx;
+					}
+					#qrcodeCanvas {
+						position: fixed;
+						top: -100%;
+						left: -100%;
+						opacity: 0;
 					}
 					text {
 						&:nth-child(2) {
@@ -617,6 +1203,7 @@
 							flex-wrap: wrap;
 							align-items: center;
 							justify-content: space-between;
+							gap: 20rpx;
 							.item-form-list-row {
 								width: 88rpx;
 								height: 88rpx;

--
Gitblit v1.9.3