diff --git a/components/message/list/list.vue b/components/message/list/list.vue
index 502b274..c7fa821 100644
--- a/components/message/list/list.vue
+++ b/components/message/list/list.vue
@@ -21,7 +21,7 @@
                                 <view class="title-box flex-between">
                                     <text class="title">{{ displayTitle(item.title) }}</text>
                                     <text class="time">{{ formatDate(getLastMessage(item.chatList)?.time || item.time)
-                                        }}</text>
+                                    }}</text>
                                 </view>
                                 <view class="content">
                                     <view v-if="isImageMsg(getLastMessage(item.chatList))"
@@ -471,11 +471,15 @@ const editItem = (item) => {
         }
 
         .dot {
+            width: 28rpx;
+            height: 28rpx;
             position: absolute;
-            padding: 4rpx 10rpx;
+            display: flex;
+            align-items: center;
+            justify-content: center;
             background-color: #E93A22;
             color: #FFFFFF;
-            line-height: 20rpx;
+            line-height: 18rpx;
             font-size: 20rpx;
             border-radius: 16rpx;
             right: -8rpx;
diff --git a/pages.json b/pages.json
index 3a7f1a1..35c9856 100644
--- a/pages.json
+++ b/pages.json
@@ -17,7 +17,7 @@
 					"navigationBarTitleText": "通话记录页面",
 					"navigationStyle": "custom"
 				}
-			},{
+			}, {
 				"path": "detail/callDetail",
 				"style": {
 					"navigationBarTitleText": "通话记录详情",
@@ -138,6 +138,13 @@
 						"navigationBarTitleText": "拼多多订单详情",
 						"navigationStyle": "custom"
 					}
+				},
+				{
+					"path": "pdd/add-order/add-order",
+					"style": {
+						"navigationBarTitleText": "pdd添加修改订单信息",
+						"navigationStyle": "custom"
+					}
 				}
 			]
 		},
