From 6e47575c0b1dc97642625206020ca5fb387658fd Mon Sep 17 00:00:00 2001
From: 15233722133 <15233722133@163.com>
Date: Thu, 16 Jul 2026 14:10:04 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=E5=88=B7=E6=96=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/merchant/pickupList.vue | 23 +++++++++--
pages/merchant/storeManage.vue | 73 +++++++++++++++++++---------------
pages/order/pickUpVerify.vue | 66 +++++++++++++++++++++++++++++-
pages/order/stockProgress.vue | 5 +--
4 files changed, 127 insertions(+), 40 deletions(-)
diff --git a/pages/merchant/pickupList.vue b/pages/merchant/pickupList.vue
index c8688aa..2cdeeda 100644
--- a/pages/merchant/pickupList.vue
+++ b/pages/merchant/pickupList.vue
@@ -158,7 +158,7 @@