diff --git a/apps/admin-web/src/lib/storeCreate.ts b/apps/admin-web/src/lib/storeCreate.ts
index 37fa198..f595209 100644
--- a/apps/admin-web/src/lib/storeCreate.ts
+++ b/apps/admin-web/src/lib/storeCreate.ts
@@ -27,6 +27,7 @@ export type StoreCreateForm = {
bankAccountNo: string;
bankBranch: string;
settlementRate?: number;
+ sortOrder?: number;
visibilityWhitelistEnabled?: boolean;
visibilityPhones?: string[];
};
diff --git a/apps/admin-web/src/pages/StoresPage.tsx b/apps/admin-web/src/pages/StoresPage.tsx
index eee1dec..0d580cf 100644
--- a/apps/admin-web/src/pages/StoresPage.tsx
+++ b/apps/admin-web/src/pages/StoresPage.tsx
@@ -192,6 +192,7 @@ type StoreRow = {
closeTime2?: string | null;
avgPrice?: number | null;
settlementRate?: number;
+ sortOrder?: number;
category?: { id: string; name: string; parentId?: string | null } | null;
};
@@ -409,6 +410,7 @@ export default function StoresPage() {
? (d.visibilityPhones as string[])
: [],
isTest: !!d.isTest,
+ sortOrder: d.sortOrder != null ? Number(d.sortOrder) : 0,
});
setDrawerOpen(true);
}
@@ -454,6 +456,7 @@ export default function StoresPage() {
bankBranch: v.bankBranch ?? null,
visibilityWhitelistEnabled: !!v.visibilityWhitelistEnabled,
isTest: !!v.isTest,
+ sortOrder: v.sortOrder != null ? Number(v.sortOrder) : 0,
...(hasCoords
? { latitude: Number(v.latitude), longitude: Number(v.longitude) }
: {}),
@@ -538,6 +541,7 @@ export default function StoresPage() {
createForm.setFieldsValue({
envPhotoUrls: [],
settlementRate: 60,
+ sortOrder: 0,
openTime: '10:00',
closeTime: '22:00',
openTime2: undefined,
@@ -626,6 +630,7 @@ export default function StoresPage() {
bankAccountNo: values.bankAccountNo.replace(/\s/g, ''),
bankBranch: values.bankBranch.trim(),
settlementRate: Number(values.settlementRate ?? 60) / 100,
+ sortOrder: values.sortOrder != null ? Number(values.sortOrder) : 0,
visibilityWhitelistEnabled: !!values.visibilityWhitelistEnabled,
}),
});
@@ -699,6 +704,7 @@ export default function StoresPage() {
v ? 限测 : 公开,
},
{ title: '介绍', dataIndex: 'intro', width: 160, ellipsis: true, render: (v) => v || '—' },
+ { title: '排序', dataIndex: 'sortOrder', width: 70 },
{ title: '店长', dataIndex: ['account', 'name'], width: 90, render: (v) => v || '—' },
{ title: '创建', dataIndex: 'createdAt', width: 160, render: fmtTime },
{
@@ -978,6 +984,13 @@ export default function StoresPage() {
+
+
+
@@ -1154,6 +1167,9 @@ export default function StoresPage() {
+
+
+
diff --git a/apps/mini-user/src/pages/store-package-detail/index.tsx b/apps/mini-user/src/pages/store-package-detail/index.tsx
index f60f592..e4639e9 100644
--- a/apps/mini-user/src/pages/store-package-detail/index.tsx
+++ b/apps/mini-user/src/pages/store-package-detail/index.tsx
@@ -1,9 +1,10 @@
import { useCallback, useState } from 'react';
-import { View, Text, Image } from '@tarojs/components';
+import { View, Text } from '@tarojs/components';
import Taro, { useLoad, useRouter } from '@tarojs/taro';
import { normalizeStorePackageImageUrls } from '@dukang/shared-types';
import PageShell from '../../components/PageShell';
import PageNavBar from '../../components/PageNavBar';
+import ProductCarousel from '../../components/ProductCarousel';
import { request, toast } from '../../lib/api';
type StorePackage = {
@@ -99,10 +100,6 @@ export default function StorePackageDetailPage() {
}
}
- function previewImage(urls: string[], current: string) {
- Taro.previewImage({ urls, current }).catch(() => toast('无法预览图片'));
- }
-
if (loading) {
return (
@@ -139,19 +136,16 @@ export default function StorePackageDetailPage() {
) : null}
- {imageUrls.map((url) => (
- previewImage(imageUrls, url)}
- >
- 0 ? (
+
+
- ))}
+ ) : null}
diff --git a/apps/mini-user/src/styles/store-detail.css b/apps/mini-user/src/styles/store-detail.css
index e883f62..fef3d3a 100644
--- a/apps/mini-user/src/styles/store-detail.css
+++ b/apps/mini-user/src/styles/store-detail.css
@@ -352,7 +352,7 @@
padding-left: 4px;
}
-.store-package-detail-photo {
+.store-package-detail-gallery {
margin: 14px 0 0;
border-radius: var(--radius-lg);
overflow: hidden;
@@ -360,10 +360,8 @@
box-shadow: var(--shadow-card);
}
-.store-package-detail-photo-image {
- width: 100%;
- display: block;
- vertical-align: top;
+.store-package-detail-gallery .detail-carousel-wrap {
+ border-radius: 0;
}
.store-package-detail-content {
diff --git a/server/dukang-api/prisma/schema.prisma b/server/dukang-api/prisma/schema.prisma
index d8da835..7f49349 100644
--- a/server/dukang-api/prisma/schema.prisma
+++ b/server/dukang-api/prisma/schema.prisma
@@ -1277,6 +1277,8 @@ model Store {
withdrawWhitelistEnabled Boolean @default(false) @map("withdraw_whitelist_enabled")
/// 测试门店：不计结算 / HQ 可手动标记
isTest Boolean @default(false) @map("is_test")
+ /// C 端 / 列表排序：数值越小越靠前
+ sortOrder Int @default(0) @map("sort_order")
createdAt DateTime @default(now()) @map("created_at") @db.DateTime(3)
updatedAt DateTime @updatedAt @map("updated_at") @db.DateTime(3)
@@ -1299,6 +1301,7 @@ model Store {
@@index([partnerAccountId])
@@index([auditStatus, createdAt])
@@index([isTest])
+ @@index([sortOrder])
@@map("store_store")
}
diff --git a/server/dukang-api/src/modules/ops/admin-stores.service.ts b/server/dukang-api/src/modules/ops/admin-stores.service.ts
index 58c544a..0f7351e 100644
--- a/server/dukang-api/src/modules/ops/admin-stores.service.ts
+++ b/server/dukang-api/src/modules/ops/admin-stores.service.ts
@@ -72,7 +72,7 @@ export class AdminStoresService {
const [items, total] = await Promise.all([
this.prisma.store.findMany({
where,
- orderBy: { createdAt: 'desc' },
+ orderBy: [{ sortOrder: 'asc' }, { createdAt: 'desc' }],
skip: (page - 1) * pageSize,
take: pageSize,
include: {
@@ -365,6 +365,7 @@ export class AdminStoresService {
? { visibilityWhitelistEnabled: !!dto.visibilityWhitelistEnabled }
: {}),
...(dto.isTest !== undefined ? { isTest: !!dto.isTest } : {}),
+ ...(dto.sortOrder !== undefined ? { sortOrder: Math.floor(Number(dto.sortOrder)) || 0 } : {}),
...(latitude != null && longitude != null ? { latitude, longitude } : {}),
},
});
@@ -582,6 +583,7 @@ export class AdminStoresService {
closeTime2: closeTime2 || null,
visibilityWhitelistEnabled: whitelistEnabled,
isTest,
+ sortOrder: dto.sortOrder != null ? Math.floor(Number(dto.sortOrder)) || 0 : 0,
...(latitude != null && longitude != null ? { latitude, longitude } : {}),
status: 'OPEN',
auditStatus: 'APPROVED',
diff --git a/server/dukang-api/src/modules/ops/dto/admin-mutate.dto.ts b/server/dukang-api/src/modules/ops/dto/admin-mutate.dto.ts
index 5396f8a..9174629 100644
--- a/server/dukang-api/src/modules/ops/dto/admin-mutate.dto.ts
+++ b/server/dukang-api/src/modules/ops/dto/admin-mutate.dto.ts
@@ -145,6 +145,12 @@ export class CreateStoreDto {
@IsOptional()
@IsBoolean()
isTest?: boolean;
+
+ /** 列表排序，越小越靠前 */
+ @IsOptional()
+ @IsNumber()
+ @Min(0)
+ sortOrder?: number;
}
export class UpdateStoreDto {
@@ -259,6 +265,12 @@ export class UpdateStoreDto {
@IsOptional()
@IsBoolean()
isTest?: boolean;
+
+ /** 列表排序，越小越靠前 */
+ @IsOptional()
+ @IsNumber()
+ @Min(0)
+ sortOrder?: number;
}
export class CreateStoreAccountDto {
diff --git a/server/dukang-api/src/modules/store/store.service.ts b/server/dukang-api/src/modules/store/store.service.ts
index b09956a..90e2069 100644
--- a/server/dukang-api/src/modules/store/store.service.ts
+++ b/server/dukang-api/src/modules/store/store.service.ts
@@ -154,7 +154,7 @@ export class StoreService {
category: true,
coverResource: true,
},
- orderBy: { createdAt: 'desc' },
+ orderBy: [{ sortOrder: 'asc' }, { createdAt: 'desc' }],
});
const whitelistPhones = stores.some((s) => s.visibilityWhitelistEnabled)
@@ -172,6 +172,7 @@ export class StoreService {
distanceMeters: number | null;
latitude?: unknown;
longitude?: unknown;
+ sortOrder?: number;
};
const items: StoreListItem[] = [];
@@ -190,13 +191,16 @@ export class StoreService {
items.push({ ...mapped, distanceMeters });
}
- if (hasUser) {
- items.sort((a, b) => {
+ items.sort((a, b) => {
+ const so = (a.sortOrder ?? 0) - (b.sortOrder ?? 0);
+ if (so !== 0) return so;
+ if (hasUser) {
const da = a.distanceMeters ?? Number.POSITIVE_INFINITY;
const db = b.distanceMeters ?? Number.POSITIVE_INFINITY;
return da - db;
- });
- }
+ }
+ return 0;
+ });
return serializeBigInt(items);
}
@@ -268,7 +272,7 @@ export class StoreService {
const stores = await this.prisma.store.findMany({
where,
include: { category: true, coverResource: true },
- orderBy: { createdAt: 'desc' },
+ orderBy: [{ sortOrder: 'asc' }, { createdAt: 'desc' }],
});
return serializeBigInt(stores.map(mapStoreCompat));
}
diff --git a/杜康好客-v3.4.15-mini-user门店列表优化.md b/杜康好客-v3.4.15-mini-user门店列表优化.md
index 90b78a6..925ed88 100644
--- a/杜康好客-v3.4.15-mini-user门店列表优化.md
+++ b/杜康好客-v3.4.15-mini-user门店列表优化.md
@@ -1,6 +1,6 @@
# 杜康好客 · v3.4.15 mini-user 门店列表 + HQ 门店照片 / 套餐多图
-> **2026-08-07** · **开发中** · mini-user `3.4.15` · **未发版**
+> **2026-08-07** · mini-user `3.4.15`
## 更新内容
@@ -22,7 +22,12 @@
- 单条套餐支持多图：`imageUrls`（JSON）+ `imageUrl` 同步为首图（兼容旧数据）
- 上限 `STORE_PACKAGE_IMAGE_MAX_COUNT = 20`
-- HQ / 合伙人 H5 / 门店 H5 均可增删换图；C 端套餐详情按列表展示并可预览
+- HQ / 合伙人 H5 / 门店 H5 均可增删换图；C 端套餐详情左右滑动浏览并可点击预览
+
+### D. 门店排序字段
+
+- `store_store.sort_order`（`Store.sortOrder`，默认 0，越小越靠前）
+- HQ 门店列表 / 新建 / 编辑可配置；C 端门店列表优先按 `sortOrder`，同序再按距离（有定位）或创建时间
## 范围
@@ -30,7 +35,8 @@
|----|------|
| 门店列表卡片 | 布局与交互如上 |
| HQ 门店照片 | 审核材料可替换/删除 |
-| 套餐多图 | 最多 20 张 / 条 |
+| 套餐多图 | 最多 20 张 / 条；C 端左右滑动 |
+| 门店排序 | `sortOrder` 字段 + HQ 配置 + C 端排序 |
| 版本号 | `mini-user` `3.4.15` |
## ACC
@@ -42,4 +48,5 @@
- [ ] 封面右上角可见「营业中」斜角标签
- [ ] HQ 门店详情可替换/删除门头照、环境照、合同并保存生效
- [ ] 环境照无法超过 20 张
-- [ ] 套餐单条可上传至多 20 张图；C 端详情可浏览全部
+- [ ] 套餐单条可上传至多 20 张图；C 端详情可左右滑动浏览全部
+- [ ] HQ 可设置门店排序；C 端列表按排序优先展示