diff --git a/pages/merchant/pickupList.vue b/pages/merchant/pickupList.vue
index dd134de..c22b0dc 100644
--- a/pages/merchant/pickupList.vue
+++ b/pages/merchant/pickupList.vue
@@ -38,32 +38,34 @@
-
- {{ item.statusName }}
+
+
+ {{ item.statusName }}
+
+
+ 共{{ getOrderItems(item).length }}件
+
下单时间:{{ sheep.$helper.timeFormat(item.createTime, 'yyyy-mm-dd hh:MM') }}
-
-
-
-
-
- 暂无图片
-
-
- {{ getPicCount(item) }}
-
+
+
+ 暂无图片
- {{ getOrderTitle(item) }}
+ {{ getMainItem(item)?.spuName || '商品信息暂无' }}
+
+ 规格:{{ getItemSpec(getMainItem(item)) }}
+
+ 数量:x{{ getMainItem(item)?.count || 0 }}
订单号:{{ item.orderNo }}
取货码:{{ getPickUpCode(item) || '--' }}
@@ -76,6 +78,49 @@
+
+
+
+ {{ getExtraItems(item).length }}
+
+ {{ isExpanded(item) ? '收起其他商品' : `展开其他${getExtraItems(item).length}件商品` }}
+
+
+
+
+
+
+
+
+
+ 暂无图片
+
+ {{ goods.spuName || '商品信息暂无' }}
+
+ 规格:{{ getItemSpec(goods) }}
+
+ 数量:x{{ goods.count || 0 }}
+
+
+
+
暂无数据
@@ -101,6 +146,7 @@
const list = ref([]);
const loading = ref(false);
+ const expandedMap = ref({});
const userStore = sheep.$store('user');
const displayList = computed(() => list.value);
@@ -166,34 +212,40 @@
return Array.isArray(item?.items) ? item.items.filter(Boolean) : [];
};
- const getPicList = (item) => {
- const pics = getOrderItems(item)
- .map((it) => sanitizeText(it?.picUrl))
- .filter(Boolean);
- const fallback = sanitizeText(item?.picUrl);
- return pics.length ? pics : [fallback].filter(Boolean);
+ const getMainItem = (item) => {
+ return getOrderItems(item)[0] || null;
};
- const getStackPics = (item) => {
- return getPicList(item).slice(0, 3);
+ const getExtraItems = (item) => {
+ return getOrderItems(item).slice(1);
};
- const getPicCount = (item) => {
- return getPicList(item).length;
- };
-
- const resolvePicUrl = (url) => {
- const text = sanitizeText(url);
+ const getItemPic = (goods) => {
+ const text = sanitizeText(goods?.picUrl);
if (!text) return '';
if (/^https?:\/\//i.test(text)) return text;
return sheep.$url.cdn(text);
};
- const getOrderTitle = (item) => {
- const firstName = getOrderItems(item)[0]?.spuName || item?.spuName || '';
- const totalCount = Number(item?.totalCount || getOrderItems(item).length || 0);
- if (!firstName) return '商品信息暂无';
- return totalCount > 1 ? `${firstName} 等${totalCount}件商品` : firstName;
+ const getItemSpec = (goods) => {
+ return goods?.spec || '';
+ };
+
+ const getExpandKey = (item) => {
+ return String(item?.orderId || item?.id || '');
+ };
+
+ const isExpanded = (item) => {
+ return Boolean(expandedMap.value[getExpandKey(item)]);
+ };
+
+ const toggleExpand = (item) => {
+ const key = getExpandKey(item);
+ if (!key) return;
+ expandedMap.value = {
+ ...expandedMap.value,
+ [key]: !expandedMap.value[key],
+ };
};
const getPickUpCode = (item) => {
@@ -288,6 +340,13 @@
margin-bottom: 14rpx;
}
+ .status-wrap {
+ display: flex;
+ align-items: center;
+ gap: 10rpx;
+ min-width: 0;
+ }
+
.status {
font-size: 24rpx;
color: #2556ec;
@@ -301,37 +360,32 @@
background: rgba(107, 78, 255, 0.12);
}
- .thumb-stack {
- width: 184rpx;
+ .goods-total {
+ font-size: 22rpx;
+ color: #8a8a8a;
+ }
+
+ .goods-thumb {
+ width: 140rpx;
height: 140rpx;
margin-right: 16rpx;
flex-shrink: 0;
position: relative;
}
- .thumb-card {
- position: absolute;
- top: 0;
- width: 140rpx;
- height: 140rpx;
- border-radius: 18rpx;
- overflow: hidden;
- background: #f2f4f7;
- box-shadow: 0 6rpx 18rpx rgba(0, 0, 0, 0.08);
- border: 2rpx solid rgba(255, 255, 255, 0.9);
- }
-
- .thumb-img {
+ .goods-thumb__img,
+ .goods-thumb__empty {
width: 100%;
height: 100%;
+ border-radius: 18rpx;
+ background: #f2f4f7;
+ }
+
+ .goods-thumb__img {
display: block;
}
- .thumb-empty {
- width: 140rpx;
- height: 140rpx;
- border-radius: 18rpx;
- background: #f2f4f7;
+ .goods-thumb__empty {
color: #bbb;
font-size: 22rpx;
display: flex;
@@ -341,25 +395,6 @@
box-sizing: border-box;
}
- .thumb-count {
- position: absolute;
- right: 45rpx;
- bottom: 0;
- min-width: 36rpx;
- height: 36rpx;
- padding: 0 10rpx;
- font-size: 22rpx;
- display: flex;
- align-items: center;
- justify-content: center;
- box-sizing: border-box;
- border-radius: 18rpx;
- color: rgba(0, 0, 0, 0.75);
- background: rgba(255, 255, 255, 0.7);
- box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
- z-index: 5;
- }
-
.name {
font-size: 28rpx;
color: #222;
@@ -392,6 +427,124 @@
color: #2556ec;
}
+ .fold-box {
+ margin-top: 16rpx;
+ border-radius: 18rpx;
+ background: #f7f8fc;
+ border: 2rpx solid #eef1f6;
+ overflow: hidden;
+ transition: all 0.2s ease;
+ }
+
+ .fold-box--active {
+ background: #f5f7ff;
+ border-color: rgba(37, 86, 236, 0.18);
+ box-shadow: 0 8rpx 24rpx rgba(37, 86, 236, 0.06);
+ }
+
+ .fold-trigger {
+ padding: 18rpx 20rpx;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ }
+
+ .fold-trigger__left {
+ display: flex;
+ align-items: center;
+ min-width: 0;
+ gap: 12rpx;
+ }
+
+ .fold-trigger__badge {
+ min-width: 36rpx;
+ height: 36rpx;
+ padding: 0 10rpx;
+ border-radius: 999rpx;
+ background: rgba(37, 86, 236, 0.12);
+ color: #2556ec;
+ font-size: 22rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ box-sizing: border-box;
+ }
+
+ .fold-trigger__text {
+ font-size: 25rpx;
+ color: #4d5562;
+ }
+
+ .fold-trigger__icon {
+ width: 40rpx;
+ height: 40rpx;
+ border-radius: 20rpx;
+ background: #fff;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-shrink: 0;
+ border: 2rpx solid #eceff5;
+ box-sizing: border-box;
+ }
+
+ .fold-trigger__icon--active {
+ background: rgba(37, 86, 236, 0.1);
+ border-color: rgba(37, 86, 236, 0.14);
+ }
+
+ .fold-panel {
+ padding: 0 20rpx 18rpx;
+ border-top: 2rpx dashed #e6ebf4;
+ }
+
+ .fold-item {
+ display: flex;
+ align-items: flex-start;
+ padding-top: 16rpx;
+ }
+
+ .fold-item + .fold-item {
+ margin-top: 16rpx;
+ padding-top: 16rpx;
+ border-top: 2rpx solid #eceff5;
+ }
+
+ .fold-item__img,
+ .fold-item__empty {
+ width: 104rpx;
+ height: 104rpx;
+ border-radius: 14rpx;
+ flex-shrink: 0;
+ background: #f2f4f7;
+ }
+
+ .fold-item__img {
+ display: block;
+ }
+
+ .fold-item__empty {
+ color: #bbb;
+ font-size: 20rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ border: 2rpx dashed #e3e6ee;
+ box-sizing: border-box;
+ }
+
+ .fold-item__info {
+ margin-left: 16rpx;
+ min-width: 0;
+ flex: 1;
+ }
+
+ .fold-item__name {
+ font-size: 26rpx;
+ color: #222;
+ font-weight: 600;
+ }
+
.empty {
text-align: center;
padding: 80rpx 0;
diff --git a/pages/merchant/scanVerify.vue b/pages/merchant/scanVerify.vue
index 492db0e..2475822 100644
--- a/pages/merchant/scanVerify.vue
+++ b/pages/merchant/scanVerify.vue
@@ -26,7 +26,9 @@
或点击下方按钮开始扫码
- 开始扫码
+
+ {{ verifying ? '核销中...' : '开始扫码' }}
+
@@ -39,7 +41,9 @@
:styles="{ fontSize: '34rpx' }"
/>
- 确认核销
+
+ {{ verifying ? '核销中...' : '确认核销' }}
+
@@ -63,9 +67,13 @@