diff --git a/components/nav-bar/nav-bar.vue b/components/nav-bar/nav-bar.vue
index 8b9b2fd..26cb799 100644
--- a/components/nav-bar/nav-bar.vue
+++ b/components/nav-bar/nav-bar.vue
@@ -6,7 +6,7 @@
 		<view class="status-placeholder" :style="{ height: `${data.statusBarHeight}px` }">
 			<slot name="statusBar"></slot>
 		</view>
-		<view class="nav-box" style="width: 100%;height: 88rpx;" @click="openPopup">
+		<view class="nav-box" style="width: 100%;height: 88rpx;">
 			<slot>
 				<uni-nav-bar backgroundColor="#00000000" class="nav-bar" :border="false" :title="title" v-bind="$attrs"
 					v-on="$attrs">
diff --git a/main.js b/main.js
index 90b19b2..bfbed21 100644
--- a/main.js
+++ b/main.js
@@ -29,7 +29,7 @@ export function createApp() {
 	app.config.globalProperties.$system = plus.os.name;
 	// #endif
 	app.config.globalProperties.$systemInfo = systemInfo
-	uni.setStorageSync('version', '1.0.5.sp3')
+	uni.setStorageSync('version', '1.0.5.sp4')
 	app.config.globalProperties.$version = uni.getStorageSync('version')
 	app.use(globalMethods);
 	return {
diff --git a/pages.json b/pages.json
index f3af044..6431d01 100644
--- a/pages.json
+++ b/pages.json
@@ -108,6 +108,14 @@
 						"navigationBarTitleText": "淘宝闪购订单详情",
 						"navigationStyle": "custom"
 					}
+				},
+				{
+					"path" : "taobao/add-shangou-order/add-shangou-order",
+					"style" : 
+					{
+						"navigationBarTitleText" : "添加淘宝闪购订单详情",
+						"navigationStyle": "custom"
+					}
 				}
 			]
 		},
diff --git a/pages/other/about-this-iphone/about-this-iphone.vue b/pages/other/about-this-iphone/about-this-iphone.vue
index a80c1b1..345b65e 100644
--- a/pages/other/about-this-iphone/about-this-iphone.vue
+++ b/pages/other/about-this-iphone/about-this-iphone.vue
@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<!-- Custom Nav Bar -->
-		<view class="custom-nav-bar">
+		<view class="custom-nav-bar" :class="{ 'android-nav': isAndroid }">
 			<view class="status-bar" :style="{ height: statusBarHeight + 'px' }"></view>
 			<view class="nav-content">
 				<view class="left-icon" @click="back">
@@ -13,7 +13,7 @@
 		</view>
 
 		<!-- Placeholder to push content down -->
-		<view class="nav-placeholder" :style="{ height: statusBarHeight + 'px' }"></view>
+		<view class="nav-placeholder" :style="{ height: statusBarHeight + 74 + 'px' }"></view>
 
 		<view class="info-container">
 			<block v-for="(group, groupIndex) in listData" :key="groupIndex">
