productDev/gtzxinglijicun.git

			@@ -237,6 +237,7 @@
			<view class="footer" >
			<view class="footer-btns">
			<view class="btn kong" @click="contactPhoneDo(info.takePhone)" v-if="info.status === 1 \|\| info.status === 5" >联系客户</view>
			<view class="btn kong" @click="openTrackPopup">订单轨迹</view>
			<view class="btn kong" @click="contactPhoneDo(info.driverPhone)" v-if="info.type ===1&&(info.status === 4 \|\| info.status === 3)">联系骑手</view>
			<!-- <view class="btn you" v-if="[1,4].includes(info.status) && info.takeShopId" @click="hexiaoOrder(info)" >收件核销</view> -->

			@@ -261,6 +262,40 @@
			</view>
			</view>
			</u-popup>
			<u-popup :show="showTrackPopup" mode="bottom" round="24" :safeAreaInsetBottom="true" :closeOnClickOverlay="true" @close="closeTrackPopup">
			<view class="track-popup">
			<view class="track-popup__header">
			<text class="track-popup__title">订单轨迹</text>
			<view class="track-popup__close" @click="closeTrackPopup">×</view>
			</view>
			<scroll-view scroll-y class="track-popup__body">
			<view class="track-empty" v-if="!trackList.length">暂无轨迹信息</view>
			<view class="track-list" v-else>
			<view class="track-item" v-for="(track, index) in trackList" :key="track.key \|\| index">
			<view class="track-item__content">
			<view class="track-item__rail">
			<image v-if="index === 0" class="track-item__dot track-item__dot--active" src="/static/icon/dian.png" mode="aspectFit"></image>
			<view v-else class="track-item__dot"></view>
			<view class="track-item__line" v-if="index !== trackList.length - 1"></view>
			</view>
			<view class="track-item__body">
			<text class="track-item__time">{{ track.time }}</text>
			<text class="track-item__desc">{{ track.title }}</text>
			<view class="track-item__images" v-if="track.images && track.images.length">
			<image
			v-for="(img, imgIndex) in track.images"
			:key="track.key + '-' + imgIndex"
			:src="img"
			mode="aspectFill"
			></image>
			</view>
			</view>
			</view>
			</view>
			</view>
			</scroll-view>
			</view>
			</u-popup>
			</view>
			</template>

			@@ -279,6 +314,8 @@
			id:null,
			qrcodeImage:null,
			showCancel:false,
			showTrackPopup:false,
			trackList: [],
			info:{},
			mapLat: 0,
			mapLng: 0,
			@@ -289,6 +326,7 @@
			},
			onShow() {
			this.showCancel=false
			this.trackList = []
			this.info={}
			this.getOrderDetail()
			},
			@@ -296,10 +334,71 @@
			this.id = options.id
			},
			methods:{
			async openTrackPopup() {
			uni.showLoading({
			title: '加载中...',
			mask: true
			})
			let success = false
			try {
			success = await this.getOrderTimeline()
			} finally {
			uni.hideLoading()
			}
			if (success) {
			this.showTrackPopup = true
			}
			},
			closeTrackPopup() {
			this.showTrackPopup = false
			},
			async getOrderTimeline() {
			if (!this.id) {
			this.trackList = []
			return false
			}
			try {
			let res = await this.$u.api.shopTimeline(this.id)
			if (res.code === 200) {
			let list = Array.isArray(res.data) ? res.data : []
			this.trackList = list.map((item, index) => ({
			key: item.id \|\| item.time \|\| index,
			title: item.title \|\| '',
			time: item.time \|\| '--',
			images: this.normalizeTrackImages(item.images)
			}))
			return true
			}
			this.trackList = []
			uni.showToast({
			title: res.msg \|\| '获取轨迹失败',
			icon: 'none'
			})
			return false
			} catch (e) {
			this.trackList = []
			uni.showToast({
			title: '获取轨迹失败',
			icon: 'none'
			})
			return false
			}
			},
			normalizeTrackImages(images) {
			if (!Array.isArray(images)) {
			return []
			}
			return images.filter(item => !!item)
			},
			previewImage(images,index = 0) {
			console.log(images)
			console.log(index)
			uni.previewImage({
			current: index,
			urls: images
			urls: images,
			fail(err) {
			console.log(err)
			}
			});
			},
			hexiaoOrder(item){
			@@ -362,14 +461,22 @@
			height: 180,
			correctLevel: 2
			})
			setTimeout(() => {
			uni.canvasToTempFilePath({
			canvasId: 'qrcodeCanvas',
			success: (res) => {
			that.qrcodeImage = res.tempFilePath
			}
			}, this)
			}, 100)
			this.$nextTick(() => {
			uni.canvasToTempFilePath({
			canvasId: 'qrcodeCanvas',
			success: (res) => {
			that.qrcodeImage = res.tempFilePath
			}
			}, this)
			})
			// setTimeout(() => {
			// uni.canvasToTempFilePath({
			// canvasId: 'qrcodeCanvas',
			// success: (res) => {
			// that.qrcodeImage = res.tempFilePath
			// }
			// }, this)
			// }, 100)
			}

			},
			@@ -637,6 +744,127 @@
			.head1{
			background: #E4730B;
			}
			.track-popup {
			background: #FFFFFF;
			border-radius: 24rpx 24rpx 0 0;
			padding: 24rpx 24rpx calc(24rpx + env(safe-area-inset-bottom));
			box-sizing: border-box;
			.track-popup__header {
			height: 88rpx;
			display: flex;
			align-items: center;
			justify-content: center;
			position: relative;
			}
			.track-popup__title {
			font-size: 40rpx;
			font-weight: 600;
			color: #222222;
			}
			.track-popup__close {
			position: absolute;
			right: 0;
			top: 50%;
			transform: translateY(-50%);
			width: 56rpx;
			height: 56rpx;
			display: flex;
			align-items: center;
			justify-content: center;
			font-size: 56rpx;
			line-height: 1;
			color: #A5A7AD;
			}
			.track-popup__body {
			height: 50vh;
			}
			.track-empty {
			line-height: 50vh;
			text-align: center;
			font-size: 28rpx;
			color: #999999;
			}
			.track-list {
			padding: 12rpx 0 0;
			}
			.track-item {
			position: relative;
			}
			.track-item__rail {
			width: 34rpx;
			flex-shrink: 0;
			display: flex;
			flex-direction: column;
			align-items: center;
			align-self: stretch;
			position: relative;
			}
			.track-item__dot {
			width: 16rpx;
			height: 16rpx;
			flex-shrink: 0;
			position: relative;
			z-index: 1;
			border-radius: 50%;
			background: #CCCCCC;
			margin-top: 12rpx;
			}
			.track-item__dot--active {
			width: 32rpx;
			height: 32rpx;
			flex-shrink: 0;
			display: block;
			position: relative;
			z-index: 1;
			margin-top: 4rpx;
			background: transparent;
			}
			.track-item__line {
			width: 2rpx;
			position: absolute;
			left: 50%;
			top: 28rpx;
			bottom: -30rpx;
			transform: translateX(-50%);
			background: #E6EAF0;
			}
			.track-item__content {
			display: flex;
			align-items: flex-start;
			column-gap: 22rpx;
			padding: 0 0 20rpx;
			}
			.track-item__body {
			flex: 1;
			min-width: 0;
			}
			.track-item__time {
			display: block;
			font-size: 28rpx;
			font-weight: 400;
			color: #8A8F99;
			line-height: 1.4;
			}
			.track-item__desc {
			display: block;
			margin-top: 22rpx;
			font-weight: 500;
			font-size: 30rpx;
			color: #666666;
			}
			.track-item__images {
			display: flex;
			flex-wrap: wrap;
			gap: 18rpx;
			margin-top: 24rpx;
			image {
			width: 130rpx;
			height: 130rpx;
			border-radius: 12rpx;
			background: #F3F5F8;
			}
			}
			}
			.head {
			width: 100%;
			padding: 0 30rpx;