diff --git a/pages/shopping/index.vue b/pages/shopping/index.vue
index 1d7d4a2..e6e5afc 100644
--- a/pages/shopping/index.vue
+++ b/pages/shopping/index.vue
@@ -64,8 +64,7 @@ const menuList = ref([{
 	bgColor: ["#FFE0DF", "#FFFFFF"],
 	btnBg: "#FF4848",
 	shadowColor: "#FF4848",
-	// url: "/pages/shopping/pdd/list-index"
-	url: ""
+	url: "/pages/shopping/pdd/list-index"
 }, {
 	name: "快手",
 	icon: "kuaishou",
diff --git a/pages/shopping/pdd/add-order/add-order.vue b/pages/shopping/pdd/add-order/add-order.vue
new file mode 100644
index 0000000..a18e065
--- /dev/null
+++ b/pages/shopping/pdd/add-order/add-order.vue
@@ -0,0 +1,1355 @@
+<template>
+	<view class="page-container flex-column">
+
+		<NavBar :title="navTitle" bgColor="#F5F5F5" isRightButton @right-click="onConfirm"></NavBar>
+
+		<view class="tab-box" v-if="!isEditMode">
+			<view class="tab" :class="{ active: item.key == activeTab }" v-for="item in shoppingType" :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 class="hightlight-box">
+			<view class="title-box flex-column flex-center">
+				<view v-if="order.orderType == 'wait_pay'" class="flex-column flex-center">
+					<view class="title flex-align-center">待付款 <auto-width-input style="margin-left: 16rpx;"
+							v-model="order.statusDesc" show-edit fontSize="36rpx" fontWeight="500" />
+					</view>
+					<view class="sub-title flex-align-center">
+						<text>请在</text>
+						<picker mode="multiSelector" :range="timeRange" :value="waitPayTimeValue"
+							@change="handleWaitPayTimeChange">
+							<view class="flex-align-center" style="margin: 0 10rpx;">
+								<text>{{ order.waitPayTime }}</text>
+								<image style="width: 24rpx;height: 24rpx;margin-left: 6rpx;"
+									src="/static/image/common/edit.png"></image>
+							</view>
+						</picker>
+						<text>内支付，逾期订单将自动取消</text>
+					</view>
+				</view>
+				<view v-if="order.orderType == 'wait_recv'" class="flex-column flex-center">
+					<view class="title flex-align-center" style="color: #20A61E;">
+						<image style="width: 44rpx;height: 44rpx;margin-right: 12rpx;"
+							src="/static/image/shopping/pdd/paijianzhong.png"></image>
+						<auto-width-input color="#20A61E" fontSize="36rpx" fontWeight="500"
+							v-model="order.deliveryStatus" show-edit />
+					</view>
+					<view class="sub-title flex-align-center" style="color: #20A61E;margin-top: 8rpx;">
+						<auto-width-input color="#20A61E" v-model="order.statusDesc" show-edit />
+					</view>
+				</view>
+				<view v-if="order.orderType == 'received'" class="flex-column flex-center">
+					<view class="title flex-align-center" style="color: #20A61E;">
+						<image style="width: 44rpx;height: 44rpx;margin-right: 12rpx;"
+							src="/static/image/shopping/pdd/yiqianshou.png"></image>
+						已签收
+					</view>
+					<view class="sub-title flex-align-center" style="color: #20A61E;margin-top: 8rpx;">
+						<auto-width-input color="#20A61E" v-model="order.statusDesc" show-edit />
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 头部信息卡片：优惠券 + 物流 + 地址 -->
+		<view class="header-info-card">
+			<!-- 优惠券横幅 -->
+			<view v-if="order.orderType !== 'wait_pay' && order.couponInfo"
+				class="coupon-banner flex-align-center flex-justify-between">
+				<view class="flex-align-center">
+					<view class="coupon-icon flex-center">￥</view>
+					<text class="black-text">{{ order.couponInfo.title }}</text>
+					<text class="red-text">{{ order.couponInfo.priceText }}</text>
+					<text class="black-text">{{ order.couponInfo.timeText }}</text>
+				</view>
+				<uni-icons type="right" size="14" color="#D3D3D3"></uni-icons>
+			</view>
+
+			<!-- 物流信息 -->
+			<view v-if="order.orderType !== 'wait_pay' && order.logistics"
+				class="logistics-box flex-align-center flex-justify-between">
+				<view class="icon-wrap flex-center">
+					<image class="icon" src="/static/image/shopping/pdd/yunshuzhong.png" mode="widthFix"></image>
+				</view>
+				<view class="info flex-1 flex-column">
+					<auto-width-input class="title text-ellipsis-1" v-model="order.logistics.desc" type="textarea"
+						show-edit />
+					<view class="flex-align-center" @click="openTimePicker('logistics')">
+						<text class="time">{{ order.logistics.time }}</text>
+						<image style="width: 24rpx;height: 24rpx;margin-left: 6rpx;"
+							src="/static/image/common/edit.png"></image>
+					</view>
+				</view>
+				<uni-icons type="right" size="14" color="#D3D3D3"></uni-icons>
+			</view>
+
+			<view v-if="order.orderType !== 'wait_pay'" class="divider-line"></view>
+
+			<!-- 地址信息 -->
+			<view class="adress-box flex-align-center flex-justify-between">
+				<view class="icon-wrap flex-center">
+					<image class="icon" src="/static/image/shopping/pdd/location.png" mode="widthFix"></image>
+				</view>
+				<view class="user-info flex-1 flex-column">
+					<view class="name-phone flex-align-center">
+						<auto-width-input class="name" v-model="order.address.name" show-edit />
+						<auto-width-input class="phone" v-model="order.address.phone" show-edit />
+						<image src="/static/image/shopping/pdd/eye-close.png" class="eye-icon" mode="aspectFit"></image>
+					</view>
+					<view class="detail text-ellipsis-2">
+						<view class="flex-align-center flex-1"><auto-width-input v-model="order.address.province"
+								show-edit type="textarea" />
+							<!-- <auto-width-input v-model="order.address.detail" show-edit /> -->
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="upload-shop-logo-box flex-justify-between flex-align-center">
+			<text>上传拼单头像</text>
+			<view class="flex-align-center" style="margin-left: auto;">
+				<view class="avatars-preview flex-align-center" style="margin-right: 16rpx;"
+					v-if="order.avatars && order.avatars.length > 0">
+					<image v-for="(av, idx) in order.avatars" :key="idx" :src="av" mode="aspectFill"
+						style="width: 52rpx; height: 52rpx; border-radius: 50%; border: 2rpx solid #fff;"
+						:style="{ marginLeft: idx > 0 ? '-16rpx' : '0' }" @click="deleteAvatar(idx)"></image>
+				</view>
+				<view class="add-avatar-btn flex-center" @click="chooseAvatar"
+					v-if="!order.avatars || order.avatars.length < 4"
+					style="width: 52rpx; height: 52rpx; border-radius: 50%; border: 1px dashed #ccc; background-color: #f8f8f8;">
+					<text style="color: #999; font-size: 36rpx; line-height: 52rpx; margin-top: -6rpx;">+</text>
+				</view>
+			</view>
+		</view>
+
+		<view class="upload-shop-logo-box  flex-align-center">
+			<text>店铺标签显示</text>
+			<view class="flex-align-center" style="margin-left: auto;">
+				<text style="font-size: 22rpx; color: #999;">品牌认证</text>
+				<switch :checked="order.shop.hasBrandAuth" @change="(e) => order.shop.hasBrandAuth = e.detail.value"
+					color="#E02E24" style="transform: scale(0.6); margin: 0 -10rpx;" />
+				<text style="font-size: 22rpx; color: #999;">旗舰店 </text>
+				<switch :checked="order.shop.hasFlagship" @change="(e) => order.shop.hasFlagship = e.detail.value"
+					color="#E02E24" style="transform: scale(0.6); margin-left: -10rpx; margin-right: -20rpx;" />
+			</view>
+		</view>
+
+
+		<view class="product-card">
+			<!-- 店铺信息 -->
+			<view class="shop-header flex-align-center">
+				<view class="shop-logo flex-center" @click="chooseImage('shopLogo')">
+					<text style="color: #555555;font-size: 32rpx;" v-if="!order.shop.logo">+</text>
+					<image v-else class="w100 h100" :src="order.shop.logo" mode="widthFix"></image>
+				</view>
+				<auto-width-input class="shop-name" v-model="order.shop.name" show-edit />
+				<image v-if="order.shop.hasBrandAuth" class="brand-auth-tag"
+					src="/static/image/shopping/pdd/pinpairenzheng.png" mode="heightFix">
+				</image>
+				<image v-if="order.shop.hasFlagship" class="flagship-tag"
+					src="/static/image/shopping/pdd/qijiandian.png" mode="heightFix"></image>
+			</view>
+
+			<!-- 商品主要内容 -->
+			<view class="product-content flex" v-for="(product, idx) in order.products" :key="idx"
+				:style="{ marginTop: idx > 0 ? '30rpx' : '0' }">
+				<view class="img-box">
+					<image class="product-img" :src="product.img || product.image" mode="aspectFill"
+						@click="chooseImage('product', idx)"></image>
+				</view>
+				<view class="info-box flex-1">
+					<view class="title-price flex">
+						<view class="title text-ellipsis-2 flex-1">
+							<auto-width-input type="textarea" v-model="product.title" show-edit />
+						</view>
+						<view class="price-box flex-column align-end">
+							<text class="price">¥<auto-width-input v-model="product.price" type="number"
+									show-edit /></text>
+							<text class="count">x<auto-width-input v-model="product.count" type="number"
+									show-edit /></text>
+						</view>
+					</view>
+					<view class="spec text-ellipsis-2">
+						<auto-width-input type="textarea" v-model="product.spec" show-edit />
+					</view>
+					<view class="tags flex-align-center" style="flex-wrap: wrap; gap: 8rpx 0;">
+						<view class="green-tag" v-for="(tag, tagIdx) in product.serviceTags" :key="tagIdx">
+							<auto-width-input v-model="product.serviceTags[tagIdx]" show-edit color="#1a1a1a" />
+							<view @click="product.serviceTags.splice(tagIdx, 1)"
+								style="margin-left: 4rpx; display: flex; align-items: center; padding: 4rpx;">
+								<uni-icons type="closeempty" size="12" color="#1a1a1a"></uni-icons>
+							</view>
+						</view>
+						<view class="green-tag flex-center" style="padding: 4rpx 12rpx; opacity: 0.8;"
+							@click="product.serviceTags.push('新标签')">
+							<text style="color: #1a1a1a; font-size: 26rpx; line-height: 26rpx;">+</text>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<view class="divider"></view>
+
+			<!-- 底部支付金额 -->
+			<view class="payment-box flex-align-center">
+				<view style="flex: 1;"></view>
+				<text class="label">{{ order.orderType === 'wait_pay' ? '应付: ' : '实付: ' }} </text>
+				<text class="symbol">¥</text>
+				<auto-width-input class="amount" v-model="order.payment.totalAmount" type="number" color="#DF2E26"
+					show-edit />
+
+				<auto-width-input class="freight" v-model="order.payment.freightDesc" show-edit />
+			</view>
+		</view>
+		<!-- 订单信息 -->
+		<view class="order-info">
+			<view class="info-card flex-column">
+				<view class="info-line flex-align-center flex-justify-between"
+					v-for="(item, index) in (isOrderInfoExpanded || order.orderType === 'wait_pay' ? orderInfoList : orderInfoList.slice(0, 2))"
+					:key="index">
+					<view class="left flex-align-center">
+						<text class="label">{{ item.label }}</text>
+						<view class="flex-align-center" v-if="item.label.includes('时间')"
+							@click="openTimePicker('orderInfo', index, item.value)">
+							<text class="value" style="font-size: 28rpx; color: #1A1A1A;">{{ item.value || '请选择时间'
+							}}</text>
+							<image style="width: 28rpx;height: 28rpx;margin-left: 6rpx;"
+								src="/static/image/common/edit.png"></image>
+						</view>
+						<auto-width-input v-else class="value" v-model="item.value" show-edit />
+						<view class="avatars flex-align-center" v-if="item.hasAvatars && order.avatars">
+							<image class="avatar" v-for="(avatar, aIdx) in order.avatars" :key="aIdx" :src="avatar"
+								mode="aspectFill" :style="{ zIndex: 2 - aIdx, marginLeft: aIdx > 0 ? '-12rpx' : '0' }">
+							</image>
+						</view>
+						<text class="arrow" v-if="item.hasArrow">></text>
+					</view>
+				</view>
+
+				<view class="expand-btn flex-align-center" v-if="!isOrderInfoExpanded && order.orderType !== 'wait_pay'"
+					@click="isOrderInfoExpanded = true">
+					<text class="label">查看更多订单信息</text>
+					<view class="icon-box">
+						<uni-icons type="bottom" size="12" color="#999999"></uni-icons>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 支付方式列表 -->
+		<view v-if="order.orderType == 'wait_pay'" class="pay-list">
+			<view class="pay-item flex-align-center" v-for="(item, index) in payList" :key="index"
+				@click="order.activePayIndex = index">
+				<image :src="item.icon" class="pay-icon" mode="aspectFit"></image>
+				<view class="pay-info flex-1 flex-align-center">
+					<text class="pay-name">{{ item.name }}</text>
+					<text class="pay-subname" v-if="item.subName">{{ item.subName }}</text>
+				</view>
+				<image v-if="order.activePayIndex === index" style="width: 32rpx;height: 32rpx;"
+					src="/static/image/shopping/pdd/pay/select.png"></image>
+			</view>
+		</view>
+		<!-- 底部固定支付栏 -->
+		<view v-if="order.orderType == 'wait_pay'" class="fixed-bottom-bar flex-justify-between">
+			<!-- 样式 2：先用后付 (order.activePayIndex === 2) -->
+			<view class="left-info style-2 flex-column" v-if="order.activePayIndex === 2">
+				<view class="line-top flex-align-end">
+					<text class="label">实付款: </text>
+					<text class="symbol">￥</text>
+					<text class="amount">0</text>
+				</view>
+				<view class="line-bottom">
+					<text>确认收货后付款 ￥{{ order.payment.totalAmount }}</text>
+				</view>
+			</view>
+			<!-- 样式 1：其它支付方式 -->
+			<view class="left-info style-1 flex-align-center" v-else>
+				<view class="flex-align-end">
+					<text class="label">应付: </text>
+					<text class="symbol">￥</text>
+					<auto-width-input class="amount" v-model="order.payment.totalAmount" type="number" show-edit />
+
+					<text class="discount"><auto-width-input class="discount" color="#E02E24" fontSize="26rpx" show-edit
+							v-model="order.payment.discountText" type="text" /></text>
+				</view>
+			</view>
+
+			<view class="pay-btn flex-center">
+				<text>去支付</text>
+			</view>
+		</view>
+	</view>
+
+	<uni-popup ref="timepopup" type="bottom">
+		<view class="timeBox">
+			<view class="titleBox">
+				<view class="title" @click="closeTimePicker">取消</view>
+				<view class="btn" @click="settmes">确定</view>
+			</view>
+			<DateTimePicker :defaultDate="datePickerData.selectDate" :minDate="datePickerData.startDate"
+				:maxDate="datePickerData.endDate" :mode="4" @onChange="onChangeStartDate" />
+		</view>
+	</uni-popup>
+</template>
+
+
+<script setup>
+import { ref, computed, watch } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+import NavBar from "@/components/nav-bar/nav-bar.vue";
+import AutoWidthInput from "@/components/common/auto-width-input.vue";
+import DateTimePicker from '@/components/dengrq-datetime-picker/dateTimePicker/index.vue';
+import { shoppingType, shoppingClassfiy, shoppingProductList } from "../json/order.json";
+import { stringUtil, util } from '@/utils/common.js';
+
+const activeTab = ref("wait_pay");
+const isEditMode = ref(false);
+const currentId = ref('');
+const navTitle = computed(() => isEditMode.value ? "修改订单" : "新增订单");
+
+const isOrderInfoExpanded = ref(true);
+
+const order = ref(JSON.parse(JSON.stringify(shoppingClassfiy[activeTab.value])));
+
+// 自动计算商品总价 (监听单价和数量变化)
+watch(() => order.value.products, (newProducts) => {
+	if (!newProducts || !order.value.payment) return;
+	let total = 0;
+	newProducts.forEach(product => {
+		const price = Number(product.price) || 0;
+		const count = Number(product.count) || 0;
+		total += price * count;
+	});
+	order.value.payment.totalAmount = total.toFixed(2);
+}, { deep: true });
+
+const switchTab = (item) => {
+	// 备份当前数据，防止切 tab 导致用户填写的关键数据丢失
+	const oldData = JSON.parse(JSON.stringify(order.value));
+
+	activeTab.value = item.key;
+	order.value = JSON.parse(JSON.stringify(shoppingClassfiy[activeTab.value]));
+
+	// 将用户的核心更改覆盖回全新的状态模板中
+	if (oldData) {
+		order.value.shop = oldData.shop;
+		order.value.avatars = oldData.avatars;
+		order.value.products = oldData.products;
+		order.value.address = oldData.address;
+		order.value.payment = oldData.payment;
+		order.value.waitPayTime = oldData.waitPayTime;
+		if (oldData.logistics && oldData.logistics.desc) {
+			order.value.logistics = oldData.logistics;
+		}
+		if (oldData.orderInfo && oldData.orderInfo.length > 0) {
+			order.value.orderInfo.forEach(newItem => {
+				const oldItem = oldData.orderInfo.find(o => o.label === newItem.label);
+				if (oldItem && oldItem.value) {
+					newItem.value = oldItem.value;
+				}
+			});
+		}
+		if (oldData.activePayIndex !== undefined) {
+			order.value.activePayIndex = oldData.activePayIndex;
+		}
+		if (oldData.avatars) {
+			order.value.avatars = oldData.avatars;
+			syncAvatarsToOrderInfo();
+		}
+	}
+};
+
+onLoad((options) => {
+	const editFlag = String(options.isEdit) === 'true' || options.isEdit === true;
+	if (editFlag && options.id) {
+		isEditMode.value = true;
+		currentId.value = String(options.id);
+		const list = uni.getStorageSync('pddOrderList') || [];
+		const editData = list.find(item => String(item.id) === String(options.id));
+		if (editData) {
+			order.value = JSON.parse(JSON.stringify(editData));
+			activeTab.value = editData.orderType;
+		}
+	} else {
+		// Init for add mode
+		clickRandomDate();
+	}
+});
+
+const clickRandomDate = () => {
+	if (!shoppingProductList || shoppingProductList.length === 0) return;
+	const randomIndex = Math.floor(Math.random() * shoppingProductList.length);
+	const selected = JSON.parse(JSON.stringify(shoppingProductList[randomIndex]));
+	if (order.value && selected.products && selected.products.length > 0) {
+		order.value.products[0] = {
+			...order.value.products[0],
+			...selected.products[0]
+		};
+		order.value.products[0].img = selected.products[0].img || selected.products[0].image || '/static/image/shopping/pdd/logo.png';
+		order.value.shop.name = selected.shop.name;
+		order.value.payment.totalAmount = selected.payment.totalAmount;
+
+		// 随机生成 waitPayTime (hh:mm:ss，不能大于24小时)
+		const h = Math.floor(Math.random() * 24).toString().padStart(2, '0');
+		const m = Math.floor(Math.random() * 60).toString().padStart(2, '0');
+		const s = Math.floor(Math.random() * 60).toString().padStart(2, '0');
+		order.value.waitPayTime = `${h}:${m}:${s}`;
+
+		// 随机生成 logistics.time ("今天/昨天/前天 hh:mm:ss")
+		if (order.value.logistics) {
+			const prefixes = ['今天', '昨天', '前天'];
+			const randomPrefix = prefixes[Math.floor(Math.random() * prefixes.length)];
+			const lh = Math.floor(Math.random() * 24).toString().padStart(2, '0');
+			const lm = Math.floor(Math.random() * 60).toString().padStart(2, '0');
+			const ls = Math.floor(Math.random() * 60).toString().padStart(2, '0');
+			order.value.logistics.time = `${randomPrefix} ${lh}:${lm}:${ls}`;
+		}
+
+		// 随机生成订单编号、快递单号和各环节时间
+		if (order.value.orderInfo && order.value.orderInfo.length > 0) {
+			const randomOrderNo = `26${Math.floor(Math.random() * 10000).toString().padStart(4, '0')}-${Math.floor(Math.random() * 1e14).toString().padStart(14, '0')}`;
+			const randomExpressNo = `77${Math.floor(Math.random() * 1e14).toString().padStart(14, '0')}`;
+
+			const fmt = (d) => {
+				const Y = d.getFullYear();
+				const M = (d.getMonth() + 1).toString().padStart(2, '0');
+				const D = d.getDate().toString().padStart(2, '0');
+				const h = d.getHours().toString().padStart(2, '0');
+				const m = d.getMinutes().toString().padStart(2, '0');
+				const s = d.getSeconds().toString().padStart(2, '0');
+				return `${Y}-${M}-${D} ${h}:${m}:${s}`;
+			};
+
+			const now = new Date();
+			const orderTimeStr = fmt(now);
+
+			const spellDate = new Date(now.getTime());
+			spellDate.setSeconds(spellDate.getSeconds() + Math.floor(Math.random() * 50) + 10);
+			const spellTimeStr = fmt(spellDate);
+
+			const deliverDate = new Date(spellDate.getTime());
+			deliverDate.setHours(deliverDate.getHours() + Math.floor(Math.random() * 24) + 1);
+			const deliverTimeStr = fmt(deliverDate);
+
+			order.value.orderInfo.forEach(item => {
+				if (item.label.includes('订单编号')) {
+					item.value = randomOrderNo;
+				} else if (item.label.includes('快递单号')) {
+					item.value = randomExpressNo;
+				} else if (item.label.includes('下单时间')) {
+					item.value = orderTimeStr;
+				} else if (item.label.includes('拼单时间')) {
+					item.value = spellTimeStr;
+				} else if (item.label.includes('发货时间')) {
+					item.value = deliverTimeStr;
+				}
+			});
+		}
+	}
+};
+
+const removeLocalFile = (filePath) => {
+	if (!filePath) return;
+	if (filePath.startsWith('http') || filePath.startsWith('/static')) return;
+	uni.removeSavedFile({
+		filePath,
+		fail: () => { }
+	});
+};
+
+const syncAvatarsToOrderInfo = () => {
+	if (order.value.orderInfo) {
+		const target = order.value.orderInfo.find(item => item.hasAvatars);
+		if (target) {
+			target.avatars = order.value.avatars;
+		}
+	}
+};
+
+const deleteAvatar = (idx) => {
+	if (!order.value.avatars) return;
+
+	uni.showActionSheet({
+		itemList: ['替换', '删除'],
+		success: (res) => {
+			if (res.tapIndex === 0) {
+				uni.chooseImage({
+					count: 1,
+					success: (imgRes) => {
+						const tempFilePath = imgRes.tempFilePaths[0];
+						uni.saveFile({
+							tempFilePath,
+							success: (saveRes) => {
+								const oldPath = order.value.avatars[idx];
+								if (oldPath) removeLocalFile(oldPath);
+								order.value.avatars.splice(idx, 1, saveRes.savedFilePath);
+								syncAvatarsToOrderInfo();
+							},
+							fail: () => {
+								order.value.avatars.splice(idx, 1, tempFilePath);
+								syncAvatarsToOrderInfo();
+							}
+						});
+					}
+				});
+			} else if (res.tapIndex === 1) {
+				const oldPath = order.value.avatars[idx];
+				if (oldPath) removeLocalFile(oldPath);
+				order.value.avatars.splice(idx, 1);
+				syncAvatarsToOrderInfo();
+			}
+		}
+	});
+};
+
+const chooseAvatar = () => {
+	const currentCount = order.value.avatars ? order.value.avatars.length : 0;
+	if (currentCount >= 4) return;
+
+	uni.chooseImage({
+		count: 4 - currentCount,
+		success: (res) => {
+			if (!order.value.avatars) {
+				order.value.avatars = [];
+			}
+			res.tempFilePaths.forEach(path => {
+				uni.saveFile({
+					tempFilePath: path,
+					success: (saveRes) => {
+						if (order.value.avatars.length < 4) {
+							order.value.avatars.push(saveRes.savedFilePath);
+						}
+						syncAvatarsToOrderInfo();
+					},
+					fail: () => {
+						if (order.value.avatars.length < 4) {
+							order.value.avatars.push(path);
+						}
+						syncAvatarsToOrderInfo();
+					}
+				});
+			});
+		}
+	});
+};
+
+const chooseImage = (type, idx = 0) => {
+	uni.chooseImage({
+		count: 1,
+		success: (res) => {
+			const tempFilePath = res.tempFilePaths[0];
+			uni.saveFile({
+				tempFilePath: tempFilePath,
+				success: (saveRes) => {
+					if (type === 'shopLogo') {
+						if (order.value.shop.logo) removeLocalFile(order.value.shop.logo);
+						order.value.shop.logo = saveRes.savedFilePath;
+					} else if (type === 'product') {
+						if (order.value.products[idx].img) removeLocalFile(order.value.products[idx].img);
+						order.value.products[idx].img = saveRes.savedFilePath;
+					}
+				},
+				fail: () => {
+					if (type === 'shopLogo') {
+						order.value.shop.logo = tempFilePath;
+					} else if (type === 'product') {
+						order.value.products[idx].img = tempFilePath;
+					}
+				}
+			});
+		}
+	});
+};
+
+const onConfirm = () => {
+	if (order.value.payment && order.value.payment.totalAmount !== undefined) {
+		const amount = Number(order.value.payment.totalAmount);
+		if (!isNaN(amount)) {
+			order.value.payment.totalAmount = parseFloat(amount.toFixed(2));
+		}
+	}
+
+	let list = uni.getStorageSync('pddOrderList') || [];
+	if (isEditMode.value) {
+		const idx = list.findIndex(item => String(item.id) === currentId.value);
+		if (idx > -1) {
+			list[idx] = { ...list[idx], ...order.value };
+		}
+	} else {
+		const newOrder = {
+			...order.value,
+			id: Date.now().toString()
+		};
+		list.unshift(newOrder);
+	}
+	uni.setStorageSync('pddOrderList', list);
+	uni.showToast({ title: '保存成功', icon: 'success' });
+	console.log(order.value);
+	setTimeout(() => {
+		uni.navigateBack();
+	}, 1000);
+};
+
+const orderInfoList = computed(() => {
+	return order.value.orderInfo || [];
+});
+
+const payList = ref([
+	{ name: '多多支付', icon: '/static/image/shopping/pdd/pay/duoduo.png' },
+	{ name: '微信支付', icon: '/static/image/shopping/pdd/pay/wechat.png' },
+	{ name: '先用后付', subName: ' (0元下单，确认收货后付款)', icon: '/static/image/shopping/pdd/pay/xianyonghoufu.png' },
+	{ name: '支付宝', icon: '/static/image/shopping/pdd/pay/alipay.png' },
+	{ name: '找微信好友支付', icon: '/static/image/shopping/pdd/pay/zhaohaoyou.png' },
+	{ name: 'Apple Pay', icon: '/static/image/shopping/pdd/pay/apple.png' },
+	{ name: 'QQ钱包', icon: '/static/image/shopping/pdd/pay/qq.png' },
+	{ name: '云闪付', icon: '/static/image/shopping/pdd/pay/yunshanfu-red.png' },
+	{ name: '云闪付', icon: '/static/image/shopping/pdd/pay/yunshanfu-blue.png' }
+]);
+
+// 时间选择器数据 (hh:mm:ss, 不能大于24小时)
+const timeRange = ref([
+	Array.from({ length: 24 }, (_, i) => (i < 10 ? '0' + i : i + '')), // 时 00-23
+	Array.from({ length: 60 }, (_, i) => (i < 10 ? '0' + i : i + '')),  // 分 00-59
+	Array.from({ length: 60 }, (_, i) => (i < 10 ? '0' + i : i + ''))   // 秒 00-59
+]);
+
+const waitPayTimeValue = computed(() => {
+	if (!order.value || !order.value.waitPayTime) return [0, 0, 0];
+	const parts = order.value.waitPayTime.split(':');
+	if (parts.length !== 3) return [0, 0, 0];
+	return [
+		parseInt(parts[0]) || 0,
+		parseInt(parts[1]) || 0,
+		parseInt(parts[2]) || 0
+	];
+});
+
+const handleWaitPayTimeChange = (e) => {
+	const val = e.detail.value;
+	const h = timeRange.value[0][val[0]];
+	const m = timeRange.value[1][val[1]];
+	const s = timeRange.value[2][val[2]];
+	order.value.waitPayTime = `${h}:${m}:${s}`;
+};
+
+const logisticsPickerValue = computed(() => {
+	if (!order.value || !order.value.logistics || !order.value.logistics.time) return '';
+	const relativeStr = order.value.logistics.time;
+	const parts = relativeStr.split(' ');
+	if (parts.length < 2) return '';
+
+	const prefix = parts[0];
+	const timePart = parts[1];
+
+	const now = new Date();
+	let targetDate = new Date(now);
+
+	if (prefix === '今天') {
+		// 维持今天
+	} else if (prefix === '昨天') {
+		targetDate.setDate(targetDate.getDate() - 1);
+	} else if (prefix === '前天') {
+		targetDate.setDate(targetDate.getDate() - 2);
+	} else if (prefix.includes('-')) {
+		const dp = prefix.split('-');
+		if (dp.length === 2) {
+			targetDate.setMonth(parseInt(dp[0]) - 1);
+			targetDate.setDate(parseInt(dp[1]));
+		}
+	}
+
+	const Y = targetDate.getFullYear();
+	const M = (targetDate.getMonth() + 1).toString().padStart(2, '0');
+	const D = targetDate.getDate().toString().padStart(2, '0');
+	return `${Y}-${M}-${D} ${timePart}`;
+});
+
+const timepopup = ref();
+const datePickerData = ref({
+	selectDate: "",
+	startDate: "",
+	endDate: "",
+});
+
+// 记录当前弹窗编辑的目标类型与索引
+const activeTimePicker = ref({ type: '', index: -1 });
+
+const openTimePicker = (type, index = -1, currentValue = '') => {
+	activeTimePicker.value = { type, index };
+
+	let initVal = currentValue;
+	if (type === 'logistics' && logisticsPickerValue.value) {
+		initVal = logisticsPickerValue.value;
+	} else if (!initVal) {
+		initVal = util.formatTime(new Date());
+	}
+
+	datePickerData.value.selectDate = initVal;
+	datePickerData.value.endDate = "2099-12-31 23:59:59";
+	timepopup.value.open();
+};
+
+const closeTimePicker = () => {
+	timepopup.value.close();
+};
+
+const onChangeStartDate = (e) => {
+	datePickerData.value.selectDate = e;
+};
+
+const settmes = () => {
+	const val = datePickerData.value.selectDate;
+	if (!val) {
+		timepopup.value.close();
+		return;
+	}
+
+	if (activeTimePicker.value.type === 'logistics') {
+		// val 格式为 "YYYY-MM-DD HH:mm:ss"
+		const selectedDate = new Date(val.replace(/-/g, '/'));
+		const now = new Date();
+
+		const selectedDay = new Date(selectedDate.getFullYear(), selectedDate.getMonth(), selectedDate.getDate());
+		const todayDay = new Date(now.getFullYear(), now.getMonth(), now.getDate());
+
+		const diffTime = todayDay - selectedDay;
+		const diffDays = Math.floor(diffTime / (1000 * 60 * 60 * 24));
+
+		const h = selectedDate.getHours().toString().padStart(2, '0');
+		const m = selectedDate.getMinutes().toString().padStart(2, '0');
+		const s = selectedDate.getSeconds().toString().padStart(2, '0');
+		const timePart = `${h}:${m}:${s}`;
+
+		if (diffDays === 0) {
+			order.value.logistics.time = `今天 ${timePart}`;
+		} else if (diffDays === 1) {
+			order.value.logistics.time = `昨天 ${timePart}`;
+		} else if (diffDays === 2) {
+			order.value.logistics.time = `前天 ${timePart}`;
+		} else {
+			const MM = (selectedDate.getMonth() + 1).toString().padStart(2, '0');
+			const DD = selectedDate.getDate().toString().padStart(2, '0');
+			order.value.logistics.time = `${MM}-${DD} ${timePart}`;
+		}
+	} else if (activeTimePicker.value.type === 'orderInfo' && activeTimePicker.value.index !== -1) {
+		// 订单信息中的各种时间（发货、拼单等），直接回填 YYYY-MM-DD HH:mm:ss 格式
+		order.value.orderInfo[activeTimePicker.value.index].value = val;
+	}
+
+	timepopup.value.close();
+};
+</script>
+
+
+<style lang="less" scoped>
+.tab-box {
+	display: flex;
+	background-color: #ffffff;
+	padding: 20rpx 24rpx 0;
+	border-bottom: 1rpx solid #F2F3F7;
+
+	.tab {
+		flex: 1;
+		text-align: center;
+		padding-bottom: 20rpx;
+		font-size: 28rpx;
+		color: #1A1A1A;
+		border-bottom: 4rpx solid transparent;
+
+		&.active {
+			color: #DD223F;
+			border-bottom-color: #DD223F;
+			font-weight: 500;
+		}
+	}
+}
+
+.random-dice {
+	margin-top: 16rpx;
+	display: flex;
+	align-items: center;
+	justify-content: flex-end;
+}
+
+.title {
+	font-weight: 500;
+	font-size: 36rpx;
+	color: #1A1A1A;
+	line-height: 36rpx;
+
+}
+
+.sub-title {
+	font-weight: 400;
+	font-size: 26rpx;
+	color: #DF2E26;
+	line-height: 26rpx;
+	white-space: nowrap;
+	margin-top: 14rpx;
+}
+
+.hightlight-box {
+	border-bottom: 1rpx solid #F4F4F4;
+	background-color: #ffffff;
+	padding: 24rpx 24rpx;
+	margin: 16rpx 0;
+}
+
+.header-info-card {
+	background-color: #ffffff;
+	margin-bottom: 18rpx;
+
+	.icon-wrap {
+		width: 60rpx;
+		flex-shrink: 0;
+
+		.icon {
+			width: 40rpx;
+		}
+	}
+
+	.coupon-banner {
+		background-color: #FFF2E2;
+		padding: 18rpx 24rpx;
+
+		.coupon-icon {
+			width: 30rpx;
+			height: 30rpx;
+			background-color: #DF2E26;
+			color: #ffffff;
+			font-size: 20rpx;
+			border-radius: 4rpx;
+			margin-right: 12rpx;
+		}
+
+		.black-text {
+			font-size: 26rpx;
+			color: #333333;
+		}
+
+		.red-text {
+			font-size: 26rpx;
+			color: #DF2E26;
+		}
+	}
+
+	.logistics-box {
+		padding: 24rpx;
+
+		.info {
+			margin-left: 10rpx;
+			margin-right: 20rpx;
+			width: 100px;
+
+			.title {
+				font-weight: 400;
+				font-size: 30rpx;
+				color: #535353;
+				line-height: 30rpx;
+			}
+
+			.time {
+				font-weight: 400;
+				font-size: 26rpx;
+				color: #999999;
+				line-height: 26rpx;
+				margin-top: 14rpx;
+			}
+		}
+	}
+
+	.divider-line {
+		height: 1rpx;
+		background-color: #F4F4F4;
+		margin-left: 80rpx;
+		margin-right: 24rpx;
+	}
+
+	.adress-box {
+		padding: 24rpx;
+
+		.user-info {
+			margin-left: 10rpx;
+			margin-right: 20rpx;
+
+			.name-phone {
+				font-size: 28rpx;
+				color: #535353;
+				line-height: 30rpx;
+
+				.name {
+					margin-right: 12rpx;
+				}
+
+				.phone {
+					margin-right: 8rpx;
+				}
+
+				.eye-icon {
+					width: 32rpx;
+					height: 32rpx;
+					margin: 0 10rpx;
+				}
+
+				.province {
+					color: #999999;
+				}
+			}
+
+			.detail {
+				font-size: 28rpx;
+				color: #535353;
+				margin-top: 8rpx;
+				line-height: 30rpx;
+			}
+		}
+
+		.edit-btn {
+			flex-shrink: 0;
+			font-weight: 400;
+			font-size: 30rpx;
+			line-height: 30rpx;
+			color: #DF2E26;
+			border-radius: 8rpx;
+			border: 1rpx solid #DF2E26;
+			text-align: center;
+			padding: 8rpx 20rpx;
+		}
+	}
+}
+
+.pay-list {
+	background-color: #ffffff;
+	margin-bottom: 16rpx;
+	margin-top: 16rpx;
+
+	.pay-item {
+		height: 90rpx;
+		margin-left: 24rpx;
+		margin-right: 22rpx;
+		border-bottom: 1rpx solid #F6F6F6;
+
+		&:last-child {
+			border-bottom: none;
+		}
+
+		.pay-icon {
+			width: 44rpx;
+			height: 44rpx;
+			margin-right: 20rpx;
+			flex-shrink: 0;
+		}
+
+		.pay-info {
+			.pay-name {
+				font-weight: 400;
+				font-size: 30rpx;
+				color: #1A1A1A;
+				line-height: 30rpx;
+			}
+
+			.pay-subname {
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #535353;
+				line-height: 30rpx;
+			}
+		}
+	}
+}
+
+.product-card {
+	background-color: #ffffff;
+	padding: 16rpx 0 0;
+	// margin-bottom: 20rpx;
+
+	.shop-header {
+		margin-bottom: 16rpx;
+		padding: 0 24rpx;
+
+		.shop-logo {
+			width: 40rpx;
+			height: 40rpx;
+			border-radius: 4rpx;
+			margin-right: 16rpx;
+			background-color: #F4F4F4;
+		}
+
+		.shop-name {
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #1A1A1A;
+			line-height: 24rpx;
+			margin-right: 8rpx;
+		}
+
+		.brand-auth-tag {
+			height: 28rpx;
+			margin-right: 10rpx;
+		}
+
+		.flagship-tag {
+			height: 28rpx;
+		}
+	}
+
+	.product-content {
+		margin-bottom: 16rpx;
+		padding: 0 24rpx;
+
+		.img-box {
+			width: 164rpx;
+			height: 164rpx;
+			border-radius: 4rpx;
+			background-color: #f5f5f5;
+			margin-right: 32rpx;
+			flex-shrink: 0;
+			overflow: hidden;
+
+			.product-img {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.info-box {
+			width: 0;
+
+			.title-price {
+				align-items: flex-start;
+
+				.title {
+					margin-right: 24rpx;
+					font-size: 28rpx;
+					color: #1A1A1A;
+					font-weight: 400;
+					line-height: 36rpx;
+				}
+
+				.price-box {
+					flex-shrink: 0;
+
+					.price {
+						font-size: 26rpx;
+						color: #999999;
+						line-height: 36rpx;
+					}
+
+					.count {
+						font-size: 24rpx;
+						color: #999999;
+						margin-top: 4rpx;
+						text-align: right;
+					}
+				}
+			}
+
+			.spec {
+				font-weight: 400;
+				font-size: 26rpx;
+				color: #999999;
+				line-height: 34rpx;
+				margin-bottom: 14rpx;
+				margin-right: 110rpx;
+			}
+
+			.tags {
+				.green-tag {
+					color: #1a1a1a;
+					border: 1px dashed #D2D2D2;
+					font-size: 26rpx;
+					line-height: 26rpx;
+					padding: 4rpx 2rpx 4rpx 6rpx;
+					border-radius: 4rpx;
+					margin-right: 6rpx;
+					display: inline-flex;
+					align-items: center;
+				}
+			}
+		}
+	}
+
+	.divider {
+		height: 1rpx;
+		background-color: #EFEFEF;
+		width: 100%;
+	}
+
+	.payment-box {
+		padding: 16rpx 24rpx;
+		align-items: baseline;
+
+		.label {
+			font-weight: 400;
+			font-size: 26rpx;
+			color: #1A1A1A;
+			line-height: 24rpx;
+		}
+
+		.symbol {
+			font-size: 24rpx;
+			color: #DF2E26;
+			margin-left: 10rpx;
+			font-weight: 500;
+			margin-right: 4rpx;
+		}
+
+		.amount {
+			font-size: 34rpx;
+			color: #DF2E26;
+			font-weight: 500;
+		}
+
+		.decimal {
+			font-size: 26rpx;
+			color: #DF2E26;
+			font-weight: 500;
+		}
+
+		.freight {
+			font-size: 26rpx;
+			color: #1A1A1A;
+			margin-left: 8rpx;
+		}
+	}
+}
+
+.text-ellipsis-2 {
+	display: -webkit-box;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 2;
+	overflow: hidden;
+}
+
+.align-end {
+	align-items: flex-end;
+}
+
+.upload-shop-logo-box {
+	background-color: #fff;
+	padding: 24rpx 26rpx;
+	margin-bottom: 18rpx;
+}
+
+.order-info {
+	.info-card {
+		background-color: #ffffff;
+		padding: 22rpx 24rpx;
+		margin-bottom: 16rpx;
+
+		.info-line {
+			margin-bottom: 8rpx;
+
+			&:last-child {
+				margin-bottom: 0;
+			}
+
+			.label,
+			.value {
+				font-weight: 400;
+				font-size: 26rpx;
+				color: #999999;
+				line-height: 30rpx;
+			}
+
+			.value {
+				margin-left: 10rpx;
+			}
+
+			.arrow {
+				font-size: 20rpx;
+				color: #BDBDBD;
+				margin-left: 6rpx;
+				font-family: monospace;
+			}
+
+			.avatars {
+				margin-left: 14rpx;
+
+				.avatar {
+					width: 32rpx;
+					height: 32rpx;
+					border-radius: 50%;
+					border: 2rpx solid #FFFFFF;
+					background-color: #EFEFEF;
+				}
+			}
+		}
+
+		.expand-btn {
+			margin-top: 8rpx;
+
+			.label {
+				font-weight: 400;
+				font-size: 26rpx;
+				color: #999999;
+			}
+
+			.icon-box {
+				width: 24rpx;
+				height: 24rpx;
+				border-radius: 2rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				margin-left: 6rpx;
+			}
+		}
+	}
+
+	.cancel-card {
+		background-color: #ffffff;
+		height: 96rpx;
+
+		text {
+			font-size: 30rpx;
+			color: #535353;
+			line-height: 30rpx;
+		}
+	}
+}
+
+.page-container {
+	padding-bottom: 200rpx;
+}
+
+.fixed-bottom-bar {
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	background-color: #ffffff;
+	border-top: 1rpx solid #F0F0F0;
+	display: flex;
+	z-index: 100;
+	padding-bottom: env(safe-area-inset-bottom);
+	padding-bottom: constant(safe-area-inset-bottom);
+
+	.left-info {
+		flex: 1;
+		display: flex;
+		justify-content: flex-end;
+		padding-right: 24rpx;
+		height: 108rpx;
+
+		&.style-1 {
+			align-items: center;
+
+			.label {
+				font-size: 26rpx;
+				color: #1A1A1A;
+				font-weight: 400;
+			}
+
+			.symbol {
+				font-size: 24rpx;
+				color: #E02E24;
+				margin-left: 6rpx;
+				font-weight: 500;
+			}
+
+			.amount {
+				font-size: 40rpx;
+				color: #E02E24;
+				font-weight: 500;
+			}
+
+			.decimal {
+				font-size: 28rpx;
+				color: #E02E24;
+				font-weight: 500;
+			}
+
+			.discount {
+				font-size: 26rpx;
+				color: #E02E24;
+			}
+		}
+
+		&.style-2 {
+			flex-direction: column;
+			justify-content: center;
+			align-items: flex-end;
+
+			.line-top {
+				display: flex;
+				align-items: baseline;
+
+				.label {
+					font-size: 26rpx;
+					color: #1A1A1A;
+					font-weight: 400;
+				}
+
+				.symbol {
+					font-size: 24rpx;
+					color: #E02E24;
+					margin-left: 6rpx;
+					font-weight: 500;
+				}
+
+				.amount {
+					font-size: 40rpx;
+					color: #E02E24;
+					font-weight: 500;
+				}
+			}
+
+			.line-bottom {
+				font-size: 26rpx;
+				color: #E02E24;
+				font-weight: 500;
+				line-height: 26rpx;
+				margin-top: 4rpx;
+			}
+		}
+	}
+
+	.pay-btn {
+		width: 250rpx;
+		height: 108rpx;
+		background-color: #E02E24;
+
+		text {
+			font-weight: 400;
+			font-size: 34rpx;
+			color: #FFFFFF;
+		}
+	}
+}
+
+.timeBox {
+	background-color: #fff;
+	padding: 10px;
+	border-radius: 24rpx 24rpx 0 0;
+
+	.titleBox {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin-bottom: 20px;
+		padding: 0 10px;
+
+		.title {
+			font-size: 28rpx;
+			color: #999;
+		}
+
+		.btn {
+			font-size: 28rpx;
+			color: #1676FE;
+			font-weight: 500;
+		}
+	}
+}
+</style>
+<style>
+@import '@/common/main.css';
+</style>
diff --git a/pages/shopping/pdd/components/list-card/list-card.vue b/pages/shopping/pdd/components/list-card/list-card.vue
index 331f28f..ad5a6ca 100644
--- a/pages/shopping/pdd/components/list-card/list-card.vue
+++ b/pages/shopping/pdd/components/list-card/list-card.vue
@@ -1,15 +1,18 @@
 <template>
-    <view class="list-card-container" v-if="item">
+    <view class="list-card-container" v-if="item" @click="toDetail(item.id)" @longpress="onLongPress">
         <!-- 头部店铺信息和状态 -->
         <view class="header-box flex-between flex-align-center">
             <view class="shop-info flex-align-center">
-                <view class="shop-logo-placeholder flex-center" v-if="item.isBrand"><text class="logo-text">正品</text>
+                <view class="shop-logo-placeholder flex-center" v-if="item.shop.logo">
+                    <image class="brand-img" :src="item.shop.logo">
+                    </image>
                 </view>
-                <text class="shop-name">{{ item.shopName }}</text>
-                <!-- <view class="tag-brand" v-if="item.isBrand">品牌认证</view> -->
-                <image v-if="item.isBrand" class="brand-img" src="/static/image/shopping/pdd/pinpairenzheng.png">
+                <text class="shop-name">{{ item.shop?.name }}</text>
+                <image v-if="item.shop?.hasBrandAuth" class="brand-img"
+                    src="/static/image/shopping/pdd/pinpairenzheng.png">
+                </image>
+                <image class="flag-img" v-if="item.shop?.hasFlagship" src="/static/image/shopping/pdd/qijiandian.png">
                 </image>
-                <image class="flag-img" v-if="item.isFlagship" src="/static/image/shopping/pdd/qijiandian.png"></image>
                 <uni-icons style="margin-top: 4rpx;" type="right" color="#999999" size="12"></uni-icons>
             </view>
             <view class="status-text" v-if="item.orderType === 'wait_pay'">待支付</view>
@@ -18,26 +21,26 @@
         </view>
 
         <!-- 商品主要内容 -->
-        <view class="product-box flex">
+        <view class="product-box flex" v-for="(product, pIndex) in item.products" :key="pIndex">
             <view class="product-img-box">
-                <image class="product-img" :src="item.productImg" mode="aspectFill"></image>
+                <image class="product-img" :src="product.img" mode="aspectFill"></image>
             </view>
             <view class="product-content flex-1">
                 <view class="title-box">
-                    <view class="brand-tag flex-center">品牌</view>
-                    <text class="title-text">{{ item.productTitle }}</text>
+                    <view class="brand-tag flex-center" v-if="item.shop?.hasBrandAuth">品牌</view>
+                    <text class="title-text">{{ product.title }}</text>
                 </view>
-                <view class="spec-text text-ellipsis">{{ item.productSpec }}</view>
+                <view class="spec-text text-ellipsis">{{ product.spec }}</view>
                 <view class="tags-box flex-align-center">
-                    <view class="green-tag" v-for="(tag, index) in item.tags" :key="index">{{ tag }}</view>
+                    <view class="green-tag" v-for="(tag, index) in product.serviceTags" :key="index">{{ tag }}</view>
                 </view>
             </view>
             <view class="price-box flex-column align-end">
                 <text class="price">¥
-                    <text style="font-size: 30rpx;">{{ Number(item.price).toFixed(1).split('.')[0] + '.' }}</text>
-                    <text style="font-size: 22rpx;">{{ Number(item.price).toFixed(1).split('.')[1] }}</text>
+                    <text style="font-size: 30rpx;">{{ Number(product.price).toFixed(1).split('.')[0] + '.' }}</text>
+                    <text style="font-size: 22rpx;">{{ Number(product.price).toFixed(1).split('.')[1] }}</text>
                 </text>
-                <text class="count">x{{ item.quantity }}</text>
+                <text class="count">x{{ product.count }}</text>
             </view>
         </view>
 
@@ -52,8 +55,8 @@
                 <view class="total-price flex-align-center">
                     <text class="label">{{ item.orderType === 'wait_pay' ? '应付' : '实付' }}:</text>
                     <text class="symbol">¥</text>
-                    <text class="amount">{{ item.totalAmount }}</text>
-                    <text class="freight">({{ item.freightText }})</text>
+                    <text class="amount">{{ item.payment.totalAmount }}</text>
+                    <text class="freight">{{ item.payment.freightDesc }}</text>
                 </view>
             </view>
 
@@ -84,18 +87,18 @@
             </view>
 
             <!-- 物流状态栏 -->
-            <view class="delivery-box flex-align-center" v-if="item.deliveryStatus">
+            <view class="delivery-box flex-align-center" v-if="item.deliveryStatus && item.orderType !== 'received'">
                 <view class="truck-icon flex-center">
                     <image style="width:32rpx;height: 32rpx;" src="/static/image/shopping/pdd/yunshuzhong.png"></image>
                 </view>
                 <view class="delivery-content text-ellipsis flex-1">
                     <template v-if="item.orderType === 'wait_pay'">
                         <text class="green-text">{{ item.deliveryStatus }}</text>
-                        <text class="green-text">{{ item.deliveryDetail }}</text>
+                        <text class="green-text">{{ item.statusDesc }}</text>
                     </template>
                     <template v-if="item.orderType === 'wait_recv'">
                         <text class="green-text">{{ item.deliveryStatus }}</text>
-                        <text class="gray-text">{{ item.deliveryDetail }}</text>
+                        <text class="gray-text">{{ item.logistics.desc }}</text>
                     </template>
                 </view>
             </view>
@@ -105,7 +108,7 @@
 </template>
 
 <script setup>
-import { defineProps } from 'vue';
+import { defineProps, defineEmits } from 'vue';
 
 const props = defineProps({
     item: {
@@ -113,6 +116,18 @@ const props = defineProps({
         default: () => ({})
     }
 });
+
+const emit = defineEmits(['longpress']);
+
+const onLongPress = (e) => {
+    emit('longpress', e);
+};
+
+const toDetail = (id) => {
+    uni.navigateTo({
+        url: `/pages/shopping/pdd/order-detail/order-detail?id=${id}`
+    });
+};
 </script>
 
 <style lang="less" scoped>
@@ -170,17 +185,12 @@ const props = defineProps({
     margin-bottom: 24rpx;
 
     .shop-logo-placeholder {
-        width: 44rpx;
-        height: 24rpx;
-        background-color: #E01B13;
-        border-radius: 20rpx;
-        margin-right: 8rpx;
-
-        .logo-text {
-            color: #fff;
-            font-size: 16rpx;
-            transform: scale(0.8);
-        }
+        flex-shrink: 0;
+        width: 40rpx;
+        height: 40rpx;
+        border-radius: 4rpx;
+        margin-right: 6rpx;
+        overflow: hidden;
     }
 
     .shop-name {
diff --git a/pages/shopping/pdd/json/order.json b/pages/shopping/pdd/json/order.json
new file mode 100644
index 0000000..871e802
--- /dev/null
+++ b/pages/shopping/pdd/json/order.json
@@ -0,0 +1,632 @@
+{
+    // "购物订单分类字段"
+    "shoppingClassfiy": {
+        "wait_pay": {
+            // type: 1,
+            "id": 1,
+            "orderType": "wait_pay",
+            "waitPayTime": "23:59:27",
+            "shop": {
+                "name": "",
+                "logo": "",
+                "hasBrandAuth": true,
+                "hasFlagship": true
+            },
+            "products": [
+                {
+                    "img": "",
+                    "title": "",
+                    "price": 0,
+                    "count": 0,
+                    "spec": "",
+                    "serviceTags": []
+                }
+            ],
+            "avatars": [],
+            "activePayIndex": 2,
+            "address": {
+                "name": "张三",
+                "phone": "13888888888",
+                "province": "上海市浦东新区汤臣一品1号楼",
+                "detail": ""
+            },
+            "payment": {
+                "totalAmount": "",
+                "discountText": "已优惠10元",
+                "freightDesc": "（免运费）"
+            },
+            "totalAmount": 0,
+            "freightText": "",
+            "collectCount": 0,
+            "deliveryStatus": "",
+            "statusDesc": "预计后天送达",
+            "logistics": {
+                "desc": "",
+                "time": ""
+            },
+            "orderInfo": [
+                {
+                    "label": "订单编号：",
+                    "value": "",
+                    "hasCopy": true
+                },
+                {
+                    "label": "下单时间：",
+                    "value": ""
+                }
+            ]
+        },
+        "wait_recv": {
+            // type: 2,
+            "id": 2,
+            "orderType": "wait_recv",
+            "shop": {
+                "name": "",
+                "logo": "",
+                "hasBrandAuth": true,
+                "hasFlagship": true
+            },
+            "products": [
+                {
+                    "img": "",
+                    "title": "",
+                    "price": 0,
+                    "count": 0,
+                    "spec": "",
+                    "serviceTags": []
+                }
+            ],
+            "avatars": [],
+            "address": {
+                "name": "张三",
+                "phone": "13888888888",
+                "province": "上海市浦东新区汤臣一品1号楼",
+                "detail": ""
+            },
+            "payment": {
+                "totalAmount": "",
+                "discountText": "",
+                "freightDesc": "（免运费）"
+            },
+            "totalAmount": 0,
+            "freightText": "",
+            "collectCount": 0,
+            "deliveryStatus": "运输中 预计明天送达",
+            "statusDesc": "商家已早于承诺时间发货",
+            "logistics": {
+                "desc": "申通快递：【南京市】快件已发往 上海市浦东新区",
+                "time": "今天 06:25:21"
+            },
+            "orderInfo": [
+                {
+                    "label": "订单编号：",
+                    "value": "260403-03369586325654",
+                    "hasCopy": true
+                },
+                {
+                    "label": "商品快照：",
+                    "value": "发生交易争议时，可作为判断依据",
+                    "hasArrow": true
+                },
+                {
+                    "label": "支付方式：",
+                    "value": "支付宝"
+                },
+                {
+                    "label": "物流公司：",
+                    "value": "申通快递"
+                },
+                {
+                    "label": "快递单号：",
+                    "value": "777445412223333326"
+                },
+                {
+                    "label": "下单时间：",
+                    "value": "2026-03-31 08:55:30"
+                },
+                {
+                    "label": "拼单时间：",
+                    "value": "2026-03-31 08:55:30",
+                    "hasAvatars": true,
+                    "hasArrow": true
+                },
+                {
+                    "label": "发货时间：",
+                    "value": "2026-03-31 11:11:52"
+                }
+            ]
+        },
+        "received": {
+            // type: 3,
+            "id": 3,
+            "orderType": "received",
+            "shop": {
+                "name": "",
+                "logo": "",
+                "hasBrandAuth": true,
+                "hasFlagship": true
+            },
+            "products": [
+                {
+                    "img": "",
+                    "title": "",
+                    "price": 0,
+                    "count": 0,
+                    "spec": "",
+                    "serviceTags": []
+                }
+            ],
+            "avatars": [],
+            "address": {
+                "name": "张三",
+                "phone": "13888888888",
+                "province": "上海市浦东新区汤臣一品1号楼",
+                "detail": ""
+            },
+            "payment": {
+                "totalAmount": "",
+                "discountText": "",
+                "freightDesc": "（免运费）"
+            },
+            "totalAmount": 0,
+            "freightText": "",
+            "collectCount": 558,
+            "deliveryStatus": "",
+            "statusDesc": "商家已早于承诺时间发货",
+            "logistics": {
+                "desc": "申通快递：【上海市】订单已签收 上海市浦东新区汤臣一品",
+                "time": "今天 10:25:21"
+            },
+            "orderInfo": [
+                {
+                    "label": "订单编号：",
+                    "value": "260403-03369586325654",
+                    "hasCopy": true
+                },
+                {
+                    "label": "商品快照：",
+                    "value": "发生交易争议时，可作为判断依据",
+                    "hasArrow": true
+                },
+                {
+                    "label": "支付方式：",
+                    "value": "支付宝"
+                },
+                {
+                    "label": "物流公司：",
+                    "value": "申通快递"
+                },
+                {
+                    "label": "快递单号：",
+                    "value": "77735698745526"
+                },
+                {
+                    "label": "下单时间：",
+                    "value": "2026-03-31 08:55:30"
+                },
+                {
+                    "label": "拼单时间：",
+                    "value": "2026-03-31 08:55:30",
+                    "hasAvatars": true,
+                    "hasArrow": true
+                },
+                {
+                    "label": "发货时间：",
+                    "value": "2026-03-31 11:11:52"
+                }
+            ]
+        }
+    },
+    // "购物类型"
+    "shoppingType": [
+        {
+            "label": "等待付款",
+            "key": "wait_pay"
+        },
+        {
+            "label": "待收货",
+            "key": "wait_recv"
+        },
+        {
+            "label": "完成-已签收",
+            "key": "received"
+        }
+    ],
+    // "购物随机产品列表"
+    "shoppingProductList": [
+        {
+            "payment": {
+                "totalAmount": "35.9",
+                "discountText": "立省 6.59",
+                "freightDesc": "（免运费）"
+            },
+            "shop": {
+                "name": "多多数码旗舰店",
+                "logo": "",
+                "hasBrandAuth": true,
+                "hasFlagship": true
+            },
+            "products": [
+                {
+                    "img": "/static/image/shopping/jingdong/product/shopping/xianka.png",
+                    "name": "",
+                    "title": "华硕 TUF 5090显卡",
+                    "spec": "5090旗舰算力 水冷夜神OC",
+                    "serviceTags": [
+                        "不支持7天无理由退货"
+                    ],
+                    "price": "39849.00",
+                    "count": "1"
+                }
+            ]
+        },
+        {
+            "payment": {
+                "totalAmount": "35.9",
+                "discountText": "立省 6.59",
+                "freightDesc": "（免运费）"
+            },
+            "shop": {
+                "name": "Apple 产品旗舰店",
+                "logo": "",
+                "hasBrandAuth": true,
+                "hasFlagship": true
+            },
+            "products": [
+                {
+                    "img": "/static/image/shopping/jingdong/product/shopping/iphone.png",
+                    "name": "Apple iPhone 17 Pro",
+                    "title": "Apple/苹果 iPhone 17 Pro Max 1TB 星宇橙色",
+                    "spec": "星宇橙色；全网通5G",
+                    "serviceTags": [
+                        "免费上门退换",
+                        "七天无理由退货"
+                    ],
+                    "price": "12999.00",
+                    "count": "1"
+                }
+            ]
+        },
+        {
+            "payment": {
+                "totalAmount": "35.9",
+                "discountText": "立省 6.59",
+                "freightDesc": "（免运费）"
+            },
+            "shop": {
+                "name": "路易威登官方旗舰店",
+                "logo": "",
+                "hasBrandAuth": true,
+                "hasFlagship": true
+            },
+            "products": [
+                {
+                    "img": "/static/image/shopping/jingdong/product/shopping/lv.png",
+                    "name": "LV",
+                    "title": "路易威登 经典老花手提包",
+                    "spec": "经典老花；手提包",
+                    "serviceTags": [
+                        "次日达",
+                        "七天无理由退货"
+                    ],
+                    "price": "23979.25",
+                    "count": "1"
+                }
+            ]
+        },
+        {
+            "payment": {
+                "totalAmount": "35.9",
+                "discountText": "立省 6.59",
+                "freightDesc": "（免运费）"
+            },
+            "shop": {
+                "name": "索尼（SONY）数码官方旗舰店",
+                "logo": "",
+                "hasBrandAuth": true,
+                "hasFlagship": true
+            },
+            "products": [
+                {
+                    "img": "/static/image/shopping/jingdong/product/shopping/sony.png",
+                    "name": "Sony",
+                    "title": "索尼（SONY）Alpha 7 IV 全画幅微单数码相机",
+                    "spec": "单机身（不含镜头）；约3300万有效像素",
+                    "serviceTags": [
+                        "厂家发货",
+                        "七天无理由退货"
+                    ],
+                    "price": "15499.00",
+                    "count": "1"
+                }
+            ]
+        },
+        {
+            "payment": {
+                "totalAmount": "35.9",
+                "discountText": "立省 6.59",
+                "freightDesc": "（免运费）"
+            },
+            "shop": {
+                "name": "五粮液自营店",
+                "logo": "",
+                "hasBrandAuth": true,
+                "hasFlagship": true
+            },
+            "products": [
+                {
+                    "img": "/static/image/shopping/jingdong/product/shopping/wuliangye.png",
+                    "name": "五粮液",
+                    "title": "五粮液 普五 第八代 浓香型白酒 52度 500ml*2瓶",
+                    "spec": "500ml*2礼盒装；浓香型",
+                    "serviceTags": [
+                        "七天无理由退货",
+                        "假一赔十"
+                    ],
+                    "price": "1099.00",
+                    "count": "2"
+                }
+            ]
+        },
+        {
+            "payment": {
+                "totalAmount": "35.9",
+                "discountText": "立省 6.59",
+                "freightDesc": "（免运费）"
+            },
+            "shop": {
+                "name": "戴森Dyson官方旗舰店",
+                "logo": "",
+                "hasBrandAuth": true,
+                "hasFlagship": true
+            },
+            "products": [
+                {
+                    "img": "/static/image/shopping/jingdong/product/shopping/dyson_v12.png",
+                    "name": "戴森",
+                    "title": "戴森(Dyson) V12 Detect Slim 无绳吸尘器",
+                    "spec": "轻量版；激光探测；轻量吸尘器",
+                    "serviceTags": [
+                        "厂家发货",
+                        "七天无理由退货"
+                    ],
+                    "price": "3299.00",
+                    "count": "1"
+                }
+            ]
+        }
+    ],
+    //默认数据
+    "defaultDataList": [
+        {
+            "id": "1780046536767",
+            "orderType": "received",
+            "shop": {
+                "name": "五粮液自营店",
+                "logo": "",
+                "hasBrandAuth": true,
+                "hasFlagship": true
+            },
+            "products": [
+                {
+                    "img": "/static/image/shopping/jingdong/product/shopping/wuliangye.png",
+                    "title": "五粮液 普五 第八代 浓香型白酒 52度 500ml*2瓶",
+                    "price": "1099.00",
+                    "count": "2",
+                    "spec": "500ml*2礼盒装；浓香型",
+                    "serviceTags": [
+                        "七天无理由退货",
+                        "假一赔十"
+                    ],
+                    "name": "五粮液"
+                }
+            ],
+            "avatars": [],
+            "address": {
+                "name": "张三",
+                "phone": "13888888888",
+                "province": "上海市浦东新区汤臣一品1号楼",
+                "detail": ""
+            },
+            "payment": {
+                "totalAmount": 2198,
+                "discountText": "已优惠10元",
+                "freightDesc": "（免运费）"
+            },
+            "totalAmount": 0,
+            "freightText": "",
+            "collectCount": 558,
+            "deliveryStatus": "",
+            "statusDesc": "商家已早于承诺时间发货",
+            "logistics": {
+                "desc": "申通快递：【上海市】订单已签收 上海市浦东新区汤臣一品",
+                "time": "昨天 18:35:17"
+            },
+            "orderInfo": [
+                {
+                    "label": "订单编号：",
+                    "value": "265333-63850934463838",
+                    "hasCopy": true
+                },
+                {
+                    "label": "商品快照：",
+                    "value": "发生交易争议时，可作为判断依据",
+                    "hasArrow": true
+                },
+                {
+                    "label": "支付方式：",
+                    "value": "支付宝"
+                },
+                {
+                    "label": "物流公司：",
+                    "value": "申通快递"
+                },
+                {
+                    "label": "快递单号：",
+                    "value": "7726047284494359"
+                },
+                {
+                    "label": "下单时间：",
+                    "value": "2026-05-29 01:56:29"
+                },
+                {
+                    "label": "拼单时间：",
+                    "value": "2026-05-29 01:57:19",
+                    "hasAvatars": true,
+                    "hasArrow": true,
+                    "avatars": []
+                },
+                {
+                    "label": "发货时间：",
+                    "value": "2026-05-29 20:57:19"
+                }
+            ],
+            "waitPayTime": "22:55:05",
+            "activePayIndex": 2
+        },
+        {
+            "id": "1780046527800",
+            "orderType": "wait_recv",
+            "shop": {
+                "name": "索尼（SONY）数码官方旗舰店",
+                "logo": "",
+                "hasBrandAuth": true,
+                "hasFlagship": true
+            },
+            "products": [
+                {
+                    "img": "/static/image/shopping/jingdong/product/shopping/sony.png",
+                    "title": "索尼（SONY）Alpha 7 IV 全画幅微单数码相机",
+                    "price": "15499.00",
+                    "count": "1",
+                    "spec": "单机身（不含镜头）；约3300万有效像素",
+                    "serviceTags": [
+                        "厂家发货",
+                        "七天无理由退货"
+                    ],
+                    "name": "Sony"
+                }
+            ],
+            "avatars": [],
+            "address": {
+                "name": "张三",
+                "phone": "13888888888",
+                "province": "上海市浦东新区汤臣一品1号楼",
+                "detail": ""
+            },
+            "payment": {
+                "totalAmount": 15499,
+                "discountText": "已优惠10元",
+                "freightDesc": "（免运费）"
+            },
+            "totalAmount": 0,
+            "freightText": "",
+            "collectCount": 0,
+            "deliveryStatus": "运输中 预计明天送达",
+            "statusDesc": "商家已早于承诺时间发货",
+            "logistics": {
+                "desc": "顺丰快递：【南京市】快件已发往 上海市浦东新区",
+                "time": "今天 06:25:21"
+            },
+            "orderInfo": [
+                {
+                    "label": "订单编号：",
+                    "value": "262022-17081287841024",
+                    "hasCopy": true
+                },
+                {
+                    "label": "商品快照：",
+                    "value": "发生交易争议时，可作为判断依据",
+                    "hasArrow": true
+                },
+                {
+                    "label": "支付方式：",
+                    "value": "支付宝"
+                },
+                {
+                    "label": "物流公司：",
+                    "value": "申通快递"
+                },
+                {
+                    "label": "快递单号：",
+                    "value": "777445412223333326"
+                },
+                {
+                    "label": "下单时间：",
+                    "value": "2026-05-28 17:05:56"
+                },
+                {
+                    "label": "拼单时间：",
+                    "value": "2026-03-31 08:55:30",
+                    "hasAvatars": true,
+                    "hasArrow": true,
+                    "avatars": []
+                },
+                {
+                    "label": "发货时间：",
+                    "value": "2026-03-31 11:11:52"
+                }
+            ],
+            "waitPayTime": "01:45:17",
+            "activePayIndex": 2
+        },
+        {
+            "id": "1780046506911",
+            "orderType": "wait_pay",
+            "waitPayTime": "23:49:16",
+            "shop": {
+                "name": "Apple 产品旗舰店",
+                "logo": "",
+                "hasBrandAuth": true,
+                "hasFlagship": true
+            },
+            "products": [
+                {
+                    "img": "/static/image/shopping/jingdong/product/shopping/iphone.png",
+                    "title": "Apple/苹果 iPhone 17 Pro Max 1TB 星宇橙色",
+                    "price": "12999.00",
+                    "count": "1",
+                    "spec": "星宇橙色；全网通5G",
+                    "serviceTags": [
+                        "免费上门退换",
+                        "七天无理由退货"
+                    ],
+                    "name": "Apple iPhone 17 Pro"
+                }
+            ],
+            "avatars": [],
+            "activePayIndex": 2,
+            "address": {
+                "name": "张三",
+                "phone": "13888888888",
+                "province": "上海市浦东新区汤臣一品1号楼",
+                "detail": ""
+            },
+            "payment": {
+                "totalAmount": 12999,
+                "discountText": "已优惠10元",
+                "freightDesc": "（免运费）"
+            },
+            "totalAmount": 0,
+            "freightText": "",
+            "collectCount": 0,
+            "deliveryStatus": "",
+            "statusDesc": "预计后天送达",
+            "logistics": {
+                "desc": "",
+                "time": "今天 16:14:06"
+            },
+            "orderInfo": [
+                {
+                    "label": "订单编号：",
+                    "value": "267726-97143795493977",
+                    "hasCopy": true
+                },
+                {
+                    "label": "下单时间：",
+                    "value": "2026-05-29 05:52:46"
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/pages/shopping/pdd/list-index.vue b/pages/shopping/pdd/list-index.vue
index 7c96b3f..1634efb 100644
--- a/pages/shopping/pdd/list-index.vue
+++ b/pages/shopping/pdd/list-index.vue
@@ -1,9 +1,12 @@
 <template>
 	<view class="page-container flex-column">
 		<view class="nav-bar">
-			<nav-bar>
+			<nav-bar v-if="!selectedImage" :buttonGroup="buttonGroup" @button-click="util.clickTitlePopupButton"
+				tipLayerType="pdd-shopping-list" isTipLayer tipLayerText="添加订单信息">
 				<template v-slot:left>
-					<image style="width: 48rpx;height: 48rpx;" src="/static/image/shopping/pdd/back.png"></image>
+					<image style="width: 48rpx;height: 48rpx;" src="/static/image/shopping/pdd/back.png"
+						@click="util.goBack()">
+					</image>
 				</template>
 				<template v-slot:center>
 					<view class="title-box flex-center flex-column">
@@ -19,134 +22,498 @@
 					<image style="width: 48rpx;height: 48rpx;" src="/static/image/shopping/pdd/search.png"></image>
 				</template>
 			</nav-bar>
+
+			<nav-bar v-else title="拼图" bgColor="#EFEFEF" noBack @back="closeImage" isRightButton
+				@right-click="confirmImage">
+			</nav-bar>
 		</view>
 		<view class="tab-list flex-align-center">
-			<view class="tab-item" :class="{ active: tab.id == activeTab }" v-for="(tab, index) in tabList"
-				:key="index">
+			<view class="tab-item" :class="{ active: tab.id == activeTab }" v-for="(tab, index) in tabList" :key="index"
+				@click="activeTab = tab.id">
 				<text>{{ tab.name }}</text>
 			</view>
 		</view>
-		<scroll-view class="flex-1" style="height: 100px;" scroll-y="true">
-			<list-card v-for="(item, index) in orderList" :key="index" :item="item"></list-card>
-			<view v-if="orderList.length == 0" class="null-data-box flex-align-center">
+		<scroll-view v-if="activeTab === 4" class="tab2-box" scroll-x="true" :show-scrollbar="false">
+			<view class="tab2-content flex-align-center">
+				<view class="tab2-item flex-center" :class="{ active: activeTab2 === item.id }"
+					v-for="(item, index) in displayTab2List" :key="index" @click="handleTab2Click(item)">
+					<text>{{ item.name }} {{ item.count }}</text>
+				</view>
+			</view>
+		</scroll-view>
+		<scroll-view class="flex-1" style="height: 100px;" scroll-y="true" :scroll-into-view="scrollIntoId"
+			scroll-with-animation>
+			<list-card v-for="(item, index) in filteredOrderList" :key="index" :item="item"
+				@longpress="handleLongPress($event, item)"></list-card>
+			<view v-if="filteredOrderList.length == 0" class="null-data-box flex-align-center">
 				<text>没找到订单？试试</text>
 				<text style="color: #2686E4;">查看全部</text>
 				<text>或</text>
 				<text style="color: #2686E4;">切换账号</text>
 			</view>
+			<view class="bottom-fixed" style="height: 1000rpx;">
+				<view v-if="!selectedImage" class="upload-screenshot-box" @touchstart="handleTouchStart"
+					@touchend="handleTouchEnd">
+					<view v-if="!screenshotImage" class="upload-screenshot-content">
+						<image class="upload-screenshot" src="/static/image/common/upload-screenshot.png"
+							mode="aspectFit">
+						</image>
+						<view class="upload-screenshot-text">长按替换截图</view>
+					</view>
+					<view v-else class="screenshot-preview-box">
+						<image class="screenshot-preview" :src="screenshotImage" mode="widthFix"></image>
+					</view>
+					<!-- <image v-else class="w100 h100" :src="screenshotImage" mode="widthFix"></image> -->
+				</view>
+				<view v-else class="upload-screenshot-box scroll-image-box">
+					<scroll-view class="image-box" style="width: 100%;height: 100%;" scroll-y :show-scrollbar="false"
+						@scroll="onImageScroll">
+						<image class="crop-image-target" style="width:100%;" :src="selectedImage" mode="widthFix">
+						</image>
+					</scroll-view>
+					<view class="dashed-line-box">
+						<view class="dashed-line-text">我是分割线</view>
+					</view>
+				</view>
+				<canvas canvas-id="crop-canvas"
+					style="position: fixed; left: -9999px; width: 750rpx; height: 100vh; pointer-events: none;"></canvas>
+				<view id="bottom-anchor" style="height: 1px;"></view>
+			</view>
 		</scroll-view>
+
+		<!-- 上下文菜单和遮罩 -->
+		<view class="menu-mask" v-if="showMenu" @click="showMenu = false"></view>
+		<view class="context-menu flex-column" v-if="showMenu" :style="{ left: menuX + 'px', top: menuY + 'px' }">
+			<view class="menu-item" @click="handleEdit">编辑</view>
+			<view class="menu-item text-red" @click="handleDelete">删除</view>
+		</view>
+
+		<!-- 水印 -->
+		<view v-if="$isVip()">
+			<watermark dark="light" source="uni_alipay_shopping_pdd" />
+			<liu-drag-button :canDocking="false" @clickBtn="$goRechargePage('watermark', 'uni_alipay_shopping_pdd')">
+				<c-lottie ref="cLottieRef" :src='$watermark()' width="94px" height='74px' :loop="true"></c-lottie>
+			</liu-drag-button>
+		</view>
 	</view>
-
-
 </template>
 
 
 
 <script setup>
-import { ref } from 'vue';
+import { ref, computed, getCurrentInstance } from 'vue';
+import { onShow, onLoad } from '@dcloudio/uni-app';
 import ListCard from './components/list-card/list-card.vue';
+import { defaultDataList } from '@/pages/shopping/pdd/json/order.json';
+import { util } from '@/utils/common.js';
 
+const { proxy } = getCurrentInstance();
 const activeTab = ref(0);
+const scrollIntoId = ref('');
+
+
+//导航栏菜单按钮
+const buttonGroup = [
+	{
+		name: "新增购物订单",
+		click: () => {
+			uni.navigateTo({
+				url: '/pages/shopping/pdd/add-order/add-order'
+			});
+		}
+	}, {
+		name: "切换推荐商品图片",
+		click: () => {
+			scrollIntoId.value = '';
+			setTimeout(() => {
+				scrollIntoId.value = 'bottom-anchor';
+			}, 50);
+			setTimeout(() => {
+				chooseImage();
+			}, 400);
+		}
+	},
+]
+
+onLoad(() => {
+	proxy.$apiUserEvent('all', {
+		type: 'event',
+		key: 'shopping',
+		prefix: '.uni.other.',
+		value: '拼多多'
+	})
+})
 
 const tabList = ref([
 	{
 		name: '全部',
-		id: 0
+		id: 0,
+		value: 'all'
 	},
 	{
 		name: '待付款',
-		id: 1
+		id: 1,
+		value: 'wait_pay'
 	},
 	{
 		name: '拼团中',
-		id: 2
+		id: 2,
+		value: 'grouping'
 	},
 	{
 		name: '打包中',
-		id: 3
+		id: 3,
+		value: 'packing'
 	},
 	{
 		name: '待收货',
-		id: 4
+		id: 4,
+		value: 'wait_recv'
 	},
 	{
 		name: '评价',
-		id: 5
+		id: 5,
+		value: 'received'
 	},
 ]);
 
-const orderList = ref([
-	{
-		// type: 1,
-		orderType: "wait_pay",
-		shopName: '澳松旗舰店',
-		isBrand: true,
-		isFlagship: true,
-		productImg: 'https://picsum.photos/200/200?random=1',
-		productTitle: '适配哈哈哈哈哈哈哈哈哈哈哈哈头配哈哈哈哈哈哈哈哈哈哈哈哈很好...',
-		productSpec: '(小头款)哈哈哈哈哈哈哈哈哈哈哈哈很好...',
-		tags: ['坏了包赔', '7天无理由退货'],
-		price: '35.9',
-		quantity: 1,
-		avatars: [
-			'https://picsum.photos/40/40?random=1',
-			'https://picsum.photos/40/40?random=2',
-			'https://picsum.photos/40/40?random=3',
-			'https://picsum.photos/40/40?random=4'
-		],
-		totalAmount: '35.9',
-		freightText: '免运费',
-		deliveryStatus: '现在支付，预计6小时内发货，',
-		deliveryDetail: '后天送达'
-	},
-	{
-		// type: 2,
-		orderType: "wait_recv",
-		shopName: '澳松旗舰店',
-		isBrand: true,
-		isFlagship: true,
-		productImg: 'https://picsum.photos/200/200?random=2',
-		productTitle: '适配哈哈哈哈哈哈哈哈哈哈哈哈头配哈哈哈哈哈哈哈哈哈哈哈哈很好...',
-		productSpec: '(小头款)哈哈哈哈哈哈哈哈哈哈哈哈很好...',
-		tags: ['7天无理由退货'],
-		price: '35.9',
-		quantity: 1,
-		avatars: [
-			'https://picsum.photos/40/40?random=5',
-			'https://picsum.photos/40/40?random=6',
-			'https://picsum.photos/40/40?random=7',
-			'https://picsum.photos/40/40?random=8'
-		],
-		totalAmount: '35.9',
-		freightText: '免运费',
-		collectCount: 558,
-		deliveryStatus: '运输中 预计明天送达',
-		deliveryDetail: '申通快递：【洛阳市】快件已发往 新...'
-	},
-	{
-		// type: 3,
-		orderType: "received",
-		shopName: '澳松旗舰店',
-		isBrand: true,
-		isFlagship: true,
-		productImg: 'https://picsum.photos/200/200?random=3',
-		productTitle: '适配哈哈哈哈哈哈哈哈哈哈哈哈头配哈哈哈哈哈哈哈哈哈哈哈哈很好...',
-		productSpec: '(小头款)哈哈哈哈哈哈哈哈哈哈哈哈很好...',
-		tags: ['退货包运费保障中'],
-		price: '35.9',
-		quantity: 1,
-		avatars: [
-			'https://picsum.photos/40/40?random=9',
-			'https://picsum.photos/40/40?random=10',
-			'https://picsum.photos/40/40?random=11',
-			'https://picsum.photos/40/40?random=12'
-		],
-		totalAmount: '35.9',
-		freightText: '免运费',
-		collectCount: 558
+const activeTab2 = ref(0);
+const tab2List = ref([
+	{ name: '全部', count: 1, id: 0 },
+	{ name: '已签收', count: 0, id: 1 },
+	{ name: '待取件', count: 0, id: 2 },
+	{ name: '派件中', count: 0, id: 3 },
+	{ name: '运输中', count: 1, id: 4 },
+	{ name: '其他', count: 0, id: 5 },
+]);
+
+const displayTab2List = computed(() => {
+	let sum = 0;
+	tab2List.value.forEach(item => {
+		if (item.id !== 0) {
+			sum += Number(item.count || 0);
+		}
+	});
+	return tab2List.value.map(item => {
+		if (item.id === 0) {
+			return { ...item, count: sum };
+		}
+		return item;
+	});
+});
+
+const saveTab2List = () => {
+	uni.setStorageSync('pdd_tab2List', tab2List.value);
+	uni.showToast({
+		title: '修改已保存',
+		icon: 'success'
+	});
+};
+
+const handleTab2Click = (item) => {
+	if (item.id !== 0) {
+		// 非“全部”项直接弹窗修改数量，不允许进入选中态
+		uni.showModal({
+			title: `修改[${item.name}]数量`,
+			editable: true,
+			placeholderText: '请输入数量',
+			success: (res) => {
+				if (res.confirm && res.content) {
+					const num = parseInt(res.content);
+					if (!isNaN(num) && num >= 0) {
+						const target = tab2List.value.find(t => t.id === item.id);
+						if (target) {
+							target.count = num;
+							saveTab2List();
+						}
+					}
+				}
+			}
+		});
+	} else {
+		// 只有点击“全部”本身可以重置或保持激活（尽管业务上可能默认锁死它）
+		activeTab2.value = item.id;
 	}
-]);
+};
 
+const orderList = ref([]);
+const showMenu = ref(false);
+const menuX = ref(0);
+const menuY = ref(0);
+const currentEditItem = ref(null);
+
+const handleLongPress = (e, item) => {
+	const touch = e.touches && e.touches[0] ? e.touches[0] : (e.changedTouches && e.changedTouches[0] ? e.changedTouches[0] : e);
+	menuX.value = touch.clientX || touch.pageX || 100;
+	menuY.value = touch.clientY || touch.pageY || 100;
+
+	currentEditItem.value = item;
+	showMenu.value = true;
+};
+
+const handleEdit = () => {
+	showMenu.value = false;
+	if (currentEditItem.value) {
+		uni.navigateTo({
+			url: `/pages/shopping/pdd/add-order/add-order?isEdit=true&id=${currentEditItem.value.id}`
+		});
+	}
+};
+
+const removeLocalFile = (filePath) => {
+	if (!filePath) return;
+	if (filePath.startsWith('http') || filePath.startsWith('/static')) return;
+	uni.removeSavedFile({
+		filePath,
+		fail: () => { }
+	});
+};
+
+const handleDelete = () => {
+	showMenu.value = false;
+	if (currentEditItem.value) {
+		uni.showModal({
+			title: '提示',
+			content: '确定要删除该订单吗？',
+			success: (res) => {
+				if (res.confirm) {
+					const index = orderList.value.findIndex(item => item.id === currentEditItem.value.id);
+					if (index > -1) {
+						const deletedOrder = orderList.value[index];
+						// 清理关联的本地缓存图片
+						if (deletedOrder.shop && deletedOrder.shop.logo) {
+							removeLocalFile(deletedOrder.shop.logo);
+						}
+						if (deletedOrder.products) {
+							deletedOrder.products.forEach(p => {
+								if (p.img) removeLocalFile(p.img);
+								if (p.image) removeLocalFile(p.image);
+							});
+						}
+						if (deletedOrder.avatars) {
+							deletedOrder.avatars.forEach(av => removeLocalFile(av));
+						}
+
+						orderList.value.splice(index, 1);
+						// 同步写入缓存
+						uni.setStorageSync('pddOrderList', orderList.value);
+						uni.showToast({ title: '删除成功', icon: 'success' });
+					}
+				}
+			}
+		});
+	}
+};
+
+const getOrderTime = (order) => {
+	if (order.orderInfo) {
+		const timeInfo = order.orderInfo.find(info => info.label && info.label.includes('下单时间'));
+		if (timeInfo && timeInfo.value) {
+			const timestamp = new Date(timeInfo.value.replace(/-/g, '/')).getTime();
+			if (!isNaN(timestamp)) {
+				return timestamp;
+			}
+		}
+	}
+	return Number(order.id) || 0;
+};
+
+const filteredOrderList = computed(() => {
+	const currentTab = tabList.value.find(t => t.id === activeTab.value);
+	let list = orderList.value;
+	if (currentTab && currentTab.value !== 'all') {
+		list = list.filter(item => item.orderType === currentTab.value);
+	}
+	return list.slice().sort((a, b) => getOrderTime(b) - getOrderTime(a));
+});
+
+onShow(() => {
+	const isInitialized = uni.getStorageSync('isPddOrderListInitialized');
+	if (!isInitialized) {
+		uni.setStorageSync('pddOrderList', defaultDataList);
+		uni.setStorageSync('isPddOrderListInitialized', true);
+		orderList.value = defaultDataList;
+	} else {
+		const cacheList = uni.getStorageSync('pddOrderList');
+		orderList.value = cacheList || [];
+	}
+
+	// 加载拼图截图缓存 (若不存在则初始化默认底图)
+	let savedScreenshot = uni.getStorageSync('pdd_screenshot');
+	if (!savedScreenshot) {
+		savedScreenshot = '/static/image/shopping/pdd/pdd-bottom-product.png';
+		uni.setStorageSync('pdd_screenshot', savedScreenshot);
+	}
+	screenshotImage.value = savedScreenshot;
+
+	// 加载二级导航数量缓存
+	const cachedTab2 = uni.getStorageSync('pdd_tab2List');
+	if (cachedTab2) {
+		tab2List.value = cachedTab2;
+	}
+});
+
+// 长按替换截图相关
+const screenshotImage = ref('');
+const selectedImage = ref('');
+const scrollTop = ref(0);
+let longPressTimer = null;
+
+
+// 长按替换截图 - 选择图片
+const chooseImage = () => {
+	if (selectedImage.value) return;
+	uni.chooseImage({
+		count: 1,
+		sourceType: ['album'],
+		success: (res) => {
+			selectedImage.value = res.tempFilePaths[0];
+		}
+	});
+};
+
+// 长按事件
+const handleTouchStart = (e) => {
+	const systemInfo = uni.getSystemInfoSync();
+	if (systemInfo.platform === 'ios' && systemInfo.safeAreaInsets?.bottom) {
+		const clientY = e.touches[0].clientY;
+		const windowHeight = systemInfo.windowHeight;
+		if (clientY > windowHeight - systemInfo.safeAreaInsets.bottom) {
+			return;
+		}
+	}
+	longPressTimer = setTimeout(() => {
+		uni.vibrateShort();
+		chooseImage();
+	}, 1200);
+};
+
+const handleTouchEnd = () => {
+	if (longPressTimer) {
+		clearTimeout(longPressTimer);
+		longPressTimer = null;
+	}
+};
+
+// 图片滚动
+const onImageScroll = (e) => {
+	scrollTop.value = e.detail.scrollTop;
+};
+// 确认图片裁剪
+const confirmImage = () => {
+	uni.showLoading({
+		title: '处理中...'
+	})
+	const query = uni.createSelectorQuery().in(proxy)
+
+	// 获取容器和图片信息
+	query.select('.image-box').boundingClientRect()
+	query.select('.crop-image-target').boundingClientRect()
+	query.exec(res => {
+		if (!res[0] || !res[1]) {
+			uni.hideLoading()
+			return
+		}
+
+		console.log('rects', res)
+		const container = res[0] // 容器
+		const image = res[1] // 图片实际渲染尺寸
+
+		// 计算缩放比例 (渲染宽度 / 实际宽度 不准确，应该反过来用 图片原始宽/渲染宽?)
+		// 这里更简单的方法是：canvas设为容器大小，把图片画进去
+		// canvas drawImage 参数: img, sx, sy, sWidth, sHeight, dx, dy, dWidth, dHeight
+
+		// 获取图片原始尺寸
+		uni.getImageInfo({
+			src: selectedImage.value,
+			success: (imgInfo) => {
+				const scale = imgInfo.width / image.width // 图片 原始宽 / 渲染宽
+				const sTop = scrollTop.value * scale // 原始图上的裁切起始Y
+				const sHeight = container.height * scale // 原始图上的裁切高度
+
+				// 因为是 widthFix，宽度就是原始图宽度（或裁切全宽）
+				const sWidth = imgInfo.width
+
+				// 设置画布尺寸 (使用像素值)
+				// 注意：canvasContext绘制使用的是逻辑像素还是物理像素？通常需要考虑到 pixelRatio，
+				// 但 uni-app canvas-id 方式通常对应逻辑像素(px)
+				// 我们把 canvas 大小设为和容器显示一致
+				const canvasW = container.width
+				const canvasH = container.height
+				const ctx = uni.createCanvasContext('crop-canvas', proxy)
+
+				// 清除画布
+				ctx.clearRect(0, 0, canvasW, canvasH)
+
+				// 绘制
+				// drawImage(imageResource, sx, sy, sWidth, sHeight, dx, dy, dWidth, dHeight)
+				ctx.drawImage(
+					imgInfo.path,
+					0, sTop, sWidth, sHeight, // 源图裁剪区域
+					0, 0, canvasW, canvasH // 画布绘制区域
+				)
+				ctx.draw(false, () => {
+					uni.canvasToTempFilePath({
+						canvasId: 'crop-canvas',
+						width: canvasW,
+						height: canvasH,
+						destWidth: sWidth, // 使用原图实际宽度,保持原图清晰度
+						destHeight: sHeight, // 使用原图实际高度,保持原图清晰度
+						success: (res) => {
+							console.log('crop success (temp)', res
+								.tempFilePath)
+
+							// 将临时路径保存为永久路径
+							uni.saveFile({
+								tempFilePath: res.tempFilePath,
+								success: (saveRes) => {
+									console.log('save success (saved)', saveRes.savedFilePath)
+									screenshotImage.value = saveRes.savedFilePath
+									selectedImage.value = '' // 隐藏编辑模式
+									setTimeout(() => {
+										plus.navigator.setStatusBarStyle("light");
+									}, 200)
+									// 保存到缓存
+									uni.setStorageSync('pdd_screenshot', screenshotImage.value)
+									uni.hideLoading()
+								},
+								fail: (err) => {
+									console.error('saveFile fail', err)
+									uni.hideLoading()
+									uni.showToast({
+										title: '保存失败',
+										icon: 'none'
+									})
+								}
+							})
+						},
+						fail: (err) => {
+							console.error(err)
+							uni.hideLoading()
+							uni.showToast({
+								title: '裁剪失败',
+								icon: 'none'
+							})
+						}
+					}, proxy)
+				})
+			},
+			fail: () => {
+				uni.hideLoading()
+				uni.showToast({
+					title: '图片加载失败',
+					icon: 'none'
+				})
+			}
+		})
+
+	})
+}
+
+// 关闭截图预览
+const closeImage = () => {
+	selectedImage.value = '';
+};
 
 
 </script>
@@ -196,7 +563,47 @@ const orderList = ref([
 		&.active {
 			color: #E01B13;
 			font-weight: 500;
-			border-bottom: 4rpx solid #E01B13;
+			box-shadow: inset 0 -4rpx 0 0 #E01B13;
+		}
+	}
+}
+
+.tab2-box {
+	height: 78rpx;
+	background-color: #ffff;
+	border-bottom: 0.5px solid #D2D2D2;
+	width: 100%;
+	white-space: nowrap;
+
+	:deep(.uni-scroll-view::-webkit-scrollbar) {
+		display: none !important;
+		width: 0 !important;
+		height: 0 !important;
+		-webkit-appearance: none;
+		background: transparent;
+	}
+
+	.tab2-content {
+		display: inline-flex;
+		padding: 0 24rpx;
+		height: 100%;
+	}
+
+	.tab2-item {
+		flex-shrink: 0;
+		height: 52rpx;
+		padding: 0 16rpx;
+		background-color: #F8F8F8;
+		border-radius: 26rpx;
+		margin-right: 20rpx;
+		font-size: 26rpx;
+		color: #1A1A1A;
+		white-space: nowrap;
+
+		&.active {
+			background-color: #FCEFEF;
+			font-weight: 500;
+			color: #E01B13;
 		}
 	}
 }
@@ -208,6 +615,147 @@ const orderList = ref([
 	line-height: 28rpx;
 	padding: 42rpx 0;
 }
+
+.menu-mask {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	z-index: 998;
+}
+
+.context-menu {
+	position: fixed;
+	z-index: 999;
+	background-color: #fff;
+	border-radius: 8rpx;
+	box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.15);
+	width: 200rpx;
+	overflow: hidden;
+
+	.menu-item {
+		height: 80rpx;
+		line-height: 80rpx;
+		text-align: center;
+		font-size: 28rpx;
+		color: #333;
+		border-bottom: 1rpx solid #F5F5F5;
+
+		&:last-child {
+			border-bottom: none;
+		}
+
+		&.text-red {
+			color: #DF2E26;
+		}
+	}
+}
+
+.bottom-fixed {
+	display: flex;
+	flex-direction: column;
+
+	.upload-screenshot-box {
+		width: 100%;
+		flex: 1;
+		min-height: 540rpx;
+		background-color: #FFFFFF;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		position: relative;
+
+		.upload-screenshot {
+			width: 92rpx;
+			height: 92rpx;
+		}
+
+		.upload-screenshot-content {
+			width: 100%;
+			height: 100%;
+			display: flex;
+			align-items: center;
+			flex-direction: column;
+			justify-content: center;
+
+			.upload-screenshot-text {
+				font-size: 36rpx;
+				color: #1777FF;
+				line-height: 50rpx;
+				margin-top: 16rpx;
+			}
+
+
+		}
+
+		.screenshot-preview-box {
+			width: 100%;
+			height: 100%;
+			display: flex;
+			align-items: flex-start;
+			// flex-direction: column;
+			justify-content: center;
+
+			.screenshot-preview {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.scroll-image-box {
+			width: 100%;
+			min-height: 0; // 修复 flex一出问题
+			// overflow: hidden; // scroll-view 需要
+			position: relative;
+		}
+
+		.dashed-line-box {
+			width: 100%;
+			height: 100%;
+			position: absolute;
+			top: 0;
+			left: 0;
+			border: 4rpx dashed #ffffff;
+			pointer-events: none;
+
+			.dashed-line-text {
+				height: 44rpx;
+				line-height: 44rpx;
+				width: 180rpx;
+				padding: 0 20rpx;
+				border-radius: 8rpx;
+				color: #1777FF;
+				font-size: 24rpx;
+				font-weight: 500;
+				background-color: #fff;
+				position: absolute;
+				top: 0;
+				left: 50%;
+				transform: translate(-50%, -50%);
+			}
+		}
+
+		.mask {
+			position: fixed;
+			top: 0;
+			left: 0;
+			right: 0;
+			bottom: 0;
+			background-color: rgba(0, 0, 0, 0.8);
+			z-index: 999;
+
+			.mask-icon {
+				position: absolute;
+				top: 50%;
+				right: 52rpx;
+				transform: translateY(-25%);
+				width: 360rpx;
+				height: 360rpx;
+			}
+		}
+	}
+}
 </style>
 <style>
 @import '@/common/main.css';
diff --git a/pages/shopping/pdd/order-detail/order-detail.vue b/pages/shopping/pdd/order-detail/order-detail.vue
index 5849667..2aabe1c 100644
--- a/pages/shopping/pdd/order-detail/order-detail.vue
+++ b/pages/shopping/pdd/order-detail/order-detail.vue
@@ -1,29 +1,80 @@
 <template>
-	<view class="page-container flex-column">
+	<view class="page-container flex-column" :class="{ 'wait-pay': order.orderType == 'wait_pay' }">
 		<view class="hightlight-box">
-			<nav-bar>
+			<nav-bar :buttonGroup="buttonGroup" @button-click="util.clickTitlePopupButton"
+				tipLayerType="pdd-shopping-order" isTipLayer tipLayerText="修改订单信息">
 				<template v-slot:center>
-					<view class="flex-column flex-center">
-						<view class="title">待付款 预计后天送达</view>
-						<view class="sub-title">请在23:59:27.2内支付，逾期订单将自动取消</view>
+					<view v-if="order.orderType == 'wait_pay'" class="flex-column flex-center">
+						<view class="title">待付款 {{ order.statusDesc }}</view>
+						<view class="sub-title">请在{{ order.waitPayTime }}内支付，逾期订单将自动取消</view>
+					</view>
+					<view v-if="order.orderType == 'wait_recv'" class="flex-column flex-center">
+						<view class="title flex-align-center" style="color: #20A61E;">
+							<image style="width: 44rpx;height: 44rpx;margin-right: 12rpx;"
+								src="/static/image/shopping/pdd/paijianzhong.png"></image>
+							{{ order.deliveryStatus }}
+						</view>
+						<view class="sub-title" style="color: #20A61E;margin-top: 8rpx;">{{ order.statusDesc }}</view>
+					</view>
+					<view v-if="order.orderType == 'received'" class="flex-column flex-center">
+						<view class="title flex-align-center" style="color: #20A61E;">
+							<image style="width: 44rpx;height: 44rpx;margin-right: 12rpx;"
+								src="/static/image/shopping/pdd/yiqianshou.png"></image>
+							已签收
+						</view>
+						<view class="sub-title" style="color: #20A61E;margin-top: 8rpx;">{{ order.statusDesc }}</view>
 					</view>
 				</template>
 			</nav-bar>
 		</view>
-		<view class="adress-box flex-align-center flex-justify-between">
-			<image style="width:40rpx;height: 40rpx;flex-shrink: 0;" src="/static/image/shopping/pdd/location.png">
-			</image>
-			<view class="user-info flex-1">
-				<view>
-					<text>姓名</text> <text>电话</text>
-				</view>
-				<view>
-					<text>地址</text>
+		<!-- 头部信息卡片：优惠券 + 物流 + 地址 -->
+		<view class="header-info-card">
+			<!-- 优惠券横幅 -->
+			<view v-if="order.orderType !== 'wait_pay' && order.couponInfo"
+				class="coupon-banner flex-align-center flex-justify-between">
+				<view class="flex-align-center">
+					<view class="coupon-icon flex-center">￥</view>
+					<text class="black-text">{{ order.couponInfo.title }}</text>
+					<text class="red-text">{{ order.couponInfo.priceText }}</text>
+					<text class="black-text">{{ order.couponInfo.timeText }}</text>
 				</view>
+				<uni-icons type="right" size="14" color="#D3D3D3"></uni-icons>
+			</view>
+
+			<!-- 物流信息 -->
+			<view v-if="order.orderType !== 'wait_pay' && order.logistics"
+				class="logistics-box flex-align-center flex-justify-between">
+				<view class="icon-wrap flex-center">
+					<image class="icon" src="/static/image/shopping/pdd/yunshuzhong.png" mode="widthFix"></image>
+				</view>
+				<view class="info flex-1 flex-column">
+					<text class="title text-ellipsis-1">{{ order.logistics.desc }}</text>
+					<text class="time">{{ order.logistics.time }}</text>
+				</view>
+				<uni-icons type="right" size="14" color="#D3D3D3"></uni-icons>
+			</view>
+
+			<view v-if="order.orderType !== 'wait_pay'" class="divider-line"></view>
+
+			<!-- 地址信息 -->
+			<view class="adress-box flex-align-center flex-justify-between">
+				<view class="icon-wrap flex-center">
+					<image class="icon" src="/static/image/shopping/pdd/location.png" mode="widthFix"></image>
+				</view>
+				<view class="user-info flex-1 flex-column">
+					<view class="name-phone flex-align-center">
+						<text class="name">{{ order.address.name }}</text>
+						<text class="phone">{{ stringUtil.maskPhone(order.address.phone) }}</text>
+						<image src="/static/image/shopping/pdd/hide.png" class="eye-icon" mode="aspectFit"></image>
+					</view>
+					<view class="detail text-ellipsis-2">
+						<text>{{ order.address.province }} {{ order.address.detail }}</text>
+					</view>
+				</view>
+				<view v-if="order.orderType == 'wait_pay'" class="edit-btn">修改</view>
 			</view>
-			<view v-if="order.orderType == 'wait_pay'" class="edit-btn">修改</view>
 		</view>
-		<view class="upload-shop-logo-box flex-justify-between flex-align-center">
+		<view v-if="false" class="upload-shop-logo-box flex-justify-between flex-align-center">
 			<text>上传店铺头像</text>
 			<view>
 
@@ -32,40 +83,41 @@
 		<view class="product-card">
 			<!-- 店铺信息 -->
 			<view class="shop-header flex-align-center">
-				<view class="shop-logo flex-center">
-					<text>卫松</text>
+				<view v-if="order.shop.logo" class="shop-logo flex-center">
+					<image class="w100 h100" :src="order.shop.logo" mode="widthFix"></image>
 				</view>
-				<text class="shop-name">卫松旗舰店</text>
-				<image class="brand-auth-tag" src="/static/image/shopping/pdd/pinpairenzheng.png" mode="heightFix">
+				<text class="shop-name">{{ order.shop.name }}</text>
+				<image v-if="order.shop.hasBrandAuth" class="brand-auth-tag"
+					src="/static/image/shopping/pdd/pinpairenzheng.png" mode="heightFix">
 				</image>
-				<image class="flagship-tag" src="/static/image/shopping/pdd/qijiandian.png" mode="heightFix"></image>
+				<image v-if="order.shop.hasFlagship" class="flagship-tag"
+					src="/static/image/shopping/pdd/qijiandian.png" mode="heightFix"></image>
 			</view>
 
 			<!-- 商品主要内容 -->
-			<view class="product-content flex">
+			<view class="product-content flex" v-for="(product, idx) in order.products" :key="idx"
+				:style="{ marginTop: idx > 0 ? '30rpx' : '0' }">
 				<view class="img-box">
-					<image class="product-img"
-						src="https://img.pddpic.com/mms-material-img/2022-09-02/76b7e127-ecdf-41ef-8d69-a36c561570d5.png"
-						mode="aspectFill"></image>
+					<image class="product-img" :src="product.img" mode="aspectFill"></image>
 				</view>
 				<view class="info-box flex-1">
 					<view class="title-price flex">
 						<view class="title text-ellipsis-2 flex-1">
-							【云南傣味】 头配哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈
+							{{ product.title }}
 						</view>
 						<view class="price-box flex-column align-end">
-							<text class="price">¥35.9</text>
-							<text class="count">x1</text>
+							<text class="price">¥{{ product.price }}</text>
+							<text class="count">x{{ product.count }}</text>
 						</view>
 					</view>
 					<view class="spec text-ellipsis-2">
-						傣味头款哈哈哈哈哈哈哈哈哈哈哈哈哈很哈哈哈哈哈哈
+						{{ product.spec }}
 					</view>
 					<view class="tags flex-align-center">
-						<view class="green-tag">坏了包赔<uni-icons type="right" size="10" color="#fff"
-								style="margin-left: 2rpx;"></uni-icons></view>
-						<view class="green-tag">7天无理由退货<uni-icons type="right" size="10" color="#fff"
-								style="margin-left: 2rpx;"></uni-icons></view>
+						<view class="green-tag" v-for="(tag, tagIdx) in product.serviceTags" :key="tagIdx">
+							{{ tag }}<uni-icons type="right" size="12" color="#fff"
+								style="margin-left: 2rpx;"></uni-icons>
+						</view>
 					</view>
 				</view>
 			</view>
@@ -73,14 +125,18 @@
 			<!-- 联系商家按钮 -->
 			<view class="contact-box flex">
 				<view style="flex: 1;"></view>
+				<view v-if="order.orderType != 'wait_pay'" class="contact-btn flex-center">
+					<text>分享商品</text>
+				</view>
 				<view class="contact-btn flex-center">
-					<view class="chat-icon">
-						<view class="dot"></view>
-						<view class="dot"></view>
-						<view class="dot"></view>
-					</view>
+					<image style="width: 32rpx;height: 32rpx;margin-right: 8rpx;"
+						src="/static/image/shopping/pdd/lianxishangjia.png">
+					</image>
 					<text>联系商家</text>
 				</view>
+				<view v-if="order.orderType != 'wait_pay'" class="contact-btn flex-center red">
+					<text>申请退款</text>
+				</view>
 			</view>
 
 			<view class="divider"></view>
@@ -88,25 +144,243 @@
 			<!-- 底部支付金额 -->
 			<view class="payment-box flex-align-center">
 				<view style="flex: 1;"></view>
-				<text class="label">应付: </text>
-				<text class="symbol">￥</text>
-				<text class="amount">16.9</text>
-				<text class="freight">(免运费)</text>
+				<text class="label">{{ order.orderType === 'wait_pay' ? '应付' : '实付' }}:</text>
+				<text class="symbol">¥</text>
+				<text class="amount">{{ Number(order.payment.totalAmount).toFixed(2).split('.')[0] }}</text>
+				<text class="decimal" v-if="Number(order.payment.totalAmount).toFixed(2).split('.')[1] !== '00'">.{{
+					Number(order.payment.totalAmount).toFixed(2).split('.')[1].replace(/0$/, '') }}</text>
+				<text class="freight" v-if="order.payment.freightDesc">{{ order.payment.freightDesc }}</text>
 			</view>
 		</view>
+
+		<!-- 支付方式列表 -->
+		<view v-if="order.orderType == 'wait_pay'" class="pay-list">
+			<view class="pay-item flex-align-center" v-for="(item, index) in payList" :key="index"
+				@click="selectPayMethod(index)">
+				<image :src="item.icon" class="pay-icon" mode="aspectFit"></image>
+				<view class="pay-info flex-1 flex-align-center">
+					<text class="pay-name">{{ item.name }}</text>
+					<text class="pay-subname" v-if="item.subName">{{ item.subName }}</text>
+				</view>
+				<image v-if="order.activePayIndex === index" style="width: 32rpx;height: 32rpx;"
+					src="/static/image/shopping/pdd/pay/select.png"></image>
+			</view>
+		</view>
+
+		<!-- 订单信息 -->
+		<view class="order-info">
+			<view class="info-card flex-column">
+				<view class="info-line flex-align-center flex-justify-between"
+					v-for="(item, index) in (isOrderInfoExpanded || order.orderType === 'wait_pay' ? orderInfoList : orderInfoList.slice(0, 2))"
+					:key="index">
+					<view class="left flex-align-center">
+						<text class="label">{{ item.label }}</text>
+						<text class="value">{{ item.value }}</text>
+						<view class="avatars flex-align-center" v-if="item.hasAvatars && order.avatars">
+							<image class="avatar" v-for="(avatar, aIdx) in order.avatars" :key="aIdx" :src="avatar"
+								mode="aspectFill" :style="{ zIndex: 2 - aIdx, marginLeft: aIdx > 0 ? '-12rpx' : '0' }">
+							</image>
+						</view>
+						<uni-icons v-if="item.hasArrow" style="margin-top: 2rpx;" type="right" size="12"
+							color="#999999"></uni-icons>
+					</view>
+					<view class="copy-btn" v-if="item.hasCopy">复制</view>
+				</view>
+
+				<view class="expand-btn flex-align-center" v-if="!isOrderInfoExpanded && order.orderType !== 'wait_pay'"
+					@click="isOrderInfoExpanded = true">
+					<text class="label">查看更多订单信息</text>
+					<view class="icon-box">
+						<uni-icons type="bottom" size="12" color="#999999"></uni-icons>
+					</view>
+				</view>
+			</view>
+
+			<view v-if="order.orderType == 'wait_pay'" class="cancel-card flex-center">
+				<text>取消订单</text>
+			</view>
+		</view>
+
+
+		<view v-if="order.orderType != 'wait_pay'">
+			<image style="width: 100%;" :src="screenshotImage || '/static/image/shopping/pdd/pdd-bottom-product.png'"
+				mode="widthFix"></image>
+		</view>
+
+		<!-- 底部固定支付栏 -->
+		<view v-if="order.orderType == 'wait_pay'" class="fixed-bottom-bar flex-justify-between">
+			<!-- 样式 2：先用后付 (activePayIndex === 2) -->
+			<view class="left-info style-2 flex-column" v-if="activePayIndex === 2">
+				<view class="line-top flex-align-end">
+					<text class="label">实付款: </text>
+					<text class="symbol">￥</text>
+					<text class="amount">0</text>
+				</view>
+				<view class="line-bottom">
+					<text>确认收货后付款 ￥{{ order.payment.totalAmount }}</text>
+				</view>
+			</view>
+			<!-- 样式 1：其它支付方式 -->
+			<view class="left-info style-1 flex-align-center" v-else>
+				<view class="flex-align-end">
+					<text class="label">应付: </text>
+					<text class="symbol">￥</text>
+					<text class="amount">{{ Number(order.payment.totalAmount).toFixed(2).split('.')[0] }}</text>
+					<text class="decimal" v-if="Number(order.payment.totalAmount).toFixed(2).split('.')[1] !== '00'">.{{
+						Number(order.payment.totalAmount).toFixed(2).split('.')[1].replace(/0$/, '') }} </text>
+					<text class="discount">{{ order.payment.discountText }}</text>
+				</view>
+			</view>
+
+			<view class="pay-btn flex-center">
+				<text>去支付</text>
+			</view>
+		</view>
+		<!-- 底部固定支付栏 -->
+		<view v-else class="fixed-bottom-bar flex-justify-between">
+			<view class="flex-align-center buttons">
+				<view class="more">更多</view>
+				<view class="button">再次拼单</view>
+				<view class="button">查看物流</view>
+				<view class="button red">确认收货</view>
+			</view>
+
+		</view>
+	</view>
+
+	<!-- 水印 -->
+	<view v-if="$isVip()">
+		<watermark dark="light" source="uni_alipay_shopping_pdd_detail" />
+		<liu-drag-button :canDocking="false" @clickBtn="$goRechargePage('watermark', 'uni_alipay_shopping_pdd_detail')">
+			<c-lottie ref="cLottieRef" :src='$watermark()' width="94px" height='74px' :loop="true"></c-lottie>
+		</liu-drag-button>
 	</view>
 </template>
 
 <script setup>
-import { ref } from 'vue';
+import { ref, computed, getCurrentInstance } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+import { stringUtil } from '@/utils/common.js';
+import { util } from '@/utils/common.js';
+
+const { proxy } = getCurrentInstance();
+//导航栏菜单按钮
+const buttonGroup = [
+	{
+		name: "修改购物订单",
+		click: () => {
+			uni.navigateTo({
+				url: `/pages/shopping/pdd/add-order/add-order?isEdit=true&id=${order.value.id}`
+			});
+		}
+	}
+]
+onLoad(() => {
+	proxy.$apiUserEvent('all', {
+		type: 'event',
+		key: 'shopping',
+		prefix: '.uni.other.',
+		value: '拼多多订单详情'
+	})
+})
+const isOrderInfoExpanded = ref(false);
 const order = ref({
-	orderType: 'wait_pay'
+	orderType: 'wait_recv',
+	statusDesc: '商家已早于承诺时间发货',
+	couponInfo: {
+		title: '你还有',
+		priceText: '满299减15元平台券',
+		timeText: '快到期，00:56:55.3'
+	},
+	logistics: {
+		desc: '【重庆市】 重庆哈哈哈哈哈哈哈哈 的快...',
+		time: '今天 06:25:21'
+	},
+	address: {
+		name: '罗婷',
+		phone: '187****4589',
+		province: '重庆市九龙坡区',
+		detail: '华哈哈哈哈'
+	},
+	shop: {
+		name: '卫松旗舰店',
+		logo: '/static/image/shopping/pdd/logo.png',
+		hasBrandAuth: true,
+		hasFlagship: true
+	},
+	products: [
+		{
+			img: 'https://img.pddpic.com/mms-material-img/2022-09-02/76b7e127-ecdf-41ef-8d69-a36c561570d5.png',
+			title: '【云南傣味】 头配哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈',
+			price: 35.9,
+			count: 1,
+			spec: '傣味头款哈哈哈哈哈哈哈哈哈哈哈哈哈很哈哈哈哈哈哈',
+			serviceTags: ['坏了包赔', '7天无理由退货']
+		}
+	],
+	payment: {
+		totalAmount: 16.9,
+		freightDesc: '(免运费)'
+	},
+	orderInfo: [
+		{ label: '订单编号：', value: '260403-03369586325654', hasCopy: true },
+		{ label: '商品快照：', value: '发生交易争议时，可作为判断依据', hasArrow: true },
+		{ label: '支付方式：', value: '支付宝' },
+		{ label: '物流公司：', value: '申通快递' },
+		{ label: '快递单号：', value: '77735698745526' },
+		{ label: '下单时间：', value: '2026-03-31 08:55:30' },
+		{
+			label: '拼单时间：',
+			value: '2026-03-31 08:55:30',
+			hasAvatars: true,
+			avatars: [
+				'https://img.pddpic.com/mms-material-img/2022-09-02/76b7e127-ecdf-41ef-8d69-a36c561570d5.png',
+				'https://img.pddpic.com/mms-material-img/2022-09-02/76b7e127-ecdf-41ef-8d69-a36c561570d5.png'
+			],
+			hasArrow: true
+		},
+		{ label: '发货时间：', value: '2026-03-31 11:11:52' }
+	]
+})
+
+const orderInfoList = computed(() => {
+	return order.value.orderInfo || [];
+});
+
+const activePayIndex = ref(2)
+
+const payList = ref([
+	{ name: '多多支付', icon: '/static/image/shopping/pdd/pay/duoduo.png' },
+	{ name: '微信支付', icon: '/static/image/shopping/pdd/pay/wechat.png' },
+	{ name: '先用后付', subName: ' (0元下单，确认收货后付款)', icon: '/static/image/shopping/pdd/pay/xianyonghoufu.png' },
+	{ name: '支付宝', icon: '/static/image/shopping/pdd/pay/alipay.png' },
+	{ name: '找微信好友支付', icon: '/static/image/shopping/pdd/pay/zhaohaoyou.png' },
+	{ name: 'Apple Pay', icon: '/static/image/shopping/pdd/pay/apple.png' },
+	{ name: 'QQ钱包', icon: '/static/image/shopping/pdd/pay/qq.png' },
+	{ name: '云闪付', icon: '/static/image/shopping/pdd/pay/yunshanfu-red.png' },
+	{ name: '云闪付', icon: '/static/image/shopping/pdd/pay/yunshanfu-blue.png' }
+])
+
+onLoad((option) => {
+	const cacheList = uni.getStorageSync('pddOrderList');
+	order.value = cacheList.find(item => item.id == option.id);
 })
 
 
+const selectPayMethod = (index) => {
+	order.value.activePayIndex = index;
+	const cacheList = uni.getStorageSync('pddOrderList');
+	const itemIndex = cacheList.findIndex(item => item.id == order.value.id);
+	cacheList[itemIndex] = order.value;
+	uni.setStorageSync('pddOrderList', cacheList);
+}
 </script>
 
 <style lang="less" scoped>
+::v-deep .uni-navbar__header-btns {
+	width: 50px !important;
+}
+
 .title {
 	font-weight: 500;
 	font-size: 36rpx;
@@ -128,82 +402,217 @@ const order = ref({
 	border-bottom: 1rpx solid #F4F4F4;
 }
 
-.adress-box {
+.header-info-card {
 	background-color: #ffffff;
-	padding: 24rpx 26rpx;
 	margin-bottom: 18rpx;
 
-	.user-info {
-		margin-left: 22rpx;
-		margin-right: 56rpx;
-		color: #535353;
-		font-size: 30rpx;
+	.icon-wrap {
+		width: 60rpx;
+		flex-shrink: 0;
+
+		.icon {
+			width: 40rpx;
+		}
 	}
 
-	.edit-btn {
-		flex-shrink: 0;
-		font-weight: 400;
-		font-size: 30rpx;
-		line-height: 30rpx;
-		color: #DF2E26;
-		border-radius: 8rpx;
-		border: 1rpx solid #DF2E26;
-		text-align: center;
-		padding: 16rpx 22rpx;
+	.coupon-banner {
+		background-color: #FFF2E2;
+		padding: 18rpx 24rpx;
+
+		.coupon-icon {
+			width: 30rpx;
+			height: 30rpx;
+			background-color: #DF2E26;
+			color: #ffffff;
+			font-size: 20rpx;
+			border-radius: 4rpx;
+			margin-right: 12rpx;
+		}
+
+		.black-text {
+			font-size: 26rpx;
+			color: #333333;
+		}
+
+		.red-text {
+			font-size: 26rpx;
+			color: #DF2E26;
+		}
+	}
+
+	.logistics-box {
+		padding: 24rpx;
+
+		.info {
+			margin-left: 10rpx;
+			margin-right: 20rpx;
+			width: 100px;
+
+			.title {
+				font-weight: 400;
+				font-size: 30rpx;
+				color: #535353;
+				line-height: 30rpx;
+				white-space: nowrap;
+				overflow: hidden;
+				text-overflow: ellipsis;
+			}
+
+			.time {
+				font-weight: 400;
+				font-size: 26rpx;
+				color: #999999;
+				line-height: 26rpx;
+				margin-top: 14rpx;
+			}
+		}
+	}
+
+	.divider-line {
+		height: 1rpx;
+		background-color: #F4F4F4;
+		margin-left: 80rpx;
+		margin-right: 24rpx;
+	}
+
+	.adress-box {
+		padding: 24rpx;
+
+		.user-info {
+			margin-left: 10rpx;
+			margin-right: 20rpx;
+
+			.name-phone {
+				font-size: 28rpx;
+				color: #535353;
+				line-height: 30rpx;
+
+				.name {
+					margin-right: 12rpx;
+				}
+
+				.phone {
+					margin-right: 8rpx;
+				}
+
+				.eye-icon {
+					width: 28rpx;
+					height: 28rpx;
+					margin: 0 8rpx;
+				}
+
+				.province {
+					color: #999999;
+				}
+			}
+
+			.detail {
+				font-size: 28rpx;
+				color: #535353;
+				margin-top: 8rpx;
+				line-height: 30rpx;
+			}
+		}
+
+		.edit-btn {
+			flex-shrink: 0;
+			font-weight: 400;
+			font-size: 30rpx;
+			line-height: 30rpx;
+			color: #DF2E26;
+			border-radius: 8rpx;
+			border: 1rpx solid #DF2E26;
+			text-align: center;
+			padding: 8rpx 20rpx;
+		}
+	}
+}
+
+.pay-list {
+	background-color: #ffffff;
+	margin-bottom: 16rpx;
+	margin-top: 16rpx;
+
+	.pay-item {
+		height: 90rpx;
+		margin-left: 24rpx;
+		margin-right: 22rpx;
+		border-bottom: 1rpx solid #F6F6F6;
+
+		&:last-child {
+			border-bottom: none;
+		}
+
+		.pay-icon {
+			width: 44rpx;
+			height: 44rpx;
+			margin-right: 20rpx;
+			flex-shrink: 0;
+		}
+
+		.pay-info {
+			.pay-name {
+				font-weight: 400;
+				font-size: 30rpx;
+				color: #1A1A1A;
+				line-height: 30rpx;
+			}
+
+			.pay-subname {
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #535353;
+				line-height: 30rpx;
+			}
+		}
 	}
 }
 
 .product-card {
 	background-color: #ffffff;
-	padding: 24rpx 24rpx 0;
-	margin-bottom: 20rpx;
+	padding: 16rpx 0 0;
+	// margin-bottom: 20rpx;
 
 	.shop-header {
-		margin-bottom: 24rpx;
+		margin-bottom: 16rpx;
+		padding: 0 24rpx;
 
 		.shop-logo {
-			width: 48rpx;
-			height: 26rpx;
-			background-color: #E02020;
-			border-radius: 13rpx;
-			margin-right: 12rpx;
-			position: relative;
-			box-shadow: 0 0 0 2rpx #fff, 0 0 0 4rpx #E02020;
-
-			text {
-				font-size: 16rpx;
-				color: #fff;
-				font-weight: bold;
-				transform: scale(0.8);
-			}
+			width: 40rpx;
+			height: 40rpx;
+			border-radius: 4rpx;
+			margin-right: 16rpx;
+			background-color: #F4F4F4;
 		}
 
 		.shop-name {
-			font-size: 30rpx;
-			color: #151515;
-			margin-right: 12rpx;
-			font-weight: 500;
-		}
-
-		.brand-auth-tag {
-			height: 30rpx;
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #1A1A1A;
+			line-height: 24rpx;
 			margin-right: 8rpx;
 		}
 
+		.brand-auth-tag {
+			height: 28rpx;
+			margin-right: 10rpx;
+		}
+
 		.flagship-tag {
-			height: 30rpx;
+			height: 28rpx;
 		}
 	}
 
 	.product-content {
-		margin-bottom: 24rpx;
+		margin-bottom: 16rpx;
+		padding: 0 24rpx;
 
 		.img-box {
-			width: 156rpx;
-			height: 156rpx;
-			border-radius: 8rpx;
+			width: 164rpx;
+			height: 164rpx;
+			border-radius: 4rpx;
 			background-color: #f5f5f5;
-			margin-right: 18rpx;
+			margin-right: 32rpx;
 			flex-shrink: 0;
 			overflow: hidden;
 
@@ -220,11 +629,11 @@ const order = ref({
 				align-items: flex-start;
 
 				.title {
+					margin-right: 24rpx;
 					font-size: 28rpx;
-					color: #151515;
-					line-height: 40rpx;
+					color: #1A1A1A;
 					font-weight: 400;
-					margin-right: 20rpx;
+					line-height: 36rpx;
 				}
 
 				.price-box {
@@ -246,22 +655,23 @@ const order = ref({
 			}
 
 			.spec {
+				font-weight: 400;
 				font-size: 26rpx;
 				color: #999999;
-				line-height: 36rpx;
-				margin-top: 4rpx;
-				margin-bottom: 12rpx;
+				line-height: 34rpx;
+				margin-bottom: 14rpx;
+				margin-right: 110rpx;
 			}
 
 			.tags {
 				.green-tag {
-					background-color: #49B113;
+					background-color: #2BB40C;
 					color: #ffffff;
-					font-size: 22rpx;
-					line-height: 22rpx;
-					padding: 6rpx 4rpx 6rpx 8rpx;
-					border-radius: 6rpx;
-					margin-right: 10rpx;
+					font-size: 26rpx;
+					line-height: 26rpx;
+					padding: 4rpx 2rpx 4rpx 6rpx;
+					border-radius: 4rpx;
+					margin-right: 6rpx;
 					display: inline-flex;
 					align-items: center;
 				}
@@ -270,13 +680,22 @@ const order = ref({
 	}
 
 	.contact-box {
-		padding-bottom: 24rpx;
+		padding: 0 24rpx 14rpx;
 
 		.contact-btn {
-			height: 56rpx;
-			padding: 0 24rpx;
+			height: 64rpx;
+			padding: 0 12rpx;
 			border-radius: 8rpx;
-			border: 1rpx solid #DEDEDE;
+			border: 1rpx solid #9E9E9E;
+			margin-left: 16rpx;
+
+			&.red {
+				border: 1rpx solid #E02E24;
+
+				text {
+					color: #E02E24;
+				}
+			}
 
 			.chat-icon {
 				width: 28rpx;
@@ -312,25 +731,29 @@ const order = ref({
 			}
 
 			text {
-				font-size: 26rpx;
-				color: #151515;
+				font-weight: 400;
+				font-size: 30rpx;
+				color: #1A1A1A;
+				line-height: 28rpx;
 			}
 		}
 	}
 
 	.divider {
-		height: 1px;
+		height: 1rpx;
 		background-color: #EFEFEF;
-		transform: scaleY(0.5);
 		width: 100%;
 	}
 
 	.payment-box {
-		padding: 24rpx 0;
+		padding: 16rpx 24rpx;
+		align-items: baseline;
 
 		.label {
+			font-weight: 400;
 			font-size: 26rpx;
-			color: #151515;
+			color: #1A1A1A;
+			line-height: 24rpx;
 		}
 
 		.symbol {
@@ -338,17 +761,24 @@ const order = ref({
 			color: #DF2E26;
 			margin-left: 10rpx;
 			font-weight: 500;
+			margin-right: 4rpx;
 		}
 
 		.amount {
-			font-size: 36rpx;
+			font-size: 34rpx;
+			color: #DF2E26;
+			font-weight: 500;
+		}
+
+		.decimal {
+			font-size: 26rpx;
 			color: #DF2E26;
 			font-weight: 500;
 		}
 
 		.freight {
 			font-size: 26rpx;
-			color: #151515;
+			color: #1A1A1A;
 			margin-left: 8rpx;
 		}
 	}
@@ -370,6 +800,246 @@ const order = ref({
 	padding: 24rpx 26rpx;
 	margin-bottom: 18rpx;
 }
+
+.order-info {
+	.info-card {
+		background-color: #ffffff;
+		padding: 22rpx 24rpx;
+		margin-bottom: 16rpx;
+
+		.info-line {
+			margin-bottom: 8rpx;
+
+			&:last-child {
+				margin-bottom: 0;
+			}
+
+			.label,
+			.value {
+				font-weight: 400;
+				font-size: 26rpx;
+				color: #999999;
+				line-height: 30rpx;
+			}
+
+			.value {
+				margin-left: 10rpx;
+			}
+
+			.copy-btn {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 76rpx;
+				height: 42rpx;
+				border-radius: 8rpx;
+				border: 1rpx solid #9E9E9E;
+				font-weight: 400;
+				font-size: 26rpx;
+				color: #535353;
+				line-height: 26rpx;
+			}
+
+			.arrow {
+				font-size: 20rpx;
+				color: #BDBDBD;
+				margin-left: 6rpx;
+				font-family: monospace;
+			}
+
+			.avatars {
+				margin-left: 14rpx;
+
+				.avatar {
+					width: 32rpx;
+					height: 32rpx;
+					border-radius: 50%;
+					border: 2rpx solid #FFFFFF;
+					background-color: #EFEFEF;
+				}
+			}
+		}
+
+		.expand-btn {
+			margin-top: 8rpx;
+
+			.label {
+				font-weight: 400;
+				font-size: 26rpx;
+				color: #999999;
+			}
+
+			.icon-box {
+				width: 24rpx;
+				height: 24rpx;
+				border-radius: 2rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				margin-left: 6rpx;
+			}
+		}
+	}
+
+	.cancel-card {
+		background-color: #ffffff;
+		height: 96rpx;
+
+		text {
+			font-size: 30rpx;
+			color: #535353;
+			line-height: 30rpx;
+		}
+	}
+}
+
+.page-container {
+	&.wait-pay {
+		padding-bottom: 200rpx;
+		padding-bottom: calc(200rpx + env(safe-area-inset-bottom));
+		padding-bottom: calc(200rpx + constant(safe-area-inset-bottom));
+	}
+}
+
+.fixed-bottom-bar {
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	background-color: #ffffff;
+	border-top: 1rpx solid #F0F0F0;
+	display: flex;
+	z-index: 100;
+	padding-bottom: env(safe-area-inset-bottom);
+	padding-bottom: constant(safe-area-inset-bottom);
+
+
+
+	.buttons {
+		padding: 0 24rpx;
+		padding-top: 20rpx;
+		width: 100%;
+		height: 80rpx;
+		justify-content: flex-end;
+
+		.more {
+			font-weight: 400;
+			font-size: 30rpx;
+			color: #1A1A1A;
+			line-height: 28rpx;
+			margin-right: 52rpx
+		}
+
+		.button {
+			height: 62rpx;
+			line-height: 62rpx;
+			padding: 0 12rpx;
+			font-size: 30rpx;
+			color: #1A1A1A;
+			border-radius: 8rpx;
+			border: 1rpx solid #9E9E9E;
+			margin-left: 16rpx;
+
+			&.red {
+				border: none;
+				background-color: #E02E24;
+				color: #fff;
+			}
+		}
+	}
+
+	.left-info {
+		flex: 1;
+		display: flex;
+		justify-content: flex-end;
+		padding-right: 24rpx;
+		height: 108rpx;
+
+		&.style-1 {
+			align-items: center;
+
+			.label {
+				font-size: 26rpx;
+				color: #1A1A1A;
+				font-weight: 400;
+			}
+
+			.symbol {
+				font-size: 24rpx;
+				color: #E02E24;
+				margin-left: 6rpx;
+				font-weight: 500;
+			}
+
+			.amount {
+				font-size: 40rpx;
+				color: #E02E24;
+				font-weight: 500;
+			}
+
+			.decimal {
+				font-size: 28rpx;
+				color: #E02E24;
+				font-weight: 500;
+			}
+
+			.discount {
+				font-size: 26rpx;
+				color: #E02E24;
+			}
+		}
+
+		&.style-2 {
+			flex-direction: column;
+			justify-content: center;
+			align-items: flex-end;
+
+			.line-top {
+				display: flex;
+				align-items: baseline;
+
+				.label {
+					font-size: 26rpx;
+					color: #1A1A1A;
+					font-weight: 400;
+				}
+
+				.symbol {
+					font-size: 24rpx;
+					color: #E02E24;
+					margin-left: 6rpx;
+					font-weight: 500;
+				}
+
+				.amount {
+					font-size: 40rpx;
+					color: #E02E24;
+					font-weight: 500;
+				}
+			}
+
+			.line-bottom {
+				font-size: 26rpx;
+				color: #E02E24;
+				font-weight: 500;
+				line-height: 26rpx;
+				margin-top: 4rpx;
+			}
+		}
+	}
+
+	.pay-btn {
+		width: 250rpx;
+		height: 108rpx;
+		background-color: #E02E24;
+
+		text {
+			font-weight: 400;
+			font-size: 34rpx;
+			color: #FFFFFF;
+		}
+	}
+}
 </style>
 <style>
 @import '@/common/main.css';
diff --git a/static/image/shopping/pdd/hide.png b/static/image/shopping/pdd/hide.png
new file mode 100644
index 0000000..b4b2614
Binary files /dev/null and b/static/image/shopping/pdd/hide.png differ
diff --git a/static/image/shopping/pdd/lianxishangjia.png b/static/image/shopping/pdd/lianxishangjia.png
new file mode 100644
index 0000000..f9c8c2d
Binary files /dev/null and b/static/image/shopping/pdd/lianxishangjia.png differ
diff --git a/static/image/shopping/pdd/paijianzhong.png b/static/image/shopping/pdd/paijianzhong.png
new file mode 100644
index 0000000..c8e6b8b
Binary files /dev/null and b/static/image/shopping/pdd/paijianzhong.png differ
diff --git a/static/image/shopping/pdd/pay/alipay.png b/static/image/shopping/pdd/pay/alipay.png
new file mode 100644
index 0000000..3ad2751
Binary files /dev/null and b/static/image/shopping/pdd/pay/alipay.png differ
diff --git a/static/image/shopping/pdd/pay/apple.png b/static/image/shopping/pdd/pay/apple.png
new file mode 100644
index 0000000..dd6759a
Binary files /dev/null and b/static/image/shopping/pdd/pay/apple.png differ
diff --git a/static/image/shopping/pdd/pay/duoduo.png b/static/image/shopping/pdd/pay/duoduo.png
new file mode 100644
index 0000000..d22a2ba
Binary files /dev/null and b/static/image/shopping/pdd/pay/duoduo.png differ
diff --git a/static/image/shopping/pdd/pay/qq.png b/static/image/shopping/pdd/pay/qq.png
new file mode 100644
index 0000000..386199b
Binary files /dev/null and b/static/image/shopping/pdd/pay/qq.png differ
diff --git a/static/image/shopping/pdd/pay/select.png b/static/image/shopping/pdd/pay/select.png
new file mode 100644
index 0000000..a3d2259
Binary files /dev/null and b/static/image/shopping/pdd/pay/select.png differ
diff --git a/static/image/shopping/pdd/pay/wechat.png b/static/image/shopping/pdd/pay/wechat.png
new file mode 100644
index 0000000..ec6df4c
Binary files /dev/null and b/static/image/shopping/pdd/pay/wechat.png differ
diff --git a/static/image/shopping/pdd/pay/xianyonghoufu.png b/static/image/shopping/pdd/pay/xianyonghoufu.png
new file mode 100644
index 0000000..4d3aa26
Binary files /dev/null and b/static/image/shopping/pdd/pay/xianyonghoufu.png differ
diff --git a/static/image/shopping/pdd/pay/yunshanfu-blue.png b/static/image/shopping/pdd/pay/yunshanfu-blue.png
new file mode 100644
index 0000000..2485099
Binary files /dev/null and b/static/image/shopping/pdd/pay/yunshanfu-blue.png differ
diff --git a/static/image/shopping/pdd/pay/yunshanfu-red.png b/static/image/shopping/pdd/pay/yunshanfu-red.png
new file mode 100644
index 0000000..47da81e
Binary files /dev/null and b/static/image/shopping/pdd/pay/yunshanfu-red.png differ
diff --git a/static/image/shopping/pdd/pay/zhaohaoyou.png b/static/image/shopping/pdd/pay/zhaohaoyou.png
new file mode 100644
index 0000000..54a3fd0
Binary files /dev/null and b/static/image/shopping/pdd/pay/zhaohaoyou.png differ
diff --git a/static/image/shopping/pdd/pdd-bottom-product.png b/static/image/shopping/pdd/pdd-bottom-product.png
new file mode 100644
index 0000000..67f21cd
Binary files /dev/null and b/static/image/shopping/pdd/pdd-bottom-product.png differ
diff --git a/static/image/shopping/pdd/yiqianshou.png b/static/image/shopping/pdd/yiqianshou.png
new file mode 100644
index 0000000..3d18de0
Binary files /dev/null and b/static/image/shopping/pdd/yiqianshou.png differ
diff --git a/static/image/shopping/pdd/yunshu.png b/static/image/shopping/pdd/yunshu.png
new file mode 100644
index 0000000..03441af
Binary files /dev/null and b/static/image/shopping/pdd/yunshu.png differ