@@ -143,6 +143,8 @@ const defaultData = [
 
 const listData = ref([]);
 const statusBarHeight = ref(0);
+const isAndroid = ref(false);
+
 onShow(() => {
 	// #ifdef APP-PLUS
 	util.setAndroidSystemBarColor('#F2F1F6')
@@ -166,6 +168,10 @@ onMounted(() => {
 	const systemInfo = uni.getSystemInfoSync();
 	statusBarHeight.value = systemInfo.statusBarHeight || 0;
 
+	if (systemInfo.osName === 'android' || systemInfo.platform === 'android') {
+		isAndroid.value = true;
+	}
+
 	const cached = uni.getStorageSync(CACHE_KEY);
 	if (cached) {
 		try {
@@ -250,6 +256,20 @@ const confirmModal = () => {
 	}
 }
 
+/* 安卓手机降级：取消复杂的渐变、滤镜与遮罩，直接使用纯色 */
+.custom-nav-bar.android-nav {
+	opacity: 1 !important;
+	background: #F2F1F6 !important;
+	backdrop-filter: none !important;
+	-webkit-backdrop-filter: none !important;
+	mask-image: none !important;
+	-webkit-mask-image: none !important;
+
+	.nav-content {
+		padding-bottom: 10rpx !important;
+	}
+}
+
 .nav-placeholder {
 	width: 100%;
 	padding-top: 146rpx;
@@ -267,8 +287,8 @@ const confirmModal = () => {
 
 .info-container {
 	padding: 30rpx;
+	padding-top: 0;
 	padding-bottom: 60rpx;
-	margin-top: 60rpx;
 }
 
 .info-group {
@@ -323,6 +343,7 @@ const confirmModal = () => {
 	line-height: 32rpx;
 	margin-bottom: 16rpx;
 	color: #85858A;
+	font-weight: 500;
 }
 
 .custom-modal-mask {
diff --git a/pages/shopping/taobao/add-shangou-order/add-shangou-order.vue b/pages/shopping/taobao/add-shangou-order/add-shangou-order.vue
new file mode 100644
index 0000000..97af1e1
--- /dev/null
+++ b/pages/shopping/taobao/add-shangou-order/add-shangou-order.vue
@@ -0,0 +1,1493 @@
+<template>
+	<view>
+		<nav-bar class="nav-bar" :title="navTitle" bgColor="#F1F5F8" tipLayerType="jingdong-shopping-list" isTipLayer
+			tipLayerText="添加订单信息" isRightButton @right-click="onConfirm">
+		</nav-bar>
+
+		<view class="tab-box" v-if="!isEditMode">
+			<view class="tab" :class="{ active: item.key == activeTab }" v-for="item in waimaiType" :key="item.key"
+				@click="switchTab(item)">
+				<text>{{ item.label }}</text>
+			</view>
+		</view>
+
+		<view v-if="!isEditMode" class="random-dice">
+			<image style="width: 2rem;height: 2rem;" src="/static/image/common/random-dice.png"
+				@click="clickRandomDate">
+			</image>
+		</view>
+
+		<!-- 待收货骑手地图 -->
+		<view v-if="order.statusType == 'wait_recv'" class="map-box">
+
+			<view class="qishou flex-align-center flex-column">
+				<view class="qishou-info"
+					:style="{ transform: isEditMode ? 'translateY(0)' : 'translateY(-20%) !important' }">
+					<view class="title">骑手正在按序送货</view>
+					<view class="time flex-align-center" style="white-space: nowrap;">前方剩余<view class="">
+							<auto-width-input class="num green" v-model="order.orderQty" fontSize="24rpx"
+								color="#1AA35B" show-edit />
+						</view>，约<view class=""><auto-width-input class="green" v-model="order.surplusDeliveryTime"
+								fontSize="24rpx" color="#1AA35B" show-edit /></view>
+						送达
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view v-if="order.statusType == 'wait_pay'" class="wait_pay"
+			:style="(!isEditMode && order.statusType != 'wait_recv') ? 'margin-top: 20rpx;' : ''">
+			<view class="flex-align-center">
+				<view v-if="order.statusType == 'wait_pay'" class="main-text flex-align-center"
+					style="white-space: nowrap;">
+					<text>待支付，剩余</text>
+					<view class="time" style="margin-left: 12rpx;">
+						<picker mode="multiSelector" :range="payTimePickerArray" :value="payTimePickerIndex"
+							@change="onPayTimeChange">
+							<view class="flex-align-center">
+								<text style="font-size: 48rpx; font-weight: 600; color: #1A1A1A;">{{
+									order.remainingPayTime }}</text>
+								<image style="width: 28rpx; height: 28rpx; margin-left: 12rpx; margin-top: 4rpx;"
+									src="/static/image/common/edit.png"></image>
+							</view>
+						</picker>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="deliver-info" v-if="order.statusType != 'closed'">
+			<view v-if="order.statusType == 'wait_recv' || order.statusType == 'wait_pay'"
+				style="justify-content: baseline; display: flex; align-items: center;">
+				<text class="label">预计</text>
+				<view class="time">
+					<picker mode="multiSelector" :range="timeRangePickerArray" :value="timeRangePickerIndex"
+						@change="onTimeRangeChange">
+						<view class="flex-align-center" style="min-width: 150rpx; height: 100%;">
+							<text style="font-size: 40rpx; font-weight: 500; color: #1A1A1A;">{{ order.deliveryTime
+							}}</text>
+							<image style="width: 28rpx; height: 28rpx; margin-left: 12rpx; margin-top: 4rpx;"
+								src="/static/image/common/edit.png"></image>
+						</view>
+					</picker>
+				</view>
+			</view>
+			<view v-if="order.statusType != 'closed'" class="flex"
+				style="margin-top: 26rpx;justify-content: flex-start;">
+				<text class="label">送至</text>
+				<view class="flex-1 address-info flex-align-center" style="max-width: 550rpx;">
+					<view class=" flex-1"><auto-width-input v-model="order.orderInfo[0].value" fontSize="26rpx"
+							color="#1A1A1A" type="textarea" show-edit /></view>
+				</view>
+			</view>
+			<view v-if="order.statusType == 'success'" class="flex"
+				style="margin-top: 26rpx;justify-content: flex-start; padding-bottom: 20rpx;">
+				<text class="label">送达图片</text>
+				<view class="delivery-photo flex-align-center">
+					<view v-if="!order.deliveryPhoto || deliveryPhotos.includes(order.deliveryPhoto)" class="add"
+						@click="chooseDeliveryPhoto">+</view>
+					<image v-else style="width: 80rpx;height: 80rpx;" :src="order.deliveryPhoto" mode="aspectFill"
+						@click="chooseDeliveryPhoto"
+						:class="!deliveryPhotos.includes(order.deliveryPhoto) ? 'active-photo' : ''">
+					</image>
+					<image style="width: 80rpx;height: 80rpx;margin-left: 16rpx;"
+						v-for="(photo, index) in deliveryPhotos" :key="index" :src="photo" mode="aspectFill"
+						@click="selectDeliveryPhoto(photo)"
+						:class="order.deliveryPhoto === photo ? 'active-photo' : ''">
+					</image>
+				</view>
+			</view>
+			<view v-if="order.statusType == 'wait_recv'" class="flex"
+				style="margin-top: 26rpx;justify-content: flex-start;">
+				<text class="label">服务</text>
+				<view class="flex-1 address-info">
+					<text style="color: #1AA35B;">超20分钟免单-生效中</text>
+					<text> 若超时，即{{ timeoutDelivery }}后送达赔4元可叠加红包</text>
+					<uni-icons type="right" size="12" color="#8C8C8C"></uni-icons>
+				</view>
+			</view>
+			<view v-if="order.statusType == 'wait_recv'" class="flex"
+				style="margin-top: 26rpx;justify-content: flex-start; padding-bottom: 20rpx;">
+				<text class="label">配送地图</text>
+				<view class="delivery-photo flex-align-center">
+					<image style="width: 120rpx;height: 80rpx;margin-right: 16rpx;" v-for="(mapImg, index) in mapPhotos"
+						:key="index" :src="mapImg" mode="aspectFill" @click="selectMapPhoto(mapImg)"
+						:class="order.mapUrl === mapImg ? 'active-photo' : ''">
+					</image>
+				</view>
+			</view>
+		</view>
+		<view v-if="order.statusType == 'wait_pay'" class="wait_pay-buttom">
+			<view class="button flex-center flex-column">
+				<view class="flex-align-center" style="font-size: 32rpx;line-height: 32rpx; white-space: nowrap;">去支付 ￥
+					<view class=""><auto-width-input v-model="order.priceDetail.actualPay" type="digit" fontSize="32rpx"
+							color="#FFFFFF" show-edit /></view>
+				</view>
+			</view>
+		</view>
+		<view class="product-info-box">
+			<!-- 订单详情卡片 -->
+			<view class="info-card">
+				<view class="shop-title-box flex-align-center">
+					<view class="shop-name " style="white-space: nowrap;"><auto-width-input v-model="order.shopName"
+							fontSize="30rpx" fontWeight="500" color="#1A1A1A" show-edit />
+					</view>
+					<text class="shop-name">(</text>
+					<view class="shop-name " style="white-space: nowrap;"><auto-width-input v-model="order.location"
+							fontSize="30rpx" fontWeight="500" color="#1A1A1A" show-edit />
+					</view><text class="shop-name">)</text>
+					<uni-icons type="right" size="16" color="#8C8C8C"></uni-icons>
+				</view>
+
+				<view class="goods-item flex" v-for="(item, index) in order.goodsList" :key="index"
+					style="position: relative; padding-bottom: 30rpx; border-bottom: 1rpx solid #F5F5F5; margin-bottom: 30rpx; align-items: flex-start;">
+
+					<view class="goods-img-box flex-center" @click="chooseImage(item)"
+						style="width: 150rpx; height: 150rpx; flex-shrink: 0; margin-right: 24rpx; border-radius: 12rpx; overflow: hidden; background-color: #F5F5F5; display: flex; align-items: center; justify-content: center;">
+						<image v-if="item.image" class="goods-img" :src="item.image" mode="aspectFill"
+							style="width: 100%; height: 100%;">
+						</image>
+						<uni-icons v-else type="plusempty" size="36" color="#D9D9D9"></uni-icons>
+					</view>
+
+					<view class="goods-info flex-1 flex-column" style="overflow: hidden; padding-top: 4rpx;">
+						<!-- 第一排：商品标题及删除按钮 -->
+						<view class="flex-align-center" style="margin-bottom: 20rpx;">
+							<auto-width-input class="flex-1" v-model="item.title" fontSize="28rpx" color="#1A1A1A"
+								type="textarea" show-edit />
+							<view class="flex-center" @click.stop="removeGoods(index)"
+								style="margin-left: 20rpx; flex-shrink: 0;">
+								<uni-icons type="trash" size="18" color="#FF4D4F"></uni-icons>
+							</view>
+						</view>
+
+						<!-- 第二排：商品描述/规格 -->
+						<view class="flex-align-center" style="margin-bottom: 20rpx;">
+							<auto-width-input class="flex-1" v-model="item.spec" fontSize="24rpx" color="#7C8495"
+								show-edit />
+						</view>
+
+						<!-- 第二排：商品服务 -->
+						<view class="flex-align-center" style="margin-bottom: 20rpx;">
+							<auto-width-input class="flex-1" v-model="item.tag" fontSize="24rpx" color="#0AA957"
+								placeholder="请输入商品服务" show-edit />
+						</view>
+
+						<!-- 第三排：数量 -->
+						<view class="flex-align-center" style="margin-bottom: 20rpx;">
+							<auto-width-input class="flex-1" v-model="item.count" type="number" fontSize="24rpx"
+								color="#7C8495" show-edit />
+						</view>
+
+						<!-- 第四排：价格 -->
+						<view class="flex-align-center" style="margin-bottom: 20rpx;">
+							<text
+								style="font-size: 26rpx; color: #1A1A1A; margin-right: 4rpx; font-weight: 500;">￥</text>
+							<auto-width-input class="flex-1" v-model="item.actualPrice" type="digit" fontSize="34rpx"
+								fontWeight="500" color="#1A1A1A" show-edit />
+						</view>
+
+						<!-- 第五排：优惠/原价 -->
+						<view class="flex-align-center" style="color: #F86603;">
+							<text style="font-size: 24rpx; margin-right: 4rpx;">原价 ￥</text>
+							<auto-width-input class="flex-1" v-model="item.oriPrice" type="digit" fontSize="24rpx"
+								color="#1a1a1a" show-edit />
+						</view>
+					</view>
+				</view>
+
+				<view class="flex-center" style="margin-top: 10rpx; padding-bottom: 20rpx;" @click="addGoods">
+					<view
+						style="border: 1px dashed #FF7824; color: #FF7824; font-size: 26rpx; padding: 12rpx 50rpx; border-radius: 40rpx;width: 100%; text-align: center;">
+						+ 添加商品</view>
+				</view>
+
+				<view class="fee-item flex-between" v-for="(fee, index) in order.fees" :key="'fee-' + index">
+					<view class="fee-left flex-align-center">
+						<view class="">
+							<auto-width-input v-model="fee.name" fontSize="26rpx" color="#7C8495"
+								:show-edit="!(fee.name === '打包费' || fee.name === '配送费')"
+								:disabled="fee.name === '打包费' || fee.name === '配送费'" />
+						</view>
+					</view>
+					<view class="fee-right flex-column flex-align-end">
+						<view class="actual-price flex-align-center"><text class="label">实付</text><text
+								class="symbol wx-font-medium">￥</text>
+							<view class="num wx-font-medium "><auto-width-input v-model="fee.actualPrice" type="digit"
+									fontSize="36rpx" fontWeight="500" color="#1A1A1A" show-edit />
+							</view>
+						</view>
+						<view class="ori-price wx-font-regular flex-align-center">￥<view class="">
+								<auto-width-input v-model="fee.oriPrice" type="digit" fontSize="24rpx" color="#7C8495"
+									show-edit />
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<view class="fee-item flex-between" style="align-items: center;"
+					v-for="(comp, index) in order.compensations" :key="'comp-' + index">
+					<view class="fee-left flex-align-center">
+						<view class=""><auto-width-input v-model="comp.name" fontSize="26rpx" color="#7C8495"
+								show-edit />
+						</view>
+						<uni-icons v-if="comp.showQuestion" type="help" size="16" color="#C6C6C6"
+							style="margin-left: 6rpx;"></uni-icons>
+					</view>
+					<view class="fee-right ">
+						<auto-width-input v-model="comp.value" fontSize="26rpx"
+							:color="comp.isRed ? '#F83D3D' : '#1A1A1A'" show-edit />
+					</view>
+				</view>
+				<view class="price-detail-title flex-between">
+					<view class="left flex-align-center">
+						<text>价格明细</text>
+					</view>
+					<view class="right flex-align-center">
+						<view class="total-discount flex-align-center" style="white-space: nowrap;">总优惠
+							<text class="symbol wx-font-medium">￥</text>
+							<view class=""><auto-width-input v-model="order.priceDetail.totalDiscount" type="digit"
+									fontSize="34rpx" color="#FF2020" show-edit /></view>
+						</view>
+						<view class="total-actual flex-align-center" style="white-space: nowrap;">实付<text
+								class="symbol wx-font-medium">￥</text>
+							<view class="num wx-font-medium "><auto-width-input v-model="order.priceDetail.actualPay"
+									type="digit" fontSize="34rpx" color="#1A1A1A" show-edit /></view>
+						</view>
+					</view>
+				</view>
+
+				<view class="price-detail-list">
+					<view class="detail-item flex-between" v-for="(detail, index) in order.priceDetail.details"
+						:key="'detail-' + index">
+						<view class="label ">{{ detail.name }}</view>
+						<view class="val alipay-font " :class="{ 'bold-val': detail.isBold, 'red-val': detail.isRed }">
+							<auto-width-input v-model="detail.value" fontSize="32rpx"
+								:color="detail.isRed ? '#F83D3D' : '#1A1A1A'" show-edit />
+						</view>
+					</view>
+				</view>
+
+				<view class="divider-line"></view>
+
+				<view class="order-info-area">
+					<view class="order-item flex" v-for="(info, index) in order.orderInfo" :key="'info-' + index"
+						:style="info.label === '收货信息' ? 'align-items: flex-start;' : ''"
+						v-show="!(order.statusType === 'wait_pay' && info.label === '送达时间')">
+						<text class="label" :style="info.label === '收货信息' ? 'line-height:36rpx;' : ''">{{ info.label
+						}}</text>
+						<view class="val flex-1 flex-align-center" style="justify-content: flex-end;">
+
+							<!-- 送达时间 picker -->
+							<template v-if="info.label === '送达时间'">
+								<picker mode="multiSelector" :range="deliveryInfoPickerArray"
+									:value="deliveryInfoPickerIndex" @change="(e) => onDeliveryInfoChange(e, index)"
+									class="flex-1" :disabled="order.statusType === 'wait_pay'">
+									<view class="flex-align-center" style="justify-content: flex-end;">
+										<text style="font-size: 24rpx; color: #1A1A1A;">{{ info.value || '请选择送达时间'
+										}}</text>
+										<image v-if="order.statusType !== 'wait_pay'"
+											style="width: 24rpx; height: 24rpx; margin-left: 8rpx;"
+											src="/static/image/common/edit.png"></image>
+									</view>
+								</picker>
+							</template>
+
+							<!-- 下单时间、付款时间等 picker -->
+							<template v-else-if="info.label.includes('时间')">
+								<picker mode="multiSelector" :range="orderTimePickerArray" :value="orderTimePickerIndex"
+									@change="(e) => onOrderTimeChange(e, index)" class="flex-1">
+									<view class="flex-align-center" style="justify-content: flex-end;">
+										<text style="font-size: 24rpx; color: #1A1A1A;">{{ info.value || '请选择时间'
+										}}</text>
+										<image style="width: 24rpx; height: 24rpx; margin-left: 8rpx;"
+											src="/static/image/common/edit.png"></image>
+									</view>
+								</picker>
+							</template>
+
+							<!-- 常规文本输入 -->
+							<template v-else>
+								<view class=" input-box flex-1" style="display: flex; justify-content: flex-end;">
+									<auto-width-input v-model="info.value" fontSize="24rpx" color="#1A1A1A"
+										:type="info.label === '收货信息' ? 'textarea' : (info.label === '订单号' ? 'number' : 'text')"
+										style="text-align: right;" show-edit />
+								</view>
+							</template>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+import { ref, reactive, computed, onMounted, nextTick, watch } from 'vue';
+import { onPageScroll, onShow, onLoad } from '@dcloudio/uni-app';
+import { util } from '@/utils/common.js';
+import { defualtData, waimaiType, waimaiClassfiy, waimaiProductList } from '../json/order.json';
+import AutoWidthInput from "@/components/common/auto-width-input.vue";
+import DateTimePicker from '@/components/dengrq-datetime-picker/dateTimePicker/index.vue';
+
+const isScrolled = ref(false);
+const screenshotImage = ref('');
+
+const activeTab = ref("wait_pay");
+const isEditMode = ref(false);
+const currentId = ref('');
+const navTitle = computed(() => isEditMode.value ? "修改外卖订单" : "新增外卖订单");
+
+const savedDeliveryTime = ref('');
+const savedOrderDeliveryTime = ref('');
+
+const deliveryPhotos = ref(['/static/image/shopping/taobao/waimai/deliveryPhoto1.png', '/static/image/shopping/taobao/waimai/deliveryPhoto2.png']);
+const mapPhotos = ref(['/static/image/shopping/taobao/waimai/map1.png', '/static/image/shopping/taobao/waimai/map2.png']);
+
+const order = ref({
+	...JSON.parse(JSON.stringify(waimaiClassfiy[activeTab.value])),
+	statusType: activeTab.value,
+	orderType: 'waimai'
+});
+
+if (!order.value.deliveryPhoto) {
+	order.value.deliveryPhoto = deliveryPhotos.value[0];
+}
+
+if (!order.value.mapUrl) {
+	order.value.mapUrl = mapPhotos.value[0];
+}
+
+// 核心自动计算引擎 (监听商品列表、费用列表、以及手动添加的其他优惠)
+watch(() => {
+	if (!order.value || !order.value.priceDetail) return null;
+	// 避免无限循环，排查掉会被我们程序自动改写的明细项
+	const detailsDep = order.value.priceDetail.details ? order.value.priceDetail.details.map(d => {
+		if (['总价', '商品总价', '商品优惠', '配送费优惠', '打包费优惠'].includes(d.name)) return null;
+		return d.value;
+	}) : [];
+	return {
+		goods: JSON.stringify(order.value.goodsList || []),
+		fees: JSON.stringify(order.value.fees || []),
+		details: JSON.stringify(detailsDep)
+	};
+}, (newVal) => {
+	if (!newVal || !order.value.priceDetail || !order.value.priceDetail.details) return;
+	let sum = 0;
+	let goodsDiscount = 0;
+	let actualGoodsSum = 0;
+
+	// 1. 计算商品总价与商品优惠
+	if (order.value.goodsList) {
+		order.value.goodsList.forEach(item => {
+			const oriStr = String(item.oriPrice || item.actualPrice || '0').trim();
+			const oriPrice = parseFloat(oriStr.replace(/[^0-9.]/g, '')) || 0;
+			const actStr = String(item.actualPrice || '0').trim();
+			const actualPrice = parseFloat(actStr.replace(/[^0-9.]/g, '')) || 0;
+			const count = parseInt(item.count) || 1;
+
+			sum += oriPrice * count;
+			actualGoodsSum += actualPrice * count;
+			if (item.oriPrice && oriPrice > actualPrice) {
+				goodsDiscount += (oriPrice - actualPrice) * count;
+			}
+		});
+	}
+
+	// 2. 计算费用优惠 (配送费/打包费)
+	let deliveryDiscount = 0;
+	let packageDiscount = 0;
+	let feeSum = 0;
+	if (order.value.fees) {
+		order.value.fees.forEach(fee => {
+			if (fee.name === '配送费' || fee.name === '打包费') {
+				const oriStr = String(fee.oriPrice || fee.actualPrice || '0').trim();
+				const oriPrice = parseFloat(oriStr.replace(/[^0-9.]/g, '')) || 0;
+				const actStr = String(fee.actualPrice || '0').trim();
+				const actualPrice = parseFloat(actStr.replace(/[^0-9.]/g, '')) || 0;
+
+				feeSum += actualPrice;
+
+				if (fee.oriPrice && oriPrice > actualPrice) {
+					if (fee.name === '配送费') deliveryDiscount += (oriPrice - actualPrice);
+					if (fee.name === '打包费') packageDiscount += (oriPrice - actualPrice);
+				}
+			}
+		});
+	}
+
+	const getDetailObj = (name) => order.value.priceDetail.details.find(d => d.name === name);
+
+	const totalObj = getDetailObj('总价') || getDetailObj('商品总价');
+	if (totalObj) totalObj.value = '￥' + sum.toFixed(2);
+
+	const goodsDiscountObj = getDetailObj('商品优惠');
+	if (goodsDiscountObj) goodsDiscountObj.value = '-￥' + goodsDiscount.toFixed(2);
+
+	const deliveryDiscountObj = getDetailObj('配送费优惠');
+	if (deliveryDiscountObj) deliveryDiscountObj.value = '-￥' + deliveryDiscount.toFixed(2);
+
+	const packageDiscountObj = getDetailObj('打包费优惠');
+	if (packageDiscountObj) packageDiscountObj.value = '-￥' + packageDiscount.toFixed(2);
+
+	// 3. 计算总优惠 (遍历所有明细里的优惠项)
+	let totalDiscount = 0;
+	order.value.priceDetail.details.forEach(d => {
+		if (d.name && !['总价', '商品总价'].includes(d.name)) {
+			// 只有明确是带有 - 号或者是红色(优惠项)的，才加总
+			if (String(d.value).includes('-') || d.isRed) {
+				const val = parseFloat(String(d.value || '0').replace(/[^0-9.]/g, '')) || 0;
+				totalDiscount += val;
+			}
+		}
+	});
+
+	order.value.priceDetail.totalDiscount = totalDiscount.toFixed(2);
+
+	// 4. 计算实付价格 (商品实付总和 + 配送费打包费实付)
+	const actualPaySum = actualGoodsSum + feeSum;
+	order.value.priceDetail.actualPay = actualPaySum.toFixed(2);
+
+}, { deep: true, immediate: true });
+
+onPageScroll((e) => {
+	isScrolled.value = e.scrollTop > 10;
+});
+
+const switchTab = (item) => {
+	activeTab.value = item.key;
+
+	// 备份所有用户可能已经编辑或随机生成的核心业务数据，防止模板覆盖
+	const backup = {
+		shopName: order.value.shopName,
+		location: order.value.location,
+		goodsList: JSON.parse(JSON.stringify(order.value.goodsList || [])),
+		fees: JSON.parse(JSON.stringify(order.value.fees || [])),
+		compensations: JSON.parse(JSON.stringify(order.value.compensations || [])),
+		deliveryPhoto: order.value.deliveryPhoto,
+		mapUrl: order.value.mapUrl,
+		deliveryTime: order.value.deliveryTime,
+		remainingPayTime: order.value.remainingPayTime,
+		surplusDeliveryTime: order.value.surplusDeliveryTime,
+		orderQty: order.value.orderQty,
+		priceDetail: JSON.parse(JSON.stringify(order.value.priceDetail || {})),
+		orderInfoMap: {}
+	};
+	if (order.value.orderInfo) {
+		order.value.orderInfo.forEach(info => {
+			backup.orderInfoMap[info.label] = info.value;
+		});
+	}
+
+	order.value = JSON.parse(JSON.stringify(waimaiClassfiy[item.key]));
+
+	// 恢复备份的数据，保持数据连贯性
+	if (backup.shopName) order.value.shopName = backup.shopName;
+	if (backup.location) order.value.location = backup.location;
+	if (backup.goodsList.length > 0) order.value.goodsList = backup.goodsList;
+	if (backup.fees.length > 0) order.value.fees = backup.fees;
+	if (backup.compensations.length > 0) order.value.compensations = backup.compensations;
+
+	if (backup.deliveryTime) {
+		order.value.deliveryTime = backup.deliveryTime;
+	}
+
+	if (backup.deliveryPhoto) {
+		order.value.deliveryPhoto = backup.deliveryPhoto;
+	} else {
+		order.value.deliveryPhoto = deliveryPhotos.value[0];
+	}
+
+	if (backup.mapUrl) {
+		order.value.mapUrl = backup.mapUrl;
+	} else {
+		order.value.mapUrl = mapPhotos.value[0];
+	}
+
+	if (backup.remainingPayTime) order.value.remainingPayTime = backup.remainingPayTime;
+	if (backup.surplusDeliveryTime) order.value.surplusDeliveryTime = backup.surplusDeliveryTime;
+	if (backup.orderQty) order.value.orderQty = backup.orderQty;
+	if (backup.priceDetail && Object.keys(backup.priceDetail).length > 0) order.value.priceDetail = backup.priceDetail;
+
+	if (order.value.orderInfo) {
+		if (backup.orderInfoMap['送达时间'] && backup.orderInfoMap['送达时间'] !== '尽快送达') {
+			savedOrderDeliveryTime.value = backup.orderInfoMap['送达时间'];
+		}
+		order.value.orderInfo.forEach(info => {
+			if (backup.orderInfoMap[info.label]) {
+				info.value = backup.orderInfoMap[info.label];
+			}
+
+			if (info.label === '送达时间') {
+				if (item.key === 'wait_pay') {
+					info.value = '尽快送达';
+				} else if (info.value === '尽快送达' && savedOrderDeliveryTime.value) {
+					info.value = savedOrderDeliveryTime.value;
+				}
+			}
+		});
+	}
+
+	order.value.statusType = item.key;
+	order.value.orderType = 'waimai';
+}
+
+const onConfirm = () => {
+	if (!order.value.shopName) {
+		uni.showToast({ title: '请输入店铺名称', icon: 'none' });
+		return;
+	}
+	let list = uni.getStorageSync('taobaoShopping') || [];
+
+	if (isEditMode.value) {
+		const idx = list.findIndex(item => String(item.id) === String(currentId.value));
+		if (idx > -1) {
+			list[idx] = JSON.parse(JSON.stringify(order.value));
+		} else {
+			list.unshift(JSON.parse(JSON.stringify(order.value)));
+		}
+	} else {
+		const newOrder = JSON.parse(JSON.stringify(order.value));
+		newOrder.id = new Date().getTime().toString();
+
+		list.unshift(newOrder);
+		console.log("新增数据")
+	}
+
+	uni.setStorageSync('taobaoShopping', list);
+	uni.showToast({
+		title: '保存成功',
+		icon: 'success'
+	});
+	setTimeout(() => {
+		util.goBack();
+	}, 1000);
+}
+
+const setDefaultOrderTime = () => {
+	if (order.value.orderInfo && order.value.orderInfo.length > 0) {
+		const now = new Date();
+		const curY = now.getFullYear();
+		const curM = (now.getMonth() + 1).toString().padStart(2, '0');
+		const curD = now.getDate().toString().padStart(2, '0');
+		const curH = now.getHours().toString().padStart(2, '0');
+		const curMin = now.getMinutes().toString().padStart(2, '0');
+		const curS = now.getSeconds().toString().padStart(2, '0');
+		const currentTimeStr = `${curY}-${curM}-${curD} ${curH}:${curMin}:${curS}.123`;
+
+		order.value.orderInfo.forEach(info => {
+			if (info.label === '下单时间') {
+				info.value = currentTimeStr;
+			}
+		});
+	}
+};
+
+onLoad((options) => {
+	const editFlag = String(options.isEdit) === 'true' || options.isEdit === true;
+	if (editFlag && options.id) {
+		isEditMode.value = true;
+		currentId.value = String(options.id);
+		let list = uni.getStorageSync('taobaoShopping') || [];
+		let editData = list.find(item => String(item.id) === String(options.id));
+
+		if (!editData) {
+			editData = defualtData.find(item => String(item.id) === String(options.id));
+		}
+
+		if (editData) {
+			order.value = JSON.parse(JSON.stringify(editData));
+			activeTab.value = editData.statusType || 'wait_pay';
+		}
+	} else {
+		setDefaultOrderTime();
+		clickRandomDate();
+	}
+});
+
+// === 待支付倒计时选择器逻辑 (mm:ss) ===
+const payMinutes = Array.from({ length: 16 }, (_, i) => i.toString().padStart(2, '0')); // 00 to 15
+const paySeconds = Array.from({ length: 60 }, (_, i) => i.toString().padStart(2, '0'));
+const payTimePickerArray = [payMinutes, [':'], paySeconds];
+const payTimePickerIndex = ref([14, 0, 59]);
+
+const onPayTimeChange = (e) => {
+	const val = e.detail.value;
+	let m = payMinutes[val[0]];
+	let s = paySeconds[val[2]];
+	// 限制最多15分钟
+	if (m === '15') {
+		s = '00';
+	}
+	order.value.remainingPayTime = `${m}:${s}`;
+};
+
+const initRandomPayTime = () => {
+	const m = Math.floor(Math.random() * 15); // 0 to 14
+	const s = Math.floor(Math.random() * 60); // 0 to 59
+	order.value.remainingPayTime = `${m.toString().padStart(2, '0')}:${s.toString().padStart(2, '0')}`;
+};
+
+// === 时间范围选择器逻辑 (hh:mm-hh:mm) ===
+const hours = Array.from({ length: 24 }, (_, i) => i.toString().padStart(2, '0'));
+const minutes = Array.from({ length: 60 }, (_, i) => i.toString().padStart(2, '0'));
+const timeRangePickerArray = [hours, minutes, ['-'], hours, minutes];
+const timeRangePickerIndex = ref([12, 0, 0, 12, 30]);
+
+const onTimeRangeChange = (e) => {
+	const val = e.detail.value;
+	const h1 = hours[val[0]];
+	const m1 = minutes[val[1]];
+	const h2 = hours[val[3]];
+	const m2 = minutes[val[4]];
+	order.value.deliveryTime = `${h1}:${m1}-${h2}:${m2}`;
+	savedDeliveryTime.value = order.value.deliveryTime;
+};
+
+const initRandomDeliveryTime = () => {
+	const h = Math.floor(Math.random() * 14) + 8; // 8 to 21
+	const m1 = Math.floor(Math.random() * 60);
+	const m2 = (m1 + 30) % 60;
+	const h2 = m1 + 30 >= 60 ? h + 1 : h;
+
+	const hStr = h.toString().padStart(2, '0');
+	const m1Str = m1.toString().padStart(2, '0');
+	const h2Str = h2.toString().padStart(2, '0');
+	const m2Str = m2.toString().padStart(2, '0');
+
+	order.value.deliveryTime = `${hStr}:${m1Str}-${h2Str}:${m2Str}`;
+	savedDeliveryTime.value = order.value.deliveryTime;
+};
+
+// === 订单明细底部时间选择器逻辑 (下单时间 / 送达时间 等) ===
+const getVal = (str) => str.replace(/[^0-9]/g, '');
+
+const getWeekday = (y, m, d) => {
+	const week = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
+	const date = new Date(y, parseInt(m) - 1, parseInt(d));
+	return week[date.getDay()];
+};
+
+const pickerYears = Array.from({ length: 15 }, (_, i) => (2020 + i).toString() + '年');
+const pickerMonths = Array.from({ length: 12 }, (_, i) => (i + 1).toString().padStart(2, '0') + '月');
+const pickerDays = Array.from({ length: 31 }, (_, i) => (i + 1).toString().padStart(2, '0') + '日');
+const pickerHours = Array.from({ length: 24 }, (_, i) => i.toString().padStart(2, '0') + '时');
+const pickerMinutes = Array.from({ length: 60 }, (_, i) => i.toString().padStart(2, '0') + '分');
+const pickerSeconds = Array.from({ length: 60 }, (_, i) => i.toString().padStart(2, '0') + '秒');
+
+const orderTimePickerArray = [pickerYears, pickerMonths, pickerDays, pickerHours, pickerMinutes, pickerSeconds];
+const orderTimePickerIndex = ref([6, 0, 0, 12, 0, 0]); // 默认从 2026 年开始
+
+const deliveryInfoPickerArray = [pickerMonths, pickerDays, pickerHours, pickerMinutes, pickerHours, pickerMinutes];
+const deliveryInfoPickerIndex = ref([0, 0, 12, 0, 12, 30]);
+
+const onOrderTimeChange = (e, index) => {
+	const val = e.detail.value;
+	const Y = getVal(orderTimePickerArray[0][val[0]]);
+	const M = getVal(orderTimePickerArray[1][val[1]]);
+	const D = getVal(orderTimePickerArray[2][val[2]]);
+	const h = getVal(orderTimePickerArray[3][val[3]]);
+	const m = getVal(orderTimePickerArray[4][val[4]]);
+	const s = getVal(orderTimePickerArray[5][val[5]]);
+
+	order.value.orderInfo[index].value = `${Y}-${M}-${D} ${h}:${m}:${s}.123`;
+};
+
+const onDeliveryInfoChange = (e, index) => {
+	const val = e.detail.value;
+	const M = getVal(deliveryInfoPickerArray[0][val[0]]);
+	const D = getVal(deliveryInfoPickerArray[1][val[1]]);
+	const h1 = getVal(deliveryInfoPickerArray[2][val[2]]);
+	const m1 = getVal(deliveryInfoPickerArray[3][val[3]]);
+	const h2 = getVal(deliveryInfoPickerArray[4][val[4]]);
+	const m2 = getVal(deliveryInfoPickerArray[5][val[5]]);
+
+	const currentYear = new Date().getFullYear();
+	const wd = getWeekday(currentYear, M, D);
+
+	order.value.orderInfo[index].value = `${M}-${D}(${wd}) ${h1}:${m1}-${h2}:${m2}`;
+	savedOrderDeliveryTime.value = order.value.orderInfo[index].value;
+};
+
+const initRandomOrderInfoTimes = () => {
+	const currentYear = new Date().getFullYear();
+	const M = Math.floor(Math.random() * 12) + 1;
+	const D = Math.floor(Math.random() * 28) + 1;
+	const h1 = Math.floor(Math.random() * 14) + 8;
+	const m1 = Math.floor(Math.random() * 60);
+	const s1 = Math.floor(Math.random() * 60);
+
+	const h2 = (m1 + 30) >= 60 ? h1 + 1 : h1;
+	const m2 = (m1 + 30) % 60;
+
+	const MM = M.toString().padStart(2, '0');
+	const DD = D.toString().padStart(2, '0');
+	const HH1 = h1.toString().padStart(2, '0');
+	const mm1 = m1.toString().padStart(2, '0');
+	const HH2 = h2.toString().padStart(2, '0');
+	const mm2 = m2.toString().padStart(2, '0');
+	const SS1 = s1.toString().padStart(2, '0');
+
+	const wd = getWeekday(currentYear, MM, DD);
+
+	if (order.value.orderInfo && order.value.orderInfo.length > 0) {
+		order.value.orderInfo.forEach(info => {
+			if (info.label === '送达时间') {
+				const randomVal = `${MM}-${DD}(${wd}) ${HH1}:${mm1}-${HH2}:${mm2}`;
+				savedOrderDeliveryTime.value = randomVal;
+				info.value = order.value.statusType === 'wait_pay' ? '尽快送达' : randomVal;
+			} else if (info.label.includes('时间') && info.label !== '下单时间') {
+				info.value = `${currentYear}-${MM}-${DD} ${HH1}:${mm1}:${SS1}.123`;
+			}
+		});
+	}
+};
+
+const clickRandomDate = () => {
+	initRandomDeliveryTime();
+	initRandomPayTime();
+	initRandomOrderInfoTimes();
+
+	if (!waimaiProductList || waimaiProductList.length === 0) return;
+	const randomIndex = Math.floor(Math.random() * waimaiProductList.length);
+	const selected = JSON.parse(JSON.stringify(waimaiProductList[randomIndex]));
+	if (order.value && selected.products && selected.products.length > 0) {
+		order.value.shopName = selected.shopName || order.value.shopName;
+		order.value.location = selected.location || order.value.location;
+
+		order.value.goodsList = selected.products.map(p => ({
+			image: p.image,
+			title: p.title,
+			spec: p.desc || '',
+			actualPrice: p.price || p.actualPrice,
+			oriPrice: p.oriPrice || '',
+			count: p.count || '1',
+			tag: p.tag || "食品安全理赔 慢必赔"
+		}));
+	}
+};
+
+const addGoods = () => {
+	if (!order.value.goodsList) order.value.goodsList = [];
+	order.value.goodsList.push({
+		title: "新增外卖商品",
+		image: "",
+		spec: "默认规格",
+		tag: "食品安全理赔 慢必赔",
+		actualPrice: "10.6",
+		oriPrice: "15.00",
+		count: "1"
+	});
+};
+
+const removeGoods = (index) => {
+	if (order.value.goodsList.length > 1) {
+		order.value.goodsList.splice(index, 1);
+	} else {
+		uni.showToast({ title: '至少保留一个商品', icon: 'none' });
+	}
+};
+
+const chooseImage = (goodsItem) => {
+	uni.chooseImage({
+		count: 1,
+		success: (res) => {
+			const tempPath = res.tempFilePaths[0];
+			uni.saveFile({
+				tempFilePath: tempPath,
+				success: (saveRes) => {
+					goodsItem.image = saveRes.savedFilePath;
+					uni.showToast({ title: '图片已更新', icon: 'success' });
+				}
+			});
+		}
+	});
+}
+
+const chooseDeliveryPhoto = () => {
+	uni.chooseImage({
+		count: 1,
+		success: (res) => {
+			const tempPath = res.tempFilePaths[0];
+			uni.saveFile({
+				tempFilePath: tempPath,
+				success: (saveRes) => {
+					order.value.deliveryPhoto = saveRes.savedFilePath;
+					uni.showToast({ title: '送达图片已更新', icon: 'success' });
+				}
+			});
+		}
+	});
+};
+
+const selectDeliveryPhoto = (photo) => {
+	order.value.deliveryPhoto = photo;
+};
+
+const selectMapPhoto = (photo) => {
+	order.value.mapUrl = photo;
+};
+
+onShow(() => {
+	const savedScreenshot = uni.getStorageSync('taobao_screenshot');
+	if (savedScreenshot) {
+		screenshotImage.value = savedScreenshot;
+	}
+})
+
+const timeoutDelivery = computed(() => {
+	if (!order.value.deliveryTime) return '';
+	const parts = order.value.deliveryTime.split('-');
+	if (parts.length < 2) return '';
+	const timeParts = parts[1].trim().split(':');
+	if (timeParts.length < 2) return '';
+	let hours = parseInt(timeParts[0], 10);
+	let minutes = parseInt(timeParts[1], 10) + 20;
+	if (minutes >= 60) {
+		hours = (hours + Math.floor(minutes / 60)) % 24;
+		minutes = minutes % 60;
+	}
+	return `${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}`;
+});
+
+const items = [
+	{
+		image: "/static/image/shopping/taobao/waimai/zhaorenfu.png",
+		text: "找人付",
+		show: () => {
+			return order.value.statusType == 'wait_pay'
+		}
+	},
+	{
+		image: "/static/image/shopping/taobao/waimai/gaidingdan.png",
+		text: "修改订单信息",
+		show: () => order.value.statusType == 'wait_pay' || order.value.statusType == 'wait_recv',
+		color: "#FE6306"
+	},
+	{
+		image: "/static/image/shopping/taobao/waimai/shenqingshouhou.png",
+		text: "申请售后",
+		show: () => order.value.statusType == 'success',
+	},
+	{
+		image: "/static/image/shopping/taobao/waimai/zaimaiyidan.png",
+		text: "再买一单",
+		show: () => order.value.statusType == 'success',
+		color: "#FE6306"
+	},
+	{
+		image: "/static/image/shopping/taobao/waimai/pingjiayinhongbao.png",
+		text: "评价赢红包",
+		show: () => order.value.statusType == 'success',
+	},
+	{
+		image: "/static/image/shopping/taobao/waimai/lianxi.png",
+		text: "联系商家",
+		show: () => order.value.statusType == 'wait_recv' || order.value.statusType == 'success'
+	},
+	{
+		image: "/static/image/shopping/taobao/waimai/lianxi.png",
+		text: "联系骑士",
+		show: () => order.value.statusType == 'wait_recv' || order.value.statusType == 'success'
+	},
+	{
+		image: "/static/image/shopping/taobao/waimai/cuidan.png",
+		text: "催单",
+		show: () => order.value.statusType == 'wait_recv'
+	},
+	{
+		image: "/static/image/shopping/taobao/waimai/quxiaodingdan.png",
+		text: "取消订单",
+		show: () => order.value.statusType == 'wait_pay' || order.value.statusType == 'wait_recv'
+	},
+	{
+		image: "/static/image/shopping/taobao/waimai/dianhuashangjia.png",
+		text: "电话商家",
+		show: () => order.value.statusType == 'closed'
+	}
+]
+
+
+</script>
+
+<style lang="less" scoped>
+.tab-box {
+	background-color: #F2F3F7;
+	padding: 22rpx 24rpx;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	overflow: hidden;
+	overflow-x: scroll;
+
+	&::-webkit-scrollbar {
+		display: none;
+	}
+
+	.tab {
+		white-space: nowrap;
+		padding: 10rpx 32rpx;
+		border-radius: 28rpx;
+		margin-right: 16rpx;
+		background-color: #fff;
+		font-size: 26rpx;
+		color: #1a1a1a;
+		flex-shrink: 0;
+		font-weight: 500;
+
+		&.active {
+			color: #FF7824;
+		}
+	}
+}
+
+.random-dice {
+	z-index: 100;
+	padding: 10rpx;
+	display: flex;
+	align-items: center;
+	justify-content: flex-end;
+}
+
+
+::v-deep .uni-navbar__header-btns {
+	width: auto !important;
+}
+
+::v-deep .uni-navbar__header-container {
+	padding: 0 14rpx;
+	padding-left: 34rpx;
+}
+
+.wait-recv-page-container {
+	::v-deep .placeholder-box {
+		display: none;
+	}
+}
+
+.nav-bar {
+	background-color: #ffffff;
+
+	.back-icon {
+		width: 40rpx;
+		height: 40rpx;
+	}
+
+	.search-box {
+		background-color: #F1F5F8;
+		padding: 0 18rpx;
+		width: 100%;
+		border-radius: 16rpx;
+
+		.search-icon {
+			width: 26rpx;
+			height: 26rpx;
+			margin-right: 10rpx;
+		}
+
+		.input {
+			width: 100%;
+			height: 72rpx;
+			font-size: 26rpx;
+
+			::v-deep .input-placeholder {
+				color: #7E8C9D;
+			}
+		}
+	}
+
+	.right-box {
+		.item {
+			margin-left: 30rpx;
+			height: 70rpx;
+			border-radius: 12rpx;
+			align-items: center;
+			justify-content: center;
+			flex-direction: column;
+
+			.icon {
+				width: 40rpx;
+				height: 40rpx;
+			}
+
+			.text {
+				font-size: 18rpx;
+				color: #1A1A1A;
+				line-height: 18rpx;
+			}
+		}
+	}
+}
+
+.map-box {
+	position: relative;
+
+	.qishou {
+		left: 50%;
+		top: 50%;
+
+		.qishou-info {
+			background-color: #ffffff;
+			border-radius: 12rpx;
+			padding: 20rpx 16rpx;
+			margin-bottom: 8rpx;
+
+			.title {
+				font-size: 32rpx;
+				color: #1A1A1A;
+				line-height: 26rpx;
+				font-weight: 500;
+				margin-bottom: 12rpx;
+			}
+
+			.time {
+				font-size: 24rpx;
+				color: #7B7E8C;
+				line-height: 26rpx;
+			}
+
+			.green {
+				color: #1AA35B;
+			}
+		}
+	}
+}
+
+.wait_pay {
+	padding: 32rpx 16rpx;
+	padding-bottom: 18rpx;
+	background-color: #ffffff;
+
+	.main-text {
+		font-weight: 400;
+		font-size: 48rpx;
+		line-height: 48rpx;
+		color: #1A1A1A;
+		font-weight: 600;
+		margin-right: 8rpx;
+		margin-left: 16rpx;
+	}
+
+	.notice-box {
+		padding: 28rpx 16rpx;
+		margin-top: 30rpx;
+		background-color: #FAFAFA;
+		border-radius: 8rpx;
+
+		.notice-text {
+			font-size: 26rpx;
+			color: #1A1A1A;
+			line-height: 26rpx;
+		}
+	}
+}
+
+.deliver-info {
+	background-color: #FFFFFF;
+	padding: 32rpx 32rpx 0;
+
+	.bold-text {
+		font-size: 40rpx;
+		color: #1A1A1A;
+		line-height: 40rpx;
+		font-weight: 500;
+	}
+
+	.label {
+		font-size: 26rpx;
+		color: #1A1A1A;
+		line-height: 26rpx;
+		font-weight: 500;
+		margin-right: 10rpx;
+	}
+
+	.time {
+		font-weight: 500;
+		font-size: 40rpx;
+		color: #1A1A1A;
+		line-height: 40rpx;
+	}
+
+	.address-info {
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #1A1A1A;
+		line-height: 40rpx;
+		margin-top: -8rpx;
+	}
+
+	.delivery-photo {
+		overflow: hidden;
+		background-color: #FFFFFF;
+
+		.add {
+			width: 80rpx;
+			height: 80rpx;
+			line-height: 70rpx;
+			border-radius: 12rpx;
+			background-color: #F0F0F0;
+			margin-right: 16rpx;
+			font-size: 60rpx;
+			color: #8C8C8C;
+			text-align: center;
+		}
+
+		image {
+			width: 80rpx;
+			height: 80rpx;
+			border-radius: 12rpx;
+			background-color: #F0F0F0;
+			box-sizing: border-box;
+
+			&.active-photo {
+				border: 4rpx solid #1AA35B !important;
+			}
+		}
+
+		// &::before {
+		// 	content: '+1';
+		// 	background-color: #000000;
+		// 	opacity: 0.5;
+		// 	border-radius: 12rpx 0 12rpx 0;
+		// 	font-size: 20rpx;
+		// 	color: #FFFFFF;
+		// 	line-height: 20rpx;
+		// 	padding: 6rpx 8rpx;
+		// }
+	}
+
+}
+
+.wait_pay-buttom {
+	padding: 0 32rpx;
+	padding-top: 42rpx;
+	background-color: #ffffff;
+	padding-bottom: 32rpx;
+
+	.button {
+		background-color: #FE6306;
+		width: 100%;
+		height: 80rpx;
+		border-radius: 12rpx;
+		flex-direction: column;
+		color: #FFFFFF;
+	}
+}
+
+
+
+.orange {
+	color: #FE6306 !important;
+}
+
+.product-info-box {
+	background-color: transparent;
+	margin-top: 16rpx;
+
+	.flex-between {
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.info-card {
+		background-color: #FFFFFF;
+		padding: 24rpx 32rpx;
+		margin-bottom: 16rpx;
+
+		.shop-title-box {
+			margin-bottom: 30rpx;
+
+			.tag {
+				background-color: #FE6306;
+				color: #FFFFFF;
+				font-size: 20rpx;
+				padding: 2rpx 6rpx;
+				border-radius: 4rpx;
+				margin-right: 12rpx;
+				line-height: 28rpx;
+			}
+
+			.shop-name {
+				font-size: 30rpx;
+				font-weight: 500;
+				color: #1A1A1A;
+				margin-right: 6rpx;
+				line-height: 28rpx;
+				max-width: 300rpx;
+			}
+		}
+
+		.goods-collapsed {
+			margin-bottom: 40rpx;
+
+			.images {
+				.img {
+					width: 80rpx;
+					height: 80rpx;
+					border-radius: 12rpx;
+					margin-right: 12rpx;
+					background-color: #F5F5F5;
+					flex-shrink: 0;
+				}
+			}
+
+			.count {
+				font-size: 24rpx;
+				color: #7C8495;
+				flex-shrink: 0;
+				margin-left: 20rpx;
+			}
+		}
+
+		.goods-item {
+			margin-bottom: 40rpx;
+			align-items: flex-start;
+
+			.goods-img-box {
+				position: relative;
+				width: 100rpx;
+				height: 100rpx;
+				margin-right: 16rpx;
+				border-radius: 12rpx;
+				flex-shrink: 0;
+
+				.goods-img {
+					width: 100%;
+					height: 100%;
+					border-radius: 12rpx;
+					background-color: #F5F5F5;
+				}
+			}
+
+			.goods-middle {
+				margin-right: 32rpx;
+
+				.title {
+					font-size: 26rpx;
+					color: #1A1A1A;
+					line-height: 32rpx;
+				}
+
+				.spec {
+					font-size: 24rpx;
+					color: #7C8495;
+					line-height: 36rpx;
+					margin-top: 4rpx;
+				}
+
+				.count {
+					font-size: 24rpx;
+					color: #7C8495;
+					line-height: 26rpx;
+					margin-top: 6rpx;
+				}
+			}
+
+			.goods-right {
+				.actual-price {
+					color: #1A1A1A;
+					line-height: 24rpx;
+					margin-top: 4rpx;
+
+					.label {
+						font-size: 24rpx;
+						margin-right: 4rpx;
+					}
+
+					.symbol {
+						font-size: 26rpx;
+						font-weight: 500;
+					}
+
+					.num {
+						font-size: 36rpx;
+						font-weight: 500;
+					}
+				}
+
+				.ori-price {
+					font-size: 24rpx;
+					line-height: 24rpx;
+					color: #7C8495;
+					margin-top: 10rpx;
+					text-align: right;
+				}
+			}
+		}
+
+		.fee-item {
+			margin-bottom: 32rpx;
+			line-height: 26rpx;
+			font-size: 26rpx;
+			align-items: flex-start;
+
+			.fee-left {
+				font-size: 26rpx;
+				color: #7C8495;
+			}
+
+			.fee-right {
+				.actual-price {
+					color: #1A1A1A;
+
+					.label {
+						font-size: 24rpx;
+						margin-right: 4rpx;
+					}
+
+					.symbol {
+						font-size: 26rpx;
+					}
+
+					.num {
+						font-size: 36rpx;
+					}
+				}
+
+				.ori-price {
+					font-size: 24rpx;
+					color: #7C8495;
+					margin-top: 10rpx;
+					text-align: right;
+				}
+
+				.red-text {
+					font-size: 26rpx;
+					color: #F83D3D;
+				}
+			}
+		}
+
+		.price-detail-title {
+			margin-top: 40rpx;
+			margin-bottom: 24rpx;
+			line-height: 30rpx;
+
+			.left {
+				font-size: 28rpx;
+				font-weight: bold;
+				color: #1A1A1A;
+			}
+
+			.right {
+				align-items: baseline;
+
+				.total-discount {
+					font-size: 24rpx;
+					color: #FF2020;
+					margin-right: 16rpx;
+
+					.symbol {
+						font-size: 22rpx;
+					}
+				}
+
+				.total-actual {
+					font-size: 24rpx;
+					color: #1A1A1A;
+
+					.symbol {
+						font-size: 24rpx;
+					}
+
+					.num {
+						font-size: 34rpx;
+					}
+				}
+			}
+		}
+
+		.price-detail-list {
+			background-color: #F1F5F8;
+			border-radius: 12rpx;
+			padding: 30rpx 16rpx;
+			margin-bottom: 16rpx;
+
+			.detail-item {
+				margin-bottom: 36rpx;
+				line-height: 26rpx;
+
+				&:last-child {
+					margin-bottom: 0;
+				}
+
+				.label {
+					font-size: 26rpx;
+					color: #7C8495;
+				}
+
+				.val {
+					font-size: 32rpx;
+					color: #1A1A1A;
+
+					&.red-val {
+						color: #F83D3D;
+					}
+				}
+			}
+		}
+
+		.divider-line {
+			height: 1rpx;
+			background-color: #D8D8D8;
+			margin-bottom: 32rpx;
+		}
+
+		.order-info-area {
+			.order-item {
+				margin-bottom: 36rpx;
+				line-height: 26rpx;
+
+				.label {
+					font-size: 26rpx;
+					color: #7C8495;
+					width: 140rpx;
+					flex-shrink: 0;
+				}
+
+				.val {
+					font-size: 24rpx;
+					line-height: 26rpx;
+					color: #1A1A1A;
+					word-break: break-all;
+					width: 100px;
+
+					.input-box {
+						width: 100%;
+						overflow-x: scroll;
+					}
+				}
+			}
+		}
+	}
+}
+
+.common-problem-box {
+	height: 108rpx;
+	background-color: #ffffff;
+	padding: 0 32rpx;
+	color: #1A1A1A;
+	font-size: 30rpx;
+	font-weight: bold;
+	margin-bottom: 16rpx;
+
+	.item {
+		font-size: 24rpx;
+		color: #465C72;
+		line-height: 24rpx;
+		background-color: #F1F5F8;
+		border-radius: 4rpx;
+		padding: 0 20rpx;
+		height: 48rpx;
+		line-height: 48rpx;
+		margin-left: 18rpx;
+		font-weight: 400;
+	}
+}
+</style>
+<style>
+@import "/common/main.css";
+
+page {
+	background-color: #F1F5F8;
+}
+</style>
diff --git a/pages/shopping/taobao/components/list-card/list-card.vue b/pages/shopping/taobao/components/list-card/list-card.vue
index 1d8997a..39da94a 100644
--- a/pages/shopping/taobao/components/list-card/list-card.vue
+++ b/pages/shopping/taobao/components/list-card/list-card.vue
@@ -4,72 +4,154 @@
             @touchstart="handleTouchStart($event, item)" @touchmove="handleTouchMove" @touchend="handleTouchEnd">
             <!-- 顶部店铺和状态 -->
             <view class="card-header">
-                <view class="shop-info">
-                    <image class="taobao-logo" :src="`/static/image/shopping/taobao/${item.shopType}.png`"
+                <view class="shop-info flex-align-center">
+                    <image class="taobao-logo" :class="{ shangou: item.orderType === 'waimai' }"
+                        :src="`/static/image/shopping/taobao/${item.orderType === 'waimai' ? 'shangou' : item.shopType}.png`"
                         mode="heightFix">
                     </image>
-                    <text class="shop-name">{{ item.shopName || '淘宝店铺' }}</text>
-                    <uni-icons style="margin-left: 4rpx;" type="right" size="10" color="#8C8C8C"></uni-icons>
+                    <text class="shop-name flex-align-center"><text
+                            :class="{ 'waimai-shop-name': item.orderType === 'waimai' }">{{ item.shopName || '淘宝店铺'
+                            }}</text> <text v-if="item.orderType === 'waimai'" style="color: #7C8495;"
+                            class="waimai-shop-name">{{
+                                item.location }}</text></text>
+                    <uni-icons style="margin-left: 4rpx;" type="right" size="12" color="#8C8C8C"></uni-icons>
                     <!-- <text class="iconfont icon-arrow-right arrow-icon">></text> -->
                 </view>
-                <view class="order-status" :class="item.statusType">
+                <view class="order-status" :class="[item.statusType, item.orderType]">
                     {{ item.statusText || getStatusText(item.statusType) }}
                 </view>
             </view>
 
             <!-- 商品列表 -->
             <view class="goods-list" @tap="goToDetail(item)">
-                <view class="goods-item" v-for="(goods, gIdx) in item.goodsList" :key="gIdx">
-                    <image class="goods-img" :class="{ refunding: item.statusType === 'refunding' }"
-                        :src="goods.image || '/static/default-goods.png'" mode="aspectFill"
-                        :style="{ width: imgHeights[index + '-' + gIdx] ? imgHeights[index + '-' + gIdx] + 'px' : '', height: imgHeights[index + '-' + gIdx] ? imgHeights[index + '-' + gIdx] + 'px' : '' }">
-                    </image>
-                    <view class="goods-info" :id="'goods-info-' + index + '-' + gIdx">
-                        <view class="goods-title-row">
-                            <view class="good-info-box" :id="'title-box-' + index + '-' + gIdx">
-                                <text class="goods-title">{{ getTruncatedTitle(item, index, goods, gIdx) }}</text>
-                                <view class="goods-spec" v-if="goods.specs">{{ goods.specs }}</view>
-                            </view>
-
-                            <view class="goods-price-box">
-                                <text class="price-symbol wx-font-medium">￥</text>
-                                <text class="price-val wx-font-medium">{{ goods.price }}</text>
-                                <text class="goods-count">x{{ goods.count || 1 }}</text>
-                            </view>
-                        </view>
-
-                        <view class="goods-tags" v-if="goods.tags && item.statusType !== 'refunding'">
-                            <text class="tag">{{ goods.tags }}</text>
-                        </view>
-                        <!-- 单个商品的售后状态 -->
-                        <view class="goods-evaluation" v-if="item.statusType == 'success'">
-                            <view class="left">
-                                <image style="width: 24rpx;height: 24rpx;margin-right: 8rpx;"
-                                    src='/static/image/shopping/taobao/pingjia.png'>
-                                </image>
-                                <text>评价将帮助70人</text>
-                            </view>
-                            <view class="right">
-                                <image style="width: 24rpx;height: 24rpx;margin-right: 8rpx;"
-                                    src='/static/image/shopping/taobao/chaping.png'>
-                                </image>
-                                <text>差评</text>
-                                <image style="width: 24rpx;height: 24rpx;margin-right: 8rpx;"
-                                    src='/static/image/shopping/taobao/zhongping.png'>
-                                </image>
-                                <text>中评</text>
-                                <image style="width: 24rpx;height: 24rpx;margin-right: 8rpx;"
-                                    src='/static/image/shopping/taobao/haoping.png'>
-                                </image>
-                                <text>好评</text>
+                <template v-if="item.orderType === 'waimai'">
+                    <!-- 外卖单个商品 -->
+                    <!-- :style="{ width: imgHeights[index + '-0'] ? imgHeights[index + '-0'] + 'px' : '', height: imgHeights[index + '-0'] ? imgHeights[index + '-0'] + 'px' : '' }" -->
+                    <view v-if="item.goodsList.length === 1" class="goods-item">
+                        <image class="goods-img" :src="item.goodsList[0].image || '/static/default-goods.png'"
+                            mode="aspectFill">
+                        </image>
+                        <view class="goods-info" :id="'goods-info-' + index + '-0'">
+                            <view class="goods-title-row">
+                                <view class="good-info-box" :id="'title-box-' + index + '-0'">
+                                    <text class="goods-title">{{ getTruncatedTitle(item, index, item.goodsList[0], 0)
+                                    }}</text>
+                                    <view class="goods-spec" style="margin-top: 18rpx; color: #999;">默认</view>
+                                    <view class="goods-tags" v-if="item.goodsList[0].tags || item.goodsList[0].tag"
+                                        style="margin-top: 18rpx;">
+                                        <text class="tag">{{ item.goodsList[0].tags || item.goodsList[0].tag }}</text>
+                                    </view>
+                                </view>
+                                <view class="goods-price-box">
+                                    <text class="price-symbol wx-font-medium">￥</text>
+                                    <text class="price-val wx-font-medium">{{ item.goodsList[0].actualPrice ||
+                                        item.goodsList[0].price }}</text>
+                                    <text class="goods-count">x{{ item.goodsList[0].count || 1 }}</text>
+                                </view>
                             </view>
                         </view>
                     </view>
-                </view>
+                    <!-- 外卖多个商品 -->
+                    <view v-else class="waimai-multi-goods flex-align-center"
+                        style="margin-bottom: 18rpx; height: 136rpx;">
+                        <scroll-view scroll-x class="waimai-images"
+                            style="flex: 1; white-space: nowrap; overflow: hidden; margin-right: 16rpx; height: 100%;">
+                            <view v-for="(goods, gIdx) in item.goodsList" :key="gIdx"
+                                style="display: inline-block; position: relative; margin-right: 16rpx; width: 136rpx; height: 136rpx;">
+                                <image :src="goods.image || '/static/default-goods.png'" mode="aspectFill"
+                                    style="width: 100%; height: 100%; border-radius: 12rpx; background-color: #F5F5F5;">
+                                </image>
+                                <text
+                                    style="position: absolute; bottom: 0; left: 0; background: rgba(0,0,0,0.4); color: #fff; font-size: 20rpx; padding: 2rpx 8rpx; border-radius: 0 12rpx 0 12rpx;">x{{
+                                        goods.count || 1 }}</text>
+                            </view>
+                        </scroll-view>
+                        <view class="waimai-total-count"
+                            style="font-size: 24rpx; color: #7C8495; flex-shrink: 0; font-weight: 400;">共{{
+                                getTotalCount(item.goodsList) }}件</view>
+                    </view>
+                </template>
+                <template v-else>
+                    <view class="goods-item" v-for="(goods, gIdx) in item.goodsList" :key="gIdx">
+                        <image class="goods-img"
+                            :class="{ refunding: item.statusType === 'refunding' && currentFilter == 4 }"
+                            :src="goods.image || '/static/default-goods.png'" mode="aspectFill"
+                            :style="{ width: imgHeights[index + '-' + gIdx] ? imgHeights[index + '-' + gIdx] + 'px' : '', height: imgHeights[index + '-' + gIdx] ? imgHeights[index + '-' + gIdx] + 'px' : '' }">
+                        </image>
+                        <view class="goods-info" :id="'goods-info-' + index + '-' + gIdx">
+                            <view class="goods-title-row">
+                                <view class="good-info-box" :id="'title-box-' + index + '-' + gIdx">
+                                    <text class="goods-title">{{ getTruncatedTitle(item, index, goods, gIdx) }}</text>
+                                    <view class="goods-spec" v-if="goods.specs">{{ goods.specs }}</view>
+                                </view>
+
+                                <view class="goods-price-box">
+                                    <text class="price-symbol wx-font-medium">￥</text>
+                                    <text class="price-val wx-font-medium">{{ goods.price }}</text>
+                                    <text class="goods-count">x{{ goods.count || 1 }}</text>
+                                </view>
+                            </view>
+
+                            <view class="goods-tags" v-if="goods.tags && currentFilter != 4">
+                                <text class="tag">{{ goods.tags }}</text>
+                            </view>
+                            <!-- 单个商品的售后状态 -->
+                            <view class="goods-evaluation" v-if="item.statusType == 'success'">
+                                <view class="left">
+                                    <image style="width: 24rpx;height: 24rpx;margin-right: 8rpx;"
+                                        src='/static/image/shopping/taobao/pingjia.png'>
+                                    </image>
+                                    <text>评价将帮助70人</text>
+                                </view>
+                                <view class="right">
+                                    <image style="width: 24rpx;height: 24rpx;margin-right: 8rpx;"
+                                        src='/static/image/shopping/taobao/chaping.png'>
+                                    </image>
+                                    <text>差评</text>
+                                    <image style="width: 24rpx;height: 24rpx;margin-right: 8rpx;"
+                                        src='/static/image/shopping/taobao/zhongping.png'>
+                                    </image>
+                                    <text>中评</text>
+                                    <image style="width: 24rpx;height: 24rpx;margin-right: 8rpx;"
+                                        src='/static/image/shopping/taobao/haoping.png'>
+                                    </image>
+                                    <text>好评</text>
+                                </view>
+                            </view>
+                            <!-- 单个商品的售后状态 -->
+                            <view class="goods-evaluation" v-if="item.statusType == 'refunding' && currentFilter != 4">
+                                <view class="left">
+                                    <image style="width: 24rpx;height: 24rpx;margin-right: 8rpx;"
+                                        src='/static/image/shopping/taobao/tuikuanchenggong.png'>
+                                    </image>
+                                    <text>退款成功</text>
+                                </view>
+                                <view class="desc">
+                                    {{ item.statusDesc }}
+                                </view>
+                                <uni-icons type="right" size="12" color="#7B7E8C"></uni-icons>
+                            </view>
+                        </view>
+                    </view>
+                </template>
             </view>
 
             <!-- 各种提示信息 -->
-            <view v-if="item.statusType == 'wait_pay'" class="tips-box daifukuan">
+            <view v-if="item.orderType === 'waimai' && item.statusType === 'wait_recv'" class="tips-box waimai-delivery"
+                style="background-color: #F4F5F7; border-radius: 12rpx; padding: 16rpx 24rpx; margin-top: 16rpx; display: flex; align-items: center; height: auto;">
+                <image style="width: 36rpx; height: 36rpx; margin-right: 16rpx; flex-shrink: 0;"
+                    src="/static/image/shopping/taobao/daocha.png"></image>
+                <view style="flex: 1; overflow: hidden;">
+                    <view
+                        style="font-size: 26rpx; color: #1A1A1A; font-weight: 500; display: flex; align-items: center;">
+                        预计 <text style="color: #FF7824; margin: 0 8rpx;">{{ item.deliveryTime || '14:15-14:45' }}</text>
+                        送达</view>
+                    <view style="font-size: 22rpx; color: #999; margin-top: 6rpx;">下单时间 {{ item.orderInfo?.[8]?.value }}
+                    </view>
+                </view>
+                <uni-icons type="right" size="12" color="#7C8495"></uni-icons>
+            </view>
+            <view v-else-if="item.statusType == 'wait_pay' && item.orderType != 'waimai'" class="tips-box daifukuan">
                 <image class="tip-icon" src="/static/image/shopping/taobao/daifukuan.png"></image>
                 <text class="text">订单即将关闭，建议尽快付款</text>
             </view>
@@ -87,32 +169,35 @@
                 <uni-icons v-if="item.statusDesc2" type="right" size="14" color="#7B7E8C"></uni-icons>
             </view>
 
-            <view v-else-if="item.statusType == 'refunding'" class="tips-box yunshuzhong">
+            <view v-else-if="item.statusType == 'refunding' && props.currentFilter == 4" class="tips-box yunshuzhong">
                 <text class="title">退款成功</text>
                 <text class="text">{{ item.statusDesc }}</text>
             </view>
 
             <!-- 价格合计 -->
             <view class="order-total">
-                <text class="total-label">共{{ getTotalCount(item.goodsList) }}件商品</text>
-                <text class="total-label">实付款</text>
+                <text class="total-label" :style="item.orderType === 'waimai' ? 'color: #7B7E8C;' : ''">共{{
+                    getTotalCount(item.goodsList) }}件{{ item.orderType === 'waimai' ? ' (含包装/配送费)' : '商品' }}</text>
+                <text class="total-label" style="margin-left: 8rpx;">实付款</text>
                 <text class="total-symbol wx-font-medium">￥</text>
                 <text class="total-price wx-font-medium">{{ Number(
-                    item.totalPrice).toFixed(2).split(".")[0] }}</text>
+                    item.priceDetail?.actualPay || item.totalPrice || 0).toFixed(2).split(".")[0] }}</text>
                 <text class="total-price wx-font-medium" style="font-size: 28rpx;">.{{ Number(
-                    item.totalPrice).toFixed(2).split(".")[1] }}</text>
+                    item.priceDetail?.actualPay || item.totalPrice || 0).toFixed(2).split(".")[1] }}</text>
             </view>
 
             <!-- 底部按钮 -->
-            <view class="card-footer" v-if="getButtons(item.statusType).buttons.length > 0">
-                <view class="more-text"
-                    v-if="getButtons(item.statusType).moreText.text || '更多' && getButtons(item.statusType).moreText.isShow"
-                    :style="{ color: getButtons(item.statusType).moreText.color }">
-                    {{ getButtons(item.statusType).moreText.text || '更多' }}
+            <view class="card-footer" v-if="getButtons(item.statusType, item.orderType).buttons.length > 0">
+                <view class="more-text" v-if="getButtons(item.statusType, item.orderType).moreText?.isShow"
+                    :style="{ color: getButtons(item.statusType, item.orderType).moreText?.color || '#1A1A1A' }">
+                    {{ getButtons(item.statusType, item.orderType).moreText?.text || '更多' }}
                 </view>
                 <view class="btn" :class="{ 'btn-primary': btn.primary }"
-                    v-for="(btn, bIdx) in getButtons(item.statusType).buttons" :key="bIdx"
-                    @tap.stop="handleAction(btn.action, item)">
+                    v-for="(btn, bIdx) in getButtons(item.statusType, item.orderType).buttons" :key="bIdx"
+                    @tap.stop="handleAction(btn.action, item)" style="position: relative;">
+                    <text v-if="btn.tag"
+                        style="position: absolute; top: -18rpx; left: 50%; transform: translateX(-50%); background-color: #FF7824; color: #fff; font-size: 16rpx; padding: 2rpx 8rpx; border-radius: 16rpx; border-bottom-left-radius: 4rpx; white-space: nowrap;">{{
+                            btn.tag }}</text>
                     {{ btn.text }}
                 </view>
             </view>
@@ -127,6 +212,10 @@ const props = defineProps({
     list: {
         type: Array,
         default: () => []
+    },
+    currentFilter: {
+        type: String,
+        default: ''
     }
 });
 
@@ -170,7 +259,7 @@ const calcFitTitle = (originalTitle, containerWidth) => {
         }
     }
 
-    return found ? originalTitle.slice(0, cutIndex - 1) : originalTitle;
+    return found ? originalTitle.slice(0, cutIndex - 2) + '...' : originalTitle;
 };
 
 /**
@@ -251,13 +340,50 @@ const getStatusText = (status) => {
         'wait_recv': '卖家已发货',
         'success': '交易成功',
         'closed': '交易关闭',
-        'refunding': '退货'
+        'refunding': '交易关闭'
     };
+    if (status == 'refunding' && props.currentFilter == 4) {
+        map[status] = '退款'
+    }
     return map[status] || status;
 };
 
 // 状态对应的按钮配置
-const getButtons = (status) => {
+const getButtons = (status, orderType) => {
+    if (orderType === 'waimai') {
+        const waimaiMap = {
+            'wait_pay': {
+                moreText: { isShow: false },
+                buttons: [
+                    { text: '继续付款', action: 'pay', primary: true }
+                ]
+            },
+            'wait_recv': {
+                moreText: { isShow: false },
+                buttons: [
+                    { text: '查看订单', action: 'view_order' },
+                    { text: '查看物流', action: 'view_logistics' }
+                ]
+            },
+            'success': {
+                moreText: { isShow: false },
+                buttons: [
+                    { text: '删除订单', action: 'delete' },
+                    { text: '评价', action: 'comment' },
+                    { text: '再买一单', action: 'buy_again', primary: false }
+                ]
+            },
+            'closed': {
+                moreText: { isShow: false },
+                buttons: [
+                    { text: '删除订单', action: 'delete' },
+                    { text: '再买一单', action: 'buy_again', primary: false }
+                ]
+            }
+        };
+        return waimaiMap[status] || { moreText: { isShow: false }, buttons: [] };
+    }
+
     const map = {
         'wait_pay': {
             moreText: {
@@ -418,14 +544,27 @@ const goToDetail = (item) => {
             .taobao-logo {
                 height: 28rpx;
                 margin-right: 6rpx;
+
+                &.shangou {
+                    height: 36rpx;
+                }
             }
 
             .shop-name {
                 font-size: 28rpx;
+                line-height: 28rpx;
                 color: #333333;
                 font-weight: bold;
             }
 
+            .waimai-shop-name {
+                display: inline-block;
+                max-width: 220rpx;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+            }
+
             .arrow-icon {
                 font-size: 24rpx;
                 color: #999;
@@ -477,6 +616,10 @@ const goToDetail = (item) => {
                     .good-info-box {
                         flex: 1;
                         width: 100px;
+                        overflow: hidden;
+                        text-overflow: ellipsis;
+                        // margin-right: 8px;
+
                     }
 
                     .goods-title {
@@ -485,6 +628,7 @@ const goToDetail = (item) => {
                         line-height: 36rpx;
                         white-space: nowrap;
                         overflow: hidden;
+                        text-overflow: ellipsis;
                         flex: 1;
                         margin-right: 18rpx;
                         font-weight: 500;
@@ -562,7 +706,6 @@ const goToDetail = (item) => {
                         align-items: center;
 
                         text {
-                            width: 176rpx;
                             white-space: nowrap;
                             overflow: hidden;
                             text-overflow: ellipsis;
@@ -586,6 +729,15 @@ const goToDetail = (item) => {
                         font-weight: 500;
                         line-height: 24rpx;
                     }
+
+                    .desc {
+                        flex: 1;
+                        width: 100px;
+                        font-size: 24rpx;
+                        color: #7C8495;
+                        line-height: 24rpx;
+                        margin-left: 20rpx;
+                    }
                 }
             }
         }
diff --git a/pages/shopping/taobao/json/order.json b/pages/shopping/taobao/json/order.json
index f641c65..655481e 100644
--- a/pages/shopping/taobao/json/order.json
+++ b/pages/shopping/taobao/json/order.json
@@ -517,8 +517,880 @@
             ]
         }
     ],
+    //外卖类型
+    "waimaiType": [
+        {
+            "label": "待支付",
+            "key": "wait_pay"
+        },
+        {
+            "label": "骑手配送中",
+            "key": "wait_recv"
+        },
+        {
+            "label": "已送达",
+            "key": "success"
+        },
+        {
+            "label": "已取消",
+            "key": "closed"
+        }
+    ],
+    //外卖类型字段分类
+    "waimaiClassfiy": {
+        "wait_pay": {
+            "id": "",
+            "orderType": "waimai",
+            "statusType": "wait_pay",
+            "statusText": "待支付",
+            "isExpanded": false,
+            "isOrderInfoExpanded": false,
+            "shopName": "",
+            "location": "",
+            "deliveryPhoto": "",
+            "deliveryTime": "",
+            "remainingPayTime": "",
+            "goodsList": [
+                {
+                    "image": "",
+                    "title": "",
+                    "count": 1,
+                    "actualPrice": 0,
+                    "oriPrice": 0,
+                    "tag": "食品安全理赔 慢必赔"
+                }
+            ],
+            "fees": [
+                {
+                    "name": "打包费",
+                    "showQuestion": true,
+                    "actualPrice": 1.3,
+                    "oriPrice": 2
+                },
+                {
+                    "name": "配送费",
+                    "showQuestion": true,
+                    "actualPrice": 1.3,
+                    "oriPrice": 2
+                }
+            ],
+            "compensations": [
+                {
+                    "name": "超20分钟免单",
+                    "showQuestion": true,
+                    "value": "商家赠送",
+                    "isRed": true
+                },
+                {
+                    "name": "满返红包",
+                    "showQuestion": false,
+                    "value": "满返￥2商家红包",
+                    "isRed": true
+                }
+            ],
+            "priceDetail": {
+                "totalDiscount": "24.61",
+                "actualPay": "20.78",
+                "details": [
+                    {
+                        "name": "总价",
+                        "value": "￥45.39",
+                        "isBold": true
+                    },
+                    {
+                        "name": "商品优惠",
+                        "value": "-￥10.21",
+                        "isRed": true
+                    },
+                    {
+                        "name": "配送费优惠",
+                        "value": "-￥3.4",
+                        "isRed": true
+                    },
+                    {
+                        "name": "红包/抵用券",
+                        "value": "-￥9.0",
+                        "isRed": true
+                    }
+                ]
+            },
+            "orderInfo": [
+                {
+                    "label": "收货信息",
+                    "value": "上海市浦东新区汤臣一品 一单元1001 张三(男士) 13256325698",
+                    "hasModify": true
+                },
+                {
+                    "label": "备注",
+                    "value": "1份餐具",
+                    "isFoldDisplay": true
+                },
+                {
+                    "label": "慢必赔",
+                    "value": "平台赠送",
+                    "hasArrow": true
+                },
+                {
+                    "label": "其它服务",
+                    "value": "号码保护",
+                    "hasArrow": true
+                },
+                {
+                    "label": "订单号",
+                    "value": "8034160313365695921",
+                    "hasCopy": true,
+                    "isFoldDisplay": true
+                },
+                {
+                    "label": "送达时间",
+                    "value": "尽快送达"
+                },
+                {
+                    "label": "下单时间",
+                    "value": "2026-03-31 11: 11: 55.220"
+                },
+                {
+                    "label": "支付方式",
+                    "value": "支付宝免密支付"
+                }
+            ]
+        },
+        "wait_recv": {
+            "id": "",
+            "orderType": "waimai",
+            "statusType": "wait_recv",
+            "statusText": "骑手送货中",
+            "isExpanded": false,
+            "isOrderInfoExpanded": false,
+            "shopName": "",
+            "location": "",
+            "deliveryPhoto": "",
+            "deliveryTime": "",
+            "remainingPayTime": "",
+            "orderQty": "12单",
+            "surplusDeliveryTime": "40分钟",
+            "mapUrl": "/static/image/shopping/taobao/waimai/map1.png",
+            "goodsList": [
+                {
+                    "image": "",
+                    "title": "",
+                    "count": 1,
+                    "actualPrice": 0,
+                    "oriPrice": 0,
+                    "tag": "食品安全理赔 慢必赔"
+                }
+            ],
+            "fees": [
+                {
+                    "name": "打包费",
+                    "showQuestion": true,
+                    "actualPrice": 1.3,
+                    "oriPrice": 2
+                },
+                {
+                    "name": "配送费",
+                    "showQuestion": true,
+                    "actualPrice": 1.3,
+                    "oriPrice": 2
+                }
+            ],
+            "compensations": [
+                {
+                    "name": "超20分钟免单",
+                    "showQuestion": true,
+                    "value": "商家赠送",
+                    "isRed": true
+                },
+                {
+                    "name": "满返红包",
+                    "showQuestion": false,
+                    "value": "满返￥2商家红包",
+                    "isRed": true
+                }
+            ],
+            "priceDetail": {
+                "totalDiscount": "24.61",
+                "actualPay": "20.78",
+                "details": [
+                    {
+                        "name": "总价",
+                        "value": "￥45.39",
+                        "isBold": true
+                    },
+                    {
+                        "name": "商品优惠",
+                        "value": "-￥10.21",
+                        "isRed": true
+                    },
+                    {
+                        "name": "配送费优惠",
+                        "value": "-￥3.4",
+                        "isRed": true
+                    },
+                    {
+                        "name": "红包/抵用券",
+                        "value": "-￥9.0",
+                        "isRed": true
+                    }
+                ]
+            },
+            "orderInfo": [
+                {
+                    "label": "收货信息",
+                    "value": "上海市浦东新区汤臣一品 一单元1001 张三(男士) 13256325698",
+                    "hasModify": true
+                },
+                {
+                    "label": "联系不上时",
+                    "value": "可设置暂存点放置外卖",
+                    "hasSetting": true
+                },
+                {
+                    "label": "备注",
+                    "value": "1份餐具",
+                    "isFoldDisplay": true
+                },
+                {
+                    "label": "发票",
+                    "value": "未添加开票信息",
+                    "hasArrow": true
+                },
+                {
+                    "label": "配送方式",
+                    "value": "蜂鸟准时达",
+                    "hasArrow": true
+                },
+                {
+                    "label": "配送骑士",
+                    "value": "赵乃炼",
+                    "hasArrow": true
+                },
+                {
+                    "label": "订单号",
+                    "value": "8034160313365695921",
+                    "hasCopy": true,
+                    "isFoldDisplay": true
+                },
+                {
+                    "label": "送达时间",
+                    "value": "03-31(周二)11: 41-11: 56"
+                },
+                {
+                    "label": "下单时间",
+                    "value": "2026-03-31 11: 11: 55.220"
+                },
+                {
+                    "label": "支付方式",
+                    "value": "支付宝免密支付"
+                }
+            ]
+        },
+        "success": {
+            "id": "",
+            "orderType": "waimai",
+            "statusType": "success",
+            "statusText": "已送达",
+            "isExpanded": false,
+            "isOrderInfoExpanded": false,
+            "shopName": "",
+            "location": "",
+            "deliveryPhoto": "",
+            "deliveryTime": "",
+            "remainingPayTime": "",
+            "orderQty": "",
+            "surplusDeliveryTime": "",
+            "goodsList": [
+                {
+                    "image": "",
+                    "title": "",
+                    "count": 1,
+                    "actualPrice": 0,
+                    "oriPrice": 0,
+                    "tag": "食品安全理赔 慢必赔"
+                }
+            ],
+            "fees": [
+                {
+                    "name": "打包费",
+                    "showQuestion": true,
+                    "actualPrice": 1.3,
+                    "oriPrice": 2
+                },
+                {
+                    "name": "配送费",
+                    "showQuestion": true,
+                    "actualPrice": 1.3,
+                    "oriPrice": 2
+                }
+            ],
+            "compensations": [
+                {
+                    "name": "超20分钟免单",
+                    "showQuestion": true,
+                    "value": "商家赠送",
+                    "isRed": true
+                },
+                {
+                    "name": "满返红包",
+                    "showQuestion": false,
+                    "value": "满返￥2商家红包",
+                    "isRed": true
+                }
+            ],
+            "priceDetail": {
+                "totalDiscount": "24.61",
+                "actualPay": "20.78",
+                "details": [
+                    {
+                        "name": "总价",
+                        "value": "￥45.39",
+                        "isBold": true
+                    },
+                    {
+                        "name": "商品优惠",
+                        "value": "-￥10.21",
+                        "isRed": true
+                    },
+                    {
+                        "name": "配送费优惠",
+                        "value": "-￥3.4",
+                        "isRed": true
+                    },
+                    {
+                        "name": "红包/抵用券",
+                        "value": "-￥9.0",
+                        "isRed": true
+                    }
+                ]
+            },
+            "orderInfo": [
+                {
+                    "label": "收货信息",
+                    "value": "上海市浦东新区汤臣一品 一单元1001 张三(男士) 13256325698",
+                    "hasModify": true
+                },
+                {
+                    "label": "备注",
+                    "value": "1份餐具"
+                },
+                {
+                    "label": "发票",
+                    "value": "未添加开票信息",
+                    "hasArrow": true,
+                    "isFoldDisplay": true
+                },
+                {
+                    "label": "配送方式",
+                    "value": "蜂鸟准时达",
+                    "hasArrow": true
+                },
+                {
+                    "label": "配送骑士",
+                    "value": "赵乃炼",
+                    "hasArrow": true
+                },
+                {
+                    "label": "食无忧",
+                    "value": "如有以无编制或引起就医,可申请理赔",
+                    "hasApply": true,
+                    "isFoldDisplay": true
+                },
+                {
+                    "label": "超20分钟免单",
+                    "value": "订单已准时送达,服务保障已结束",
+                    "hasArrow": true,
+                    "isFoldDisplay": true
+                },
+                {
+                    "label": "其他服务",
+                    "value": "号码保护",
+                    "hasArrow": true
+                },
+                {
+                    "label": "订单号",
+                    "value": "8034160313365695921",
+                    "hasCopy": true,
+                    "isFoldDisplay": true
+                },
+                {
+                    "label": "送达时间",
+                    "value": "03-31(周二)11: 41-11: 56"
+                },
+                {
+                    "label": "下单时间",
+                    "value": "2026-03-31 11: 11: 55.220"
+                },
+                {
+                    "label": "支付方式",
+                    "value": "支付宝免密支付"
+                }
+            ]
+        },
+        "closed": {
+            "id": "",
+            "orderType": "waimai",
+            "statusType": "closed",
+            "statusText": "已取消",
+            "isExpanded": false,
+            "isOrderInfoExpanded": false,
+            "shopName": "",
+            "location": "",
+            "deliveryPhoto": "",
+            "deliveryTime": "",
+            "remainingPayTime": "",
+            "orderQty": "",
+            "surplusDeliveryTime": "",
+            "goodsList": [
+                {
+                    "image": "",
+                    "title": "",
+                    "count": 1,
+                    "actualPrice": 0,
+                    "oriPrice": 0,
+                    "tag": "食品安全理赔 慢必赔"
+                }
+            ],
+            "fees": [
+                {
+                    "name": "打包费",
+                    "showQuestion": true,
+                    "actualPrice": 1.3,
+                    "oriPrice": 2
+                },
+                {
+                    "name": "配送费",
+                    "showQuestion": true,
+                    "actualPrice": 1.3,
+                    "oriPrice": 2
+                }
+            ],
+            "compensations": [
+                {
+                    "name": "超20分钟免单",
+                    "showQuestion": true,
+                    "value": "商家赠送",
+                    "isRed": true
+                },
+                {
+                    "name": "满返红包",
+                    "showQuestion": false,
+                    "value": "满返￥2商家红包",
+                    "isRed": true
+                }
+            ],
+            "priceDetail": {
+                "totalDiscount": "24.61",
+                "actualPay": "20.78",
+                "details": [
+                    {
+                        "name": "总价",
+                        "value": "￥45.39",
+                        "isBold": true
+                    },
+                    {
+                        "name": "商品优惠",
+                        "value": "-￥10.21",
+                        "isRed": true
+                    },
+                    {
+                        "name": "配送费优惠",
+                        "value": "-￥3.4",
+                        "isRed": true
+                    },
+                    {
+                        "name": "红包/抵用券",
+                        "value": "-￥9.0",
+                        "isRed": true
+                    }
+                ]
+            },
+            "orderInfo": [
+                {
+                    "label": "收货信息",
+                    "value": "上海市浦东新区汤臣一品 一单元1001 张三(男士) 13256325698",
+                    "hasModify": true
+                },
+                {
+                    "label": "备注",
+                    "value": "1份餐具",
+                    "isFoldDisplay": true
+                },
+                {
+                    "label": "慢必赔",
+                    "value": "平台赠送"
+                },
+                {
+                    "label": "其它服务",
+                    "value": "号码保护",
+                    "hasArrow": true
+                },
+                {
+                    "label": "订单号",
+                    "value": "8034160313365695921",
+                    "hasCopy": true,
+                    "isFoldDisplay": true
+                },
+                {
+                    "label": "送达时间",
+                    "value": "03-31(周二)11: 41-11: 56"
+                },
+                {
+                    "label": "下单时间",
+                    "value": "2026-03-31 11: 11: 55.220"
+                },
+                {
+                    "label": "支付方式",
+                    "value": "支付宝免密支付"
+                }
+            ]
+        },
+    },
+    // "购物随机产品列表"
+    "waimaiProductList": [
+        {
+            "shopName": "喜茶",
+            "location": "上海中区广场店",
+            "products": [
+                {
+                    "image": "/static/image/shopping/jingdong/product/waimai/xicha1.png",
+                    "title": "多肉葡萄",
+                    "desc": "标准冰/五分糖；一人份",
+                    "price": "28.00",
+                    "actualPrice": 0.06,
+                    "oriPrice": 2,
+                    "count": "1",
+                    "discount": "2.00",
+                    "tag": "食品安全理赔 慢必赔"
+                }
+            ]
+        },
+        {
+            "shopName": "肯德基宅急送",
+            "location": "南京路店",
+            "products": [
+                {
+                    "image": "/static/image/shopping/jingdong/product/waimai/kfc.png",
+                    "title": "劲脆鸡腿堡单人餐",
+                    "desc": "汉堡+薯条+可乐；一人份",
+                    "price": "38.50",
+                    "count": "1",
+                    "discount": "9.00",
+                    "tag": "食品安全理赔 慢必赔"
+                }
+            ]
+        },
+        {
+            "shopName": "Wagas 沃歌斯",
+            "location": "嘉里中心店",
+            "products": [
+                {
+                    "image": "/static/image/shopping/jingdong/product/waimai/shala.png",
+                    "title": "沃歌斯冠军沙拉",
+                    "desc": "含鸡肉/羽衣甘蓝；一人份",
+                    "price": "68.00",
+                    "count": "1",
+                    "discount": "0.00",
+                    "tag": "食品安全理赔 慢必赔"
+                }
+            ]
+        },
+        {
+            "shopName": "海底捞外送",
+            "location": "火锅外卖",
+            "products": [
+                {
+                    "image": "/static/image/shopping/jingdong/product/waimai/haidilao.png",
+                    "title": "捞派肥牛 (半份)",
+                    "desc": "精选谷饲肥牛；一人份",
+                    "price": "36.00",
+                    "count": "1",
+                    "discount": "0.00",
+                    "tag": "食品安全理赔 慢必赔"
+                }
+            ]
+        },
+        {
+            "shopName": "星巴克专星送",
+            "location": "国金中心店",
+            "products": [
+                {
+                    "image": "/static/image/shopping/jingdong/product/waimai/xingbake.png",
+                    "title": "燕麦拿铁 (大杯)",
+                    "desc": "不额外加糖/常温；一人份",
+                    "price": "35.00",
+                    "count": "1",
+                    "discount": "7.00",
+                    "tag": "食品安全理赔 慢必赔"
+                }
+            ]
+        },
+        {
+            "shopName": "新荣记",
+            "location": "黑珍珠三钻·南京西路店",
+            "products": [
+                {
+                    "image": "/static/image/shopping/jingdong/product/waimai/huajiaoji.png",
+                    "title": "至尊黄焖两头干鲍鱼花胶鸡套餐",
+                    "desc": "精选20头干鲍、深海花胶、清远走地鸡；单人尊享",
+                    "price": "3888.00",
+                    "count": "1",
+                    "discount": "0.00",
+                    "tag": "食品安全理赔 慢必赔"
+                }
+            ]
+        }
+    ],
     //默认数据
     "defualtData": [
+        {
+            "id": "1779342764434",
+            "orderType": "waimai",
+            "statusType": "wait_recv",
+            "statusText": "骑手送货中",
+            "isExpanded": false,
+            "isOrderInfoExpanded": false,
+            "shopName": "海底捞外送",
+            "location": "火锅外卖",
+            "deliveryPhoto": "/static/image/shopping/taobao/waimai/deliveryPhoto2.png",
+            "deliveryTime": "14:17-14:47",
+            "remainingPayTime": "05:13",
+            "orderQty": "2单",
+            "surplusDeliveryTime": "20分钟",
+            "mapUrl": "/static/image/shopping/taobao/waimai/map1.png",
+            "goodsList": [
+                {
+                    "image": "/static/image/shopping/jingdong/product/waimai/haidilao.png",
+                    "title": "捞派肥牛 (半份)",
+                    "spec": "精选谷饲肥牛；一人份",
+                    "actualPrice": "36.00",
+                    "oriPrice": "",
+                    "count": "1",
+                    "tag": "食品安全理赔 慢必赔"
+                }
+            ],
+            "fees": [
+                {
+                    "name": "打包费",
+                    "showQuestion": true,
+                    "actualPrice": 1.3,
+                    "oriPrice": 2
+                },
+                {
+                    "name": "配送费",
+                    "showQuestion": true,
+                    "actualPrice": 1.3,
+                    "oriPrice": 2
+                }
+            ],
+            "compensations": [
+                {
+                    "name": "超20分钟免单",
+                    "showQuestion": true,
+                    "value": "商家赠送",
+                    "isRed": true
+                },
+                {
+                    "name": "满返红包",
+                    "showQuestion": false,
+                    "value": "满返￥2商家红包",
+                    "isRed": true
+                }
+            ],
+            "priceDetail": {
+                "totalDiscount": "9.70",
+                "actualPay": "38.60",
+                "details": [
+                    {
+                        "name": "总价",
+                        "value": "￥36.00",
+                        "isBold": true
+                    },
+                    {
+                        "name": "商品优惠",
+                        "value": "-￥0.00",
+                        "isRed": true
+                    },
+                    {
+                        "name": "配送费优惠",
+                        "value": "-￥0.70",
+                        "isRed": true
+                    },
+                    {
+                        "name": "红包/抵用券",
+                        "value": "-￥9.0",
+                        "isRed": true
+                    }
+                ]
+            },
+            "orderInfo": [
+                {
+                    "label": "收货信息",
+                    "value": "上海市浦东新区汤臣一品 一单元1001 张三(男士) 13256325698",
+                    "hasModify": true
+                },
+                {
+                    "label": "联系不上时",
+                    "value": "可设置暂存点放置外卖",
+                    "hasSetting": true
+                },
+                {
+                    "label": "备注",
+                    "value": "1份餐具",
+                    "isFoldDisplay": true
+                },
+                {
+                    "label": "发票",
+                    "value": "未添加开票信息",
+                    "hasArrow": true
+                },
+                {
+                    "label": "配送方式",
+                    "value": "蜂鸟准时达",
+                    "hasArrow": true
+                },
+                {
+                    "label": "配送骑士",
+                    "value": "赵乃炼",
+                    "hasArrow": true
+                },
+                {
+                    "label": "订单号",
+                    "value": "813507450742414085",
+                    "hasCopy": true,
+                    "isFoldDisplay": true
+                },
+                {
+                    "label": "送达时间",
+                    "value": "12-19(周六) 11:59-12:29"
+                },
+                {
+                    "label": "下单时间",
+                    "value": "2026-05-21 12:00:00.123"
+                },
+                {
+                    "label": "支付方式",
+                    "value": "支付宝免密支付"
+                }
+            ]
+        },
+        {
+            "id": "1779342647665",
+            "orderType": "waimai",
+            "statusType": "wait_pay",
+            "statusText": "待支付",
+            "isExpanded": false,
+            "isOrderInfoExpanded": false,
+            "shopName": "新荣记",
+            "location": "黑珍珠三钻·南京西路店",
+            "deliveryPhoto": "/static/image/shopping/taobao/waimai/deliveryPhoto1.png",
+            "deliveryTime": "13:44-14:14",
+            "remainingPayTime": "11:43",
+            "goodsList": [
+                {
+                    "image": "/static/image/shopping/jingdong/product/waimai/huajiaoji.png",
+                    "title": "至尊黄焖两头干鲍鱼花胶鸡套餐",
+                    "spec": "精选20头干鲍、深海花胶、清远走地鸡；单人尊享",
+                    "actualPrice": "3888.00",
+                    "oriPrice": "",
+                    "count": "1",
+                    "tag": "食品安全理赔 慢必赔"
+                }
+            ],
+            "fees": [
+                {
+                    "name": "打包费",
+                    "showQuestion": true,
+                    "actualPrice": 1.3,
+                    "oriPrice": 2
+                },
+                {
+                    "name": "配送费",
+                    "showQuestion": true,
+                    "actualPrice": 1.3,
+                    "oriPrice": 2
+                }
+            ],
+            "compensations": [
+                {
+                    "name": "超20分钟免单",
+                    "showQuestion": true,
+                    "value": "商家赠送",
+                    "isRed": true
+                },
+                {
+                    "name": "满返红包",
+                    "showQuestion": false,
+                    "value": "满返￥2商家红包",
+                    "isRed": true
+                }
+            ],
+            "priceDetail": {
+                "totalDiscount": "9.70",
+                "actualPay": "3890.60",
+                "details": [
+                    {
+                        "name": "总价",
+                        "value": "￥3888.00",
+                        "isBold": true
+                    },
+                    {
+                        "name": "商品优惠",
+                        "value": "-￥0.00",
+                        "isRed": true
+                    },
+                    {
+                        "name": "配送费优惠",
+                        "value": "-￥0.70",
+                        "isRed": true
+                    },
+                    {
+                        "name": "红包/抵用券",
+                        "value": "-￥9.0",
+                        "isRed": true
+                    }
+                ]
+            },
+            "orderInfo": [
+                {
+                    "label": "收货信息",
+                    "value": "上海市浦东新区汤臣一品 一单元1001 张三(男士) 13256325698",
+                    "hasModify": true
+                },
+                {
+                    "label": "备注",
+                    "value": "1份餐具",
+                    "isFoldDisplay": true
+                },
+                {
+                    "label": "慢必赔",
+                    "value": "平台赠送",
+                    "hasArrow": true
+                },
+                {
+                    "label": "其它服务",
+                    "value": "号码保护",
+                    "hasArrow": true
+                },
+                {
+                    "label": "订单号",
+                    "value": "859861823532161558",
+                    "hasCopy": true,
+                    "isFoldDisplay": true
+                },
+                {
+                    "label": "送达时间",
+                    "value": "尽快送达"
+                },
+                {
+                    "label": "下单时间",
+                    "value": "2026-12-07 11:03:50.123"
+                },
+                {
+                    "label": "支付方式",
+                    "value": "支付宝免密支付"
+                }
+            ]
+        },
         {
             "id": "202605110001",
             "orderType": "shopping",
@@ -694,62 +1566,5 @@
             "statusDesc2": "【上海市】 您已在上海市浦东新区汤臣一品完成取件",
             "confirmReceiptCountdown": "9天7小时"
         }
-        // {
-        //     "id": "202605110008",
-        //     "orderType": "waimai",
-        //     "shopName": "美团外卖-麦当劳",
-        //     "statusType": "success",
-        //     "statusDesc": "订单已完成",
-        //     "shopType": "taobao",
-        //     "goodsList": [
-        //         {
-        //             "image": "",
-        //             "title": "麦辣鸡腿堡套餐",
-        //             "specs": "默认",
-        //             "price": "32.00",
-        //             "count": 1,
-        //             "tags": "正品保障"
-        //         }
-        //     ],
-        //     "totalPrice": "32.00"
-        // },
-        // {
-        //     "id": "202605110009",
-        //     "orderType": "waimai",
-        //     "shopName": "饿了么-星巴克",
-        //     "statusType": "wait_send",
-        //     "statusDesc": "商家准备中",
-        //     "shopType": "taobao",
-        //     "goodsList": [
-        //         {
-        //             "image": "",
-        //             "title": "拿铁咖啡",
-        //             "specs": "大杯 / 热",
-        //             "price": "28.00",
-        //             "count": 1,
-        //             "tags": "正品保障"
-        //         }
-        //     ],
-        //     "totalPrice": "28.00"
-        // },
-        // {
-        //     "id": "202605110010",
-        //     "orderType": "waimai",
-        //     "shopName": "淘鲜达-盒马鲜生",
-        //     "statusType": "success",
-        //     "statusDesc": "订单已完成",
-        //     "shopType": "taobao",
-        //     "goodsList": [
-        //         {
-        //             "image": "",
-        //             "title": "进口智利车厘子 500g",
-        //             "specs": "JJ级",
-        //             "price": "59.00",
-        //             "count": 1,
-        //             "tags": "一小时送达"
-        //         }
-        //     ],
-        //     "totalPrice": "59.00"
-        // }
     ]
 }
\ No newline at end of file
diff --git a/pages/shopping/taobao/list-index.vue b/pages/shopping/taobao/list-index.vue
index 4545322..2f21f86 100644
--- a/pages/shopping/taobao/list-index.vue
+++ b/pages/shopping/taobao/list-index.vue
@@ -80,7 +80,7 @@
 				</view>
 			</view>
 			<listCard v-if="displayList.length > 0" :list="displayList" @click-item="goDetail"
-				@longpress="onItemLongPress" />
+				@longpress="onItemLongPress" :currentFilter="currentFilter" />
 			<view v-else-if="displayList.length == 0 && currentTab != 2" class="null-data-box flex-center flex-column">
 				<image style="width: 254rpx;height: 200rpx;" src="/static/image/shopping/taobao/null.png"></image>
 				<text
@@ -261,9 +261,8 @@ const buttonGroup = [
 	}, {
 		name: "新增闪购订单",
 		click: () => {
-			uni.showToast({
-				title: '开发中，敬请期待',
-				icon: 'none'
+			uni.navigateTo({
+				url: '/pages/shopping/taobao/add-shangou-order/add-shangou-order'
 			});
 		}
 	}, {
@@ -303,11 +302,11 @@ const displayList = computed(() => {
 		}
 	}
 
-	// 3. 时间降序排列逻辑 (创建时间 || 申请时间)
+	// 3. 时间降序排列逻辑 (创建时间 || 申请时间 || 下单时间)
 	list.sort((a, b) => {
 		const getTime = (order) => {
 			if (!order.orderInfo) return '';
-			const create = order.orderInfo.find(i => i.key === 'createTime')?.value;
+			const create = order.orderInfo.find(i => i.key === 'createTime' || i.label === '下单时间')?.value;
 			const apply = order.orderInfo.find(i => i.key === 'applyTime')?.value;
 			return create || apply || '';
 		};
@@ -555,7 +554,11 @@ const switchFilter = (index) => {
 };
 
 const goDetail = (item) => {
-	util.goPage(`/pages/shopping/taobao/shopping-order-detail/shopping-order-detail?id=${item.id}`)
+	if (item.orderType === 'waimai') {
+		util.goPage(`/pages/shopping/taobao/shangou-order-detail/shangou-order-detail?id=${item.id}`)
+	} else {
+		util.goPage(`/pages/shopping/taobao/shopping-order-detail/shopping-order-detail?id=${item.id}`)
+	}
 }
 
 /**
@@ -587,9 +590,15 @@ const handleMenuAction = (action) => {
 	if (!item) return;
 
 	if (action === 'edit') {
-		uni.navigateTo({
-			url: `/pages/shopping/taobao/add-shopping-order/add-shopping-order?id=${item.id}&isEdit=true`
-		});
+		if (item.orderType === 'waimai') {
+			uni.navigateTo({
+				url: `/pages/shopping/taobao/add-shangou-order/add-shangou-order?id=${item.id}&isEdit=true`
+			});
+		} else {
+			uni.navigateTo({
+				url: `/pages/shopping/taobao/add-shopping-order/add-shopping-order?id=${item.id}&isEdit=true`
+			});
+		}
 	} else if (action === 'delete') {
 		uni.showModal({
 			title: '提示',
diff --git a/pages/shopping/taobao/shangou-order-detail/shangou-order-detail.vue b/pages/shopping/taobao/shangou-order-detail/shangou-order-detail.vue
index baccc22..890cb11 100644
--- a/pages/shopping/taobao/shangou-order-detail/shangou-order-detail.vue
+++ b/pages/shopping/taobao/shangou-order-detail/shangou-order-detail.vue
@@ -1,8 +1,9 @@
 <template>
 	<view :class="{ 'wait-recv-page-container': order.statusType == 'wait_recv' }">
-		<nav-bar class="nav-bar" title="" :bgColor="order.statusType == 'wait_recv' ? 'transparent' : '#FFFFFF'"
-			:buttonGroup="buttonGroup" @button-click="util.clickTitlePopupButton" tipLayerType="jingdong-shopping-list"
-			isTipLayer tipLayerText="添加订单信息">
+		<nav-bar class="nav-bar" title=""
+			:bgColor="(isScrolled || order.statusType != 'wait_recv') ? '#FFFFFF' : 'transparent'"
+			:buttonGroup="buttonGroup" @button-click="util.clickTitlePopupButton" tipLayerType="taobao-shangou-detail"
+			isTipLayer tipLayerText="修改订单信息">
 			<template v-slot:left>
 				<image class="back-icon" src="/static/image/shopping/taobao/back.png" mode="aspectFit"
 					@click="util.goBack()"></image>
@@ -25,13 +26,17 @@
 				</view>
 			</template>
 		</nav-bar>
-		<view v-if="order.statusType == 'wait_recv'" class="map-box">
-			<image style="width: 100%;opacity: 0;" src="/static/image/shopping/taobao/waimai/map1.png" mode="widthFix">
+		<!-- 待收货骑手地图 -->
+		<view v-if="order.statusType == 'wait_recv'" class="map-box"
+			:style="{ 'background-image': 'url(' + (order.mapUrl || '/static/image/shopping/taobao/waimai/map1.png') + ')' }">
+			<image style="width: 100%;opacity: 0;"
+				:src="order.mapUrl || '/static/image/shopping/taobao/waimai/map1.png'" mode="widthFix">
 			</image>
 			<view class="qishou flex-align-center flex-column">
 				<view class="qishou-info">
 					<view class="title">骑手正在按序送货</view>
-					<text class="time">前方剩余<text class="num">2单</text>，约<text>11分钟</text>送达</text>
+					<text class="time">前方剩余<text class="num green">{{ order.orderQty }}</text>，约<text class="green">{{
+						order.surplusDeliveryTime }}</text>送达</text>
 				</view>
 				<image style="width: 80rpx;height: 80rpx;" src="/static/image/shopping/taobao/waimai/qishou.png">
 				</image>
@@ -65,7 +70,7 @@
 
 		<view v-if="order.statusType != 'wait_recv'" class="wait_pay">
 			<view class="flex-align-center">
-				<text v-if="order.statusType == 'wait_pay'" class="main-text">待支付，剩余15:00</text>
+				<text v-if="order.statusType == 'wait_pay'" class="main-text">待支付，剩余{{ order.remainingPayTime }}</text>
 				<text v-else class="main-text">{{ order.statusType == 'success' ? '订单已送达' : '订单已取消' }}</text>
 				<uni-icons v-if="order.statusType != 'closed'" type="right" size="16" color="#1A1A1A"></uni-icons>
 			</view>
@@ -81,13 +86,13 @@
 			<view v-if="order.statusType == 'wait_recv' || order.statusType == 'wait_pay'"
 				style="justify-content: baseline;">
 				<text class="label">预计</text>
-				<text class="time">16:32-16:47</text>
+				<text class="time">{{ order.deliveryTime }}</text>
 			</view>
 			<view v-if="order.statusType != 'closed'" class="flex"
 				style="margin-top: 26rpx;justify-content: flex-start;">
 				<text class="label">送至</text>
 				<view class="flex-1 address-info" style="max-width: 550rpx;">
-					<text>金星哈哈哈哈哈哈哈和和哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈 王总(女士) 12563259856</text>
+					<text>{{order.orderInfo.find(item => item.label === '收货信息')?.value || ''}}</text>
 					<template v-if="order.statusType != 'success'">
 						<text class="split"></text>
 						<text class="edit-text">修改</text>
@@ -95,7 +100,7 @@
 					</template>
 				</view>
 				<view class="delivery-photo" v-if="order.statusType == 'success'">
-					<image style="width: 80rpx;height: 80rpx;" src=""></image>
+					<image style="width: 80rpx;height: 80rpx;" :src="order.deliveryPhoto" mode="aspectFill"></image>
 				</view>
 			</view>
 			<view v-if="order.statusType == 'wait_recv'" class="flex"
@@ -103,14 +108,14 @@
 				<text class="label">服务</text>
 				<view class="flex-1 address-info">
 					<text style="color: #1AA35B;">超20分钟免单-生效中</text>
-					<text> 若超时，即11:57后送达赔4元可叠加红包</text>
+					<text> 若超时，即{{ timeoutDelivery }}后送达赔4元可叠加红包</text>
 					<uni-icons type="right" size="12" color="#8C8C8C"></uni-icons>
 				</view>
 			</view>
 		</view>
 		<view v-if="order.statusType == 'wait_pay'" class="wait_pay-buttom">
 			<view class="button flex-center flex-column">
-				<text style="font-size: 32rpx;line-height: 32rpx;">去支付 ￥15.6</text>
+				<text style="font-size: 32rpx;line-height: 32rpx;">去支付 ￥{{ order.priceDetail.actualPay }}</text>
 				<text style="font-size: 24rpx;line-height: 24rpx;margin-top: 4rpx;">支持更多支付方式</text>
 			</view>
 		</view>
@@ -144,23 +149,22 @@
 		<!-- 订单详情卡片 -->
 		<view class="info-card">
 			<view class="shop-title-box">
-				<image style="width: 56rpx; height: 26rpx; margin-right: 10rpx;"
+				<image style="width: 56rpx; height: 26rpx; margin-right: 10rpx;flex-shrink: 0;"
 					src="/static/image/shopping/taobao/waimai/shangou.png"></image>
-				<text class="shop-name">{{ orderData.shopName }}</text>
+				<text class="shop-name">{{ order.shopName }}({{ order.location }})</text>
 				<uni-icons type="right" size="16" color="#8C8C8C"></uni-icons>
 			</view>
 
-			<view class="goods-collapsed flex-between" v-if="!orderData.isExpanded"
-				@click="orderData.isExpanded = true">
+			<view class="goods-collapsed flex-between" v-if="!isExpanded" @click="isExpanded = true">
 				<view class="images flex flex-1" style="overflow: hidden;">
-					<image v-for="(item, index) in orderData.goodsList.slice(0, 4)" :key="index" class="img"
+					<image v-for="(item, index) in order.goodsList.slice(0, 4)" :key="index" class="img"
 						:src="item.image" mode="aspectFill"></image>
 				</view>
-				<view class="count">共{{ orderData.goodsList.length }}件</view>
+				<view class="count">共{{ order.goodsList.length }}件</view>
 			</view>
 
 			<template v-else>
-				<view class="goods-item flex" v-for="(item, index) in orderData.goodsList" :key="index">
+				<view class="goods-item flex" v-for="(item, index) in order.goodsList" :key="index">
 					<view class="goods-img-box">
 						<image class="goods-img" :src="item.image" mode="aspectFill"></image>
 					</view>
@@ -177,7 +181,7 @@
 					</view>
 				</view>
 
-				<view class="fee-item flex-between" v-for="(fee, index) in orderData.fees" :key="'fee-' + index">
+				<view class="fee-item flex-between" v-for="(fee, index) in order.fees" :key="'fee-' + index">
 					<view class="fee-left flex-align-center">
 						<text>{{ fee.name }}</text>
 						<uni-icons v-if="fee.showQuestion" type="help" size="16" color="#C6C6C6"
@@ -192,7 +196,7 @@
 				</view>
 
 				<view class="fee-item flex-between" style="align-items: center;"
-					v-for="(comp, index) in orderData.compensations" :key="'comp-' + index">
+					v-for="(comp, index) in order.compensations" :key="'comp-' + index">
 					<view class="fee-left flex-align-center">
 						<text>{{ comp.name }}</text>
 						<uni-icons v-if="comp.showQuestion" type="help" size="16" color="#C6C6C6"
@@ -204,39 +208,42 @@
 				</view>
 			</template>
 
-			<view class="price-detail-title flex-between" @click="orderData.isExpanded = !orderData.isExpanded"
-				:style="!orderData.isExpanded ? 'margin-bottom: 30rpx;' : ''">
+			<view class="price-detail-title flex-between" @click="isExpanded = !isExpanded"
+				:style="!isExpanded ? 'margin-bottom: 30rpx;' : ''">
 				<view class="left flex-align-center">
 					<text>价格明细</text>
-					<uni-icons :type="orderData.isExpanded ? 'up' : 'down'" size="14" color="#8C8C8C"
+					<uni-icons :type="isExpanded ? 'up' : 'down'" size="14" color="#8C8C8C"
 						style="margin-left: 6rpx;"></uni-icons>
 				</view>
 				<view class="right">
 					<text class="total-discount">总优惠
 						<text class="symbol wx-font-medium">￥
-							<text style="font-size: 34rpx;">{{ orderData.priceDetail.totalDiscount }}</text>
+							<text style="font-size: 34rpx;">{{ order.priceDetail.totalDiscount }}</text>
 						</text></text>
 					<text class="total-actual">实付<text class="symbol wx-font-medium">￥</text><text
 							class="num wx-font-medium">{{
-								orderData.priceDetail.actualPay }}</text></text>
+								order.priceDetail.actualPay }}</text></text>
 				</view>
 			</view>
 
-			<view class="price-detail-list" v-if="orderData.isExpanded">
-				<view class="detail-item flex-between" v-for="(detail, index) in orderData.priceDetail.details"
-					:key="'detail-' + index">
-					<text class="label">{{ detail.name }}</text>
-					<text class="val alipay-font" :class="{ 'bold-val': detail.isBold, 'red-val': detail.isRed }">{{
-						detail.value
-					}}</text>
-				</view>
+			<view class="price-detail-list" v-if="isExpanded">
+				<template v-for="(detail, index) in order.priceDetail.details" :key="'detail-' + index">
+					<view v-if="detail.name && detail.value" class="detail-item flex-between">
+						<text class="label">{{ detail.name }}</text>
+						<text class="val alipay-font" :class="{ 'bold-val': detail.isBold, 'red-val': detail.isRed }">{{
+							detail.value
+						}}</text>
+					</view>
+				</template>
+
 			</view>
 
 			<view class="divider-line"></view>
 
 			<view class="order-info-area">
-				<view class="order-item flex" v-for="(info, index) in orderData.orderInfo" :key="'info-' + index"
-					:style="info.label === '收货信息' ? 'align-items: flex-start;' : ''">
+				<template v-for="(info, index) in order.orderInfo" :key="'info-' + index">
+					<view class="order-item flex" v-if="isOrderInfoExpanded || info.isFoldDisplay"
+						:style="info.label === '收货信息' ? 'align-items: flex-start;' : ''">
 					<text class="label" :style="info.label === '收货信息' ? 'line-height:36rpx;' : ''">{{ info.label
 					}}</text>
 					<view class="val flex-1 flex-align-center" style="justify-content: flex-end;">
@@ -257,87 +264,113 @@
 							<text class="split" style="margin-left: 8rpx; margin-right: 8rpx;">|</text>
 							<text class="copy-btn">复制</text>
 						</template>
+						<template v-if="info.hasApply">
+							<text class="split" style="margin-left: 8rpx; margin-right: 8rpx;">|</text>
+							<text class="copy-btn">申请</text>
+						</template>
 					</view>
-				</view>
+					</view>
+				</template>
 
-				<view class="order-bottom-title flex-align-center">
+				<view class="order-bottom-title flex-align-center"
+					@click="isOrderInfoExpanded = !isOrderInfoExpanded">
 					<text>订单信息</text>
-					<uni-icons type="down" size="14" color="#7C8495"
+					<uni-icons :type="isOrderInfoExpanded ? 'up' : 'down'" size="14" color="#7C8495"
 						style="margin-left: 8rpx;margin-top: 6rpx;"></uni-icons>
 				</view>
 			</view>
 		</view>
 	</view>
+
+	<view class="common-problem-box flex-align-center flex-justify-between">
+		<text>常见问题</text>
+		<view class="flex-align-center">
+			<view class="item">少送餐品</view>
+			<view class="item">餐品撒漏</view>
+			<view class="item">未收到餐品</view>
+		</view>
+	</view>
+
+	<view>
+		<image style="width: 100%;" :src="screenshotImage" mode="widthFix"></image>
+	</view>
 </template>
 
 <script setup>
-import { ref, reactive } from 'vue';
+import { ref, reactive, computed } from 'vue';
+import { onPageScroll, onShow, onLoad } from '@dcloudio/uni-app';
 import { util } from '@/utils/common.js';
-const order = ref({
-	statusType: "wait_recv"
+import { defualtData } from '../json/order.json';
+
+const isScrolled = ref(false);
+const screenshotImage = ref('')
+
+//导航栏菜单按钮
+const buttonGroup = [
+	{
+		name: "编辑订单信息",
+		click: () => {
+			uni.navigateTo({
+				url: `/pages/shopping/taobao/add-shangou-order/add-shangou-order?id=${order.value.id}&isEdit=true`
+			});
+		}
+	}
+]
+
+
+onPageScroll((e) => {
+	isScrolled.value = e.scrollTop > 10;
+});
+
+const order = ref({});
+const currentId = ref('');
+const isExpanded = ref(false);
+const isOrderInfoExpanded = ref(false);
+
+onLoad((options) => {
+	if (options.id) {
+		currentId.value = String(options.id);
+	}
+});
+
+onShow(() => {
+	// 加载拼图截图缓存
+	const savedScreenshot = uni.getStorageSync('taobao_screenshot');
+	if (savedScreenshot) {
+		screenshotImage.value = savedScreenshot;
+	}
+
+	// 从缓存读取最新订单数据
+	if (currentId.value) {
+		let list = uni.getStorageSync('taobaoShopping') || [];
+		let found = list.find(item => String(item.id) === currentId.value);
+		if (!found) {
+			found = defualtData.find(item => String(item.id) === currentId.value);
+		}
+		if (found) {
+			const parsedOrder = JSON.parse(JSON.stringify(found));
+			// 默认收起展开项
+			isExpanded.value = false;
+			isOrderInfoExpanded.value = false;
+			order.value = parsedOrder;
+		}
+	}
 })
 
-const orderData = ref({
-	isExpanded: false,
-	shopName: '沙县小吃(光电园总店)',
-	goodsList: [
-		{
-			image: '/static/image/shopping/taobao/waimai/leifan.png',
-			title: '好吃的蒜蓉剁椒 （限1份，多点 无效）',
-			count: 1,
-			actualPrice: '0.06',
-			oriPrice: '2',
-			tag: '折'
-		},
-		{
-			image: '/static/image/shopping/taobao/waimai/leifan.png',
-			title: '~福利鸡腿~',
-			count: 1,
-			actualPrice: '4.5',
-			oriPrice: '9.99',
-			tag: '折'
-		},
-		{
-			image: '/static/image/shopping/taobao/waimai/leifan.png',
-			title: '【减脂】五香鸡腿饭 （2份时蔬+卤蛋+豆干）',
-			count: 1,
-			actualPrice: '14.92',
-			oriPrice: '28',
-			tag: '折'
-		}
-	],
-	fees: [
-		{ name: '打包费', showQuestion: true, actualPrice: '1.3', oriPrice: '2' },
-		{ name: '配送费', showQuestion: false, actualPrice: '0', oriPrice: '3.4' },
-	],
-	compensations: [
-		{ name: '超20分钟免单', showQuestion: true, value: '商家赠送', isRed: true },
-		{ name: '满返红包', showQuestion: false, value: '满返￥2商家红包', isRed: true }
-	],
-	priceDetail: {
-		totalDiscount: '24.61',
-		actualPay: '20.78',
-		details: [
-			{ name: '总价', value: '￥45.39', isBold: true },
-			{ name: '商品优惠', value: '-￥10.21', isRed: true },
-			{ name: '配送费优惠', value: '-￥3.4', isRed: true },
-			{ name: '红包/抵用券', value: '-￥9.0', isRed: true },
-			{ name: '店铺活动/券(沙县小吃(光电园总店)专享券)', value: '-￥2.0', isRed: true }
-		]
-	},
-	orderInfo: [
-		{ label: '收货信息', value: '金星科技大厦A区金星科技大厦A区低楼4楼3A08 八条科技 罗婷(女士) 18725982563', hasModify: true },
-		{ label: '联系不上时', value: '可设置暂存点放置外卖', hasSetting: true },
-		{ label: '备注', value: '1份餐具' },
-		{ label: '发票', value: '未添加开票信息', hasArrow: true },
-		{ label: '配送方式', value: '蜂鸟准时达', hasArrow: true },
-		{ label: '配送骑士', value: '赵乃炼', hasArrow: true },
-		{ label: '订单号', value: '8034160313365695921', hasCopy: true },
-		{ label: '送达时间', value: '03-31(周二)11:41-11:56' },
-		{ label: '下单时间', value: '2026-03-31 11:11:55.220' },
-		{ label: '支付方式', value: '支付宝免密支付' }
-	]
-})
+const timeoutDelivery = computed(() => {
+	if (!order.value.deliveryTime) return '';
+	const parts = order.value.deliveryTime.split('-');
+	if (parts.length < 2) return '';
+	const timeParts = parts[1].trim().split(':');
+	if (timeParts.length < 2) return '';
+	let hours = parseInt(timeParts[0], 10);
+	let minutes = parseInt(timeParts[1], 10) + 20;
+	if (minutes >= 60) {
+		hours = (hours + Math.floor(minutes / 60)) % 24;
+		minutes = minutes % 60;
+	}
+	return `${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}`;
+});
 
 const items = [
 	{
@@ -471,7 +504,6 @@ const items = [
 
 .map-box {
 	position: relative;
-	background-image: url('/static/image/shopping/taobao/waimai/map1.png');
 	background-size: 100% 100%;
 	background-repeat: no-repeat;
 
@@ -500,6 +532,10 @@ const items = [
 				color: #7B7E8C;
 				line-height: 26rpx;
 			}
+
+			.green {
+				color: #1AA35B;
+			}
 		}
 	}
 
@@ -652,22 +688,25 @@ const items = [
 	}
 
 	.delivery-photo {
-		width: 80rpx;
-		height: 80rpx;
 		border-radius: 12rpx;
 		overflow: hidden;
-		background-color: #F0F0F0;
 
-		&::before {
-			content: '+1';
-			background-color: #000000;
-			opacity: 0.5;
-			border-radius: 12rpx 0 12rpx 0;
-			font-size: 20rpx;
-			color: #FFFFFF;
-			line-height: 20rpx;
-			padding: 6rpx 8rpx;
+		image {
+			width: 80rpx;
+			height: 80rpx;
+			border-radius: 12rpx;
 		}
+
+		// &::before {
+		// 	content: '+1';
+		// 	background-color: #000000;
+		// 	opacity: 0.5;
+		// 	border-radius: 12rpx 0 12rpx 0;
+		// 	font-size: 20rpx;
+		// 	color: #FFFFFF;
+		// 	line-height: 20rpx;
+		// 	padding: 6rpx 8rpx;
+		// }
 	}
 
 }
@@ -756,10 +795,13 @@ const items = [
 	.info-card {
 		background-color: #FFFFFF;
 		padding: 24rpx 32rpx;
-		margin-bottom: 24rpx;
+		margin-bottom: 16rpx;
 
 		.shop-title-box {
 			margin-bottom: 30rpx;
+			display: flex;
+			align-items: center;
+			flex-wrap: nowrap;
 
 			.tag {
 				background-color: #FE6306;
@@ -772,6 +814,10 @@ const items = [
 			}
 
 			.shop-name {
+				display: inline-block;
+				white-space: nowrap;
+				overflow: hidden;
+				text-overflow: ellipsis;
 				font-size: 30rpx;
 				font-weight: 500;
 				color: #1A1A1A;
@@ -1006,6 +1052,7 @@ const items = [
 					color: #7C8495;
 					width: 140rpx;
 					flex-shrink: 0;
+					white-space: nowrap;
 				}
 
 				.val {
@@ -1040,6 +1087,29 @@ const items = [
 		}
 	}
 }
+
+.common-problem-box {
+	height: 108rpx;
+	background-color: #ffffff;
+	padding: 0 32rpx;
+	color: #1A1A1A;
+	font-size: 30rpx;
+	font-weight: bold;
+	margin-bottom: 16rpx;
+
+	.item {
+		font-size: 24rpx;
+		color: #465C72;
+		line-height: 24rpx;
+		background-color: #F1F5F8;
+		border-radius: 4rpx;
+		padding: 0 20rpx;
+		height: 48rpx;
+		line-height: 48rpx;
+		margin-left: 18rpx;
+		font-weight: 400;
+	}
+}
 </style>
 <style>
 @import "/common/main.css";
diff --git a/static/image/shopping/taobao/daocha.png b/static/image/shopping/taobao/daocha.png
new file mode 100644
index 0000000..e693fd3
Binary files /dev/null and b/static/image/shopping/taobao/daocha.png differ
diff --git a/static/image/shopping/taobao/shangou.png b/static/image/shopping/taobao/shangou.png
new file mode 100644
index 0000000..6af0b71
Binary files /dev/null and b/static/image/shopping/taobao/shangou.png differ
diff --git a/static/image/shopping/taobao/tuikuanchenggong.png b/static/image/shopping/taobao/tuikuanchenggong.png
new file mode 100644
index 0000000..fae3812
Binary files /dev/null and b/static/image/shopping/taobao/tuikuanchenggong.png differ
diff --git a/static/image/shopping/taobao/waimai/deliveryPhoto1.png b/static/image/shopping/taobao/waimai/deliveryPhoto1.png
new file mode 100644
index 0000000..6ee7aef
Binary files /dev/null and b/static/image/shopping/taobao/waimai/deliveryPhoto1.png differ
diff --git a/static/image/shopping/taobao/waimai/deliveryPhoto2.png b/static/image/shopping/taobao/waimai/deliveryPhoto2.png
new file mode 100644
index 0000000..2204eef
Binary files /dev/null and b/static/image/shopping/taobao/waimai/deliveryPhoto2.png differ
diff --git a/static/image/shopping/taobao/waimai/map2.png b/static/image/shopping/taobao/waimai/map2.png
new file mode 100644
index 0000000..454087f
Binary files /dev/null and b/static/image/shopping/taobao/waimai/map2.png differ
diff --git a/static/image/watermarkBG.png b/static/image/watermarkBG.png
index 64697d2..9955479 100644
Binary files a/static/image/watermarkBG.png and b/static/image/watermarkBG.png differ