From 554bb702a2d5dcb8d258ee93c0b56c96c9207959 Mon Sep 17 00:00:00 2001 From: xiaoquan <838115837@qq.com> Date: Mon, 11 May 2026 17:59:19 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=BF=AD=E4=BB=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/miniapp/src/api/seller/merchant.ts | 36 +- .../src/components/business/MerchantCard.vue | 447 +++---- apps/miniapp/src/pages.json | 8 +- apps/miniapp/src/pages/index/index.vue | 694 +++++++---- .../src/pages/merchant-detail/index.vue | 23 +- apps/miniapp/src/pages/search/index.vue | 448 ++----- apps/miniapp/src/pages/seller/home.vue | 78 +- .../src/pages/seller/room-calendar.vue | 819 ++++++++----- apps/miniapp/src/pages/seller/room-form.vue | 682 +++++++---- apps/miniapp/src/pages/seller/shop-create.vue | 372 +++++- apps/miniapp/src/pages/seller/shop-edit.vue | 1063 ----------------- apps/miniapp/src/types/merchant.ts | 8 + apps/miniapp/src/types/shop.ts | 113 ++ apps/server/src/entities/merchant.entity.ts | 7 + .../src/modules/merchant/dto/merchant.dto.ts | 8 + .../server/src/modules/order/order.service.ts | 18 + apps/server/src/modules/room/room.service.ts | 6 +- database/migrate.js | 186 +++ .../002_add_merchant_cover_image.sql | 11 + .../003_add_merchant_sales_count.sql | 5 + logo1.png | Bin 0 -> 32843 bytes logo2.png | Bin 0 -> 242020 bytes logo3.jpeg | Bin 0 -> 39408 bytes package.json | 1 + 24 files changed, 2539 insertions(+), 2494 deletions(-) delete mode 100644 apps/miniapp/src/pages/seller/shop-edit.vue create mode 100644 apps/miniapp/src/types/shop.ts create mode 100644 database/migrate.js create mode 100644 database/migrations/002_add_merchant_cover_image.sql create mode 100644 database/migrations/003_add_merchant_sales_count.sql create mode 100644 logo1.png create mode 100644 logo2.png create mode 100644 logo3.jpeg diff --git a/apps/miniapp/src/api/seller/merchant.ts b/apps/miniapp/src/api/seller/merchant.ts index f8e8010..ca80424 100644 --- a/apps/miniapp/src/api/seller/merchant.ts +++ b/apps/miniapp/src/api/seller/merchant.ts @@ -7,10 +7,26 @@ export interface ApplyMerchantParams { city?: string; district?: string; address?: string; - businessLicense: string; + description?: string; + coverImage?: string; + storeLicense: string; + hotelImages?: string; + contractType: string; + idCardFront?: string; + idCardBack?: string; + legalIdCardFront?: string; + legalIdCardBack?: string; + businessLicense?: string; licenseNo?: string; legalPerson?: string; - description?: string; + accountType: string; + accountName?: string; + bankAccount: string; + bankName: string; + bankBranch?: string; + bankLicense?: string; + accountIdCardFront?: string; + accountIdCardBack?: string; } export interface UpdateMerchantParams { @@ -18,13 +34,29 @@ export interface UpdateMerchantParams { logo?: string; phone?: string; description?: string; + coverImage?: string; province?: string; city?: string; district?: string; address?: string; + storeLicense?: string; + hotelImages?: string; + contractType?: string; + idCardFront?: string; + idCardBack?: string; + legalIdCardFront?: string; + legalIdCardBack?: string; businessLicense?: string; licenseNo?: string; legalPerson?: string; + accountType?: string; + accountName?: string; + bankAccount?: string; + bankName?: string; + bankBranch?: string; + bankLicense?: string; + accountIdCardFront?: string; + accountIdCardBack?: string; } // 申请创建店铺(需要商家token) diff --git a/apps/miniapp/src/components/business/MerchantCard.vue b/apps/miniapp/src/components/business/MerchantCard.vue index 902cb28..b389c62 100644 --- a/apps/miniapp/src/components/business/MerchantCard.vue +++ b/apps/miniapp/src/components/business/MerchantCard.vue @@ -1,93 +1,48 @@