From 7c8352ed5660d26dc9fbade94f49b918872c2157 Mon Sep 17 00:00:00 2001
From: 15233722133 <15233722133@163.com>
Date: Wed, 15 Jul 2026 16:21:40 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8F=90=E8=B4=A7=E6=B8=85=E5=8D=95?=
=?UTF-8?q?=E9=9A=90=E8=97=8F=E5=8F=96=E8=B4=A7=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/merchant/pickupList.vue | 17 ++++-
pages/merchant/scanVerify.vue | 116 ++++++++++++++++++----------------
pages/order/pickUpVerify.vue | 39 ++++++++++--
pages/order/stockProgress.vue | 58 +++++++++++++++--
sheep/api/trade/orderStore.js | 30 ++++++++-
5 files changed, 190 insertions(+), 70 deletions(-)
diff --git a/pages/merchant/pickupList.vue b/pages/merchant/pickupList.vue
index e10152c..3b133ea 100644
--- a/pages/merchant/pickupList.vue
+++ b/pages/merchant/pickupList.vue
@@ -36,7 +36,7 @@
@@ -76,7 +76,6 @@
数量:x{{ getMainItem(item)?.count || 0 }}
订单号:{{ item.orderNo }}
- 取货码:{{ getPickUpCode(item) || '--' }}
@@ -162,6 +161,7 @@
const storeIdsKey = ref('');
const selectedStoreId = ref(0);
const storeLoading = ref(false);
+ const STORE_SELECTED_KEY = 'merchant.pickup.selectedStoreId';
const displayList = computed(() => list.value);
@@ -290,7 +290,11 @@
};
onShow(async () => {
+ const saved = Number(uni.getStorageSync(STORE_SELECTED_KEY) || 0);
+ if (saved > 0 && saved !== selectedStoreId.value) selectedStoreId.value = saved;
await ensureStoreList();
+ const current = Number(selectedStoreId.value || 0);
+ if (current > 0) uni.setStorageSync(STORE_SELECTED_KEY, current);
await getList();
});
@@ -306,6 +310,15 @@
{ deep: false },
);
+ watch(
+ selectedStoreId,
+ (v) => {
+ const n = Number(v || 0);
+ if (n > 0) uni.setStorageSync(STORE_SELECTED_KEY, n);
+ },
+ { deep: false },
+ );
+
const goScan = () => {
uni.reLaunch({ url: '/pages/merchant/scanVerify' });
};
diff --git a/pages/merchant/scanVerify.vue b/pages/merchant/scanVerify.vue
index 5698565..c662f5d 100644
--- a/pages/merchant/scanVerify.vue
+++ b/pages/merchant/scanVerify.vue
@@ -49,7 +49,7 @@
近期核销记录
- 清空
+ 刷新
@@ -66,6 +66,7 @@