diff --git a/.env.development b/.env.development
index 49162dc..b5845e1 100644
--- a/.env.development
+++ b/.env.development
@@ -2,7 +2,7 @@ VITE_APP_NAME=后台管理系统
 VITE_SOCKET_URL=wss://server.gxwebsoft.com
 VITE_SERVER_URL=https://server.gxwebsoft.com/api
 VITE_THINK_URL=https://gxtyzx-api.websoft.top/api
-#VITE_API_URL=https://modules.gxwebsoft.com/api
+#VITE_API_URL=https://ngb-service-api.websoft.top/api
 
 
 #VITE_SERVER_URL=http://127.0.0.1:9090/api
diff --git a/.env.production b/.env.production
index b356e41..c6735fc 100644
--- a/.env.production
+++ b/.env.production
@@ -2,4 +2,4 @@ VITE_APP_NAME=后台管理系统
 VITE_SOCKET_URL=wss://server.gxwebsoft.com
 VITE_SERVER_URL=https://server.gxwebsoft.com/api
 VITE_THINK_URL=https://gxtyzx-api.websoft.top/api
-VITE_API_URL=https://modules.gxwebsoft.com/api
+VITE_API_URL=https://ngb-service-api.websoft.top/api
diff --git a/src/api/cms/article/model/index.ts b/src/api/cms/article/model/index.ts
index 055907f..d93c063 100644
--- a/src/api/cms/article/model/index.ts
+++ b/src/api/cms/article/model/index.ts
@@ -18,6 +18,8 @@ export interface Article {
   categoryName?: string;
   // 封面图
   image?: string;
+  imageWidth?: number;
+  imageHeight?: number;
   // 附件
   files?: string;
   // 缩列图
diff --git a/src/api/cms/designCategory/index.ts b/src/api/cms/designCategory/index.ts
new file mode 100644
index 0000000..c0b8e15
--- /dev/null
+++ b/src/api/cms/designCategory/index.ts
@@ -0,0 +1,106 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api';
+import type { DesignCategory, DesignCategoryParam } from './model';
+import { MODULES_API_URL } from '@/config/setting';
+
+/**
+ * 分页查询设计征集报名分类
+ */
+export async function pageDesignCategory(params: DesignCategoryParam) {
+  const res = await request.get<ApiResult<PageResult<DesignCategory>>>(
+    MODULES_API_URL + '/cms/design-category/page',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 查询设计征集报名分类列表
+ */
+export async function listDesignCategory(params?: DesignCategoryParam) {
+  const res = await request.get<ApiResult<DesignCategory[]>>(
+    MODULES_API_URL + '/cms/design-category',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 添加设计征集报名分类
+ */
+export async function addDesignCategory(data: DesignCategory) {
+  const res = await request.post<ApiResult<unknown>>(
+    MODULES_API_URL + '/cms/design-category',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 修改设计征集报名分类
+ */
+export async function updateDesignCategory(data: DesignCategory) {
+  const res = await request.put<ApiResult<unknown>>(
+    MODULES_API_URL + '/cms/design-category',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 删除设计征集报名分类
+ */
+export async function removeDesignCategory(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/cms/design-category/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 批量删除设计征集报名分类
+ */
+export async function removeBatchDesignCategory(data: (number | undefined)[]) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/cms/design-category/batch',
+    {
+      data
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 根据id查询设计征集报名分类
+ */
+export async function getDesignCategory(id: number) {
+  const res = await request.get<ApiResult<DesignCategory>>(
+    MODULES_API_URL + '/cms/design-category/' + id
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
diff --git a/src/api/cms/designCategory/model/index.ts b/src/api/cms/designCategory/model/index.ts
new file mode 100644
index 0000000..0b458d0
--- /dev/null
+++ b/src/api/cms/designCategory/model/index.ts
@@ -0,0 +1,35 @@
+import type { PageParam } from '@/api';
+
+/**
+ * 设计征集报名分类
+ */
+export interface DesignCategory {
+  // 
+  id?: number;
+  // 
+  title?: string;
+  // 用户ID
+  userId?: number;
+  // 排序(数字越小越靠前)
+  sortNumber?: number;
+  // 备注
+  comments?: string;
+  // 状态, 0已发布, 1待审核 2已驳回 3违规内容
+  status?: number;
+  // 是否删除, 0否, 1是
+  deleted?: number;
+  // 租户id
+  tenantId?: number;
+  // 创建时间
+  createTime?: string;
+  // 修改时间
+  updateTime?: string;
+}
+
+/**
+ * 设计征集报名分类搜索条件
+ */
+export interface DesignCategoryParam extends PageParam {
+  id?: number;
+  keywords?: string;
+}
diff --git a/src/api/cms/designCollect/index.ts b/src/api/cms/designCollect/index.ts
new file mode 100644
index 0000000..ab034ed
--- /dev/null
+++ b/src/api/cms/designCollect/index.ts
@@ -0,0 +1,106 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api';
+import type { DesignCollect, DesignCollectParam } from './model';
+import { MODULES_API_URL } from '@/config/setting';
+
+/**
+ * 分页查询设计征集
+ */
+export async function pageDesignCollect(params: DesignCollectParam) {
+  const res = await request.get<ApiResult<PageResult<DesignCollect>>>(
+    MODULES_API_URL + '/cms/design-collect/page',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 查询设计征集列表
+ */
+export async function listDesignCollect(params?: DesignCollectParam) {
+  const res = await request.get<ApiResult<DesignCollect[]>>(
+    MODULES_API_URL + '/cms/design-collect',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 添加设计征集
+ */
+export async function addDesignCollect(data: DesignCollect) {
+  const res = await request.post<ApiResult<unknown>>(
+    MODULES_API_URL + '/cms/design-collect',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 修改设计征集
+ */
+export async function updateDesignCollect(data: DesignCollect) {
+  const res = await request.put<ApiResult<unknown>>(
+    MODULES_API_URL + '/cms/design-collect',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 删除设计征集
+ */
+export async function removeDesignCollect(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/cms/design-collect/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 批量删除设计征集
+ */
+export async function removeBatchDesignCollect(data: (number | undefined)[]) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/cms/design-collect/batch',
+    {
+      data
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 根据id查询设计征集
+ */
+export async function getDesignCollect(id: number) {
+  const res = await request.get<ApiResult<DesignCollect>>(
+    MODULES_API_URL + '/cms/design-collect/' + id
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
diff --git a/src/api/cms/designCollect/model/index.ts b/src/api/cms/designCollect/model/index.ts
new file mode 100644
index 0000000..3ef4061
--- /dev/null
+++ b/src/api/cms/designCollect/model/index.ts
@@ -0,0 +1,40 @@
+import type { PageParam } from '@/api';
+
+/**
+ * 设计征集
+ */
+export interface DesignCollect {
+  //
+  id?: number;
+  categoryId?: number;
+  //
+  title?: string;
+  //
+  content?: string;
+  //
+  image?: string;
+  // 用户ID
+  userId?: number;
+  // 排序(数字越小越靠前)
+  sortNumber?: number;
+  // 备注
+  comments?: string;
+  // 状态, 0已发布, 1待审核 2已驳回 3违规内容
+  status?: number;
+  // 是否删除, 0否, 1是
+  deleted?: number;
+  // 租户id
+  tenantId?: number;
+  // 创建时间
+  createTime?: string;
+  // 修改时间
+  updateTime?: string;
+}
+
+/**
+ * 设计征集搜索条件
+ */
+export interface DesignCollectParam extends PageParam {
+  id?: number;
+  keywords?: string;
+}
diff --git a/src/api/cms/designSignUp/index.ts b/src/api/cms/designSignUp/index.ts
new file mode 100644
index 0000000..fb2572b
--- /dev/null
+++ b/src/api/cms/designSignUp/index.ts
@@ -0,0 +1,106 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api';
+import type { DesignSignUp, DesignSignUpParam } from './model';
+import { MODULES_API_URL } from '@/config/setting';
+
+/**
+ * 分页查询设计征集报名
+ */
+export async function pageDesignSignUp(params: DesignSignUpParam) {
+  const res = await request.get<ApiResult<PageResult<DesignSignUp>>>(
+    MODULES_API_URL + '/cms/design-sign-up/page',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 查询设计征集报名列表
+ */
+export async function listDesignSignUp(params?: DesignSignUpParam) {
+  const res = await request.get<ApiResult<DesignSignUp[]>>(
+    MODULES_API_URL + '/cms/design-sign-up',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 添加设计征集报名
+ */
+export async function addDesignSignUp(data: DesignSignUp) {
+  const res = await request.post<ApiResult<unknown>>(
+    MODULES_API_URL + '/cms/design-sign-up',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 修改设计征集报名
+ */
+export async function updateDesignSignUp(data: DesignSignUp) {
+  const res = await request.put<ApiResult<unknown>>(
+    MODULES_API_URL + '/cms/design-sign-up',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 删除设计征集报名
+ */
+export async function removeDesignSignUp(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/cms/design-sign-up/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 批量删除设计征集报名
+ */
+export async function removeBatchDesignSignUp(data: (number | undefined)[]) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/cms/design-sign-up/batch',
+    {
+      data
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 根据id查询设计征集报名
+ */
+export async function getDesignSignUp(id: number) {
+  const res = await request.get<ApiResult<DesignSignUp>>(
+    MODULES_API_URL + '/cms/design-sign-up/' + id
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
diff --git a/src/api/cms/designSignUp/model/index.ts b/src/api/cms/designSignUp/model/index.ts
new file mode 100644
index 0000000..4b942f1
--- /dev/null
+++ b/src/api/cms/designSignUp/model/index.ts
@@ -0,0 +1,42 @@
+import type {PageParam} from '@/api';
+
+/**
+ * 设计征集报名
+ */
+export interface DesignSignUp {
+  //
+  id?: number;
+  //
+  designId?: number;
+  //
+  name?: string;
+  //
+  phone?: string;
+  //
+  content?: string;
+  // 用户ID
+  userId?: number;
+  // 排序(数字越小越靠前)
+  sortNumber?: number;
+  // 备注
+  comments?: string;
+  // 状态, 0已发布, 1待审核 2已驳回 3违规内容
+  status?: number;
+  // 是否删除, 0否, 1是
+  deleted?: number;
+  // 租户id
+  tenantId?: number;
+  // 创建时间
+  createTime?: string;
+  // 修改时间
+  updateTime?: string;
+}
+
+/**
+ * 设计征集报名搜索条件
+ */
+export interface DesignSignUpParam extends PageParam {
+  id?: number;
+  designId?: number;
+  keywords?: string;
+}
diff --git a/src/api/shop/count/index.ts~merged b/src/api/shop/count/index.ts~merged
new file mode 100644
index 0000000..2c7aca5
--- /dev/null
+++ b/src/api/shop/count/index.ts~merged
@@ -0,0 +1,231 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api';
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD:modules/api/booking_____/order/index.ts
+import type { Order, OrderParam } from './model';
+import { MODULES_API_URL } from '@/config/setting';
+
+/**
+ * 分页查询
+ */
+export async function pageOrder(params: OrderParam) {
+  const res = await request.get<ApiResult<PageResult<Order>>>(
+    MODULES_API_URL + '/booking/order/page',
+=======
+>>>>>>> origin/master
+import type { Count, CountParam } from './model';
+import { MODULES_API_URL } from '@/config/setting';
+
+export async function data(params: CountParam) {
+  const res = await request.get<ApiResult<Count[]>>(
+    MODULES_API_URL + '/shop/count/data',
+<<<<<<< HEAD
+=======
+>>>>>>> origin/master:src/api/shop/count/index.ts
+>>>>>>> origin/master
+    {
+      params
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD:modules/api/booking_____/order/index.ts
+ * 查询列表
+ */
+export async function listOrder(params?: OrderParam) {
+  const res = await request.get<ApiResult<Order[]>>(
+    MODULES_API_URL + '/booking/order',
+=======
+>>>>>>> origin/master
+ * 分页查询商城销售统计表
+ */
+export async function pageCount(params: CountParam) {
+  const res = await request.get<ApiResult<PageResult<Count>>>(
+    MODULES_API_URL + '/shop/count/page',
+<<<<<<< HEAD
+=======
+>>>>>>> origin/master:src/api/shop/count/index.ts
+>>>>>>> origin/master
+    {
+      params
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD:modules/api/booking_____/order/index.ts
+ * 添加
+=======
+>>>>>>> origin/master
+ * 查询商城销售统计表列表
+ */
+export async function listCount(params?: CountParam) {
+  const res = await request.get<ApiResult<Count[]>>(
+    MODULES_API_URL + '/shop/count',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 添加商城销售统计表
+<<<<<<< HEAD
+ */
+export async function addCount(data: Count) {
+  const res = await request.post<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/count',
+=======
+>>>>>>> origin/master:src/api/shop/count/index.ts
+ */
+export async function addCount(data: Count) {
+  const res = await request.post<ApiResult<unknown>>(
+<<<<<<< HEAD:modules/api/booking_____/order/index.ts
+    MODULES_API_URL + '/booking/order',
+=======
+    MODULES_API_URL + '/shop/count',
+>>>>>>> origin/master:src/api/shop/count/index.ts
+>>>>>>> origin/master
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+<<<<<<< HEAD
+ * 修改商城销售统计表
+ */
+export async function updateCount(data: Count) {
+  const res = await request.put<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/count',
+=======
+<<<<<<< HEAD:modules/api/booking_____/order/index.ts
+ * 修改
+=======
+ * 修改商城销售统计表
+>>>>>>> origin/master:src/api/shop/count/index.ts
+ */
+export async function updateCount(data: Count) {
+  const res = await request.put<ApiResult<unknown>>(
+<<<<<<< HEAD:modules/api/booking_____/order/index.ts
+    MODULES_API_URL + '/booking/order',
+=======
+    MODULES_API_URL + '/shop/count',
+>>>>>>> origin/master:src/api/shop/count/index.ts
+>>>>>>> origin/master
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+<<<<<<< HEAD
+ * 删除商城销售统计表
+ */
+export async function removeCount(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/count/' + id
+=======
+<<<<<<< HEAD:modules/api/booking_____/order/index.ts
+ * 删除
+=======
+ * 删除商城销售统计表
+>>>>>>> origin/master:src/api/shop/count/index.ts
+ */
+export async function removeCount(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+<<<<<<< HEAD:modules/api/booking_____/order/index.ts
+    MODULES_API_URL + '/booking/order/' + id
+=======
+    MODULES_API_URL + '/shop/count/' + id
+>>>>>>> origin/master:src/api/shop/count/index.ts
+>>>>>>> origin/master
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+<<<<<<< HEAD
+ * 批量删除商城销售统计表
+ */
+export async function removeBatchCount(data: (number | undefined)[]) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/count/batch',
+=======
+<<<<<<< HEAD:modules/api/booking_____/order/index.ts
+ * 批量删除
+=======
+ * 批量删除商城销售统计表
+>>>>>>> origin/master:src/api/shop/count/index.ts
+ */
+export async function removeBatchCount(data: (number | undefined)[]) {
+  const res = await request.delete<ApiResult<unknown>>(
+<<<<<<< HEAD:modules/api/booking_____/order/index.ts
+    MODULES_API_URL + '/booking/order/batch',
+=======
+    MODULES_API_URL + '/shop/count/batch',
+>>>>>>> origin/master:src/api/shop/count/index.ts
+>>>>>>> origin/master
+    {
+      data
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD:modules/api/booking_____/order/index.ts
+ * 根据id查询
+ */
+export async function getOrder(id: number) {
+  const res = await request.get<ApiResult<Order>>(
+    MODULES_API_URL + '/booking/order/' + id
+=======
+>>>>>>> origin/master
+ * 根据id查询商城销售统计表
+ */
+export async function getCount(id: number) {
+  const res = await request.get<ApiResult<Count>>(
+    MODULES_API_URL + '/shop/count/' + id
+<<<<<<< HEAD
+=======
+>>>>>>> origin/master:src/api/shop/count/index.ts
+>>>>>>> origin/master
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
diff --git a/src/api/shop/goods/model/index.ts b/src/api/shop/goods/model/index.ts
index d439e56..330c487 100644
--- a/src/api/shop/goods/model/index.ts
+++ b/src/api/shop/goods/model/index.ts
@@ -45,18 +45,30 @@ export interface Goods {
   price?: string;
   // 销售价格
   salePrice?: string;
-  // 有赠品
-  priceGift?: boolean;
+  chainStorePrice?: string;
+  chainStoreRate?: string;
+  memberStoreRate?: string;
+  memberMarketRate?: string;
+  memberStorePrice?: string;
+  memberMarketPrice?: string;
   // 经销商价格
   dealerPrice?: string;
   // 有赠品
-  dealerGift?: string;
+  buyingGift?: boolean;
+  // 有赠品
+  priceGift?: boolean;
+  // 有赠品
+  dealerGift?: boolean;
+  buyingGiftNum?: number;
+  priceGiftNum?: number;
+  dealerGiftNum?: number;
   // 库存计算方式(10下单减库存 20付款减库存)
   deductStockType?: number;
   // 封面图
   files?: string;
   // 销量
   sales?: number;
+  isNew?: number;
   // 库存
   stock?: number;
   // 商品重量
@@ -69,6 +81,8 @@ export interface Goods {
   merchantId?: number;
   // 商户名称
   merchantName?: string;
+  supplierMerchantId?: number;
+  supplierName?: string;
   // 状态（0：未上架，1：上架）
   isShow?: number;
   // 状态, 0上架 1待上架 2待审核 3审核不通过
diff --git a/src/api/shop/goodsIncomeConfig/index.ts b/src/api/shop/goodsIncomeConfig/index.ts
new file mode 100644
index 0000000..6c2af77
--- /dev/null
+++ b/src/api/shop/goodsIncomeConfig/index.ts
@@ -0,0 +1,106 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api';
+import type { GoodsIncomeConfig, GoodsIncomeConfigParam } from './model';
+import { MODULES_API_URL } from '@/config/setting';
+
+/**
+ * 分页查询分润配置
+ */
+export async function pageGoodsIncomeConfig(params: GoodsIncomeConfigParam) {
+  const res = await request.get<ApiResult<PageResult<GoodsIncomeConfig>>>(
+    MODULES_API_URL + '/shop/goods-income-config/page',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 查询分润配置列表
+ */
+export async function listGoodsIncomeConfig(params?: GoodsIncomeConfigParam) {
+  const res = await request.get<ApiResult<GoodsIncomeConfig[]>>(
+    MODULES_API_URL + '/shop/goods-income-config',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 添加分润配置
+ */
+export async function addGoodsIncomeConfig(data: GoodsIncomeConfig) {
+  const res = await request.post<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/goods-income-config',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 修改分润配置
+ */
+export async function updateGoodsIncomeConfig(data: GoodsIncomeConfig) {
+  const res = await request.put<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/goods-income-config',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 删除分润配置
+ */
+export async function removeGoodsIncomeConfig(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/goods-income-config/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 批量删除分润配置
+ */
+export async function removeBatchGoodsIncomeConfig(data: (number | undefined)[]) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/goods-income-config/batch',
+    {
+      data
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 根据id查询分润配置
+ */
+export async function getGoodsIncomeConfig(id: number) {
+  const res = await request.get<ApiResult<GoodsIncomeConfig>>(
+    MODULES_API_URL + '/shop/goods-income-config/' + id
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
diff --git a/src/api/shop/goodsIncomeConfig/model/index.ts b/src/api/shop/goodsIncomeConfig/model/index.ts
new file mode 100644
index 0000000..d51e7a9
--- /dev/null
+++ b/src/api/shop/goodsIncomeConfig/model/index.ts
@@ -0,0 +1,39 @@
+import type { PageParam } from '@/api';
+
+/**
+ * 分润配置
+ */
+export interface GoodsIncomeConfig {
+  //
+  id?: number;
+  //
+  goodsId?: number;
+  // 店铺类型
+  merchantShopType?: string;
+  //
+  skuId?: number;
+  // 比例
+  rate?: string;
+  // 用户id
+  userId?: number;
+  // 备注
+  comments?: string;
+  // 排序号
+  sortNumber?: number;
+  // 是否删除, 0否, 1是
+  deleted?: number;
+  // 租户id
+  tenantId?: number;
+  // 修改时间
+  updateTime?: string;
+  // 创建时间
+  createTime?: string;
+}
+
+/**
+ * 分润配置搜索条件
+ */
+export interface GoodsIncomeConfigParam extends PageParam {
+  id?: number;
+  keywords?: string;
+}
diff --git a/src/api/shop/goodsStockInMerchant/index.ts b/src/api/shop/goodsStockInMerchant/index.ts
new file mode 100644
index 0000000..ae268cb
--- /dev/null
+++ b/src/api/shop/goodsStockInMerchant/index.ts
@@ -0,0 +1,106 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api';
+import type { GoodsStockInMerchant, GoodsStockInMerchantParam } from './model';
+import { MODULES_API_URL } from '@/config/setting';
+
+/**
+ * 分页查询商户商品库存
+ */
+export async function pageGoodsStockInMerchant(params: GoodsStockInMerchantParam) {
+  const res = await request.get<ApiResult<PageResult<GoodsStockInMerchant>>>(
+    MODULES_API_URL + '/shop/goods-stock-in-merchant/page',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 查询商户商品库存列表
+ */
+export async function listGoodsStockInMerchant(params?: GoodsStockInMerchantParam) {
+  const res = await request.get<ApiResult<GoodsStockInMerchant[]>>(
+    MODULES_API_URL + '/shop/goods-stock-in-merchant',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 添加商户商品库存
+ */
+export async function addGoodsStockInMerchant(data: GoodsStockInMerchant) {
+  const res = await request.post<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/goods-stock-in-merchant',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 修改商户商品库存
+ */
+export async function updateGoodsStockInMerchant(data: GoodsStockInMerchant) {
+  const res = await request.put<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/goods-stock-in-merchant',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 删除商户商品库存
+ */
+export async function removeGoodsStockInMerchant(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/goods-stock-in-merchant/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 批量删除商户商品库存
+ */
+export async function removeBatchGoodsStockInMerchant(data: (number | undefined)[]) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/goods-stock-in-merchant/batch',
+    {
+      data
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 根据id查询商户商品库存
+ */
+export async function getGoodsStockInMerchant(id: number) {
+  const res = await request.get<ApiResult<GoodsStockInMerchant>>(
+    MODULES_API_URL + '/shop/goods-stock-in-merchant/' + id
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
diff --git a/src/api/shop/goodsStockInMerchant/model/index.ts b/src/api/shop/goodsStockInMerchant/model/index.ts
new file mode 100644
index 0000000..1324f2e
--- /dev/null
+++ b/src/api/shop/goodsStockInMerchant/model/index.ts
@@ -0,0 +1,43 @@
+import type { PageParam } from '@/api';
+
+/**
+ * 商户商品库存
+ */
+export interface GoodsStockInMerchant {
+  // 
+  id?: number;
+  // 
+  goodsId?: number;
+  // 
+  skuId?: number;
+  // 
+  num?: number;
+  // 
+  merchantId?: number;
+  // 
+  stock?: number;
+  // 状态, 0上架 1待上架 2待审核 3审核不通过
+  status?: number;
+  // 备注
+  comments?: string;
+  // 排序号
+  sortNumber?: number;
+  // 用户ID
+  userId?: number;
+  // 是否删除, 0否, 1是
+  deleted?: number;
+  // 租户id
+  tenantId?: number;
+  // 创建时间
+  createTime?: string;
+  // 修改时间
+  updateTime?: string;
+}
+
+/**
+ * 商户商品库存搜索条件
+ */
+export interface GoodsStockInMerchantParam extends PageParam {
+  id?: number;
+  keywords?: string;
+}
diff --git a/src/api/shop/merchant/model/index.ts b/src/api/shop/merchant/model/index.ts
index 02cd8eb..e282464 100644
--- a/src/api/shop/merchant/model/index.ts
+++ b/src/api/shop/merchant/model/index.ts
@@ -53,12 +53,16 @@ export interface Merchant {
   ownStore?: number;
   // 是否推荐
   recommend?: number;
+  taxRate?: number;
   // 是否需要审核
   goodsReview?: number;
   // 管理入口
   adminUrl?: string;
   // 备注
   comments?: string;
+  startTime?: string;
+  endTime?: string;
+  isOn?: number;
   // 状态
   status?: number;
   // 排序号
diff --git a/src/api/shop/order/model/index.ts b/src/api/shop/order/model/index.ts
index 49f82f6..2059165 100644
--- a/src/api/shop/order/model/index.ts
+++ b/src/api/shop/order/model/index.ts
@@ -1,6 +1,8 @@
 import type { PageParam } from '@/api';
-import { ShopOrderGoods } from '@/api/shop/shopOrderGoods/model';
 import { OrderInfo } from '@/api/shop/orderInfo/model';
+import {OrderDelivery} from "@/api/shop/orderDelivery/model";
+import {OrderGoods} from "@/api/shop/orderGoods/model";
+import {Merchant} from "@/api/shop/merchant/model";
 
 /**
  *
@@ -63,11 +65,11 @@ export interface Order {
   // 教练id
   coachId?: number;
   // 1微信支付，2积分，3支付宝，4现金，5POS机，6VIP月卡，7VIP年卡，8VIP次卡，9IC月卡，10IC年卡，11IC次卡，12免费，13VIP充值卡，14IC充值卡，15积分支付，16VIP季卡，17IC季卡
-  payType?: string;
+  payType?: number;
   // 1已付款，2未付款
-  payStatus?: string;
+  payStatus?: number;
   // 1已完成，2未使用，3已取消，4退款申请中，5退款被拒绝，6退款成功，7客户端申请退款
-  orderStatus?: string;
+  orderStatus?: number;
   // 优惠类型：0无、1抵扣优惠券、2折扣优惠券、3、VIP月卡、4VIP年卡，5VIP次卡、6VIP会员卡、7IC月卡、8IC年卡、9IC次卡、10IC会员卡、11免费订单、12VIP充值卡、13IC充值卡、14VIP季卡、15IC季卡
   couponType?: string;
   // 二维码地址，保存订单号，支付成功后才生成
@@ -88,6 +90,7 @@ export interface Order {
   updateTime?: number;
   // 付款时间
   payTime?: number;
+  deliveryType?: number;
   // 退款时间
   refundTime?: number;
   // 申请退款时间
@@ -106,8 +109,18 @@ export interface Order {
   deleted?: number;
   // 租户id
   tenantId?: number;
+  selfTakeMerchantId?: number;
+  selfTakeMerchantName?: string;
+  expressMerchantId?: number;
+  expressMerchantName?: string;
+  sendStartTime?: string;
+  sendEndTime?: string;
+  hasTakeGift?: number;
+  selfTakeMerchant?: Merchant;
+  merchant?: Merchant;
   orderInfo?: OrderInfo[];
-  orderGoods?: ShopOrderGoods[];
+  orderGoods?: OrderGoods[];
+  orderDelivery?: OrderDelivery
 }
 
 /**
diff --git a/src/api/shop/orderDelivery/index.ts b/src/api/shop/orderDelivery/index.ts
new file mode 100644
index 0000000..0fa12ce
--- /dev/null
+++ b/src/api/shop/orderDelivery/index.ts
@@ -0,0 +1,19 @@
+import request from '@/utils/request';
+import type { ApiResult } from '@/api';
+import { MODULES_API_URL } from '@/config/setting';
+import {OrderDelivery} from "@/api/shop/orderDelivery/model";
+
+
+/**
+ * 添加
+ */
+export async function addOrderDelivery(data: OrderDelivery) {
+  const res = await request.post<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/order-delivery',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
diff --git a/src/api/shop/orderDelivery/model/index.ts b/src/api/shop/orderDelivery/model/index.ts
new file mode 100644
index 0000000..2f923f7
--- /dev/null
+++ b/src/api/shop/orderDelivery/model/index.ts
@@ -0,0 +1,27 @@
+import type { PageParam } from '@/api';
+import {Express} from "@/api/shop/express/model";
+
+/**
+ *
+ */
+export interface OrderDelivery {
+  //
+  deliveryId?: number;
+  orderId?: number;
+  deliveryMethod?: number;
+  expressId?: number;
+  expressNo?: string;
+  eorderHtml?: string;
+  // 创建时间
+  createTime?: string;
+  express?: Express;
+}
+
+/**
+ * 搜索条件
+ */
+export interface OrderDeliveryParam extends PageParam {
+  id?: number;
+  oid?: number;
+  keywords?: string;
+}
diff --git a/src/api/shop/splash/index.ts b/src/api/shop/splash/index.ts
new file mode 100644
index 0000000..02e7abe
--- /dev/null
+++ b/src/api/shop/splash/index.ts
@@ -0,0 +1,106 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api';
+import type { Splash, SplashParam } from './model';
+import { MODULES_API_URL } from '@/config/setting';
+
+/**
+ * 分页查询开屏广告
+ */
+export async function pageSplash(params: SplashParam) {
+  const res = await request.get<ApiResult<PageResult<Splash>>>(
+    MODULES_API_URL + '/shop/splash/page',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 查询开屏广告列表
+ */
+export async function listSplash(params?: SplashParam) {
+  const res = await request.get<ApiResult<Splash[]>>(
+    MODULES_API_URL + '/shop/splash',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 添加开屏广告
+ */
+export async function addSplash(data: Splash) {
+  const res = await request.post<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/splash',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 修改开屏广告
+ */
+export async function updateSplash(data: Splash) {
+  const res = await request.put<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/splash',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 删除开屏广告
+ */
+export async function removeSplash(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/splash/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 批量删除开屏广告
+ */
+export async function removeBatchSplash(data: (number | undefined)[]) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/splash/batch',
+    {
+      data
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 根据id查询开屏广告
+ */
+export async function getSplash(id: number) {
+  const res = await request.get<ApiResult<Splash>>(
+    MODULES_API_URL + '/shop/splash/' + id
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
diff --git a/src/api/shop/splash/model/index.ts b/src/api/shop/splash/model/index.ts
new file mode 100644
index 0000000..ba529ca
--- /dev/null
+++ b/src/api/shop/splash/model/index.ts
@@ -0,0 +1,50 @@
+import type {PageParam} from '@/api';
+
+/**
+ * 开屏广告
+ */
+export interface Splash {
+  //
+  id?: number;
+  // 标题
+  title?: string;
+  // 图片
+  image?: string;
+  // 跳转类型
+  jumpType?: string;
+  // 跳转主键
+  jumpPk?: number;
+  // 备注
+  comments?: string;
+  // 排序号
+  sortNumber?: number;
+  // 用户ID
+  userId?: number;
+  // 是否删除, 0否, 1是
+  deleted?: number;
+  // 租户id
+  tenantId?: number;
+  // 创建时间
+  createTime?: string;
+  // 修改时间
+  updateTime?: string;
+}
+
+/**
+ * 开屏广告搜索条件
+ */
+export interface SplashParam extends PageParam {
+  id?: number;
+  keywords?: string;
+}
+
+export const SplashJumpType = [
+  {
+    label: '商品',
+    value: 'goods'
+  },
+  {
+    label: '店铺',
+    value: 'merchant'
+  }
+]
diff --git a/src/api/shop/swiper/index.ts b/src/api/shop/swiper/index.ts
new file mode 100644
index 0000000..b9d1594
--- /dev/null
+++ b/src/api/shop/swiper/index.ts
@@ -0,0 +1,106 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api';
+import type { Swiper, SwiperParam } from './model';
+import { MODULES_API_URL } from '@/config/setting';
+
+/**
+ * 分页查询轮播图
+ */
+export async function pageSwiper(params: SwiperParam) {
+  const res = await request.get<ApiResult<PageResult<Swiper>>>(
+    MODULES_API_URL + '/shop/swiper/page',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 查询轮播图列表
+ */
+export async function listSwiper(params?: SwiperParam) {
+  const res = await request.get<ApiResult<Swiper[]>>(
+    MODULES_API_URL + '/shop/swiper',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 添加轮播图
+ */
+export async function addSwiper(data: Swiper) {
+  const res = await request.post<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/swiper',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 修改轮播图
+ */
+export async function updateSwiper(data: Swiper) {
+  const res = await request.put<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/swiper',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 删除轮播图
+ */
+export async function removeSwiper(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/swiper/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 批量删除轮播图
+ */
+export async function removeBatchSwiper(data: (number | undefined)[]) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/swiper/batch',
+    {
+      data
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 根据id查询轮播图
+ */
+export async function getSwiper(id: number) {
+  const res = await request.get<ApiResult<Swiper>>(
+    MODULES_API_URL + '/shop/swiper/' + id
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
diff --git a/src/api/shop/swiper/model/index.ts b/src/api/shop/swiper/model/index.ts
new file mode 100644
index 0000000..d003ad7
--- /dev/null
+++ b/src/api/shop/swiper/model/index.ts
@@ -0,0 +1,79 @@
+import type { PageParam } from '@/api';
+
+/**
+ * 轮播图
+ */
+export interface Swiper {
+  //
+  id?: number;
+  // 所属页面
+  type?: string;
+  // 图片
+  image?: string;
+  // 跳转类型
+  jumpType?: string;
+  // 跳转主键
+  jumpPk?: number;
+  // 备注
+  comments?: string;
+  color?: string;
+  // 排序号
+  sortNumber?: number;
+  // 用户ID
+  userId?: number;
+  // 是否删除, 0否, 1是
+  deleted?: number;
+  // 租户id
+  tenantId?: number;
+  // 创建时间
+  createTime?: string;
+  // 修改时间
+  updateTime?: string;
+}
+
+/**
+ * 轮播图搜索条件
+ */
+export interface SwiperParam extends PageParam {
+  id?: number;
+  keywords?: string;
+}
+
+
+export const SwiperType = [
+  {
+    label: '会员商城',
+    value: '会员商城'
+  },
+  {
+    label: '会员店',
+    value: '会员店'
+  },
+  {
+    label: '实体连锁店',
+    value: '实体连锁店'
+  },
+  {
+    label: '会员超市',
+    value: '会员超市'
+  },
+  {
+    label: '物流配送',
+    value: '物流配送'
+  },
+  {
+    label: '设计征集',
+    value: '设计征集'
+  },
+  {
+    label: '招商',
+    value: '招商'
+  },
+]
+
+export const SwiperJumpType = [
+  {
+    label: '商品',
+    value: 'goods'
+  }
+]
diff --git a/src/api/shop/userCollection/index.ts b/src/api/shop/userCollection/index.ts
new file mode 100644
index 0000000..d737555
--- /dev/null
+++ b/src/api/shop/userCollection/index.ts
@@ -0,0 +1,106 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api';
+import type { UserCollection, UserCollectionParam } from './model';
+import { MODULES_API_URL } from '@/config/setting';
+
+/**
+ * 分页查询我的收藏
+ */
+export async function pageUserCollection(params: UserCollectionParam) {
+  const res = await request.get<ApiResult<PageResult<UserCollection>>>(
+    MODULES_API_URL + '/shop/user-collection/page',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 查询我的收藏列表
+ */
+export async function listUserCollection(params?: UserCollectionParam) {
+  const res = await request.get<ApiResult<UserCollection[]>>(
+    MODULES_API_URL + '/shop/user-collection',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 添加我的收藏
+ */
+export async function addUserCollection(data: UserCollection) {
+  const res = await request.post<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/user-collection',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 修改我的收藏
+ */
+export async function updateUserCollection(data: UserCollection) {
+  const res = await request.put<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/user-collection',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 删除我的收藏
+ */
+export async function removeUserCollection(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/user-collection/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 批量删除我的收藏
+ */
+export async function removeBatchUserCollection(data: (number | undefined)[]) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/user-collection/batch',
+    {
+      data
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 根据id查询我的收藏
+ */
+export async function getUserCollection(id: number) {
+  const res = await request.get<ApiResult<UserCollection>>(
+    MODULES_API_URL + '/shop/user-collection/' + id
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
diff --git a/src/api/shop/userCollection/model/index.ts b/src/api/shop/userCollection/model/index.ts
new file mode 100644
index 0000000..c83c5ee
--- /dev/null
+++ b/src/api/shop/userCollection/model/index.ts
@@ -0,0 +1,27 @@
+import type { PageParam } from '@/api';
+
+/**
+ * 我的收藏
+ */
+export interface UserCollection {
+  // 主键ID
+  id?: number;
+  // 0店铺，1商品
+  type?: string;
+  // 租户ID
+  tid?: number;
+  // 用户ID
+  userId?: number;
+  // 租户id
+  tenantId?: number;
+  // 注册时间
+  createTime?: string;
+}
+
+/**
+ * 我的收藏搜索条件
+ */
+export interface UserCollectionParam extends PageParam {
+  id?: number;
+  keywords?: string;
+}
diff --git a/src/components/PayMethod/index.vue b/src/components/PayMethod/index.vue
index 3f810e8..73c19f1 100644
--- a/src/components/PayMethod/index.vue
+++ b/src/components/PayMethod/index.vue
@@ -60,6 +60,12 @@
       label: '现金支付',
       key: 'cashPayment',
       icon: 'PayCircleOutlined'
+    },
+    {
+      value: 16,
+      label: '代付',
+      key: 'friendPayment',
+      icon: 'https://oss.wsdns.cn/20241002/3fe17586c7394a1290fd0dae03eb1f24.png'
     }
   ]);
 
diff --git a/src/components/SelectFile/components/select-data.vue b/src/components/SelectFile/components/select-data.vue
index a039bbf..d052cda 100644
--- a/src/components/SelectFile/components/select-data.vue
+++ b/src/components/SelectFile/components/select-data.vue
@@ -1,164 +1,166 @@
 <template>
-    <ele-modal
-        width="75%"
-        :visible="visible"
-        :maskClosable="false"
-        :title="title"
-        :footer="null"
-        :body-style="{ paddingBottom: '28px' }"
-        @update:visible="updateVisible"
+  <ele-modal
+    width="75%"
+    :visible="visible"
+    :maskClosable="false"
+    :title="title"
+    :footer="null"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+  >
+    <ele-pro-table
+      ref="tableRef"
+      row-key="id"
+      :datasource="datasource"
+      :columns="columns"
+      :customRow="customRow"
+      :pagination="false"
     >
-        <ele-pro-table
-            ref="tableRef"
-            row-key="id"
-            :datasource="datasource"
-            :columns="columns"
-            :customRow="customRow"
-            :pagination="false"
-        >
-            <template #toolbar>
-                <div class="ele-cell">
-                    <div class="ele-cell-content">
-                        <a-space>
-                            <a-upload
-                                v-if="type == 'video'"
-                                :show-upload-list="false"
-                                :customRequest="onUpload"
-                                :accept="'.mp4'"
-                            >
-                                <a-button type="primary" class="ele-btn-icon">
-                                    <template #icon>
-                                        <UploadOutlined/>
-                                    </template>
-                                    <span>上传视频</span>
-                                </a-button>
-                            </a-upload>
-                            <a-upload
-                                v-else-if="type == 'audio'"
-                                :show-upload-list="false"
-                                :customRequest="onUpload"
-                                :accept="'.mp3'"
-                            >
-                                <a-button type="primary" class="ele-btn-icon">
-                                    <template #icon>
-                                        <UploadOutlined/>
-                                    </template>
-                                    <span>上传音频</span>
-                                </a-button>
-                            </a-upload>
-                            <a-upload
-                                v-else-if="type == 'file'"
-                                :show-upload-list="false"
-                                :customRequest="onUpload"
-                                :accept="'.xls,.xlsx,.pdf,.doc,.docx'"
-                            >
-                                <a-button type="primary" class="ele-btn-icon">
-                                    <template #icon>
-                                        <UploadOutlined/>
-                                    </template>
-                                    <span>上传文件</span>
-                                </a-button>
-                            </a-upload>
-                            <a-upload
-                                v-else
-                                :show-upload-list="false"
-                                :accept="'image/*,application/*'"
-                                :customRequest="onUpload"
-                            >
-                                <a-button type="primary" class="ele-btn-icon">
-                                    <template #icon>
-                                        <UploadOutlined/>
-                                    </template>
-                                    <span>上传图片</span>
-                                </a-button>
-                            </a-upload>
-                            <a-select
-                                show-search
-                                allow-clear
-                                v-model:value="dictDataId"
-                                optionFilterProp="label"
-                                :options="groupList"
-                                style="margin-left: 20px; width: 200px"
-                                placeholder="请选择分组"
-                                @select="onGroupId"
-                            />
-                            <a-input-search
-                                allow-clear
-                                v-model:value="searchText"
-                                placeholder="请输入搜索关键词"
-                                style="width: 240px"
-                                @search="reload"
-                                @pressEnter="reload"
-                            />
-                        </a-space>
-                    </div>
-                    <a-button
-                        style="margin-right: 20px"
-                        @click="openUrl('/cms/photo/dict')"
-                    >管理分组
-                    </a-button
-                    >
-                </div>
-            </template>
-            <template #bodyCell="{ column, record }">
-                <template v-if="column.key === 'path'">
-                    <!-- 文件类型 -->
-                    <template v-if="!isImage(record.path)">
-                        <span class="ele-text-secondary">[文件]</span>
-                    </template>
-                    <!-- 含http -->
-                    <template v-else-if="record.path.indexOf('http') == 0">
-                        <a-image
-                            :src="`${record.path}`"
-                            :preview="{
+      <template #toolbar>
+        <div class="ele-cell">
+          <div class="ele-cell-content">
+            <a-space>
+              <a-upload
+                v-if="type == 'video'"
+                :show-upload-list="false"
+                :customRequest="onUpload"
+                :accept="'.mp4'"
+              >
+                <a-button type="primary" class="ele-btn-icon">
+                  <template #icon>
+                    <UploadOutlined/>
+                  </template>
+                  <span>上传视频</span>
+                </a-button>
+              </a-upload>
+              <a-upload
+                v-else-if="type == 'audio'"
+                :show-upload-list="false"
+                :customRequest="onUpload"
+                :accept="'.mp3'"
+              >
+                <a-button type="primary" class="ele-btn-icon">
+                  <template #icon>
+                    <UploadOutlined/>
+                  </template>
+                  <span>上传音频</span>
+                </a-button>
+              </a-upload>
+              <a-upload
+                v-else-if="type == 'file'"
+                :show-upload-list="false"
+                :customRequest="onUpload"
+                :accept="'.xls,.xlsx,.pdf,.doc,.docx'"
+              >
+                <a-button type="primary" class="ele-btn-icon">
+                  <template #icon>
+                    <UploadOutlined/>
+                  </template>
+                  <span>上传文件</span>
+                </a-button>
+              </a-upload>
+              <a-upload
+                v-else
+                :show-upload-list="false"
+                :accept="'image/*,application/*'"
+                :customRequest="onUpload"
+              >
+                <a-button type="primary" class="ele-btn-icon">
+                  <template #icon>
+                    <UploadOutlined/>
+                  </template>
+                  <span>上传图片</span>
+                </a-button>
+              </a-upload>
+              <a-select
+                show-search
+                allow-clear
+                v-model:value="dictDataId"
+                optionFilterProp="label"
+                :options="groupList"
+                style="margin-left: 20px; width: 200px"
+                placeholder="请选择分组"
+                @select="onGroupId"
+              />
+              <a-input-search
+                allow-clear
+                v-model:value="searchText"
+                placeholder="请输入搜索关键词"
+                style="width: 240px"
+                @search="reload"
+                @pressEnter="reload"
+              />
+            </a-space>
+          </div>
+          <a-button
+            style="margin-right: 20px"
+            @click="openUrl('/cms/photo/dict')"
+          >管理分组
+          </a-button
+          >
+        </div>
+      </template>
+      <template #bodyCell="{ column, record }">
+        <template v-if="column.key === 'path'">
+          <!-- 文件类型 -->
+          <template v-if="!isImage(record.path)">
+            <span class="ele-text-secondary">[文件]</span>
+          </template>
+          <!-- 含http -->
+          <template v-else-if="record.path.indexOf('http') == 0">
+            <div class="bg-gray-300">
+              <a-image
+                :src="`${record.path}`"
+                :preview="{
                 src: `${record.downloadUrl}`
               }"
-                            :width="100"
-                        />
-                    </template>
-                    <!-- path -->
-                    <template v-else>
-                        <a-image
-                            :src="`https://oss.wsdns.cn/${record.path}`"
-                            :width="120"
-                        />
-                    </template>
-                </template>
-                <template v-if="column.dataIndex === 'name'">
-                    <a-space class="ele-cell" style="display: flex">
-                        <span>{{ record.name }}</span>
-                        <EditOutlined title="编辑" @click="openEdit(record)"/>
-                    </a-space>
-                </template>
-                <template v-if="column.key === 'action'">
-                    <template v-if="pageId == record.pageId">
-                        <a-radio v-model:checked="checked" @click="onRadio(record)"/>
-                    </template>
-                    <template v-else>
-                        <a-space>
-                            <lebal>
-                                <a-radio @click="onRadio(record)"/>
-                                <a class="ele-text-success">选择</a>
-                            </lebal>
-                            <a-divider type="vertical"/>
-                            <a class="ele-text-placeholder">编辑</a>
-                            <a-divider type="vertical"/>
-                            <a class="ele-text-placeholder">删除</a>
-                        </a-space>
-                    </template>
-                </template>
-            </template>
-        </ele-pro-table>
-    </ele-modal>
-    <!-- 编辑弹窗 -->
-    <FileRecordEdit v-model:visible="showEdit" :data="current" @done="reload"/>
+                :width="100"
+              />
+            </div>
+          </template>
+          <!-- path -->
+          <template v-else>
+            <a-image
+              :src="`https://oss.wsdns.cn/${record.path}`"
+              :width="120"
+            />
+          </template>
+        </template>
+        <template v-if="column.dataIndex === 'name'">
+          <a-space class="ele-cell" style="display: flex">
+            <span>{{ record.name }}</span>
+            <EditOutlined title="编辑" @click="openEdit(record)"/>
+          </a-space>
+        </template>
+        <template v-if="column.key === 'action'">
+          <template v-if="pageId == record.pageId">
+            <a-radio v-model:checked="checked" @click="onRadio(record)"/>
+          </template>
+          <template v-else>
+            <a-space>
+              <lebal>
+                <a-radio @click="onRadio(record)"/>
+                <a class="ele-text-success">选择</a>
+              </lebal>
+              <a-divider type="vertical"/>
+              <a class="ele-text-placeholder">编辑</a>
+              <a-divider type="vertical"/>
+              <a class="ele-text-placeholder">删除</a>
+            </a-space>
+          </template>
+        </template>
+      </template>
+    </ele-pro-table>
+  </ele-modal>
+  <!-- 编辑弹窗 -->
+  <FileRecordEdit v-model:visible="showEdit" :data="current" @done="reload"/>
 </template>
 
 <script lang="ts" setup>
 import {ref, watch} from 'vue';
 import {
-    ColumnItem,
-    DatasourceFunction
+  ColumnItem,
+  DatasourceFunction
 } from 'ele-admin-pro/es/ele-pro-table/types';
 import {pageFiles, uploadOss, uploadOssByGroupId} from '@/api/system/file';
 import {EleProTable, messageLoading} from 'ele-admin-pro';
@@ -171,24 +173,24 @@ import {message} from 'ant-design-vue/es';
 import FileRecordEdit from './file-record-edit.vue';
 
 const props = defineProps<{
-    // 弹窗是否打开
-    visible: boolean;
-    // 标题
-    title?: string;
-    // 文件类型
-    type?: string;
-    // 修改回显的数据
-    data?: FileRecord | null;
+  // 弹窗是否打开
+  visible: boolean;
+  // 标题
+  title?: string;
+  // 文件类型
+  type?: string;
+  // 修改回显的数据
+  data?: FileRecord | null;
 }>();
 
 const emit = defineEmits<{
-    (e: 'done', data: FileRecord): void;
-    (e: 'update:visible', visible: boolean): void;
+  (e: 'done', data: FileRecord): void;
+  (e: 'update:visible', visible: boolean): void;
 }>();
 
 /* 更新visible */
 const updateVisible = (value: boolean) => {
-    emit('update:visible', value);
+  emit('update:visible', value);
 };
 
 // 搜索内容
@@ -205,190 +207,190 @@ const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
 
 // 表格配置
 const columns = ref<ColumnItem[]>([
-    {
-        title: 'ID',
-        dataIndex: 'id'
-    },
-    {
-        title: '图片',
-        dataIndex: 'path',
-        key: 'path'
-    },
-    {
-        title: '名称',
-        dataIndex: 'name',
-        key: 'name'
-    },
-    {
-        title: '大小',
-        dataIndex: 'length',
-        key: 'length',
-        customRender: ({text}) => {
-            if (text < 1024) {
-                return text + 'B';
-            } else if (text < 1024 * 1024) {
-                return (text / 1024).toFixed(1) + 'KB';
-            } else if (text < 1024 * 1024 * 1024) {
-                return (text / 1024 / 1024).toFixed(1) + 'M';
-            } else {
-                return (text / 1024 / 1024 / 1024).toFixed(1) + 'G';
-            }
-        }
-    },
-    {
-        title: '操作',
-        key: 'action',
-        align: 'center'
+  {
+    title: 'ID',
+    dataIndex: 'id'
+  },
+  {
+    title: '图片',
+    dataIndex: 'path',
+    key: 'path'
+  },
+  {
+    title: '名称',
+    dataIndex: 'name',
+    key: 'name'
+  },
+  {
+    title: '大小',
+    dataIndex: 'length',
+    key: 'length',
+    customRender: ({text}) => {
+      if (text < 1024) {
+        return text + 'B';
+      } else if (text < 1024 * 1024) {
+        return (text / 1024).toFixed(1) + 'KB';
+      } else if (text < 1024 * 1024 * 1024) {
+        return (text / 1024 / 1024).toFixed(1) + 'M';
+      } else {
+        return (text / 1024 / 1024 / 1024).toFixed(1) + 'G';
+      }
     }
+  },
+  {
+    title: '操作',
+    key: 'action',
+    align: 'center'
+  }
 ]);
 
 // 表格数据源
 const datasource: DatasourceFunction = ({page, limit, where, orders}) => {
-    where = {};
-    // 搜索条件
-    if (searchText.value) {
-        where.name = searchText.value;
+  where = {};
+  // 搜索条件
+  if (searchText.value) {
+    where.name = searchText.value;
+  }
+  if (dictDataId.value) {
+    where.groupId = dictDataId.value;
+  }
+  if (props.type) {
+    let contentTypes = ''
+    switch (props.type) {
+      case 'audio' : {
+        contentTypes = 'audio/mpeg';
+      }
+        break;
+      case 'file' : {
+        contentTypes = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/pdf,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+      }
+        break;
+      case 'video' : {
+        contentTypes = 'video/mp4';
+      }
+        break;
+      default : {
+        contentTypes = 'image/jpeg,image/png,image/jpg';
+      }
+        break;
     }
-    if (dictDataId.value) {
-        where.groupId = dictDataId.value;
-    }
-    if (props.type) {
-        let contentTypes = ''
-        switch (props.type) {
-            case 'audio' : {
-                contentTypes = 'audio/mpeg';
-            }
-                break;
-            case 'file' : {
-                contentTypes = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/pdf,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
-            }
-                break;
-            case 'video' : {
-                contentTypes = 'video/mp4';
-            }
-                break;
-            default : {
-                contentTypes = 'image/jpeg,image/png,image/jpg';
-            }
-                break;
-        }
-        where.contentTypes = contentTypes;
-    }
-    return pageFiles({
-        ...where,
-        ...orders,
-        page,
-        limit
-    });
+    where.contentTypes = contentTypes;
+  }
+  return pageFiles({
+    ...where,
+    ...orders,
+    page,
+    limit
+  });
 };
 
 /* 搜索 */
 const reload = (where?: FileRecordParam) => {
-    tableRef?.value?.reload({page: 1, where});
+  tableRef?.value?.reload({page: 1, where});
 };
 
 const onRadio = (record: FileRecord) => {
-    pageId.value = Number(record.id);
-    updateVisible(false);
-    emit('done', record);
+  pageId.value = Number(record.id);
+  updateVisible(false);
+  emit('done', record);
 };
 
 const getGroupList = () => {
-    pageDictData({dictCode: 'groupId'}).then((res) => {
-        groupList.value = res?.list.map((d) => {
-            return {
-                label: d.dictDataName,
-                value: d.dictDataId
-            };
-        });
+  pageDictData({dictCode: 'groupId'}).then((res) => {
+    groupList.value = res?.list.map((d) => {
+      return {
+        label: d.dictDataName,
+        value: d.dictDataId
+      };
     });
+  });
 };
 
 const onGroupId = (index: number) => {
-    dictDataId.value = index;
-    reload();
+  dictDataId.value = index;
+  reload();
 };
 
 // 上传文件
 const onUpload = (item) => {
-    const {file} = item;
-    if (!file.type.startsWith('image') && props.type && !['video', 'audio', 'file'].includes(props.type)) {
-        message.error('只能选择图片');
-        return;
+  const {file} = item;
+  if (!file.type.startsWith('image') && props.type && !['video', 'audio', 'file'].includes(props.type)) {
+    message.error('只能选择图片');
+    return;
+  }
+  if (props.type == 'video') {
+    if (file.size / 1024 / 1024 > 100) {
+      message.error('大小不能超过 100MB');
+      return;
     }
-    if (props.type == 'video') {
-        if (file.size / 1024 / 1024 > 100) {
-            message.error('大小不能超过 100MB');
-            return;
-        }
-    } else if (props.type == 'audio') {
-        if (file.size / 1024 / 1024 > 20) {
-            message.error('大小不能超过 20MB');
-            return;
-        }
-    } else {
-        if (file.size / 1024 / 1024 > 10) {
-            message.error('大小不能超过 10MB');
-            return;
-        }
+  } else if (props.type == 'audio') {
+    if (file.size / 1024 / 1024 > 20) {
+      message.error('大小不能超过 20MB');
+      return;
     }
-    const hide = messageLoading({
-        content: '上传中..',
-        duration: 0,
-        mask: true
-    });
-    if (dictDataId.value > 0) {
-        uploadOssByGroupId(file, dictDataId.value)
-            .then(() => {
-                hide();
-                message.success('上传成功');
-                reload();
-            })
-            .catch((e) => {
-                message.error(e.message);
-                hide();
-            });
-    } else {
-        uploadOss(file)
-            .then(() => {
-                hide();
-                message.success('上传成功');
-                reload();
-            })
-            .catch((e) => {
-                message.error(e.message);
-                hide();
-            });
+  } else {
+    if (file.size / 1024 / 1024 > 10) {
+      message.error('大小不能超过 10MB');
+      return;
     }
+  }
+  const hide = messageLoading({
+    content: '上传中..',
+    duration: 0,
+    mask: true
+  });
+  if (dictDataId.value > 0) {
+    uploadOssByGroupId(file, dictDataId.value)
+      .then(() => {
+        hide();
+        message.success('上传成功');
+        reload();
+      })
+      .catch((e) => {
+        message.error(e.message);
+        hide();
+      });
+  } else {
+    uploadOss(file)
+      .then(() => {
+        hide();
+        message.success('上传成功');
+        reload();
+      })
+      .catch((e) => {
+        message.error(e.message);
+        hide();
+      });
+  }
 };
 
 const openEdit = (row?: FileRecord) => {
-    current.value = row ?? null;
-    showEdit.value = true;
+  current.value = row ?? null;
+  showEdit.value = true;
 };
 
 /* 自定义行属性 */
 const customRow = (record: FileRecord) => {
-    return {
-        // 行点击事件
-        // onClick: () => {
-        //   updateVisible(false);
-        //   emit('done', record);
-        // },
-        // 行双击事件
-        onDblclick: () => {
-            updateVisible(false);
-            emit('done', record);
-        }
-    };
+  return {
+    // 行点击事件
+    // onClick: () => {
+    //   updateVisible(false);
+    //   emit('done', record);
+    // },
+    // 行双击事件
+    onDblclick: () => {
+      updateVisible(false);
+      emit('done', record);
+    }
+  };
 };
 
 watch(
-    () => props.visible,
-    (visible) => {
-        if (visible) {
-            getGroupList();
-        }
+  () => props.visible,
+  (visible) => {
+    if (visible) {
+      getGroupList();
     }
+  }
 );
 </script>
diff --git a/src/components/SelectFile/index.vue b/src/components/SelectFile/index.vue
index 03ade59..1240251 100644
--- a/src/components/SelectFile/index.vue
+++ b/src/components/SelectFile/index.vue
@@ -3,12 +3,20 @@
         align-items: center;
         justify-content: flex-start;flex-wrap: wrap">
     <template v-for="(item, index) in data" :key="index">
-      <video v-if="type === 'video'" :src="item.url" style="width: 400px; height: 200px" controls="controls"></video>
+      <div v-if="type === 'video' || item.url.includes('.mp4')" class="relative cursor-pointer" @click="open(item.url)">
+        <img
+          :src="item.url + '?x-oss-process=video/snapshot,t_2000,f_jpg,w_200,h_200'"
+          style="width: 80px; height: 80px"
+        />
+        <div class="absolute" style="left: 30px; top: 30px">
+          <play-circle-outlined style="font-size: 20px; color:white"/>
+        </div>
+      </div>
       <a-tag :key="item.url" closable @close="onDeleteItem(index)"
              @click.native="open(item.url)" style="cursor: pointer"
              v-else-if="type && ['audio', 'file'].includes(type)"> {{ item.url }}
       </a-tag>
-      <div class="image-upload-item" v-else>
+      <div class="image-upload-item bg-gray-300" v-else>
         <a-image-preview-group>
           <a-image
             :width="width"
@@ -57,7 +65,7 @@
 </template>
 
 <script lang="ts" setup>
-import {PlusOutlined, CloseOutlined} from '@ant-design/icons-vue';
+import {PlusOutlined, CloseOutlined, PlayCircleOutlined} from '@ant-design/icons-vue';
 import {ref} from 'vue';
 import SelectData from './components/select-data.vue';
 import {FileRecord} from '@/api/system/file/model';
diff --git a/src/components/SelectMerchant/components/select-data.vue b/src/components/SelectMerchant/components/select-data.vue
index e0439a8..0a8a211 100644
--- a/src/components/SelectMerchant/components/select-data.vue
+++ b/src/components/SelectMerchant/components/select-data.vue
@@ -64,6 +64,7 @@
     title?: string;
     // 商户类型
     shopType?: string;
+    type?: string;
     // 修改回显的数据
     data?: Merchant | null;
   }>();
@@ -99,7 +100,7 @@
     {
       title: '商户类型',
       dataIndex: 'shopType',
-      key: 'shopType'
+      // key: 'shopType'
     },
     {
       title: '操作',
@@ -120,6 +121,9 @@
     } else {
       where.shopType = props.shopType;
     }
+    if (props.type) {
+      where.type = props.type;
+    }
     return pageMerchant({
       ...where,
       ...orders,
diff --git a/src/components/SelectMerchant/index.vue b/src/components/SelectMerchant/index.vue
index 81c140f..f51e3b1 100644
--- a/src/components/SelectMerchant/index.vue
+++ b/src/components/SelectMerchant/index.vue
@@ -17,6 +17,7 @@
       :data="current"
       :title="placeholder"
       :customer-type="customerType"
+      :shopType="shopType"
       @done="onChange"
     />
   </div>
@@ -33,6 +34,7 @@
       value?: any;
       customerType?: string;
       placeholder?: string;
+      shopType?: string;
     }>(),
     {
       placeholder: '请选择商户'
diff --git a/src/views/cms/ad/components/ad-edit.vue b/src/views/cms/ad/components/ad-edit.vue
index 15bdb3a..9829984 100644
--- a/src/views/cms/ad/components/ad-edit.vue
+++ b/src/views/cms/ad/components/ad-edit.vue
@@ -355,6 +355,7 @@ watch(
               status: 'done'
             });
           });
+          console.log(images.value)
         }
         // if (props.data.adType == '幻灯片') {
         //   const arr = JSON.parse(props.data.path);
diff --git a/src/views/cms/article/components/articleEdit.vue b/src/views/cms/article/components/articleEdit.vue
index fbdac84..8dd8433 100644
--- a/src/views/cms/article/components/articleEdit.vue
+++ b/src/views/cms/article/components/articleEdit.vue
@@ -42,7 +42,7 @@
               v-model:value="form.title"
             />
           </a-form-item>
-          <a-form-item label="文章图片" name="image">
+          <a-form-item label="文章图片/视频" name="image">
             <SelectFile
               :placeholder="`请选择图片`"
               :limit="1"
@@ -137,8 +137,6 @@
   import { listArticleCategory } from "@/api/cms/category";
   import { Navigation } from "@/api/cms/navigation/model";
   import SourceSelect from "@/views/cms/article/dictionary/source-select.vue";
-  import { getCmsArticleContent } from "@/api/cms/cmsArticleContent";
-  import { isImage } from "@/utils/common";
   import { getMerchantId } from "@/utils/merchant";
 
   // 是否是修改
@@ -289,6 +287,7 @@
   });
 
   const chooseImage = (data: FileRecord) => {
+    console.log(data)
     images.value.push({
       uid: data.id,
       url: data.path,
diff --git a/src/views/cms/designCategory/components/designCategoryEdit.vue b/src/views/cms/designCategory/components/designCategoryEdit.vue
new file mode 100644
index 0000000..efb0150
--- /dev/null
+++ b/src/views/cms/designCategory/components/designCategoryEdit.vue
@@ -0,0 +1,142 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑设计征集报名分类' : '添加设计征集报名分类'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="标题" name="title">
+        <a-input
+          allow-clear
+          placeholder="请输入标题"
+          v-model:value="form.title"
+        />
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+import {ref, reactive, watch} from 'vue';
+import {Form, message} from 'ant-design-vue';
+import {assignObject, uuid} from 'ele-admin-pro';
+import {addDesignCategory, updateDesignCategory} from '@/api/cms/designCategory';
+import {DesignCategory} from '@/api/cms/designCategory/model';
+import {useThemeStore} from '@/store/modules/theme';
+import {storeToRefs} from 'pinia';
+import {ItemType} from 'ele-admin-pro/es/ele-image-upload/types';
+import {FormInstance} from 'ant-design-vue/es/form';
+
+// 是否是修改
+const isUpdate = ref(false);
+const useForm = Form.useForm;
+// 是否开启响应式布局
+const themeStore = useThemeStore();
+const {styleResponsive} = storeToRefs(themeStore);
+
+const props = defineProps<{
+  // 弹窗是否打开
+  visible: boolean;
+  // 修改回显的数据
+  data?: DesignCategory | null;
+}>();
+
+const emit = defineEmits<{
+  (e: 'done'): void;
+  (e: 'update:visible', visible: boolean): void;
+}>();
+
+// 提交状态
+const loading = ref(false);
+// 是否显示最大化切换按钮
+const maxable = ref(true);
+// 表格选中数据
+const formRef = ref<FormInstance | null>(null);
+
+// 用户信息
+const form = reactive<DesignCategory>({
+  id: undefined,
+  title: undefined,
+  userId: undefined,
+  sortNumber: undefined,
+});
+
+/* 更新visible */
+const updateVisible = (value: boolean) => {
+  emit('update:visible', value);
+};
+
+// 表单验证规则
+const rules = reactive({
+  designCategoryName: [
+    {
+      required: true,
+      type: 'string',
+      message: '请填写设计征集报名分类名称',
+      trigger: 'blur'
+    }
+  ]
+});
+
+const {resetFields} = useForm(form, rules);
+
+/* 保存编辑 */
+const save = () => {
+  if (!formRef.value) {
+    return;
+  }
+  formRef.value
+    .validate()
+    .then(() => {
+      loading.value = true;
+      const formData = {
+        ...form
+      };
+      const saveOrUpdate = isUpdate.value ? updateDesignCategory : addDesignCategory;
+      saveOrUpdate(formData)
+        .then((msg) => {
+          loading.value = false;
+          message.success(msg);
+          updateVisible(false);
+          emit('done');
+        })
+        .catch((e) => {
+          loading.value = false;
+          message.error(e.message);
+        });
+    })
+    .catch(() => {
+    });
+};
+
+watch(
+  () => props.visible,
+  (visible) => {
+    if (visible) {
+      if (props.data) {
+        assignObject(form, props.data);
+        isUpdate.value = true;
+      } else {
+        isUpdate.value = false;
+      }
+    } else {
+      resetFields();
+    }
+  },
+  {immediate: true}
+);
+</script>
diff --git a/src/views/cms/designCategory/components/search.vue b/src/views/cms/designCategory/components/search.vue
new file mode 100644
index 0000000..82fea9d
--- /dev/null
+++ b/src/views/cms/designCategory/components/search.vue
@@ -0,0 +1,42 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <a-button type="primary" class="ele-btn-icon" @click="add">
+      <template #icon>
+        <PlusOutlined />
+      </template>
+      <span>添加</span>
+    </a-button>
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import type { GradeParam } from '@/api/user/grade/model';
+  import { watch } from 'vue';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: GradeParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>
diff --git a/src/views/cms/designCategory/index.vue b/src/views/cms/designCategory/index.vue
new file mode 100644
index 0000000..75bd96b
--- /dev/null
+++ b/src/views/cms/designCategory/index.vue
@@ -0,0 +1,221 @@
+<template>
+  <div class="page">
+    <div class="ele-body">
+      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+        <ele-pro-table
+          ref="tableRef"
+          row-key="designCategoryId"
+          :columns="columns"
+          :datasource="datasource"
+          :customRow="customRow"
+          tool-class="ele-toolbar-form"
+          class="sys-org-table"
+        >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              @add="openEdit"
+              @remove="removeBatch"
+              @batchMove="openMove"
+            />
+          </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'image'">
+              <a-image :src="record.image" :width="50" />
+            </template>
+            <template v-if="column.key === 'status'">
+              <a-tag v-if="record.status === 0" color="green">显示</a-tag>
+              <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
+            </template>
+            <template v-if="column.key === 'action'">
+              <a-space>
+                <a @click="openEdit(record)">修改</a>
+                <a-divider type="vertical" />
+                <a-popconfirm
+                  title="确定要删除此记录吗？"
+                  @confirm="remove(record)"
+                >
+                  <a class="ele-text-danger">删除</a>
+                </a-popconfirm>
+              </a-space>
+            </template>
+          </template>
+        </ele-pro-table>
+      </a-card>
+
+      <!-- 编辑弹窗 -->
+      <DesignCategoryEdit v-model:visible="showEdit" :data="current" @done="reload" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { createVNode, ref } from 'vue';
+  import { message, Modal } from 'ant-design-vue';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import type { EleProTable } from 'ele-admin-pro';
+  import { toDateString } from 'ele-admin-pro';
+  import type {
+    DatasourceFunction,
+    ColumnItem
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import Search from './components/search.vue';
+  import DesignCategoryEdit from './components/designCategoryEdit.vue';
+  import { pageDesignCategory, removeDesignCategory, removeBatchDesignCategory } from '@/api/cms/designCategory';
+  import type { DesignCategory, DesignCategoryParam } from '@/api/cms/designCategory/model';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<DesignCategory[]>([]);
+  // 当前编辑数据
+  const current = ref<DesignCategory | null>(null);
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+  // 是否显示批量移动弹窗
+  const showMove = ref(false);
+  // 加载状态
+  const loading = ref(true);
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({
+    page,
+    limit,
+    where,
+    orders,
+    filters
+  }) => {
+    if (filters) {
+      where.status = filters.status;
+    }
+    return pageDesignCategory({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: 'ID',
+      dataIndex: 'id',
+      key: 'id',
+      align: 'center',
+      width: 90,
+    },
+    {
+      title: '标题',
+      dataIndex: 'title',
+      key: 'title',
+      align: 'center',
+    },
+    {
+      title: '创建时间',
+      dataIndex: 'createTime',
+      key: 'createTime',
+      align: 'center',
+      sorter: true,
+      ellipsis: true,
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
+    },
+    {
+      title: '操作',
+      key: 'action',
+      width: 180,
+      fixed: 'right',
+      align: 'center',
+      hideInSetting: true
+    }
+  ]);
+
+  /* 搜索 */
+  const reload = (where?: DesignCategoryParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: DesignCategory) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: DesignCategory) => {
+    const hide = message.loading('请求中..', 0);
+    removeDesignCategory(row.designCategoryId)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  /* 批量删除 */
+  const removeBatch = () => {
+    if (!selection.value.length) {
+      message.error('请至少选择一条数据');
+      return;
+    }
+    Modal.confirm({
+      title: '提示',
+      content: '确定要删除选中的记录吗?',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = message.loading('请求中..', 0);
+        removeBatchDesignCategory(selection.value.map((d) => d.designCategoryId))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 查询 */
+  const query = () => {
+    loading.value = true;
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: DesignCategory) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+  query();
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'DesignCategory'
+  };
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/cms/designCollect/components/designCollectEdit.vue b/src/views/cms/designCollect/components/designCollectEdit.vue
new file mode 100644
index 0000000..fddf018
--- /dev/null
+++ b/src/views/cms/designCollect/components/designCollectEdit.vue
@@ -0,0 +1,310 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑设计征集' : '添加设计征集'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+    >
+      <a-form-item label="标题" name="title">
+        <a-input
+          allow-clear
+          placeholder="请输入标题"
+          v-model:value="form.title"
+        />
+      </a-form-item>
+      <a-form-item label="分类" name="categoryId">
+        <a-select v-model:value="form.categoryId">
+          <a-select-option v-for="(item, index) in cateList" :key="index" :value="item.id">{{ item.title }}</a-select-option>
+        </a-select>
+      </a-form-item>
+      <a-form-item label="内容" required>
+        <tinymce-editor
+          ref="editorRef"
+          class="content"
+          v-model:value="content"
+          :init="config"
+          placeholder="图片直接粘贴自动上传"
+          @paste="onPaste"
+        />
+      </a-form-item>
+      <a-form-item
+        label="封面"
+        name="image">
+        <SelectFile
+          :placeholder="`请选择图片`"
+          :limit="1"
+          :data="images"
+          @done="chooseImage"
+          @del="onDeleteItem"
+        />
+      </a-form-item>
+      <a-form-item label="排序(数字越小越靠前)" name="sortNumber">
+        <a-input-number
+          :min="0"
+          :max="9999"
+          class="ele-fluid"
+          placeholder="请输入排序号"
+          v-model:value="form.sortNumber"
+        />
+      </a-form-item>
+      <a-form-item label="备注" name="comments">
+        <a-textarea
+          :rows="4"
+          :maxlength="200"
+          placeholder="请输入描述"
+          v-model:value="form.comments"
+        />
+      </a-form-item>
+
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+import {ref, reactive, watch} from 'vue';
+import {Form, message} from 'ant-design-vue';
+import {assignObject, uuid} from 'ele-admin-pro';
+import {addDesignCollect, updateDesignCollect} from '@/api/cms/designCollect';
+import {DesignCollect} from '@/api/cms/designCollect/model';
+import {useThemeStore} from '@/store/modules/theme';
+import {storeToRefs} from 'pinia';
+import {ItemType} from 'ele-admin-pro/es/ele-image-upload/types';
+import {FormInstance} from 'ant-design-vue/es/form';
+import {FileRecord} from '@/api/system/file/model';
+import TinymceEditor from "@/components/TinymceEditor/index.vue";
+import {uploadFile, uploadOss} from "@/api/system/file";
+import {DesignCategory} from "@/api/cms/designCategory/model";
+import {listDesignCategory} from "@/api/cms/designCategory";
+
+// 是否是修改
+const isUpdate = ref(false);
+const useForm = Form.useForm;
+// 是否开启响应式布局
+const themeStore = useThemeStore();
+const {styleResponsive} = storeToRefs(themeStore);
+
+const props = defineProps<{
+  // 弹窗是否打开
+  visible: boolean;
+  // 修改回显的数据
+  data?: DesignCollect | null;
+}>();
+
+const emit = defineEmits<{
+  (e: 'done'): void;
+  (e: 'update:visible', visible: boolean): void;
+}>();
+
+// 提交状态
+const loading = ref(false);
+// 是否显示最大化切换按钮
+const maxable = ref(true);
+// 表格选中数据
+const formRef = ref<FormInstance | null>(null);
+const images = ref<ItemType[]>([]);
+
+// 用户信息
+const form = reactive<DesignCollect>({
+  id: undefined,
+  title: undefined,
+  categoryId: undefined,
+  content: undefined,
+  image: undefined,
+  userId: undefined,
+  sortNumber: undefined,
+  comments: undefined,
+  status: undefined,
+  deleted: undefined,
+  tenantId: undefined,
+  createTime: undefined,
+  updateTime: undefined,
+});
+
+/* 更新visible */
+const updateVisible = (value: boolean) => {
+  emit('update:visible', value);
+};
+
+// 表单验证规则
+const rules = reactive({
+  title: [{required: true, message: '请输入标题', trigger: 'blur'}],
+  image: [{required: true, message: '请上传封面', trigger: 'blur'}],
+  categoryId: [{required: true, message: '请选择分类', trigger: 'blur'}],
+});
+
+const chooseImage = (data: FileRecord) => {
+  images.value.push({
+    uid: data.id,
+    url: data.path,
+    status: 'done'
+  });
+  form.image = data.path;
+};
+
+const onDeleteItem = (index: number) => {
+  images.value.splice(index, 1);
+  form.image = '';
+};
+
+const content = ref('');
+const editorRef = ref<InstanceType<typeof TinymceEditor> | null>(null);
+const config = ref({
+  height: 500,
+  images_upload_handler: (blobInfo, success, error) => {
+    const file = blobInfo.blob();
+    const formData = new FormData();
+    formData.append('file', file, file.name);
+    uploadOss(file).then(res => {
+      success(res.path)
+    }).catch((msg) => {
+      error(msg);
+    })
+  },
+  // 自定义文件上传(这里使用把选择的文件转成 blob 演示)
+  file_picker_callback: (callback: any, _value: any, meta: any) => {
+    const input = document.createElement('input');
+    input.setAttribute('type', 'file');
+    // 设定文件可选类型
+    if (meta.filetype === 'image') {
+      input.setAttribute('accept', 'image/*');
+    } else if (meta.filetype === 'media') {
+      input.setAttribute('accept', 'video/*,.pdf');
+    }
+    input.onchange = () => {
+      const file = input.files?.[0];
+      if (!file) {
+        return;
+      }
+      if (meta.filetype === 'media') {
+        if (file.size / 1024 / 1024 > 200) {
+          editorRef.value?.alert({content: '大小不能超过 200MB'});
+          return;
+        }
+        if (file.type.startsWith('application/pdf')) {
+          uploadOss(file).then(res => {
+            const addPath = `<a href="${res.downloadUrl}" target="_blank">${res.name}</a>`;
+            content.value = content.value + addPath
+          })
+          return;
+        }
+        if (!file.type.startsWith('video/')) {
+          editorRef.value?.alert({content: '只能选择视频文件'});
+          return;
+        }
+        uploadOss(file).then(res => {
+          callback(res.path)
+        });
+      }
+    };
+    input.click();
+  }
+});
+
+/* 粘贴图片上传服务器并插入编辑器 */
+const onPaste = (e) => {
+  const items = (e.clipboardData || e.originalEvent.clipboardData).items;
+  let hasFile = false;
+  for (let i = 0; i < items.length; i++) {
+    if (items[i].type.indexOf('image') !== -1) {
+      let file = items[i].getAsFile();
+      const item: ItemType = {
+        file,
+        uid: (file as any).lastModified,
+        name: file.name
+      };
+      uploadFile(<File>item.file)
+        .then((result) => {
+          const addPath = `<p><img class="content-img" src="${result.url}"></p>`;
+          content.value = content.value + addPath
+        })
+        .catch((e) => {
+          message.error(e.message);
+        });
+      hasFile = true;
+    }
+  }
+  if (hasFile) {
+    e.preventDefault();
+  }
+}
+
+const {resetFields} = useForm(form, rules);
+
+/* 保存编辑 */
+const save = () => {
+  if (!formRef.value) {
+    return;
+  }
+  formRef.value
+    .validate()
+    .then(() => {
+      loading.value = true;
+      const formData = {
+        ...form
+      };
+      if (!content.value) {
+        return message.error('请输入内容')
+      }
+      formData.content = content.value;
+      const saveOrUpdate = isUpdate.value ? updateDesignCollect : addDesignCollect;
+      saveOrUpdate(formData)
+        .then((msg) => {
+          loading.value = false;
+          message.success(msg);
+          updateVisible(false);
+          emit('done');
+        })
+        .catch((e) => {
+          loading.value = false;
+          message.error(e.message);
+        });
+    })
+    .catch(() => {
+    });
+};
+
+const cateList = ref<DesignCategory[]>([]);
+const getCateList = async () => {
+  cateList.value = await listDesignCategory()
+}
+
+watch(
+  () => props.visible,
+  async (visible) => {
+    if (visible) {
+      await getCateList()
+      images.value = [];
+      content.value = ''
+      if (props.data) {
+        assignObject(form, props.data);
+        if (props.data.image) {
+          images.value.push({
+            uid: uuid(),
+            url: props.data.image,
+            status: 'done'
+          })
+        }
+        if (props.data.content) {
+          content.value = props.data.content;
+        }
+        isUpdate.value = true;
+      } else {
+        isUpdate.value = false;
+      }
+    } else {
+      resetFields();
+    }
+  },
+  {immediate: true}
+);
+</script>
diff --git a/src/views/cms/designCollect/components/search.vue b/src/views/cms/designCollect/components/search.vue
new file mode 100644
index 0000000..82fea9d
--- /dev/null
+++ b/src/views/cms/designCollect/components/search.vue
@@ -0,0 +1,42 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <a-button type="primary" class="ele-btn-icon" @click="add">
+      <template #icon>
+        <PlusOutlined />
+      </template>
+      <span>添加</span>
+    </a-button>
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import type { GradeParam } from '@/api/user/grade/model';
+  import { watch } from 'vue';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: GradeParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>
diff --git a/src/views/cms/designCollect/components/signUpList.vue b/src/views/cms/designCollect/components/signUpList.vue
new file mode 100644
index 0000000..178cebf
--- /dev/null
+++ b/src/views/cms/designCollect/components/signUpList.vue
@@ -0,0 +1,127 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="'70%'"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    title="设计征集报名列表"
+    :body-style="{ paddingBottom: '28px' }"
+    :footer="null"
+    @update:visible="updateVisible"
+  >
+    <ele-pro-table
+      ref="tableRef"
+      row-key="designSignUpId"
+      :columns="columns"
+      :datasource="datasource"
+      tool-class="ele-toolbar-form"
+      class="sys-org-table"
+    >
+      <template #bodyCell="{ column, record }">
+        <template v-if="column.key === 'content'">
+          <div class="flex flex-wrap justify-start items-start">
+            <a-image-preview-group>
+              <a-space>
+                <a-image class="image" v-for="(item, index) in JSON.parse(record.content)" :key="index" :src="item.url" :width="50" :height="50"/>
+              </a-space>
+            </a-image-preview-group>
+          </div>
+        </template>
+      </template>
+    </ele-pro-table>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+import {ref, watch} from 'vue';
+import {DesignCollect} from '@/api/cms/designCollect/model';
+import {pageDesignSignUp} from "@/api/cms/designSignUp";
+import {EleProTable, toDateString} from "ele-admin-pro";
+import type {ColumnItem, DatasourceFunction} from "ele-admin-pro/es/ele-pro-table/types";
+
+const props = defineProps<{
+  // 弹窗是否打开
+  visible: boolean;
+  // 修改回显的数据
+  data?: DesignCollect | null;
+}>();
+
+const emit = defineEmits<{
+  (e: 'done'): void;
+  (e: 'update:visible', visible: boolean): void;
+}>();
+
+// 提交状态
+const loading = ref(false);
+// 是否显示最大化切换按钮
+const maxable = ref(true);
+
+const columns = ref<ColumnItem[]>([
+  {
+    title: '姓名',
+    dataIndex: 'name',
+    key: 'name',
+    align: 'center',
+  },
+  {
+    title: '手机号',
+    dataIndex: 'phone',
+    key: 'phone',
+    align: 'center',
+  },
+  {
+    title: '内容',
+    key: 'content',
+    align: 'center',
+  },
+  {
+    title: '提交时间',
+    dataIndex: 'createTime',
+    key: 'createTime',
+    align: 'center',
+    sorter: true,
+    ellipsis: true,
+    customRender: ({text}) => toDateString(text, 'yyyy-MM-dd HH:mm:ss')
+  },
+]);
+
+
+/* 更新visible */
+const updateVisible = (value: boolean) => {
+  emit('update:visible', value);
+};
+
+const datasource: DatasourceFunction = ({
+                                          page,
+                                          limit,
+                                          where,
+                                          orders,
+                                        }) => {
+  where.designId = props.data?.id;
+  return pageDesignSignUp({
+    ...where,
+    ...orders,
+    page,
+    limit
+  });
+};
+
+watch(
+  () => props.visible,
+  (visible) => {
+    if (visible) {
+    } else {
+    }
+  },
+  {immediate: true}
+);
+</script>
+
+<style>
+.image{
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+}
+</style>
diff --git a/src/views/cms/designCollect/index.vue b/src/views/cms/designCollect/index.vue
new file mode 100644
index 0000000..b5bd4c5
--- /dev/null
+++ b/src/views/cms/designCollect/index.vue
@@ -0,0 +1,243 @@
+<template>
+  <div class="page">
+    <div class="ele-body">
+      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+        <ele-pro-table
+          ref="tableRef"
+          row-key="designCollectId"
+          :columns="columns"
+          :datasource="datasource"
+          :customRow="customRow"
+          tool-class="ele-toolbar-form"
+          class="sys-org-table"
+        >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              @add="openEdit"
+              @remove="removeBatch"
+              @batchMove="openMove"
+            />
+          </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'image'">
+              <a-image :src="record.image" :width="50"/>
+            </template>
+            <template v-if="column.key === 'status'">
+              <a-tag v-if="record.status === 0" color="green">显示</a-tag>
+              <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
+            </template>
+            <template v-if="column.key === 'action'">
+              <a-space>
+                <a @click="openList(record)">报名详情</a>
+                <a-divider type="vertical"/>
+                <a @click="openEdit(record)">修改</a>
+                <a-divider type="vertical"/>
+                <a-popconfirm
+                  title="确定要删除此记录吗？"
+                  @confirm="remove(record)"
+                >
+                  <a class="ele-text-danger">删除</a>
+                </a-popconfirm>
+              </a-space>
+            </template>
+          </template>
+        </ele-pro-table>
+      </a-card>
+
+      <!-- 编辑弹窗 -->
+      <DesignCollectEdit v-model:visible="showEdit" :data="current" @done="reload"/>
+      <SignUpList v-model:visible="showList" :data="current" @done="reload"/>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import {createVNode, ref} from 'vue';
+import {message, Modal} from 'ant-design-vue';
+import {ExclamationCircleOutlined} from '@ant-design/icons-vue';
+import type {EleProTable} from 'ele-admin-pro';
+import {toDateString} from 'ele-admin-pro';
+import type {
+  DatasourceFunction,
+  ColumnItem
+} from 'ele-admin-pro/es/ele-pro-table/types';
+import Search from './components/search.vue';
+import DesignCollectEdit from './components/designCollectEdit.vue';
+import {pageDesignCollect, removeDesignCollect, removeBatchDesignCollect} from '@/api/cms/designCollect';
+import type {DesignCollect, DesignCollectParam} from '@/api/cms/designCollect/model';
+import SignUpList from "@/views/cms/designCollect/components/signUpList.vue";
+
+// 表格实例
+const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+// 表格选中数据
+const selection = ref<DesignCollect[]>([]);
+// 当前编辑数据
+const current = ref<DesignCollect | null>(null);
+// 是否显示编辑弹窗
+const showEdit = ref(false);
+// 是否显示批量移动弹窗
+const showMove = ref(false);
+// 加载状态
+const loading = ref(true);
+
+// 表格数据源
+const datasource: DatasourceFunction = ({
+                                          page,
+                                          limit,
+                                          where,
+                                          orders,
+                                          filters
+                                        }) => {
+  if (filters) {
+    where.status = filters.status;
+  }
+  return pageDesignCollect({
+    ...where,
+    ...orders,
+    page,
+    limit
+  });
+};
+
+// 表格列配置
+const columns = ref<ColumnItem[]>([
+  {
+    title: 'ID',
+    dataIndex: 'id',
+    key: 'id',
+    align: 'center',
+    width: 90,
+  },
+  {
+    title: '标题',
+    dataIndex: 'title',
+    key: 'title',
+    align: 'center',
+  },
+  {
+    title: '分类',
+    dataIndex: ['category', 'title'],
+    key: 'title',
+    align: 'center',
+  },
+  {
+    title: '排序(数字越小越靠前)',
+    dataIndex: 'sortNumber',
+    key: 'sortNumber',
+    align: 'center',
+  },
+  {
+    title: '创建时间',
+    dataIndex: 'createTime',
+    key: 'createTime',
+    align: 'center',
+    sorter: true,
+    ellipsis: true,
+    customRender: ({text}) => toDateString(text, 'yyyy-MM-dd')
+  },
+  {
+    title: '操作',
+    key: 'action',
+    width: 180,
+    fixed: 'right',
+    align: 'center',
+    hideInSetting: true
+  }
+]);
+
+/* 搜索 */
+const reload = (where?: DesignCollectParam) => {
+  selection.value = [];
+  tableRef?.value?.reload({where: where});
+};
+
+/* 打开编辑弹窗 */
+const openEdit = (row?: DesignCollect) => {
+  current.value = row ?? null;
+  showEdit.value = true;
+};
+
+const showList = ref(false)
+const openList = (row?: DesignCollect) => {
+  current.value = row ?? null;
+  showList.value = true;
+};
+
+/* 打开批量移动弹窗 */
+const openMove = () => {
+  showMove.value = true;
+};
+
+/* 删除单个 */
+const remove = (row: DesignCollect) => {
+  const hide = message.loading('请求中..', 0);
+  removeDesignCollect(row.designCollectId)
+    .then((msg) => {
+      hide();
+      message.success(msg);
+      reload();
+    })
+    .catch((e) => {
+      hide();
+      message.error(e.message);
+    });
+};
+
+/* 批量删除 */
+const removeBatch = () => {
+  if (!selection.value.length) {
+    message.error('请至少选择一条数据');
+    return;
+  }
+  Modal.confirm({
+    title: '提示',
+    content: '确定要删除选中的记录吗?',
+    icon: createVNode(ExclamationCircleOutlined),
+    maskClosable: true,
+    onOk: () => {
+      const hide = message.loading('请求中..', 0);
+      removeBatchDesignCollect(selection.value.map((d) => d.designCollectId))
+        .then((msg) => {
+          hide();
+          message.success(msg);
+          reload();
+        })
+        .catch((e) => {
+          hide();
+          message.error(e.message);
+        });
+    }
+  });
+};
+
+/* 查询 */
+const query = () => {
+  loading.value = true;
+};
+
+/* 自定义行属性 */
+const customRow = (record: DesignCollect) => {
+  return {
+    // 行点击事件
+    onClick: () => {
+      // console.log(record);
+    },
+    // 行双击事件
+    onDblclick: () => {
+      openEdit(record);
+    }
+  };
+};
+query();
+</script>
+
+<script lang="ts">
+export default {
+  name: 'DesignCollect'
+};
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/cms/designSignUp/components/designSignUpEdit.vue b/src/views/cms/designSignUp/components/designSignUpEdit.vue
new file mode 100644
index 0000000..c94527c
--- /dev/null
+++ b/src/views/cms/designSignUp/components/designSignUpEdit.vue
@@ -0,0 +1,244 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑设计征集报名' : '添加设计征集报名'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="" name="designId">
+        <a-input
+          allow-clear
+          placeholder="请输入"
+          v-model:value="form.designId"
+        />
+      </a-form-item>
+      <a-form-item label="" name="name">
+        <a-input
+          allow-clear
+          placeholder="请输入"
+          v-model:value="form.name"
+        />
+      </a-form-item>
+      <a-form-item label="" name="phone">
+        <a-input
+          allow-clear
+          placeholder="请输入"
+          v-model:value="form.phone"
+        />
+      </a-form-item>
+      <a-form-item label="" name="content">
+        <a-input
+          allow-clear
+          placeholder="请输入"
+          v-model:value="form.content"
+        />
+      </a-form-item>
+      <a-form-item label="用户ID" name="userId">
+        <a-input
+          allow-clear
+          placeholder="请输入用户ID"
+          v-model:value="form.userId"
+        />
+      </a-form-item>
+      <a-form-item label="排序(数字越小越靠前)" name="sortNumber">
+        <a-input-number
+          :min="0"
+          :max="9999"
+          class="ele-fluid"
+          placeholder="请输入排序号"
+          v-model:value="form.sortNumber"
+        />
+      </a-form-item>
+      <a-form-item label="备注" name="comments">
+        <a-textarea
+          :rows="4"
+          :maxlength="200"
+          placeholder="请输入描述"
+          v-model:value="form.comments"
+        />
+      </a-form-item>
+      <a-form-item label="状态, 0已发布, 1待审核 2已驳回 3违规内容" name="status">
+        <a-radio-group v-model:value="form.status">
+          <a-radio :value="0">显示</a-radio>
+          <a-radio :value="1">隐藏</a-radio>
+        </a-radio-group>
+      </a-form-item>
+      <a-form-item label="是否删除, 0否, 1是" name="deleted">
+        <a-input
+          allow-clear
+          placeholder="请输入是否删除, 0否, 1是"
+          v-model:value="form.deleted"
+        />
+      </a-form-item>
+      <a-form-item label="修改时间" name="updateTime">
+        <a-input
+          allow-clear
+          placeholder="请输入修改时间"
+          v-model:value="form.updateTime"
+        />
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from 'ant-design-vue';
+  import { assignObject, uuid } from 'ele-admin-pro';
+  import { addDesignSignUp, updateDesignSignUp } from '@/api/cms/designSignUp';
+  import { DesignSignUp } from '@/api/cms/designSignUp/model';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { FormInstance } from 'ant-design-vue/es/form';
+  import { FileRecord } from '@/api/system/file/model';
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: DesignSignUp | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 提交状态
+  const loading = ref(false);
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+  const images = ref<ItemType[]>([]);
+
+  // 用户信息
+  const form = reactive<DesignSignUp>({
+    id: undefined,
+    designId: undefined,
+    name: undefined,
+    phone: undefined,
+    content: undefined,
+    userId: undefined,
+    sortNumber: undefined,
+    comments: undefined,
+    status: undefined,
+    deleted: undefined,
+    tenantId: undefined,
+    createTime: undefined,
+    updateTime: undefined,
+    designSignUpId: undefined,
+    designSignUpName: '',
+    status: 0,
+    comments: '',
+    sortNumber: 100
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    designSignUpName: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写设计征集报名名称',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  const chooseImage = (data: FileRecord) => {
+    images.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+    form.image = data.path;
+  };
+
+  const onDeleteItem = (index: number) => {
+    images.value.splice(index, 1);
+    form.image = '';
+  };
+
+  const { resetFields } = useForm(form, rules);
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const formData = {
+          ...form
+        };
+        const saveOrUpdate = isUpdate.value ? updateDesignSignUp : addDesignSignUp;
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        images.value = [];
+        if (props.data) {
+          assignObject(form, props.data);
+          if(props.data.image){
+            images.value.push({
+              uid: uuid(),
+              url: props.data.image,
+              status: 'done'
+            })
+          }
+          isUpdate.value = true;
+        } else {
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>
diff --git a/src/views/cms/designSignUp/components/search.vue b/src/views/cms/designSignUp/components/search.vue
new file mode 100644
index 0000000..82fea9d
--- /dev/null
+++ b/src/views/cms/designSignUp/components/search.vue
@@ -0,0 +1,42 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <a-button type="primary" class="ele-btn-icon" @click="add">
+      <template #icon>
+        <PlusOutlined />
+      </template>
+      <span>添加</span>
+    </a-button>
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import type { GradeParam } from '@/api/user/grade/model';
+  import { watch } from 'vue';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: GradeParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>
diff --git a/src/views/cms/designSignUp/index.vue b/src/views/cms/designSignUp/index.vue
new file mode 100644
index 0000000..72c8b24
--- /dev/null
+++ b/src/views/cms/designSignUp/index.vue
@@ -0,0 +1,275 @@
+<template>
+  <div class="page">
+    <div class="ele-body">
+      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+        <ele-pro-table
+          ref="tableRef"
+          row-key="designSignUpId"
+          :columns="columns"
+          :datasource="datasource"
+          :customRow="customRow"
+          tool-class="ele-toolbar-form"
+          class="sys-org-table"
+        >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              @add="openEdit"
+              @remove="removeBatch"
+              @batchMove="openMove"
+            />
+          </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'image'">
+              <a-image :src="record.image" :width="50" />
+            </template>
+            <template v-if="column.key === 'status'">
+              <a-tag v-if="record.status === 0" color="green">显示</a-tag>
+              <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
+            </template>
+            <template v-if="column.key === 'action'">
+              <a-space>
+                <a @click="openEdit(record)">修改</a>
+                <a-divider type="vertical" />
+                <a-popconfirm
+                  title="确定要删除此记录吗？"
+                  @confirm="remove(record)"
+                >
+                  <a class="ele-text-danger">删除</a>
+                </a-popconfirm>
+              </a-space>
+            </template>
+          </template>
+        </ele-pro-table>
+      </a-card>
+
+      <!-- 编辑弹窗 -->
+      <DesignSignUpEdit v-model:visible="showEdit" :data="current" @done="reload" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { createVNode, ref } from 'vue';
+  import { message, Modal } from 'ant-design-vue';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import type { EleProTable } from 'ele-admin-pro';
+  import { toDateString } from 'ele-admin-pro';
+  import type {
+    DatasourceFunction,
+    ColumnItem
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import Search from './components/search.vue';
+  import DesignSignUpEdit from './components/designSignUpEdit.vue';
+  import { pageDesignSignUp, removeDesignSignUp, removeBatchDesignSignUp } from '@/api/cms/designSignUp';
+  import type { DesignSignUp, DesignSignUpParam } from '@/api/cms/designSignUp/model';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<DesignSignUp[]>([]);
+  // 当前编辑数据
+  const current = ref<DesignSignUp | null>(null);
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+  // 是否显示批量移动弹窗
+  const showMove = ref(false);
+  // 加载状态
+  const loading = ref(true);
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({
+    page,
+    limit,
+    where,
+    orders,
+    filters
+  }) => {
+    if (filters) {
+      where.status = filters.status;
+    }
+    return pageDesignSignUp({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: '',
+      dataIndex: 'id',
+      key: 'id',
+      align: 'center',
+      width: 90,
+    },
+    {
+      title: '',
+      dataIndex: 'designId',
+      key: 'designId',
+      align: 'center',
+    },
+    {
+      title: '',
+      dataIndex: 'name',
+      key: 'name',
+      align: 'center',
+    },
+    {
+      title: '',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center',
+    },
+    {
+      title: '',
+      dataIndex: 'content',
+      key: 'content',
+      align: 'center',
+    },
+    {
+      title: '用户ID',
+      dataIndex: 'userId',
+      key: 'userId',
+      align: 'center',
+    },
+    {
+      title: '排序(数字越小越靠前)',
+      dataIndex: 'sortNumber',
+      key: 'sortNumber',
+      align: 'center',
+    },
+    {
+      title: '备注',
+      dataIndex: 'comments',
+      key: 'comments',
+      align: 'center',
+    },
+    {
+      title: '状态, 0已发布, 1待审核 2已驳回 3违规内容',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+    },
+    {
+      title: '是否删除, 0否, 1是',
+      dataIndex: 'deleted',
+      key: 'deleted',
+      align: 'center',
+    },
+    {
+      title: '创建时间',
+      dataIndex: 'createTime',
+      key: 'createTime',
+      align: 'center',
+      sorter: true,
+      ellipsis: true,
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
+    },
+    {
+      title: '修改时间',
+      dataIndex: 'updateTime',
+      key: 'updateTime',
+      align: 'center',
+    },
+    {
+      title: '操作',
+      key: 'action',
+      width: 180,
+      fixed: 'right',
+      align: 'center',
+      hideInSetting: true
+    }
+  ]);
+
+  /* 搜索 */
+  const reload = (where?: DesignSignUpParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: DesignSignUp) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: DesignSignUp) => {
+    const hide = message.loading('请求中..', 0);
+    removeDesignSignUp(row.designSignUpId)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  /* 批量删除 */
+  const removeBatch = () => {
+    if (!selection.value.length) {
+      message.error('请至少选择一条数据');
+      return;
+    }
+    Modal.confirm({
+      title: '提示',
+      content: '确定要删除选中的记录吗?',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = message.loading('请求中..', 0);
+        removeBatchDesignSignUp(selection.value.map((d) => d.designSignUpId))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 查询 */
+  const query = () => {
+    loading.value = true;
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: DesignSignUp) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+  query();
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'DesignSignUp'
+  };
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/cms/link/dict/components/dict-edit.vue~merged b/src/views/cms/link/dict/components/dict-edit.vue~merged
new file mode 100644
index 0000000..f9b755d
--- /dev/null
+++ b/src/views/cms/link/dict/components/dict-edit.vue~merged
@@ -0,0 +1,179 @@
+<!-- 分类编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="460"
+    :visible="visible"
+    :confirm-loading="loading"
+    :title="isUpdate ? '修改分类' : '添加分类'"
+    :body-style="{ paddingBottom: '8px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 5, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="分类标识" name="dictCode">
+        <a-input
+          :maxlength="20"
+          disabled
+          placeholder="请输入分类标识"
+          v-model:value="form.dictCode"
+        />
+      </a-form-item>
+      <a-form-item label="分类名称" name="dictDataName">
+        <a-input
+          allow-clear
+          :maxlength="20"
+          placeholder="请输入分类名称"
+          v-model:value="form.dictDataName"
+        />
+      </a-form-item>
+      <a-form-item label="排序" name="sortNumber">
+        <a-input-number
+          :min="0"
+          :max="99999"
+          class="ele-fluid"
+          placeholder="请输入排序号"
+          v-model:value="form.sortNumber"
+        />
+      </a-form-item>
+      <a-form-item label="备注">
+        <a-textarea
+          :rows="4"
+          :maxlength="200"
+          placeholder="请输入备注"
+          v-model:value="form.comments"
+        />
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { message } from 'ant-design-vue/es';
+  import type { FormInstance, Rule } from 'ant-design-vue/es/form';
+  import { storeToRefs } from 'pinia';
+  import { useThemeStore } from '@/store/modules/theme';
+  import useFormData from '@/utils/use-form-data';
+  import { addDictData, updateDictData } from '@/api/system/dict-data';
+  import { DictData } from '@/api/system/dict-data/model';
+  import { removeSiteInfoCache } from '@/api/cms/website';
+
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: DictData | null;
+    // 字典ID
+    dictId?: number | 0;
+  }>();
+
+  //
+  const formRef = ref<FormInstance | null>(null);
+
+  // 是否是修改
+  const isUpdate = ref(false);
+
+  // 提交状态
+  const loading = ref(false);
+
+  // 表单数据
+  const { form, resetFields, assignFields } = useFormData<DictData>({
+    dictId: undefined,
+    dictName: '',
+    dictDataId: undefined,
+    dictDataName: '',
+    dictCode: 'linkType',
+    dictDataCode: '',
+    sortNumber: 100,
+    comments: ''
+  });
+
+  // 表单验证规则
+  const rules = reactive<Record<string, Rule[]>>({
+    dictDataCode: [
+      {
+        required: true,
+        message: '请输入分类名称',
+        type: 'string',
+        trigger: 'blur'
+      }
+    ],
+    dictCode: [
+      {
+        required: true,
+        message: '请输入分类标识',
+        type: 'string',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const saveOrUpdate = isUpdate.value ? updateDictData : addDictData;
+        form.dictDataCode = form.dictDataName;
+        form.dictId = props.dictId;
+        form.dictName = '链接分类';
+        saveOrUpdate(form)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            // 清除缓存
+            removeSiteInfoCache(form.dictCode + ':' + form.tenantId);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        if (props.data) {
+          assignFields(props.data);
+          isUpdate.value = true;
+        } else {
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+        formRef.value?.clearValidate();
+      }
+    }
+  );
+</script>
diff --git a/src/views/cms/link/dict/index.vue~merged b/src/views/cms/link/dict/index.vue~merged
new file mode 100644
index 0000000..eba458a
--- /dev/null
+++ b/src/views/cms/link/dict/index.vue~merged
@@ -0,0 +1,211 @@
+<template>
+  <div class="ele-body">
+    <a-card :bordered="false">
+      <!-- 表格 -->
+      <ele-pro-table
+        ref="tableRef"
+        row-key="dictDataId"
+        :columns="columns"
+        :datasource="datasource"
+        :customRow="customRow"
+        :scroll="{ x: 800 }"
+        cache-key="proSystemRoleTable"
+      >
+        <template #toolbar>
+          <a-space>
+            <a-button type="primary" class="ele-btn-icon" @click="openEdit()">
+              <template #icon>
+                <plus-outlined />
+              </template>
+              <span>新建</span>
+            </a-button>
+          </a-space>
+        </template>
+        <template #bodyCell="{ column, record }">
+          <template v-if="column.key === 'action'">
+            <a-space>
+              <a @click="openEdit(record)">修改</a>
+              <a-divider type="vertical" />
+              <a-popconfirm
+                placement="topRight"
+                title="确定要删除此分类吗？"
+                @confirm="remove(record)"
+              >
+                <a class="ele-text-danger">删除</a>
+              </a-popconfirm>
+            </a-space>
+          </template>
+        </template>
+      </ele-pro-table>
+    </a-card>
+    <!-- 编辑弹窗 -->
+    <dict-edit
+      v-model:visible="showEdit"
+      :dictId="dictId"
+      :data="current"
+      @done="reload"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { createVNode, ref } from 'vue';
+  import { message, Modal } from 'ant-design-vue/es';
+  import {
+    PlusOutlined,
+    DeleteOutlined,
+    ExclamationCircleOutlined
+  } from '@ant-design/icons-vue';
+  import type { EleProTable } from 'ele-admin-pro/es';
+  import type {
+    DatasourceFunction,
+    ColumnItem
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import { messageLoading } from 'ele-admin-pro/es';
+  import DictEdit from './components/dict-edit.vue';
+  import {
+    pageDictData,
+    removeDictData,
+    removeDictDataBatch
+  } from '@/api/system/dict-data';
+  import { DictParam } from '@/api/system/dict/model';
+  import { DictData } from '@/api/system/dict-data/model';
+  import { addDict, listDictionaries } from '@/api/system/dict';
+  import { Dictionary } from '@/api/system/dictionary/model';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+  const dictId = ref(0);
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: 'ID',
+      dataIndex: 'dictDataId',
+      width: 80
+    },
+    {
+      title: '分类名称',
+      dataIndex: 'dictDataName',
+      showSorterTooltip: false
+    },
+    {
+      title: '备注',
+      dataIndex: 'comments',
+      sorter: true,
+      showSorterTooltip: false
+    },
+    {
+      title: '排序号',
+      width: 180,
+      align: 'center',
+      dataIndex: 'sortNumber'
+    },
+    {
+      title: '操作',
+      key: 'action',
+      width: 180,
+      align: 'center'
+    }
+  ]);
+
+  // 表格选中数据
+  const selection = ref<DictData[]>([]);
+
+  // 当前编辑数据
+  const current = ref<Dictionary | null>(null);
+
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({ page, limit, where, orders }) => {
+    where.dictCode = 'linkType';
+    return pageDictData({ ...where, ...orders, page, limit });
+  };
+
+  /* 搜索 */
+  const reload = (where?: DictParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ page: 1, where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: DictData) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: DictData) => {
+    const hide = messageLoading('请求中..', 0);
+    removeDictData(row.dictDataId)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  /* 批量删除 */
+  const removeBatch = () => {
+    if (!selection.value.length) {
+      message.error('请至少选择一条数据');
+      return;
+    }
+    Modal.confirm({
+      title: '提示',
+      content: '确定要删除选中的分类吗?',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = messageLoading('请求中..', 0);
+        removeDictDataBatch(selection.value.map((d) => d.dictDataId))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  // 初始化字典
+  const loadDict = () => {
+    listDictionaries({ dictCode: 'linkType' }).then(async (data) => {
+      if (data?.length == 0) {
+        await addDict({ dictCode: 'linkType', dictName: '链接分类' });
+      }
+      await listDictionaries({ dictCode: 'linkType' }).then((list) => {
+        list?.map((d) => {
+          dictId.value = Number(d.dictId);
+        });
+      });
+    });
+  };
+
+  loadDict();
+
+  /* 自定义行属性 */
+  const customRow = (record: DictData) => {
+    return {
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'TaskDictData'
+  };
+</script>
diff --git a/src/views/cms/photo/list.vue b/src/views/cms/photo/list.vue
index f1dfb40..6867844 100644
--- a/src/views/cms/photo/list.vue
+++ b/src/views/cms/photo/list.vue
@@ -15,13 +15,14 @@
         <template #toolbar>
           <a-space>
             <a-upload
+              multiple
               :show-upload-list="false"
               :accept="'image/*,application/*'"
               :customRequest="onUpload"
             >
               <a-button type="primary" class="ele-btn-icon">
                 <template #icon>
-                  <UploadOutlined />
+                  <UploadOutlined/>
                 </template>
                 <span>上传图片</span>
               </a-button>
@@ -34,7 +35,7 @@
               @click="removeBatch"
             >
               <template #icon>
-                <delete-outlined />
+                <delete-outlined/>
               </template>
               <span>批量删除</span>
             </a-button>
@@ -83,13 +84,15 @@
             </template>
             <!-- 含http -->
             <template v-else-if="record.path.indexOf('http') == 0">
-              <a-image
-                :src="`${record.thumbnail}`"
-                :preview="{
+              <div class="bg-gray-300">
+                <a-image
+                  :src="`${record.thumbnail}`"
+                  :preview="{
                   src: `${record.downloadUrl}`
                 }"
-                :width="80"
-              />
+                  :width="80"
+                />
+              </div>
             </template>
             <!-- path -->
             <template v-else>
@@ -115,7 +118,7 @@
           <template v-if="column.key === 'action'">
             <a-space>
               <a @click="openEdit(record)">编辑</a>
-              <a-divider type="vertical" />
+              <a-divider type="vertical"/>
               <a-popconfirm
                 placement="topRight"
                 title="确定要删除此文件吗？"
@@ -129,250 +132,250 @@
       </ele-pro-table>
     </a-card>
     <!-- 编辑弹窗 -->
-    <PhotoEdit v-model:visible="showEdit" :data="current" @done="reload" />
+    <PhotoEdit v-model:visible="showEdit" :data="current" @done="reload"/>
   </div>
 </template>
 
 <script lang="ts" setup>
-  import { createVNode, ref } from 'vue';
-  import { message, Modal } from 'ant-design-vue/es';
-  import {
-    UploadOutlined,
-    DeleteOutlined,
-    CopyOutlined,
-    ExclamationCircleOutlined
-  } from '@ant-design/icons-vue';
-  import type { EleProTable } from 'ele-admin-pro/es';
-  import type {
-    DatasourceFunction,
-    ColumnItem
-  } from 'ele-admin-pro/es/ele-pro-table/types';
-  import { messageLoading, toDateString } from 'ele-admin-pro/es';
-  import PhotoEdit from './components/photo-edit.vue';
-  import {
-    pageFiles,
-    removeFile,
-    removeFiles,
-    uploadOss
-  } from '@/api/system/file/index';
-  import type {
-    FileRecord,
-    FileRecordParam
-  } from '@/api/system/file/model/index';
-  import { copyText, isImage } from '@/utils/common';
-  import DictSelect from '@/components/DictSelect/index.vue';
-  import { getMerchantId } from '@/utils/merchant';
+import {createVNode, ref} from 'vue';
+import {message, Modal} from 'ant-design-vue/es';
+import {
+  UploadOutlined,
+  DeleteOutlined,
+  CopyOutlined,
+  ExclamationCircleOutlined
+} from '@ant-design/icons-vue';
+import type {EleProTable} from 'ele-admin-pro/es';
+import type {
+  DatasourceFunction,
+  ColumnItem
+} from 'ele-admin-pro/es/ele-pro-table/types';
+import {messageLoading, toDateString} from 'ele-admin-pro/es';
+import PhotoEdit from './components/photo-edit.vue';
+import {
+  pageFiles,
+  removeFile,
+  removeFiles,
+  uploadOss
+} from '@/api/system/file/index';
+import type {
+  FileRecord,
+  FileRecordParam
+} from '@/api/system/file/model/index';
+import {copyText, isImage} from '@/utils/common';
+import DictSelect from '@/components/DictSelect/index.vue';
+import {getMerchantId} from '@/utils/merchant';
 
-  // 表格实例
-  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
-  // 表格选中数据
-  const selection = ref<FileRecord[]>([]);
-  // 当前编辑数据
-  const current = ref<FileRecord | null>(null);
-  // 是否显示编辑弹窗
-  const showEdit = ref(false);
-  const type = ref('name');
-  const groupId = ref<number>();
-  const searchText = ref('');
-  // 表格列配置
-  const columns = ref<ColumnItem[]>([
-    // {
-    //   key: 'index',
-    //   width: 48,
-    //   align: 'center',
-    //   fixed: 'left',
-    //   hideInSetting: true,
-    //   customRender: ({ index }) => index + (tableRef.value?.tableIndex ?? 0)
-    // },
-    {
-      title: 'ID',
-      dataIndex: 'id',
-      width: 90,
-      hideInTable: true
-    },
-    {
-      title: '图片',
-      dataIndex: 'path',
-      width: 180,
-      align: 'center',
-      key: 'path'
-    },
-    {
-      title: '文件名称',
-      dataIndex: 'name'
-    },
-    {
-      title: '描述',
-      dataIndex: 'comments',
-      ellipsis: true
-    },
-    {
-      title: '文件大小',
-      dataIndex: 'length',
-      align: 'center',
-      sorter: true,
-      showSorterTooltip: false,
-      ellipsis: true,
-      customRender: ({ text }) => {
-        if (text < 1024) {
-          return text + 'B';
-        } else if (text < 1024 * 1024) {
-          return (text / 1024).toFixed(1) + 'KB';
-        } else if (text < 1024 * 1024 * 1024) {
-          return (text / 1024 / 1024).toFixed(1) + 'M';
-        } else {
-          return (text / 1024 / 1024 / 1024).toFixed(1) + 'G';
-        }
-      },
-      width: 180
-    },
-    {
-      title: '发布者',
-      width: 180,
-      align: 'center',
-      dataIndex: 'createNickname'
-    },
-    {
-      title: '发布时间',
-      dataIndex: 'createTime',
-      sorter: true,
-      align: 'center',
-      width: 180,
-      showSorterTooltip: false,
-      ellipsis: true,
-      customRender: ({ text }) => toDateString(text)
-    },
-    {
-      title: '操作',
-      key: 'action',
-      width: 200,
-      align: 'center'
-    }
-  ]);
-
-  // 表格数据源
-  const datasource: DatasourceFunction = ({ page, limit, where, orders }) => {
-    if (where.reset) {
-      where = {};
-    }
-    if (type.value == 'name') {
-      where.name = searchText.value;
-    }
-    if (type.value == 'createNickname') {
-      where.createNickname = searchText.value;
-    }
-    if (type.value == 'groupId') {
-      where.groupId = groupId.value;
-    }
-    where.merchantId = getMerchantId();
-    return pageFiles({ ...where, ...orders, page, limit });
-  };
-
-  /* 搜索 */
-  const reload = (where?: FileRecordParam) => {
-    selection.value = [];
-    tableRef?.value?.reload({ page: 1, where });
-  };
-
-  /* 打开编辑弹窗 */
-  const openEdit = (row?: FileRecord) => {
-    current.value = row ?? null;
-    showEdit.value = true;
-  };
-
-  /* 删除单个 */
-  const remove = (row: FileRecord) => {
-    const hide = messageLoading('请求中..', 0);
-    removeFile(row.id)
-      .then((msg) => {
-        hide();
-        message.success(msg);
-        reload();
-      })
-      .catch((e) => {
-        hide();
-        message.error(e.message);
-      });
-  };
-
-  /* 批量删除 */
-  const removeBatch = () => {
-    if (!selection.value.length) {
-      message.error('请至少选择一条数据');
-      return;
-    }
-    Modal.confirm({
-      title: '提示',
-      content: '确定要删除选中的记录吗?',
-      icon: createVNode(ExclamationCircleOutlined),
-      maskClosable: true,
-      onOk: () => {
-        const hide = messageLoading('请求中..', 0);
-        removeFiles(selection.value.map((d) => d.id))
-          .then((msg) => {
-            hide();
-            message.success(msg);
-            reload();
-          })
-          .catch((e) => {
-            hide();
-            message.error(e.message);
-          });
+// 表格实例
+const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+// 表格选中数据
+const selection = ref<FileRecord[]>([]);
+// 当前编辑数据
+const current = ref<FileRecord | null>(null);
+// 是否显示编辑弹窗
+const showEdit = ref(false);
+const type = ref('name');
+const groupId = ref<number>();
+const searchText = ref('');
+// 表格列配置
+const columns = ref<ColumnItem[]>([
+  // {
+  //   key: 'index',
+  //   width: 48,
+  //   align: 'center',
+  //   fixed: 'left',
+  //   hideInSetting: true,
+  //   customRender: ({ index }) => index + (tableRef.value?.tableIndex ?? 0)
+  // },
+  {
+    title: 'ID',
+    dataIndex: 'id',
+    width: 90,
+    hideInTable: true
+  },
+  {
+    title: '图片',
+    dataIndex: 'path',
+    width: 180,
+    align: 'center',
+    key: 'path'
+  },
+  {
+    title: '文件名称',
+    dataIndex: 'name'
+  },
+  {
+    title: '描述',
+    dataIndex: 'comments',
+    ellipsis: true
+  },
+  {
+    title: '文件大小',
+    dataIndex: 'length',
+    align: 'center',
+    sorter: true,
+    showSorterTooltip: false,
+    ellipsis: true,
+    customRender: ({text}) => {
+      if (text < 1024) {
+        return text + 'B';
+      } else if (text < 1024 * 1024) {
+        return (text / 1024).toFixed(1) + 'KB';
+      } else if (text < 1024 * 1024 * 1024) {
+        return (text / 1024 / 1024).toFixed(1) + 'M';
+      } else {
+        return (text / 1024 / 1024 / 1024).toFixed(1) + 'G';
       }
+    },
+    width: 180
+  },
+  {
+    title: '发布者',
+    width: 180,
+    align: 'center',
+    dataIndex: 'createNickname'
+  },
+  {
+    title: '发布时间',
+    dataIndex: 'createTime',
+    sorter: true,
+    align: 'center',
+    width: 180,
+    showSorterTooltip: false,
+    ellipsis: true,
+    customRender: ({text}) => toDateString(text)
+  },
+  {
+    title: '操作',
+    key: 'action',
+    width: 200,
+    align: 'center'
+  }
+]);
+
+// 表格数据源
+const datasource: DatasourceFunction = ({page, limit, where, orders}) => {
+  if (where.reset) {
+    where = {};
+  }
+  if (type.value == 'name') {
+    where.name = searchText.value;
+  }
+  if (type.value == 'createNickname') {
+    where.createNickname = searchText.value;
+  }
+  if (type.value == 'groupId') {
+    where.groupId = groupId.value;
+  }
+  where.merchantId = getMerchantId();
+  return pageFiles({...where, ...orders, page, limit});
+};
+
+/* 搜索 */
+const reload = (where?: FileRecordParam) => {
+  selection.value = [];
+  tableRef?.value?.reload({page: 1, where});
+};
+
+/* 打开编辑弹窗 */
+const openEdit = (row?: FileRecord) => {
+  current.value = row ?? null;
+  showEdit.value = true;
+};
+
+/* 删除单个 */
+const remove = (row: FileRecord) => {
+  const hide = messageLoading('请求中..', 0);
+  removeFile(row.id)
+    .then((msg) => {
+      hide();
+      message.success(msg);
+      reload();
+    })
+    .catch((e) => {
+      hide();
+      message.error(e.message);
     });
-  };
+};
 
-  /* 搜索 */
-  const chooseGroupId = (groupId: number) => {
-    reload({ groupId });
-  };
-
-  const reset = () => {
-    searchText.value = '';
-    reload({ groupId: 0 });
-  };
-
-  // 上传文件
-  const onUpload = (item) => {
-    const { file } = item;
-    // if (!file.type.startsWith('image')) {
-    //   message.error('只能选择图片');
-    //   return;
-    // }
-    if (file.size / 1024 / 1024 > 100) {
-      message.error('大小不能超过 100MB');
-      return;
+/* 批量删除 */
+const removeBatch = () => {
+  if (!selection.value.length) {
+    message.error('请至少选择一条数据');
+    return;
+  }
+  Modal.confirm({
+    title: '提示',
+    content: '确定要删除选中的记录吗?',
+    icon: createVNode(ExclamationCircleOutlined),
+    maskClosable: true,
+    onOk: () => {
+      const hide = messageLoading('请求中..', 0);
+      removeFiles(selection.value.map((d) => d.id))
+        .then((msg) => {
+          hide();
+          message.success(msg);
+          reload();
+        })
+        .catch((e) => {
+          hide();
+          message.error(e.message);
+        });
     }
-    const hide = messageLoading({
-      content: '上传中..',
-      duration: 0,
-      mask: true
-    });
-    uploadOss(file)
-      .then((data) => {
-        hide();
-        message.success('上传成功');
-        reload();
-      })
-      .catch((e) => {
-        message.error(e.message);
-        hide();
-      });
-  };
+  });
+};
 
-  /* 自定义行属性 */
-  const customRow = (record: FileRecord) => {
-    return {
-      // 行双击事件
-      onDblclick: () => {
-        openEdit(record);
-      }
-    };
+/* 搜索 */
+const chooseGroupId = (groupId: number) => {
+  reload({groupId});
+};
+
+const reset = () => {
+  searchText.value = '';
+  reload({groupId: 0});
+};
+
+// 上传文件
+const onUpload = (item) => {
+  const {file} = item;
+  // if (!file.type.startsWith('image')) {
+  //   message.error('只能选择图片');
+  //   return;
+  // }
+  if (file.size / 1024 / 1024 > 100) {
+    message.error('大小不能超过 100MB');
+    return;
+  }
+  const hide = messageLoading({
+    content: '上传中..',
+    duration: 0,
+    mask: true
+  });
+  uploadOss(file)
+    .then((data) => {
+      hide();
+      message.success('上传成功');
+      reload();
+    })
+    .catch((e) => {
+      message.error(e.message);
+      hide();
+    });
+};
+
+/* 自定义行属性 */
+const customRow = (record: FileRecord) => {
+  return {
+    // 行双击事件
+    onDblclick: () => {
+      openEdit(record);
+    }
   };
+};
 </script>
 
 <script lang="ts">
-  export default {
-    name: 'VideoIndex'
-  };
+export default {
+  name: 'VideoIndex'
+};
 </script>
diff --git a/src/views/shop/demo/add/index.vue~merged b/src/views/shop/demo/add/index.vue~merged
new file mode 100644
index 0000000..b29be33
--- /dev/null
+++ b/src/views/shop/demo/add/index.vue~merged
@@ -0,0 +1,1050 @@
+<template>
+  <a-page-header
+    :title="isUpdate ? '编辑商品' : '新增商品'"
+    @back="push('/goods/index')"
+  >
+    <div class="ele-cell ele-cell-align-top">
+      <div class="ele-cell-content">
+        <a-form
+          ref="formRef"
+          :model="form"
+          :rules="rules"
+          :label-col="{ md: { span: 3 }, sm: { span: 4 }, xs: { span: 24 } }"
+          :wrapper-col="{
+            md: { span: 14 },
+            sm: { span: 24 },
+            xs: { span: 24 }
+          }"
+        >
+          <a-card title="基础信息" :bordered="false" class="goods-form">
+            <a-row :gutter="16">
+              <a-col
+                v-bind="
+                  styleResponsive ? { md: 24, sm: 24, xs: 24 } : { span: 8 }
+                "
+              >
+                <a-form-item label="选择店铺" name="merchantId" v-if="!form.merchantId">
+                  <SelectMerchant
+                    :placeholder="`选择商户`"
+                    class="input-item"
+                    v-model:value="form.merchantName"
+                    @done="chooseMerchantId"
+                  />
+                </a-form-item>
+                <a-form-item
+                  label="商品类型"
+                  name="type"
+                >
+                  <a-space>
+                    <a-button
+                      :type="form.type == 1 ? 'primary' : ''"
+                      @click="onType(1)"
+                      :ghost="form.type == 1"
+                      >实物商品</a-button
+                    >
+                    <a-button
+                      :type="form.type == 2 ? 'primary' : ''"
+                      @click="onType(2)"
+                      :ghost="form.type == 2"
+                      >虚拟商品</a-button
+                    >
+                  </a-space>
+                  <div class="ele-text-placeholder">
+                    {{ form.type == 1
+                    ? `支持快递邮寄、同城配送或到店自提方式发货`
+                    : '电子券码等，线下到店核销，无需备货' }}
+                  </div>
+                </a-form-item>
+                <a-form-item label="商品分类" name="categoryId">
+                  <SelectGoodsCategory
+                    :data="data"
+                    placeholder="请选择商品分类"
+                    v-model:value="category"
+                    @done="chooseGoodsCategory"
+                  />
+                  <a-space style="margin-top: 10px">
+                    <a @click="openUrl('/goods/category')">去新增</a>
+                  </a-space>
+                </a-form-item>
+                <a-form-item
+                  label="商品图片和视频"
+                  name="images">
+                  <SelectFile
+                    :placeholder="`请选择视频文件`"
+                    :limit="1"
+                    :data="images"
+                    @done="chooseImage"
+                    @del="onDeleteItem"
+                  />
+                  <div class="ele-text-placeholder">上传视频（mp4格式），视频时长不超过60秒，视频大小不超过200M。</div>
+                </a-form-item>
+                <a-form-item label="商品名称" name="goodsName">
+                  <a-space style="margin-bottom: 20px">
+                    <a-input
+                      allow-clear
+                      show-count
+                      :maxlength="60"
+                      style="width: 558px"
+                      placeholder="请输入商品名称"
+                      v-model:value="form.goodsName"
+                    />
+                  </a-space>
+                </a-form-item>
+                <a-form-item label="商品卖点" name="comments">
+                  <a-input
+                    allow-clear
+                    :maxlength="60"
+                    style="width: 558px"
+                    placeholder="此款商品美观大方 性价比较高 不容错过"
+                    v-model:value="form.comments"
+                  />
+                </a-form-item>
+              </a-col>
+            </a-row>
+          </a-card>
+          <a-card title="规格售价与库存" :bordered="false" class="goods-form">
+            <a-form-item label="规格类型" name="specs">
+              <a-radio-group v-model:value="form.specs">
+                <a-radio :value="0">单规格</a-radio>
+                <a-radio :value="1">多规格</a-radio>
+              </a-radio-group>
+            </a-form-item>
+            <a-form-item label="商品价格" name="price" v-if="form.specs == 0">
+              <a-input-number :placeholder="`商品价格`" style="width: 180px" v-model:value="form.price" />
+              <div class="ele-text-placeholder">商品的实际购买金额，最低0.01</div>
+            </a-form-item>
+            <a-form-item label="划线价格" name="salePrice" v-if="form.specs == 0">
+              <a-input-number :placeholder="`划线价格`" style="width: 180px" v-model:value="form.salePrice" />
+              <div class="ele-text-placeholder">划线价仅用于商品页展示</div>
+            </a-form-item>
+            <a-form-item label="当前库存" name="stock" v-if="form.specs == 0">
+              <a-input-number :placeholder="`划线价格`" style="width: 180px" v-model:value="form.stock" />
+              <div class="ele-text-placeholder">商品的实际库存数量，为0时用户无法下单</div>
+            </a-form-item>
+            <!-- 商品多规格 -->
+            <a-form-item label="商品规格" name="skuList" v-if="form.specs == 1">
+              <template v-for="(item, index) in specList" :key="index">
+                <a-card class="spec-card">
+                  <template #title>
+                  <span style="margin-right: 10px">{{
+                      `属性${index + 1}`
+                    }}</span>
+                    <SelectSpec
+                      placeholder="请选择属性"
+                      :width="130"
+                      :specDict="specDict"
+                      :index="index"
+                      v-model:value="specList[index].specName"
+                      @done="changeAttr"
+                    />
+                  </template>
+                  <template #extra>
+                    <a @click="delAttribute(index)">删除属性</a>
+                  </template>
+                  <!--属性列表-->
+                  <div class="spec-list">
+                    <template v-for="(val,valIndex) in item.valueList" :key="valIndex">
+                      <a-tag color="#108ee9" closable @close="onClose(index,valIndex)">{{ val.specValue }}</a-tag>
+                    </template>
+                    <SelectSpecValue
+                      placeholder="请选择规格值"
+                      :width="130"
+                      :specId="item.specId"
+                      :index="index"
+                      @done="changeAttrValue"
+                    />
+                  </div>
+                </a-card>
+              </template>
+              <a-card :bordered="false" v-if="specList.length < 3">
+                <a @click="addAttribute"
+                ><PlusCircleOutlined style="margin-right: 4px" />创建新属性</a
+                >
+              </a-card>
+              skuList: {{ skuList }}
+              <!--            <a-divider />-->
+              <!--            {{ form.goodsSkus }}-->
+              <a-divider />
+              <!--            {{ skuColumns }}-->
+              <!-- 生生的sku数据 -->
+              <div class="sku-table">
+                <a-table
+                  :pagination="false"
+                  :dataSource="skuList"
+                  :columns="skuColumns"
+                  :scroll="{ y: 500 }"
+                >
+                  <template #bodyCell="{ record, column, index }">
+                    <template v-if="column.key === 'line'">
+                      {{ index + 1 }}
+                    </template>
+                    <template v-if="column.key === 'image'">
+                      <SelectFile
+                        :placeholder="`请选择商品图片`"
+                        :limit="1"
+                        :data="record.images || []"
+                        :index="index"
+                        @done="chooseImageItem"
+                        @del="onDeleteItem"
+                      />
+                    </template>
+                    <template v-if="column.key === 'price'">
+                      <a-input :placeholder="`商品价格`" v-model:value="skuList[index].price" />
+                    </template>
+                    <template v-if="column.key === 'salePrice'">
+                      <a-input :placeholder="`市场价`" v-model:value="record.salePrice" />
+                    </template>
+                    <template v-if="column.key === 'stock'">
+                      <a-input :placeholder="`库存`" v-model:value="record.stock" />
+                    </template>
+                    <template v-if="column.key === 'skuNo'">
+                      <a-input :placeholder="`编码`" v-model:value="record.skuNo" />
+                    </template>
+                  </template>
+                </a-table>
+                <!--              {{ skuColumns }}-->
+              </div>
+              <div class="bath-set">
+                <!--              <h5 class="title">批量设置</h5>-->
+                <a-space class="list">
+                  <a-input
+                    :placeholder="`售卖价`"
+                    v-model:value="bathSet.price"
+                  />
+                  <a-input
+                    :placeholder="`市场价`"
+                    v-model:value="bathSet.salePrice"
+                  />
+                  <a-input :placeholder="`库存`" v-model:value="bathSet.stock" />
+                  <a-input
+                    :placeholder="`规格编码`"
+                    v-model:value="bathSet.skuNo"
+                  />
+                  <a-button type="primary" @click="onBathSet">批量设置</a-button>
+                </a-space>
+              </div>
+            </a-form-item>
+            <a-form-item label="库存计算方式" name="deductStockType">
+              <a-radio-group v-model:value="form.deductStockType">
+                <a-radio :value="10">下单减库存</a-radio>
+                <a-radio :value="20">付款减库存</a-radio>
+              </a-radio-group>
+            </a-form-item>
+          </a-card>
+
+          <a-card title="商品详情" :bordered="false" class="goods-form">
+            <!-- 编辑器 -->
+            <tinymce-editor
+              ref="editorRef"
+              class="content"
+              v-model:value="content"
+              :disabled="disabled"
+              :init="config"
+              placeholder="图片直接粘贴自动上传"
+              @paste="onPaste"
+            />
+            <div style="margin-top: 20px">
+              <SelectFile
+                :placeholder="`请选择视频文件`"
+                :limit="9"
+                :data="files"
+                @done="chooseFile"
+                @del="onDeleteFile"
+              />
+            </div>
+            <div class="ele-text-placeholder"
+              >最多上传20个素材，拖拽可进行排序，单张图片需限制在10M以内</div
+            >
+          </a-card>
+
+          <a-card title="商品参数" :bordered="false" class="goods-form" />
+
+          <a-card title="更多设置" :bordered="false" class="goods-form" />
+          <a-card :bordered="false" class="goods-form">
+            <a-button type="primary" block size="large" @click="save">保存</a-button>
+          </a-card>
+
+
+          <div class="body-bottom"></div>
+
+
+          <a-card
+            :bordered="false"
+            class="goods-form"
+            style="position: fixed; bottom: 0; opacity: 0.9"
+          >
+<!--              <div style="width: 100px">-->
+<!--                <a-button block danger size="large" @click="save"-->
+<!--                  >删除</a-button-->
+<!--                >-->
+<!--              </div>-->
+              <div style="width: 100px">
+                <a-button type="primary" block size="large" @click="save">保存</a-button>
+              </div>
+<!--              <div style="width: 100px">-->
+<!--                <a-button type="primary" block size="large" @click="save"-->
+<!--                  >上架</a-button-->
+<!--                >-->
+<!--              </div>-->
+          </a-card>
+        </a-form>
+      </div>
+      <!-- 载入模拟器 -->
+      <Simulator :form="form" />
+    </div>
+  </a-page-header>
+</template>
+
+<script lang="ts" setup>
+  // 表单数据
+  import useFormData from '@/utils/use-form-data';
+  import { reactive, ref, unref, watch } from 'vue';
+  import { FormInstance, RuleObject } from 'ant-design-vue/es/form';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { Form, message } from 'ant-design-vue';
+  import { getDictionaryOptions, getMerchantId, openUrl } from "@/utils/common";
+  import { addGoods, updateGoods } from '@/api/shop/goods';
+  import { useRouter } from 'vue-router';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import { BathSet, Goods } from '@/api/shop/goods/model';
+  import {PlusCircleOutlined} from '@ant-design/icons-vue';
+  import { getGoods } from '@/api/shop/goods';
+  import { listGoodsCategory } from '@/api/shop/goodsCategory';
+  import { FileRecord } from '@/api/system/file/model';
+  import {toTreeData, uuid} from 'ele-admin-pro';
+  import { ArticleCategory } from '@/api/cms/category/model';
+  import TinymceEditor from "@/components/TinymceEditor/index.vue";
+  import {uploadFile, uploadOss} from "@/api/system/file";
+  import {ColumnItem} from "ele-admin-pro/es/ele-pro-table/types";
+  import {listSpec} from '@/api/shop/spec';
+  import {Spec} from "@/api/shop/spec/model";
+  import { getMerchantName } from "@/utils/merchant";
+  import router from "@/router";
+  import { Merchant } from "@/api/shop/merchant/model";
+
+  const { currentRoute } = useRouter();
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+  const { push } = useRouter();
+  const useForm = Form.useForm;
+  const fileList = ref<any[]>([]);
+  const files = ref<ItemType[]>([]);
+  const imgList = ref<any[]>([]);
+  const specList = ref<any[]>([]);
+  const skuList = ref<any[]>([]);
+  const specDict = ref<any[]>([]);
+  const disabled = ref(false);
+  const addColumns = ref<ColumnItem[]>([]);
+  // 是否是修改
+  const isUpdate = ref(false);
+  const content = ref('');
+  const loading = ref(false);
+  const formRef = ref<FormInstance | null>(null);
+  const images = ref<ItemType[]>([]);
+  const category = ref<string[]>([]);
+  // 树形数据
+  const data = ref<ArticleCategory[]>([]);
+  // 树展开的key
+  const expandedRowKeys = ref<number[]>([]);
+  // 树选中的key
+  const selectedRowKeys = ref<number[]>([]);
+  // 选中数据
+  const current = ref<ArticleCategory | any>(null);
+  // 字典数据
+  const goodsAttr = getDictionaryOptions('goodsAttr');
+  const index = ref(0);
+
+  const { form, assignFields } = useFormData<Goods>({
+    goodsId: undefined,
+    type: 1,
+    goodsName: '',
+    image: '',
+    content: '',
+    code: '',
+    categoryId: undefined,
+    categoryName: '',
+    categoryParent: '',
+    categoryChildren: '',
+    specs: 0,
+    goodsSkus: [],
+    goodsSpecs: [],
+    position: undefined,
+    price: undefined,
+    salePrice: undefined,
+    sales: undefined,
+    stock: 1000,
+    deductStockType: 20,
+    files: '',
+    comments: '',
+    recommend: 0,
+    sortNumber: undefined,
+    status: undefined,
+    merchantName: '',
+    merchantId: getMerchantId()
+  });
+  const skuColumns = ref<ColumnItem[]>([
+    {
+      dataIndex: 'line',
+      key: 'line'
+    }
+  ]);
+  const defaultColumns = ref<ColumnItem[]>([
+    {
+      title: '预览图',
+      dataIndex: 'image',
+      width: 120,
+      align: 'center',
+      key: 'image'
+    },
+    {
+      title: '商品价格',
+      dataIndex: 'price',
+      width: 120,
+      align: 'center',
+      key: 'price'
+    },
+    {
+      title: '划线价格',
+      dataIndex: 'salePrice',
+      width: 120,
+      align: 'center',
+      key: 'salePrice'
+    },
+    {
+      title: '库存数量',
+      dataIndex: 'stock',
+      width: 120,
+      align: 'center',
+      key: 'stock'
+    },
+    {
+      title: '规格编码',
+      dataIndex: 'skuNo',
+      width: 120,
+      align: 'center',
+      key: 'skuNo'
+    }
+  ]);
+
+  const bathSet = ref<BathSet>({});
+
+  // 表单验证规则
+  const rules = reactive({
+    type: [
+      {
+        required: true,
+        message: '请选择商品类型',
+        type: 'number',
+        trigger: 'blur'
+      }
+    ],
+    specs: [
+      {
+        required: true,
+        message: '请选择规格类型',
+        type: 'number',
+        trigger: 'blur'
+      }
+    ],
+    price: [
+      {
+        required: true,
+        message: '请填写商品价格',
+        type: 'number',
+        trigger: 'blur'
+      }
+    ],
+    stock: [
+      {
+        required: true,
+        message: '请填写商品库存',
+        type: 'number',
+        trigger: 'blur'
+      }
+    ],
+    merchantId: [
+      {
+        required: true,
+        message: '请选择店铺',
+        type: 'number',
+        trigger: 'blur'
+      }
+    ],
+    categoryId: [
+      {
+        required: true,
+        type: 'string',
+        message: '选择商品分类',
+        trigger: 'blur',
+        validator: async (_rule: RuleObject, value: string) => {
+          if (!form.categoryId) {
+            return Promise.reject('选择商品分类');
+          }
+          return Promise.resolve();
+        }
+      }
+    ],
+    goodsName: [
+      {
+        required: true,
+        message: '请选择商品名称',
+        type: 'string',
+        trigger: 'blur'
+      }
+    ],
+    sortNumber: [
+      {
+        required: true,
+        message: '请输入排序号',
+        type: 'number',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  const onType = (index: number) => {
+    form.type = index;
+  };
+
+  const addAttribute = () => {
+    specList.value.push({
+      specId: 0,
+      specName: undefined,
+      valueList: []
+    })
+  };
+
+  const delAttribute = (index) => {
+    specList.value.splice(index,1);
+    skuColumns.value.splice(index,1);
+  };
+
+  const changeAttr = (item: Spec,index: number) => {
+    // 排重（未做）
+    specList.value[index].specId = item.specId;
+    specList.value[index].specName = item.value;
+    specList.value[index].valueList = [];
+  };
+
+  const changeAttrValue = (item: any, index: number) => {
+    specList.value[index].specId = item.specId;
+    // 添加属性
+    const length = specList.value[index].valueList.length;
+    specList.value[index].valueList.push({
+      specValueId: item.specValueId,
+      specValue: item.value,
+      specId: item.specId
+    })
+    // 组装表头
+    const arr = ref<any>([]);
+    specList.value.map((d) => {
+      arr.value.push({
+        title: d.specName,
+        dataIndex: `specValue${length}`,
+        key: `specValue${length}`,
+        width: 70,
+        align: 'center',
+      })
+    })
+    // 组装skuList
+    setTimeout(() => {
+      generateSku();
+    },200);
+  }
+
+  // 生成sku
+  const generateSku = () => {
+    skuColumns.value = [
+      {
+        dataIndex: 'line',
+        width: 50,
+        key: 'line'
+      }
+    ];
+    // 根据选中的sku生成表格列
+    specList.value.forEach((item,index) => {
+      skuColumns.value.push({
+        title: item.specName,
+        dataIndex: `specValue${index}`,
+        key: `specValue${index}`,
+        align: 'center',
+      });
+    });
+
+    // 增加额外的列
+    const dataList = [
+      {
+        title: '商品图片',
+        dataIndex: 'image',
+        width: 120,
+        align: 'center',
+        key: 'image',
+      },
+      {
+        title: '价格',
+        dataIndex: 'price',
+        key: 'price',
+        width: 120,
+        align: 'center',
+      },
+      {
+        title: '市场价',
+        dataIndex: 'salePrice',
+        width: 120,
+        align: 'center',
+        key: 'salePrice'
+      },
+      {
+        title: '库存',
+        dataIndex: 'stock',
+        width: 120,
+        align: 'center',
+        key: 'stock'
+      },
+      {
+        title: 'SKU编码',
+        dataIndex: 'skuNo',
+        width: 120,
+        align: 'center',
+        key: 'skuNo'
+      }
+    ];
+
+    dataList.forEach((item) => {
+      skuColumns.value.push({
+        title: item.title,
+        dataIndex: item.key,
+        key: item.key,
+        align: 'center',
+      });
+    });
+
+    // 组合规格值
+    const attrList = [];
+    specList.value.forEach((item, index) => {
+      attrList.push([]);
+      const propType = `specValue${index}`;
+      item.valueList.forEach((subItem) => {
+        attrList[index].push({
+          propValue: subItem.specValue,
+          propCode: null,
+          propType: propType
+        });
+      });
+    });
+    const attrs = differentCombinations(attrList);
+
+    // 将规格值加入到表格列中
+    attrs.forEach((itemList, index) => {
+      // skuList.value[index] = [];
+      itemList.forEach((subItem) => {
+        console.log(index)
+        console.log(subItem);
+        const key = subItem.propType;
+        const value = subItem.propValue;
+        skuList.value[index][key] = value;
+        skuList.value[index]['pirce'] = 0.1
+      });
+    });
+  };
+
+  // 生成sku函数
+  const differentCombinations = function (param) {
+    return param.reduce(
+      (a, b) => {
+        const ret = [];
+        a.forEach((i) => b.forEach((j) => ret.push(i.concat([j]))));
+        return ret;
+      },
+      [[]]
+    );
+  };
+
+  const onClose = (index: number, valIndex: number) => {
+    specList.value[index].valueList.splice(valIndex,1);
+  }
+
+
+  const chooseImage = (data: FileRecord) => {
+    images.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+    form.image = data.url;
+  };
+
+  const chooseImageItem = (data: FileRecord) => {
+    const index = data?.index;
+    skuList.value[index].images = []
+    skuList.value[index].images.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+    skuList.value[index].image = data.path;
+  };
+
+  const onDeleteItem = (index: number) => {
+    images.value.splice(index, 1);
+  };
+
+  const chooseFile = (data: FileRecord) => {
+    files.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+  };
+
+  const onDeleteFile = (index: number) => {
+    files.value.splice(index, 1);
+  };
+
+  const chooseGoodsCategory = (item,value) => {
+    console.log(item);
+    console.log(value);
+    form.categoryId = value[1].value;
+    form.categoryParent = value[0].label;
+    form.categoryChildren = value[1].label;
+  }
+
+  /* 搜索 */
+  const chooseMerchantId = (item: Merchant) => {
+    form.merchantName = item.merchantName;
+    form.merchantId = item.merchantId;
+  };
+
+  const onBathSet = () => {
+    skuList.value.map(d => {
+      console.log(d);
+      d.price = bathSet.value.price;
+      d.salePrice = bathSet.value.salePrice;
+      d.stock = bathSet.value.stock;
+      d.skuNo = bathSet.value.skuNo;
+    })
+  }
+
+
+  const editorRef = ref<InstanceType<typeof TinymceEditor> | null>(null);
+  const config = ref({
+    height: 240,
+    plugins: 'code preview fullscreen searchreplace save autosave link autolink image media table codesample lists advlist charmap emoticons anchor directionality pagebreak quickbars nonbreaking visualblocks visualchars wordcount',
+    toolbar: false,
+    images_upload_handler: (blobInfo, success, error) => {
+      const file = blobInfo.blob();
+      const formData = new FormData();
+      formData.append('file', file, file.name);
+      uploadOss(file).then(res => {
+        success(res.path)
+      }).catch((msg) => {
+        error(msg);
+      })
+    },
+  });
+
+  /* 粘贴图片上传服务器并插入编辑器 */
+  const onPaste = (e) => {
+    const items = (e.clipboardData || e.originalEvent.clipboardData).items;
+    let hasFile = false;
+    for (let i = 0; i < items.length; i++) {
+      if (items[i].type.indexOf('image') !== -1) {
+        let file = items[i].getAsFile();
+        const item: ItemType = {
+          file,
+          uid: (file as any).lastModified,
+          name: file.name
+        };
+        uploadFile(<File>item.file)
+          .then((result) => {
+            const addPath = `<p><img class="content-img" src="${result.url}"></p>`;
+            content.value = content.value + addPath
+          })
+          .catch((e) => {
+            message.error(e.message);
+          });
+        hasFile = true;
+      }
+    }
+    if (hasFile) {
+      e.preventDefault();
+    }
+  }
+
+  const reload = () => {
+    // 读取商品分类
+    listGoodsCategory()
+      .then((list) => {
+        loading.value = false;
+        const eks: number[] = [];
+        list.forEach((d) => {
+          d.key = d.categoryId;
+          d.value = d.categoryId;
+          if (typeof d.categoryId === 'number') {
+            eks.push(d.categoryId);
+          }
+        });
+        expandedRowKeys.value = eks;
+        data.value = toTreeData({
+          data: list.map((d) => {
+            d.disabled = d.type != 0;
+            return d;
+          }),
+          idField: 'categoryId',
+          parentIdField: 'parentId'
+        });
+        if (list.length) {
+          if (typeof list[0].categoryId === 'number') {
+            selectedRowKeys.value = [list[0].categoryId];
+          }
+          current.value = list[0];
+        } else {
+          selectedRowKeys.value = [];
+          current.value = null;
+        }
+      })
+      .catch((e) => {
+        loading.value = false;
+        message.error(e.message);
+      });
+    // 规格列表
+    listSpec({}).then(list => {
+      specDict.value = list.map((d,i) => {
+        return {
+          specId: d.specId,
+          name: d.specName,
+          value: d.specName,
+<<<<<<< HEAD
+          list: d.specValues?.map(v => {
+=======
+          list: d.specValue?.map(v => {
+>>>>>>> origin/master
+            return {
+              specId: v.specId,
+              specValueId: v.specValueId,
+              name: v.specValue,
+              value: v.specValue
+            }
+          })
+        };
+      })
+    })
+    // 读取商品信息
+    if (form.goodsId) {
+      images.value = [];
+      files.value = [];
+      category.value = [];
+      content.value = '';
+      getGoods(form.goodsId).then((data) => {
+        assignFields(data);
+        if (data.image) {
+          const arr = JSON.parse(data.image);
+          arr.map((img) => {
+            images.value.push({
+              uid: uuid(),
+              url: img,
+              status: 'done'
+            });
+          });
+        }
+        if (data.files) {
+          const arr = JSON.parse(data.files);
+          arr.map((img) => {
+            files.value.push({
+              uid: uuid(),
+              url: img,
+              status: 'done'
+            });
+          });
+        }
+        if(data.content){
+          content.value = data.content;
+        }
+        if(data.goodsSpecs){
+          specList.value = data.goodsSpecs.map(d => {
+            d.valueList = [];
+            const split = d.specValues?.split(',');
+            split?.map(text => {
+              d.valueList?.push({
+                specValue: text
+              })
+            })
+            return d;
+          });
+        }
+
+        setTimeout(() => {
+          if(data.categoryParent){
+            console.log(category.value);
+            category.value.push(data.categoryParent);
+          }
+          if(data.categoryChildren){
+            category.value.push(data.categoryChildren);
+          }
+          if(data.goodsSkus){
+            skuList.value = data.goodsSkus;
+            generateSku();
+          }
+        },300)
+      });
+    }
+  };
+
+  const { validate, resetFields, validateInfos } = useForm(form, rules);
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        images.value.map((d) => {
+          imgList.value.push(d.url);
+        });
+        files.value.map((d) => {
+          fileList.value.push(d.url);
+        });
+        skuList.value.map(d => {
+          d.images = undefined
+        })
+        if(getMerchantId()){
+          form.merchantId = getMerchantId();
+          form.merchantName = getMerchantName();
+        }
+        const formData = {
+          ...form,
+          content: content.value,
+          image: JSON.stringify(imgList.value),
+          files: JSON.stringify(fileList.value),
+          goodsSpecs: specList.value,
+          goodsSkus: skuList.value
+        };
+        const saveOrUpdate = isUpdate.value ? updateGoods : addGoods;
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            imgList.value = []
+            fileList.value = []
+            category.value = []
+            resetFields();
+            message.success(msg);
+            setTimeout(() => {
+              router.go(-1)
+            },1000)
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  watch(
+    currentRoute,
+    (route) => {
+      const { query } = unref(route);
+      const { goodsId } = query;
+      if (goodsId) {
+        form.goodsId = Number(goodsId);
+        isUpdate.value = true;
+        reload();
+      } else {
+        isUpdate.value = false;
+        imgList.value = []
+        fileList.value = []
+        // images.value = [];
+        // skuList.value = [];
+        // specList.value = [];
+        // category.value = [];
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'GoodsAdd'
+  };
+</script>
+<style lang="less" scoped>
+  .goods-form {
+    width: 1020px;
+    margin-bottom: 10px;
+    .spec-card {
+      margin-top: 20px;
+      background-color: #f8fcff;
+      .spec-list {
+        margin-left: 52px;
+        .spec-value-list {
+          margin-bottom: 10px;
+          display: flex;
+          align-items: center;
+          .image {
+            margin-top: 10px;
+            margin-left: 10px;
+          }
+        }
+      }
+    }
+  }
+  .body-bottom {
+    height: 100px;
+  }
+  .bath-set {
+    display: flex;
+    flex-direction: column;
+    margin-top: 16px;
+    .list {
+      width: 100%;
+      margin: 10px 0;
+      display: flex;
+    }
+  }
+  .sku-table {
+    .goods-list {
+      .head {
+        display: flex;
+        justify-content: space-between;
+        border-bottom: 1px solid #eeeeee;
+        div {
+          padding: 6px;
+          width: 25%;
+        }
+      }
+      .table-td {
+        display: flex;
+        justify-content: space-between;
+        div {
+          width: 25%;
+          padding: 6px;
+        }
+      }
+    }
+    .desc {
+      margin-top: 20px;
+      padding: 10px 0;
+    }
+  }
+  .preview-ui {
+    position: fixed;
+    top: 155px;
+    right: 30px;
+    background: url('@/assets/img/app-ui.png');
+    background-repeat: no-repeat;
+    background-position: top;
+    background-size: 100%;
+    width: 390px;
+    height: 844px;
+  }
+  .ele-text-placeholder{
+    line-height: 2em;
+  }
+</style>
diff --git a/src/views/shop/goods/components/goodsEdit.vue b/src/views/shop/goods/components/goodsEdit.vue
index 7e13d73..16e8f8b 100644
--- a/src/views/shop/goods/components/goodsEdit.vue
+++ b/src/views/shop/goods/components/goodsEdit.vue
@@ -1,7 +1,7 @@
 <!-- 编辑弹窗 -->
 <template>
   <ele-modal
-    :width="900"
+    :width="'80%'"
     :visible="visible"
     :maskClosable="false"
     :maxable="maxable"
@@ -14,38 +14,38 @@
       ref="formRef"
       :model="form"
       :rules="rules"
-      :label-col="styleResponsive ? { md: 3, sm: 5, xs: 24 } : { flex: '90px' }"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
       :wrapper-col="
         styleResponsive ? { md: 24, sm: 24, xs: 24 } : { flex: '1' }
       "
     >
       <a-tabs type="card" v-model:active-key="active" @change="onChange">
         <a-tab-pane tab="基本信息" key="base">
-          <a-form-item label="商品类型" name="type">
-            <a-space>
-              <a-button
-                :type="form.type == 1 ? 'primary' : ''"
-                @click="onType(1)"
-                :ghost="form.type == 1"
-              >实物商品
-              </a-button
-              >
-              <a-button
-                :type="form.type == 2 ? 'primary' : ''"
-                @click="onType(2)"
-                :ghost="form.type == 2"
-              >虚拟商品
-              </a-button
-              >
-            </a-space>
-            <div class="ele-text-placeholder">
-              {{
-                form.type == 1
-                  ? `支持快递邮寄、同城配送或到店自提方式发货`
-                  : '电子券码等，线下到店核销，无需备货'
-              }}
-            </div>
-          </a-form-item>
+<!--          <a-form-item label="商品类型" name="type">-->
+<!--            <a-space>-->
+<!--              <a-button-->
+<!--                :type="form.type == 1 ? 'primary' : ''"-->
+<!--                @click="onType(1)"-->
+<!--                :ghost="form.type == 1"-->
+<!--              >实物商品-->
+<!--              </a-button-->
+<!--              >-->
+<!--              <a-button-->
+<!--                :type="form.type == 2 ? 'primary' : ''"-->
+<!--                @click="onType(2)"-->
+<!--                :ghost="form.type == 2"-->
+<!--              >虚拟商品-->
+<!--              </a-button-->
+<!--              >-->
+<!--            </a-space>-->
+<!--            <div class="ele-text-placeholder">-->
+<!--              {{-->
+<!--                form.type == 1-->
+<!--                  ? `支持快递邮寄、同城配送或到店自提方式发货`-->
+<!--                  : '电子券码等，线下到店核销，无需备货'-->
+<!--              }}-->
+<!--            </div>-->
+<!--          </a-form-item>-->
           <a-form-item
             v-if="!merchantId"
             label="选择店铺"
@@ -59,6 +59,15 @@
               @done="chooseMerchantId"
             />
           </a-form-item>
+          <a-form-item label="供应商" name="supplierMerchantId" v-if="!merchantId">
+            <SelectMerchant
+              :placeholder="`选择供应商`"
+              class="input-item"
+              style="width: 558px"
+              v-model:value="form.supplierName"
+              @done="chooseSupplier"
+            />
+          </a-form-item>
           <a-form-item label="商品名称" name="goodsName">
             <a-input
               allow-clear
@@ -76,7 +85,7 @@
               @done="chooseGoodsCategory"
             />
           </a-form-item>
-          <a-form-item label="菜品分类" name="categoryId" v-else>
+          <a-form-item label="商品分类" name="categoryId" v-else>
             <SelectGoodsCategory
               :merchantId="merchantId"
               placeholder="请选择商品分类"
@@ -120,10 +129,12 @@
                 v-model:value="form.price"
               />
               <a-checkbox v-model:checked="form.priceGift">有赠品</a-checkbox>
+              <a-input-number v-if="form.priceGift" v-model:value="form.priceGiftNum" style="width: 200px"
+                              placeholder="请输入赠品数量"/>
             </a-space>
             <div class="ele-text-placeholder">商品的实际购买金额，最低0.01</div>
           </a-form-item>
-          <a-form-item label="经销商" name="buyingPrice">
+          <a-form-item label="经销商价" name="dealerPrice" v-if="!merchantId">
             <a-space>
               <a-input-number
                 :placeholder="`经销商价格`"
@@ -132,10 +143,12 @@
                 v-model:value="form.dealerPrice"
               />
               <a-checkbox v-model:checked="form.dealerGift">有赠品</a-checkbox>
+              <a-input-number v-if="form.dealerGift" v-model:value="form.dealerGiftNum" style="width: 200px"
+                              placeholder="请输入赠品数量"/>
             </a-space>
             <div class="ele-text-placeholder">经销商价格</div>
           </a-form-item>
-          <a-form-item label="进货价" name="buyingPrice">
+          <a-form-item label="进货价" name="buyingPrice"  v-if="!merchantId">
             <a-space>
               <a-input-number
                 :placeholder="`进货价`"
@@ -146,6 +159,75 @@
             </a-space>
             <div class="ele-text-placeholder">进货价</div>
           </a-form-item>
+          <a-form-item label="连锁店价格" name="chainStorePrice" v-if="!merchantId">
+            <a-space>
+              <a-input-number
+                :placeholder="`请输入连锁店价格`"
+                :min="0.01"
+                style="width: 240px"
+                v-model:value="form.chainStorePrice"
+              />
+            </a-space>
+            <div class="ele-text-placeholder">连锁店价格</div>
+          </a-form-item>
+          <a-form-item label="连锁店差价比例(%)" name="chainStoreRate" v-if="!merchantId">
+            <a-space>
+              <a-input-number
+                :placeholder="`请输入连锁店差价比例(%)`"
+                :min="0.01"
+                :max="100"
+                style="width: 240px"
+                v-model:value="form.chainStoreRate"
+              />
+            </a-space>
+            <div class="ele-text-placeholder">连锁店差价比例(%)</div>
+          </a-form-item>
+          <a-form-item label="会员店价格" name="memberStorePrice" v-if="!merchantId">
+            <a-space>
+              <a-input-number
+                :placeholder="`请输入会员店价格`"
+                :min="0.01"
+                style="width: 240px"
+                v-model:value="form.memberStorePrice"
+              />
+            </a-space>
+            <div class="ele-text-placeholder">会员店价格</div>
+          </a-form-item>
+          <a-form-item label="会员店差价比例(%)" name="memberStoreRate" v-if="!merchantId">
+            <a-space>
+              <a-input-number
+                :placeholder="`请输入会员店差价比例(%)`"
+                :min="0.01"
+                :max="100"
+                style="width: 240px"
+                v-model:value="form.memberStoreRate"
+              />
+            </a-space>
+            <div class="ele-text-placeholder">会员店差价比例(%)</div>
+          </a-form-item>
+          <a-form-item label="会员超市价格" name="memberMarketPrice" v-if="!merchantId">
+            <a-space>
+              <a-input-number
+                :placeholder="`请输入会员超市价格`"
+                :min="0.01"
+                style="width: 240px"
+                v-model:value="form.memberMarketPrice"
+              />
+            </a-space>
+            <div class="ele-text-placeholder">会员超市价格</div>
+          </a-form-item>
+          <a-form-item label="会员超市差价比例(%)" name="memberMarketRate" v-if="!merchantId">
+            <a-space>
+              <a-input-number
+                :placeholder="`请输入会员超市差价比例(%)`"
+                :min="0.01"
+                :max="100"
+                style="width: 240px"
+                v-model:value="form.memberMarketRate"
+              />
+            </a-space>
+            <div class="ele-text-placeholder">会员超市差价比例(%)</div>
+          </a-form-item>
           <a-form-item label="当前库存" name="stock">
             <a-input-number
               :placeholder="`商品库存`"
@@ -154,6 +236,9 @@
             />
             <div class="ele-text-placeholder">划线价仅用于商品页展示</div>
           </a-form-item>
+          <a-form-item label="是否新品">
+            <a-switch size="small" v-model:checked="form.isNew" :checked-value="1" :un-checked-value="0"/>
+          </a-form-item>
           <a-form-item label="商品图片" name="image">
             <SelectFile
               :placeholder="`请选择视频文件`"
@@ -162,10 +247,9 @@
               @done="chooseImage"
               @del="onDeleteItem"
             />
-            <div class="ele-text-placeholder"
-            >支持上传视频（mp4格式），视频时长不超过60秒，视频大小不超过200M。
-            </div
-            >
+            <div class="ele-text-placeholder">
+              支持上传视频（mp4格式），视频时长不超过60秒，视频大小不超过200M。
+            </div>
           </a-form-item>
           <a-form-item label="轮播图" name="files">
             <SelectFile
@@ -291,16 +375,16 @@
           </a-form-item>
         </a-tab-pane>
         <a-tab-pane tab="商品详情" key="content">
-<!--          <a-form-item label="视频">-->
-<!--            <SelectFile-->
-<!--              type="video"-->
-<!--              :placeholder="`请选择商品视频`"-->
-<!--              :limit="1"-->
-<!--              :data="videos || []"-->
-<!--              @done="chooseVideo"-->
-<!--              @del="onDeleteVideo"-->
-<!--            />-->
-<!--          </a-form-item>-->
+          <!--          <a-form-item label="视频">-->
+          <!--            <SelectFile-->
+          <!--              type="video"-->
+          <!--              :placeholder="`请选择商品视频`"-->
+          <!--              :limit="1"-->
+          <!--              :data="videos || []"-->
+          <!--              @done="chooseVideo"-->
+          <!--              @del="onDeleteVideo"-->
+          <!--            />-->
+          <!--          </a-form-item>-->
           <a-form-item name="content">
             <!-- 编辑器 -->
             <tinymce-editor
@@ -441,6 +525,11 @@ const columns = [
     key: 'image',
     align: 'center'
   },
+  {
+    title: 'SKU',
+    dataIndex: 'sku',
+    align: 'center'
+  },
   {
     title: '售价',
     dataIndex: 'salePrice',
@@ -488,13 +577,24 @@ const form = reactive<Goods>({
   dealerPrice: undefined,
   priceGift: undefined,
   dealerGift: undefined,
+  priceGiftNum: undefined,
+  dealerGiftNum: undefined,
   files: undefined,
   sales: 0,
+  isNew: 0,
   gainIntegral: 0,
   goodsWeight: undefined,
   recommend: undefined,
   merchantId: undefined,
   merchantName: undefined,
+  supplierMerchantId: undefined,
+  supplierName: undefined,
+  chainStorePrice: undefined,
+  memberStorePrice: undefined,
+  memberMarketPrice: undefined,
+  chainStoreRate: undefined,
+  memberStoreRate: undefined,
+  memberMarketRate: undefined,
   stock: 1000,
   deductStockType: 20,
   isShow: 1,
@@ -589,6 +689,14 @@ const rules = reactive({
       trigger: 'blur'
     }
   ],
+  supplierMerchantId: [
+    {
+      required: true,
+      message: '请选择供应商',
+      type: 'number',
+      trigger: 'blur'
+    }
+  ],
   categoryId: [
     {
       required: true,
@@ -618,7 +726,32 @@ const rules = reactive({
       type: 'number',
       trigger: 'blur'
     }
-  ]
+  ],
+  chainStorePrice: [
+    {
+      required: true,
+      message: '请输入连锁店价格',
+      type: 'number',
+      trigger: 'blur'
+    }
+  ],
+  memberStorePrice: [
+    {
+      required: true,
+      message: '请输入会员店价格',
+      type: 'number',
+      trigger: 'blur'
+    }
+  ],
+  memberMarketPrice: [
+    {
+      required: true,
+      message: '请输入会员超市价格',
+      type: 'number',
+      trigger: 'blur'
+    }
+  ],
+
 });
 
 const onType = (index: number) => {
@@ -631,6 +764,11 @@ const chooseMerchantId = (item: Merchant) => {
   form.merchantId = item.merchantId;
 };
 
+const chooseSupplier = (item: Merchant) => {
+  form.supplierName = item.merchantName;
+  form.supplierMerchantId = item.merchantId;
+};
+
 const chooseGoodsCategory = (item: GoodsCategory, value: any) => {
   form.categoryId = value[1].value;
   form.parentName = value[0].label;
@@ -866,6 +1004,8 @@ const save = () => {
     .validate()
     .then(() => {
       loading.value = true;
+      if (form.priceGift && !form.priceGiftNum) return message.error('请输入会员赠品数量');
+      if (form.dealerGift && !form.dealerGiftNum) return message.error('请输入经销商赠品数量');
       const formData = {
         ...form,
         content: content.value,
diff --git a/src/views/shop/goods/index.vue b/src/views/shop/goods/index.vue
index 030e2cb..c9a41c3 100644
--- a/src/views/shop/goods/index.vue
+++ b/src/views/shop/goods/index.vue
@@ -25,15 +25,26 @@
           <template #bodyCell="{ column, record }">
             <template v-if="column.key === 'goodsName'">
               <a @click="openSpmUrl(`/item`, record, record.goodsId)">{{
-                record.goodsName
-              }}</a>
+                  record.goodsName
+                }}</a>
             </template>
             <template v-if="column.key === 'type'">
               <a-tag v-if="record.type === 0">虚拟商品</a-tag>
               <a-tag v-if="record.type === 1">实物商品</a-tag>
             </template>
             <template v-if="column.key === 'image'">
-              <a-image :src="record.image" :width="80" />
+              <a-image :src="record.image" :width="80" v-if="!record.image.includes('.mp4')"/>
+              <div v-else class="flex justify-center items-center">
+                <div @click="open(record.image)" class="relative cursor-pointer w-[80px] h-80px">
+                  <img
+                    :src="record.image + '?x-oss-process=video/snapshot,t_2000,f_jpg,w_200,h_200'"
+                    style="width: 80px; height: 80px"
+                  />
+                  <div class="absolute" style="left: 30px; top: 30px">
+                    <play-circle-outlined style="font-size: 20px; color:white"/>
+                  </div>
+                </div>
+              </div>
             </template>
             <template v-if="column.key === 'salePrice'">
               ￥{{ formatNumber(record.salePrice) }}
@@ -44,24 +55,30 @@
                 color="green"
                 class="cursor-pointer"
                 @click="onUpdate(record)"
-                >出售中</a-tag
+              >出售中
+              </a-tag
               >
               <a-tag
                 v-if="record.isShow === 0"
                 color="red"
                 class="cursor-pointer"
                 @click="onUpdate(record)"
-                >已下架</a-tag
+              >已下架
+              </a-tag
               >
             </template>
             <template v-if="column.key === 'status'">
               <a-tag v-if="record.status === 0" color="green">显示</a-tag>
               <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
             </template>
+            <template v-if="column.key === 'isNew'">
+              <a-tag v-if="record.isNew === 1" color="green">新品</a-tag>
+              <a-tag v-else color="red">非新品</a-tag>
+            </template>
             <template v-if="column.key === 'action'">
               <a-space>
                 <a @click="openEdit(record)">修改</a>
-                <a-divider type="vertical" />
+                <a-divider type="vertical"/>
                 <a-popconfirm
                   title="确定要删除此记录吗？"
                   @confirm="remove(record)"
@@ -75,333 +92,347 @@
       </a-card>
 
       <!-- 编辑弹窗 -->
-      <GoodsEdit v-model:visible="showEdit" :data="current" @done="reload" />
+      <GoodsEdit v-model:visible="showEdit" :data="current" @done="reload"/>
     </div>
   </div>
 </template>
 
 <script lang="ts" setup>
-  import { createVNode, ref, watch } from 'vue';
-  import { message, Modal } from 'ant-design-vue';
-  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
-  import type { EleProTable } from 'ele-admin-pro';
-  import type {
-    DatasourceFunction,
-    ColumnItem
-  } from 'ele-admin-pro/es/ele-pro-table/types';
-  import Search from './components/search.vue';
-  import GoodsEdit from './components/goodsEdit.vue';
-  import {
-    pageGoods,
-    removeGoods,
-    removeBatchGoods,
-    updateGoods
-  } from '@/api/shop/goods';
-  import type { Goods, GoodsParam } from '@/api/shop/goods/model';
-  import { formatNumber } from 'ele-admin-pro/es';
-  import router from '@/router';
-  import { openSpmUrl, openUrl } from '@/utils/common';
-  import { getSiteDomain } from '@/utils/domain';
-  import { getMerchantId } from '@/utils/merchant';
+import {createVNode, ref, watch} from 'vue';
+import {message, Modal} from 'ant-design-vue';
+import {ExclamationCircleOutlined, PlayCircleOutlined} from '@ant-design/icons-vue';
+import type {EleProTable} from 'ele-admin-pro';
+import type {
+  DatasourceFunction,
+  ColumnItem
+} from 'ele-admin-pro/es/ele-pro-table/types';
+import Search from './components/search.vue';
+import GoodsEdit from './components/goodsEdit.vue';
+import {
+  pageGoods,
+  removeGoods,
+  removeBatchGoods,
+  updateGoods
+} from '@/api/shop/goods';
+import type {Goods, GoodsParam} from '@/api/shop/goods/model';
+import {formatNumber} from 'ele-admin-pro/es';
+import router from '@/router';
+import {openSpmUrl} from '@/utils/common';
+import {getMerchantId} from '@/utils/merchant';
 
-  // 表格实例
-  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+// 表格实例
+const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
 
-  // 表格选中数据
-  const selection = ref<Goods[]>([]);
-  // 当前编辑数据
-  const current = ref<Goods | null>(null);
-  // 是否显示编辑弹窗
-  const showEdit = ref(false);
-  // 是否显示批量移动弹窗
-  const showMove = ref(false);
-  // 网站域名
-  const domain = getSiteDomain();
+// 表格选中数据
+const selection = ref<Goods[]>([]);
+// 当前编辑数据
+const current = ref<Goods | null>(null);
+// 是否显示编辑弹窗
+const showEdit = ref(false);
+// 是否显示批量移动弹窗
+const showMove = ref(false);
 
-  // 表格数据源
-  const datasource: DatasourceFunction = ({
+// 表格数据源
+const datasource: DatasourceFunction = ({
+                                          page,
+                                          limit,
+                                          where,
+                                          orders,
+                                          filters
+                                        }) => {
+  if (filters) {
+    where.status = filters.status;
+  }
+  where.merchantId = getMerchantId();
+  return pageGoods({
+    ...where,
+    ...orders,
     page,
-    limit,
-    where,
-    orders,
-    filters
-  }) => {
-    if (filters) {
-      where.status = filters.status;
-    }
-    where.merchantId = getMerchantId();
-    return pageGoods({
-      ...where,
-      ...orders,
-      page,
-      limit
-    });
-  };
+    limit
+  });
+};
 
-  // 表格列配置
-  const columns = ref<ColumnItem[]>([
-    {
-      title: '22商品ID',
-      dataIndex: 'goodsId',
-      key: 'goodsId',
-      align: 'center',
-      width: 90
-    },
-    {
-      title: '商品名称',
-      dataIndex: 'goodsName',
-      key: 'goodsName',
-      align: 'center'
-    },
-    {
-      title: '商品图片',
-      dataIndex: 'image',
-      key: 'image',
-      align: 'center'
-    },
-    {
-      title: '所属门店',
-      dataIndex: 'merchantName',
-      key: 'merchantName',
-      ellipsis: true,
-      align: 'center'
-    },
-    {
-      title: '商品编码',
-      dataIndex: 'code',
-      key: 'code',
-      align: 'center',
-      hideInTable: true
-    },
-    {
-      title: '类型',
-      dataIndex: 'type',
-      key: 'type',
-      align: 'center',
-      hideInTable: true
-    },
-    {
-      title: '分类ID',
-      dataIndex: 'categoryId',
-      key: 'categoryId',
-      align: 'center',
-      hideInTable: true
-    },
-    {
-      title: '一级分类',
-      dataIndex: 'categoryParent',
-      key: 'categoryParent',
-      align: 'center',
-      hideInTable: true
-    },
-    {
-      title: '二级分类',
-      dataIndex: 'categoryChildren',
-      key: 'categoryChildren',
-      align: 'center',
-      hideInTable: true
-    },
-    {
-      title: '多规格',
-      dataIndex: 'specs',
-      key: 'specs',
-      align: 'center',
-      hideInTable: true
-    },
-    {
-      title: '货架',
-      dataIndex: 'position',
-      key: 'position',
-      align: 'center',
-      hideInTable: true
-    },
-    {
-      title: '商品价格',
-      dataIndex: 'salePrice',
-      key: 'salePrice',
-      sorter: true,
-      align: 'center'
-    },
-    {
-      title: '进货价格',
-      dataIndex: 'price',
-      key: 'price',
-      align: 'center',
-      hideInTable: true
-    },
-    {
-      title: '库存计算方式',
-      dataIndex: 'deductStockType',
-      key: 'deductStockType',
-      align: 'center',
-      hideInTable: true
-    },
-    {
-      title: '销量',
-      dataIndex: 'sales',
-      key: 'sales',
-      sorter: true,
-      align: 'center'
-    },
-    {
-      title: '库存',
-      dataIndex: 'stock',
-      key: 'stock',
-      sorter: true,
-      align: 'center'
-    },
-    {
-      title: '商品重量',
-      dataIndex: 'goodsWeight',
-      key: 'goodsWeight',
-      align: 'center',
-      hideInTable: true
-    },
-    {
-      title: '推荐',
-      dataIndex: 'recommend',
-      key: 'recommend',
-      sorter: true,
-      align: 'center',
-      hideInTable: true
-    },
-    {
-      title: '商户ID',
-      dataIndex: 'merchantId',
-      key: 'merchantId',
-      align: 'center',
-      hideInTable: true
-    },
-    {
-      title: '状态',
-      dataIndex: 'isShow',
-      key: 'isShow',
-      sorter: true,
-      align: 'center'
-    },
-    {
-      title: '排序号',
-      dataIndex: 'sortNumber',
-      key: 'sortNumber',
-      sorter: true,
-      align: 'center',
-      hideInTable: true
-    },
-    {
-      title: '创建时间',
-      dataIndex: 'createTime',
-      key: 'createTime',
-      align: 'center',
-      width: 120,
-      sorter: true
-    },
-    {
-      title: '操作',
-      key: 'action',
-      width: 180,
-      fixed: 'right',
-      align: 'center',
-      hideInSetting: true
-    }
-  ]);
+// 表格列配置
+const columns = ref<ColumnItem[]>([
+  {
+    title: '商品ID',
+    dataIndex: 'goodsId',
+    key: 'goodsId',
+    align: 'center',
+    width: 90
+  },
+  {
+    title: '商品名称',
+    dataIndex: 'goodsName',
+    key: 'goodsName',
+    align: 'center'
+  },
+  {
+    title: '商品图片',
+    dataIndex: 'image',
+    key: 'image',
+    align: 'center'
+  },
+  {
+    title: '所属门店',
+    dataIndex: 'merchantName',
+    key: 'merchantName',
+    ellipsis: true,
+    align: 'center'
+  },
+  {
+    title: '供应商',
+    dataIndex: 'supplierName',
+    ellipsis: true,
+    align: 'center',
+    hideInTable: true
+  },
+  {
+    title: '商品编码',
+    dataIndex: 'code',
+    key: 'code',
+    align: 'center',
+    hideInTable: true
+  },
+  {
+    title: '类型',
+    dataIndex: 'type',
+    key: 'type',
+    align: 'center',
+    hideInTable: true
+  },
+  {
+    title: '分类ID',
+    dataIndex: 'categoryId',
+    key: 'categoryId',
+    align: 'center',
+    hideInTable: true
+  },
+  {
+    title: '一级分类',
+    dataIndex: 'categoryParent',
+    key: 'categoryParent',
+    align: 'center',
+    hideInTable: true
+  },
+  {
+    title: '二级分类',
+    dataIndex: 'categoryChildren',
+    key: 'categoryChildren',
+    align: 'center',
+    hideInTable: true
+  },
+  {
+    title: '多规格',
+    dataIndex: 'specs',
+    key: 'specs',
+    align: 'center',
+    hideInTable: true
+  },
+  {
+    title: '货架',
+    dataIndex: 'position',
+    key: 'position',
+    align: 'center',
+    hideInTable: true
+  },
+  {
+    title: '商品价格',
+    dataIndex: 'salePrice',
+    key: 'salePrice',
+    sorter: true,
+    align: 'center'
+  },
+  {
+    title: '进货价格',
+    dataIndex: 'price',
+    key: 'price',
+    align: 'center',
+    hideInTable: true
+  },
+  {
+    title: '库存计算方式',
+    dataIndex: 'deductStockType',
+    key: 'deductStockType',
+    align: 'center',
+    hideInTable: true
+  },
+  {
+    title: '销量',
+    dataIndex: 'sales',
+    key: 'sales',
+    sorter: true,
+    align: 'center'
+  },
+  {
+    title: '库存',
+    dataIndex: 'stock',
+    key: 'stock',
+    sorter: true,
+    align: 'center'
+  },
+  {
+    title: '商品重量',
+    dataIndex: 'goodsWeight',
+    key: 'goodsWeight',
+    align: 'center',
+    hideInTable: true
+  },
+  {
+    title: '推荐',
+    dataIndex: 'recommend',
+    key: 'recommend',
+    sorter: true,
+    align: 'center',
+    hideInTable: true
+  },
+  {
+    title: '商户ID',
+    dataIndex: 'merchantId',
+    key: 'merchantId',
+    align: 'center',
+    hideInTable: true
+  },
+  {
+    title: '状态',
+    dataIndex: 'isShow',
+    key: 'isShow',
+    sorter: true,
+    align: 'center'
+  },
+  {
+    title: '是否新品',
+    dataIndex: 'isNew',
+    key: 'isNew',
+    align: 'center'
+  },
+  {
+    title: '排序号',
+    dataIndex: 'sortNumber',
+    key: 'sortNumber',
+    sorter: true,
+    align: 'center',
+    hideInTable: true
+  },
+  {
+    title: '创建时间',
+    dataIndex: 'createTime',
+    key: 'createTime',
+    align: 'center',
+    width: 120,
+    sorter: true
+  },
+  {
+    title: '操作',
+    key: 'action',
+    width: 180,
+    fixed: 'right',
+    align: 'center',
+    hideInSetting: true
+  }
+]);
 
-  /* 搜索 */
-  const reload = (where?: GoodsParam) => {
-    selection.value = [];
-    tableRef?.value?.reload({ where: where });
-  };
+/* 搜索 */
+const reload = (where?: GoodsParam) => {
+  selection.value = [];
+  tableRef?.value?.reload({where: where});
+};
 
-  /* 打开编辑弹窗 */
-  const openEdit = (row?: Goods) => {
-    current.value = row ?? null;
-    showEdit.value = true;
-  };
+/* 打开编辑弹窗 */
+const openEdit = (row?: Goods) => {
+  current.value = row ?? null;
+  showEdit.value = true;
+};
 
-  /* 打开批量移动弹窗 */
-  const openMove = () => {
-    showMove.value = true;
-  };
+/* 打开批量移动弹窗 */
+const openMove = () => {
+  showMove.value = true;
+};
 
-  const onUpdate = (row?: Goods) => {
-    const isShow = row?.isShow == 0 ? 1 : 0;
-    updateGoods({ ...row, isShow }).then((msg) => {
+const open = (url?: string) => {
+  window.open(url);
+};
+
+const onUpdate = (row?: Goods) => {
+  const isShow = row?.isShow == 0 ? 1 : 0;
+  updateGoods({...row, isShow}).then((msg) => {
+    message.success(msg);
+    reload();
+  });
+};
+
+/* 删除单个 */
+const remove = (row: Goods) => {
+  const hide = message.loading('请求中..', 0);
+  removeGoods(row.goodsId)
+    .then((msg) => {
+      hide();
       message.success(msg);
       reload();
+    })
+    .catch((e) => {
+      hide();
+      message.error(e.message);
     });
-  };
+};
 
-  /* 删除单个 */
-  const remove = (row: Goods) => {
-    const hide = message.loading('请求中..', 0);
-    removeGoods(row.goodsId)
-      .then((msg) => {
-        hide();
-        message.success(msg);
-        reload();
-      })
-      .catch((e) => {
-        hide();
-        message.error(e.message);
-      });
-  };
-
-  /* 批量删除 */
-  const removeBatch = () => {
-    if (!selection.value.length) {
-      message.error('请至少选择一条数据');
-      return;
+/* 批量删除 */
+const removeBatch = () => {
+  if (!selection.value.length) {
+    message.error('请至少选择一条数据');
+    return;
+  }
+  Modal.confirm({
+    title: '提示',
+    content: '确定要删除选中的记录吗?',
+    icon: createVNode(ExclamationCircleOutlined),
+    maskClosable: true,
+    onOk: () => {
+      const hide = message.loading('请求中..', 0);
+      removeBatchGoods(selection.value.map((d) => d.goodsId))
+        .then((msg) => {
+          hide();
+          message.success(msg);
+          reload();
+        })
+        .catch((e) => {
+          hide();
+          message.error(e.message);
+        });
     }
-    Modal.confirm({
-      title: '提示',
-      content: '确定要删除选中的记录吗?',
-      icon: createVNode(ExclamationCircleOutlined),
-      maskClosable: true,
-      onOk: () => {
-        const hide = message.loading('请求中..', 0);
-        removeBatchGoods(selection.value.map((d) => d.goodsId))
-          .then((msg) => {
-            hide();
-            message.success(msg);
-            reload();
-          })
-          .catch((e) => {
-            hide();
-            message.error(e.message);
-          });
-      }
-    });
-  };
+  });
+};
 
-  /* 自定义行属性 */
-  const customRow = (record: Goods) => {
-    return {
-      // 行点击事件
-      onClick: () => {
-        // console.log(record);
-      },
-      // 行双击事件
-      onDblclick: () => {
-        openEdit(record);
-      }
-    };
-  };
-
-  watch(
-    () => router.currentRoute.value.params.id,
-    (id) => {
-      if (id && Number(id) > 0) {
-        localStorage.setItem('MerchantId', `${id}`);
-      }
-      reload();
+/* 自定义行属性 */
+const customRow = (record: Goods) => {
+  return {
+    // 行点击事件
+    onClick: () => {
+      // console.log(record);
     },
-    { immediate: true }
-  );
+    // 行双击事件
+    onDblclick: () => {
+      openEdit(record);
+    }
+  };
+};
+
+watch(
+  () => router.currentRoute.value.params.id,
+  (id) => {
+    if (id && Number(id) > 0) {
+      localStorage.setItem('MerchantId', `${id}`);
+    }
+    reload();
+  },
+  {immediate: true}
+);
 </script>
 
 <script lang="ts">
-  export default {
-    name: 'Goods'
-  };
+export default {
+  name: 'Goods'
+};
 </script>
 
 <style lang="less" scoped></style>
diff --git a/src/views/shop/goodsCategory/components/category-edit.vue b/src/views/shop/goodsCategory/components/category-edit.vue
index 5fea57f..1b43a58 100644
--- a/src/views/shop/goodsCategory/components/category-edit.vue
+++ b/src/views/shop/goodsCategory/components/category-edit.vue
@@ -151,6 +151,7 @@
     parentId: undefined,
     image: '',
     status: 0,
+    type: undefined,
     sortNumber: 100,
     merchantId: getMerchantId()
   });
@@ -222,7 +223,8 @@
           ...form,
           // menuType 对应的值与后端不一致在前端处理
           // menuType: form.menuType === 2 ? 1 : 0,
-          parentId: form.parentId || 0
+          parentId: form.parentId || 0,
+          type: getMerchantId() ? 1 : 0
         };
         const saveOrUpdate = isUpdate.value
           ? updateGoodsCategory
diff --git a/src/views/shop/goodsCategory/components/merchant-category-edit.vue b/src/views/shop/goodsCategory/components/merchant-category-edit.vue
index a417365..1753e77 100644
--- a/src/views/shop/goodsCategory/components/merchant-category-edit.vue
+++ b/src/views/shop/goodsCategory/components/merchant-category-edit.vue
@@ -214,7 +214,7 @@
           // menuType 对应的值与后端不一致在前端处理
           // menuType: form.menuType === 2 ? 1 : 0,
           parentId: form.parentId || 0,
-          type: 1
+          // type: 1
         };
         const saveOrUpdate = isUpdate.value
           ? updateGoodsCategory
diff --git a/src/views/shop/goodsCategory/index.vue b/src/views/shop/goodsCategory/index.vue
index 20de59a..4fa18ad 100644
--- a/src/views/shop/goodsCategory/index.vue
+++ b/src/views/shop/goodsCategory/index.vue
@@ -44,33 +44,36 @@
             <a-tag v-else-if="record.type === 2" color="orange">链接</a-tag>
           </template>
           <template v-else-if="column.key === 'title'">
-            <a-avatar
-              :size="26"
-              shape="square"
-              :src="`${record.image}`"
-              style="margin-right: 10px"
-              v-if="record.image"
-            />
-            <a
-              :href="`${domain}/product/${record.categoryId}`"
-              target="_blank"
-              >{{ record.title }}</a
-            >
+            <div class="flex justify-start items-center">
+              <div class="bg-gray-300 w-[30px]">
+                <a-avatar
+                  :size="26"
+                  shape="square"
+                  :src="`${record.image}`"
+                  style="margin-right: 10px"
+                  v-if="record.image"
+                />
+              </div>
+              <a
+                :href="`${domain}/product/${record.categoryId}`"
+                target="_blank"
+              >{{ record.title }}</a>
+            </div>
           </template>
           <template v-if="column.key === 'showIndex'">
             <a-space @click="onShowIndex(record)">
               <span v-if="record.showIndex === 1" class="ele-text-success"
-                ><CheckOutlined
+              ><CheckOutlined
               /></span>
-              <span v-else class="ele-text-placeholder"><CloseOutlined /></span>
+              <span v-else class="ele-text-placeholder"><CloseOutlined/></span>
             </a-space>
           </template>
           <template v-if="column.key === 'recommend'">
             <a-space @click="onRecommend(record)">
               <span v-if="record.recommend === 1" class="ele-text-success"
-                ><CheckOutlined
+              ><CheckOutlined
               /></span>
-              <span v-else class="ele-text-placeholder"><CloseOutlined /></span>
+              <span v-else class="ele-text-placeholder"><CloseOutlined/></span>
             </a-space>
           </template>
           <template v-if="column.key === 'status'">
@@ -80,11 +83,13 @@
           <template v-else-if="column.key === 'action'">
             <a-space>
               <a @click="openEdit(null, record.categoryId)">添加</a>
-              <a-divider type="vertical" />
-              <a @click="moveUp(record)">上移<ArrowUpOutlined /></a>
-              <a-divider type="vertical" />
+              <a-divider type="vertical"/>
+              <a @click="moveUp(record)">上移
+                <ArrowUpOutlined/>
+              </a>
+              <a-divider type="vertical"/>
               <a @click="openEdit(record)">修改</a>
-              <a-divider type="vertical" />
+              <a-divider type="vertical"/>
               <a-popconfirm
                 placement="topRight"
                 title="确定要删除此分类吗？"
@@ -100,7 +105,7 @@
     <!-- 商城分类编辑弹窗 -->
     <category-edit
       v-model:visible="showEdit"
-      v-if="merchantId == 0"
+      v-if="!merchantId"
       :data="current"
       :parent-id="parentId"
       :category-list="categoryData"
@@ -120,305 +125,305 @@
 </template>
 
 <script lang="ts" setup>
-  import { ref, watch } from 'vue';
-  import { message } from 'ant-design-vue/es';
-  import {
-    ArrowUpOutlined,
-    PlusOutlined,
-    CheckOutlined,
-    CloseOutlined
-  } from '@ant-design/icons-vue';
-  import type {
-    DatasourceFunction,
-    ColumnItem,
-    EleProTableDone
-  } from 'ele-admin-pro/es/ele-pro-table/types';
-  import {
-    messageLoading,
-    toDateString,
-    isExternalLink,
-    toTreeData,
-    eachTreeData
-  } from 'ele-admin-pro/es';
-  import type { EleProTable } from 'ele-admin-pro/es';
-  import CategoryEdit from './components/category-edit.vue';
-  import MerchantCategoryEdit from './components/merchant-category-edit.vue';
-  import {
-    listGoodsCategory,
-    removeGoodsCategory,
-    updateGoodsCategory
-  } from '@/api/shop/goodsCategory';
-  import type {
-    GoodsCategory,
-    GoodsCategoryParam
-  } from '@/api/shop/goodsCategory/model';
-  import { openNew, openPreview, openUrl } from '@/utils/common';
-  import { getSiteInfo } from '@/api/layout';
-  import router from '@/router';
-  import Search from './components/search.vue';
-  import { getSiteDomain } from '@/utils/domain';
-  import { getMerchantId } from "@/utils/merchant";
+import {ref, watch} from 'vue';
+import {message} from 'ant-design-vue/es';
+import {
+  ArrowUpOutlined,
+  PlusOutlined,
+  CheckOutlined,
+  CloseOutlined
+} from '@ant-design/icons-vue';
+import type {
+  DatasourceFunction,
+  ColumnItem,
+  EleProTableDone
+} from 'ele-admin-pro/es/ele-pro-table/types';
+import {
+  messageLoading,
+  toDateString,
+  isExternalLink,
+  toTreeData,
+  eachTreeData
+} from 'ele-admin-pro/es';
+import type {EleProTable} from 'ele-admin-pro/es';
+import CategoryEdit from './components/category-edit.vue';
+import MerchantCategoryEdit from './components/merchant-category-edit.vue';
+import {
+  listGoodsCategory,
+  removeGoodsCategory,
+  updateGoodsCategory
+} from '@/api/shop/goodsCategory';
+import type {
+  GoodsCategory,
+  GoodsCategoryParam
+} from '@/api/shop/goodsCategory/model';
+import {openNew, openPreview, openUrl} from '@/utils/common';
+import {getSiteInfo} from '@/api/layout';
+import router from '@/router';
+import Search from './components/search.vue';
+import {getSiteDomain} from '@/utils/domain';
+import {getMerchantId} from "@/utils/merchant";
 
-  // 表格实例
-  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+// 表格实例
+const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
 
-  // 表格列配置
-  const columns = ref<ColumnItem[]>([
-    {
-      title: 'ID',
-      dataIndex: 'categoryId',
-      width: 80
-    },
-    {
-      title: '分类名称',
-      dataIndex: 'title',
-      key: 'title',
-      showSorterTooltip: false,
-      ellipsis: true
-    },
-    // {
-    //   title: '路由地址',
-    //   dataIndex: 'path',
-    //   key: 'path'
-    // },
-    // {
-    //   title: '组件路径',
-    //   dataIndex: 'component',
-    //   key: 'component'
-    // },
-    // {
-    //   title: '类型',
-    //   dataIndex: 'type',
-    //   key: 'type',
-    //   align: 'center',
-    //   width: 120
-    // },
-    {
-      title: '首页显示',
-      dataIndex: 'showIndex',
-      key: 'showIndex',
-      align: 'center',
-      width: 120,
-      hideInTable: false
-    },
-    {
-      title: '推荐',
-      dataIndex: 'recommend',
-      key: 'recommend',
-      align: 'center',
-      width: 120,
-      hideInTable: false
-    },
-    {
-      title: '排序',
-      dataIndex: 'sortNumber',
-      align: 'center',
-      width: 120,
-      showSorterTooltip: false
-    },
-    {
-      title: '状态',
-      dataIndex: 'status',
-      key: 'status',
-      align: 'center',
-      width: 120,
-      showSorterTooltip: false,
-      customRender: ({ text }) => ['显示', '隐藏'][text]
-    },
-    {
-      title: '创建时间',
-      dataIndex: 'createTime',
-      showSorterTooltip: false,
-      ellipsis: true,
-      width: 180,
-      customRender: ({ text }) => toDateString(text)
-    },
-    {
-      title: '操作',
-      key: 'action',
-      width: 200,
-      align: 'center'
-    }
-  ]);
+// 表格列配置
+const columns = ref<ColumnItem[]>([
+  {
+    title: 'ID',
+    dataIndex: 'categoryId',
+    width: 80
+  },
+  {
+    title: '分类名称',
+    dataIndex: 'title',
+    key: 'title',
+    showSorterTooltip: false,
+    ellipsis: true
+  },
+  // {
+  //   title: '路由地址',
+  //   dataIndex: 'path',
+  //   key: 'path'
+  // },
+  // {
+  //   title: '组件路径',
+  //   dataIndex: 'component',
+  //   key: 'component'
+  // },
+  // {
+  //   title: '类型',
+  //   dataIndex: 'type',
+  //   key: 'type',
+  //   align: 'center',
+  //   width: 120
+  // },
+  {
+    title: '首页显示',
+    dataIndex: 'showIndex',
+    key: 'showIndex',
+    align: 'center',
+    width: 120,
+    hideInTable: false
+  },
+  {
+    title: '推荐',
+    dataIndex: 'recommend',
+    key: 'recommend',
+    align: 'center',
+    width: 120,
+    hideInTable: false
+  },
+  {
+    title: '排序',
+    dataIndex: 'sortNumber',
+    align: 'center',
+    width: 120,
+    showSorterTooltip: false
+  },
+  {
+    title: '状态',
+    dataIndex: 'status',
+    key: 'status',
+    align: 'center',
+    width: 120,
+    showSorterTooltip: false,
+    customRender: ({text}) => ['显示', '隐藏'][text]
+  },
+  {
+    title: '创建时间',
+    dataIndex: 'createTime',
+    showSorterTooltip: false,
+    ellipsis: true,
+    width: 180,
+    customRender: ({text}) => toDateString(text)
+  },
+  {
+    title: '操作',
+    key: 'action',
+    width: 200,
+    align: 'center'
+  }
+]);
 
-  // 当前编辑数据
-  const current = ref<GoodsCategory | null>(null);
-  // 是否显示编辑弹窗
-  const showEdit = ref(false);
-  // 上级分类id
-  const parentId = ref<number>();
-  // 分类数据
-  const categoryData = ref<GoodsCategory[]>([]);
-  // 表格展开的行
-  const expandedRowKeys = ref<number[]>([]);
-  const searchText = ref('');
-  const tenantId = ref<number>();
-  const merchantId = ref<number>();
-  // 网站域名
-  const domain = getSiteDomain();
+// 当前编辑数据
+const current = ref<GoodsCategory | null>(null);
+// 是否显示编辑弹窗
+const showEdit = ref(false);
+// 上级分类id
+const parentId = ref<number>();
+// 分类数据
+const categoryData = ref<GoodsCategory[]>([]);
+// 表格展开的行
+const expandedRowKeys = ref<number[]>([]);
+const searchText = ref('');
+const tenantId = ref<number>();
+const merchantId = ref<number>();
+// 网站域名
+const domain = getSiteDomain();
 
-  getSiteInfo().then((data) => {
-    tenantId.value = data.tenantId;
+getSiteInfo().then((data) => {
+  tenantId.value = data.tenantId;
+});
+
+// 表格数据源
+const datasource: DatasourceFunction = ({where}) => {
+  where.title = searchText.value;
+  where.type = 0;
+  if (getMerchantId()) {
+    where.type = 1;
+    where.merchantId = getMerchantId();
+  }
+  return listGoodsCategory({...where});
+};
+
+const linkTo = (item: GoodsCategory) => {
+  if (item.children) {
+    return false;
+  }
+  const url = `http://${tenantId.value}.${domain.value}${item.path}`;
+  return openNew(url.replace(':id', String(item.categoryId)));
+};
+
+// 上移
+const moveUp = (row?: GoodsCategory) => {
+  updateGoodsCategory({
+    categoryId: row?.categoryId,
+    sortNumber: Number(row?.sortNumber) - 1
+  }).then((msg) => {
+    message.success(msg);
+    reload();
   });
+};
 
-  // 表格数据源
-  const datasource: DatasourceFunction = ({ where }) => {
-    where.title = searchText.value;
-    where.type = 0;
-    if (getMerchantId()) {
-      where.type = 1;
-      where.merchantId = getMerchantId();
-    }
-    return listGoodsCategory({ ...where });
-  };
+/* 数据转为树形结构 */
+const parseData = (data: GoodsCategory[]) => {
+  return toTreeData({
+    data: data.map((d) => {
+      return {...d, key: d.categoryId, value: d.categoryId};
+    }),
+    idField: 'categoryId',
+    parentIdField: 'parentId'
+  });
+};
 
-  const linkTo = (item: GoodsCategory) => {
-    if (item.children) {
-      return false;
-    }
-    const url = `http://${tenantId.value}.${domain.value}${item.path}`;
-    return openNew(url.replace(':id', String(item.categoryId)));
-  };
+/* 表格渲染完成回调 */
+const onDone: EleProTableDone<GoodsCategory> = ({data}) => {
+  categoryData.value = data;
+};
 
-  // 上移
-  const moveUp = (row?: GoodsCategory) => {
-    updateGoodsCategory({
-      categoryId: row?.categoryId,
-      sortNumber: Number(row?.sortNumber) - 1
-    }).then((msg) => {
+/* 刷新表格 */
+const reload = (where?: GoodsCategoryParam) => {
+  tableRef?.value?.reload({where});
+};
+
+/* 打开编辑弹窗 */
+const openEdit = (row?: GoodsCategory | null, id?: number) => {
+  current.value = row ?? null;
+  parentId.value = id;
+  showEdit.value = true;
+};
+
+/* 删除单个 */
+const remove = (row: GoodsCategory) => {
+  if (row.children?.length) {
+    message.error('请先删除子节点');
+    return;
+  }
+  const hide = messageLoading('请求中..', 0);
+  removeGoodsCategory(row.categoryId)
+    .then((msg) => {
+      hide();
       message.success(msg);
       reload();
+    })
+    .catch((e) => {
+      hide();
+      message.error(e.message);
     });
-  };
+};
 
-  /* 数据转为树形结构 */
-  const parseData = (data: GoodsCategory[]) => {
-    return toTreeData({
-      data: data.map((d) => {
-        return { ...d, key: d.categoryId, value: d.categoryId };
-      }),
-      idField: 'categoryId',
-      parentIdField: 'parentId'
-    });
-  };
-
-  /* 表格渲染完成回调 */
-  const onDone: EleProTableDone<GoodsCategory> = ({ data }) => {
-    categoryData.value = data;
-  };
-
-  /* 刷新表格 */
-  const reload = (where?: GoodsCategoryParam) => {
-    tableRef?.value?.reload({ where });
-  };
-
-  /* 打开编辑弹窗 */
-  const openEdit = (row?: GoodsCategory | null, id?: number) => {
-    current.value = row ?? null;
-    parentId.value = id;
-    showEdit.value = true;
-  };
-
-  /* 删除单个 */
-  const remove = (row: GoodsCategory) => {
-    if (row.children?.length) {
-      message.error('请先删除子节点');
-      return;
+/* 展开全部 */
+const expandAll = () => {
+  let keys: number[] = [];
+  eachTreeData(categoryData.value, (d) => {
+    if (d.children && d.children.length && d.categoryId) {
+      keys.push(d.categoryId);
     }
-    const hide = messageLoading('请求中..', 0);
-    removeGoodsCategory(row.categoryId)
-      .then((msg) => {
-        hide();
-        message.success(msg);
-        reload();
-      })
-      .catch((e) => {
-        hide();
-        message.error(e.message);
-      });
-  };
+  });
+  expandedRowKeys.value = keys;
+};
 
-  /* 展开全部 */
-  const expandAll = () => {
-    let keys: number[] = [];
-    eachTreeData(categoryData.value, (d) => {
-      if (d.children && d.children.length && d.categoryId) {
-        keys.push(d.categoryId);
-      }
-    });
-    expandedRowKeys.value = keys;
-  };
+/* 折叠全部 */
+const foldAll = () => {
+  expandedRowKeys.value = [];
+};
 
-  /* 折叠全部 */
-  const foldAll = () => {
-    expandedRowKeys.value = [];
-  };
+/* 点击展开图标时触发 */
+const onExpand = (expanded: boolean, record: GoodsCategory) => {
+  if (expanded) {
+    expandedRowKeys.value = [
+      ...expandedRowKeys.value,
+      record.categoryId as number
+    ];
+  } else {
+    expandedRowKeys.value = expandedRowKeys.value.filter(
+      (d) => d !== record.categoryId
+    );
+  }
+};
 
-  /* 点击展开图标时触发 */
-  const onExpand = (expanded: boolean, record: GoodsCategory) => {
-    if (expanded) {
-      expandedRowKeys.value = [
-        ...expandedRowKeys.value,
-        record.categoryId as number
-      ];
-    } else {
-      expandedRowKeys.value = expandedRowKeys.value.filter(
-        (d) => d !== record.categoryId
-      );
-    }
-  };
+/* 判断是否是目录 */
+const isDirectory = (d: GoodsCategory) => {
+  return !!d.children?.length;
+};
 
-  /* 判断是否是目录 */
-  const isDirectory = (d: GoodsCategory) => {
-    return !!d.children?.length;
-  };
+const onShowIndex = (row: GoodsCategory) => {
+  updateGoodsCategory({
+    ...row,
+    showIndex: row.showIndex == 1 ? 0 : 1
+  }).then((msg) => {
+    message.success(msg);
+    reload();
+  });
+};
 
-  const onShowIndex = (row: GoodsCategory) => {
-    updateGoodsCategory({
-      ...row,
-      showIndex: row.showIndex == 1 ? 0 : 1
-    }).then((msg) => {
-      message.success(msg);
-      reload();
-    });
-  };
+const onRecommend = (row: GoodsCategory) => {
+  updateGoodsCategory({
+    ...row,
+    recommend: row.recommend == 1 ? 0 : 1
+  }).then((msg) => {
+    message.success(msg);
+    reload();
+  });
+};
 
-  const onRecommend = (row: GoodsCategory) => {
-    updateGoodsCategory({
-      ...row,
-      recommend: row.recommend == 1 ? 0 : 1
-    }).then((msg) => {
-      message.success(msg);
-      reload();
-    });
-  };
-
-  /* 自定义行属性 */
-  const customRow = (record: GoodsCategory) => {
-    return {
-      // 行点击事件
-      onClick: () => {
-        // console.log(record);
-      },
-      // 行双击事件
-      onDblclick: () => {
-        openEdit(record);
-      }
-    };
-  };
-
-  watch(
-    () => router.currentRoute.value.params.id,
-    (id) => {
-      merchantId.value = Number(id);
-      reload();
+/* 自定义行属性 */
+const customRow = (record: GoodsCategory) => {
+  return {
+    // 行点击事件
+    onClick: () => {
+      // console.log(record);
     },
-    { immediate: true }
-  );
+    // 行双击事件
+    onDblclick: () => {
+      openEdit(record);
+    }
+  };
+};
+
+watch(
+  () => router.currentRoute.value.params.id,
+  (id) => {
+    merchantId.value = Number(id);
+    reload();
+  },
+  {immediate: true}
+);
 </script>
 
 <script lang="ts">
-  export default {
-    name: 'GoodsCategory'
-  };
+export default {
+  name: 'GoodsCategory'
+};
 </script>
diff --git a/src/views/shop/goodsIncomeConfig/components/goodsIncomeConfigEdit.vue b/src/views/shop/goodsIncomeConfig/components/goodsIncomeConfigEdit.vue
new file mode 100644
index 0000000..c295d4a
--- /dev/null
+++ b/src/views/shop/goodsIncomeConfig/components/goodsIncomeConfigEdit.vue
@@ -0,0 +1,187 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑分润配置' : '添加分润配置'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="商品" name="goodsId">
+        <a-select v-model:value="form.goodsId" placeholder="请选择商品">
+          <a-select-option v-for="(item, index) in goodsList" :key="index" :value="item.goodsId">
+            {{ item.goodsName }}
+          </a-select-option>
+        </a-select>
+      </a-form-item>
+      <a-form-item label="店铺类型" name="merchantShopType">
+        <SelectMerchantType
+          :placeholder="`请选择店铺类型`"
+          v-model:value="form.merchantShopType"
+          @done="chooseShopType"
+        />
+      </a-form-item>
+      <a-form-item label="SKU" v-if="form.goodsId && goodsList.find(v => v.goodsId === form.goodsId)?.goodsSkus">
+        <a-select v-model:value="form.skuId" placeholder="请选择SKU">
+          <a-select-option v-for="(item, index) in goodsList.find(v => v.goodsId === form.goodsId)?.goodsSkus" :key="index" :value="item.id">
+            {{ item.sku }}
+          </a-select-option>
+        </a-select>
+      </a-form-item>
+      <a-form-item label="比例(%)" name="rate">
+        <a-input-number style="width: 200px"
+                        allow-clear
+                        placeholder="请输入比例"
+                        v-model:value="form.rate"
+        />
+      </a-form-item>
+
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+import {ref, reactive, watch} from 'vue';
+import {Form, message} from 'ant-design-vue';
+import {assignObject, uuid} from 'ele-admin-pro';
+import {addGoodsIncomeConfig, updateGoodsIncomeConfig} from '@/api/shop/goodsIncomeConfig';
+import {GoodsIncomeConfig} from '@/api/shop/goodsIncomeConfig/model';
+import {useThemeStore} from '@/store/modules/theme';
+import {storeToRefs} from 'pinia';
+import {ItemType} from 'ele-admin-pro/es/ele-image-upload/types';
+import {FormInstance} from 'ant-design-vue/es/form';
+import {MerchantType} from "@/api/shop/merchantType/model";
+import {Goods} from "@/api/shop/goods/model";
+import {listGoods} from "@/api/shop/goods";
+
+// 是否是修改
+const isUpdate = ref(false);
+const useForm = Form.useForm;
+// 是否开启响应式布局
+const themeStore = useThemeStore();
+const {styleResponsive} = storeToRefs(themeStore);
+
+const props = defineProps<{
+  // 弹窗是否打开
+  visible: boolean;
+  // 修改回显的数据
+  data?: GoodsIncomeConfig | null;
+}>();
+
+const emit = defineEmits<{
+  (e: 'done'): void;
+  (e: 'update:visible', visible: boolean): void;
+}>();
+
+// 提交状态
+const loading = ref(false);
+// 是否显示最大化切换按钮
+const maxable = ref(true);
+// 表格选中数据
+const formRef = ref<FormInstance | null>(null);
+const images = ref<ItemType[]>([]);
+
+// 用户信息
+const form = reactive<GoodsIncomeConfig>({
+  id: undefined,
+  goodsId: undefined,
+  merchantShopType: undefined,
+  skuId: undefined,
+  rate: undefined,
+  userId: undefined,
+  comments: undefined,
+  sortNumber: undefined,
+  deleted: undefined,
+  tenantId: undefined,
+  updateTime: undefined,
+  createTime: undefined,
+});
+
+/* 更新visible */
+const updateVisible = (value: boolean) => {
+  emit('update:visible', value);
+};
+
+// 表单验证规则
+const rules = reactive({
+  goodsIncomeConfigName: [
+    {
+      required: true,
+      type: 'string',
+      message: '请填写分润配置名称',
+      trigger: 'blur'
+    }
+  ]
+});
+
+const chooseShopType = (data: MerchantType) => {
+  form.merchantShopType = data.name;
+};
+
+
+const {resetFields} = useForm(form, rules);
+
+/* 保存编辑 */
+const save = () => {
+  if (!formRef.value) {
+    return;
+  }
+  formRef.value
+    .validate()
+    .then(() => {
+      loading.value = true;
+      const formData = {
+        ...form
+      };
+      const saveOrUpdate = isUpdate.value ? updateGoodsIncomeConfig : addGoodsIncomeConfig;
+      saveOrUpdate(formData)
+        .then((msg) => {
+          loading.value = false;
+          message.success(msg);
+          updateVisible(false);
+          emit('done');
+        })
+        .catch((e) => {
+          loading.value = false;
+          message.error(e.message);
+        });
+    })
+    .catch(() => {
+    });
+};
+
+const goodsList = ref<Goods[]>([]);
+const getGoodsList = async () => {
+  goodsList.value = await listGoods()
+}
+
+watch(
+  () => props.visible,
+  async (visible) => {
+    if (visible) {
+      await getGoodsList()
+      if (props.data) {
+        assignObject(form, props.data);
+        isUpdate.value = true;
+      } else {
+        isUpdate.value = false;
+      }
+    } else {
+      resetFields();
+    }
+  },
+  {immediate: true}
+);
+</script>
diff --git a/src/views/shop/goodsIncomeConfig/components/search.vue b/src/views/shop/goodsIncomeConfig/components/search.vue
new file mode 100644
index 0000000..82fea9d
--- /dev/null
+++ b/src/views/shop/goodsIncomeConfig/components/search.vue
@@ -0,0 +1,42 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <a-button type="primary" class="ele-btn-icon" @click="add">
+      <template #icon>
+        <PlusOutlined />
+      </template>
+      <span>添加</span>
+    </a-button>
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import type { GradeParam } from '@/api/user/grade/model';
+  import { watch } from 'vue';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: GradeParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>
diff --git a/src/views/shop/goodsIncomeConfig/index.vue b/src/views/shop/goodsIncomeConfig/index.vue
new file mode 100644
index 0000000..34409b2
--- /dev/null
+++ b/src/views/shop/goodsIncomeConfig/index.vue
@@ -0,0 +1,232 @@
+<template>
+  <div class="page">
+    <div class="ele-body">
+      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+        <ele-pro-table
+          ref="tableRef"
+          row-key="goodsIncomeConfigId"
+          :columns="columns"
+          :datasource="datasource"
+          :customRow="customRow"
+          tool-class="ele-toolbar-form"
+          class="sys-org-table"
+        >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              @add="openEdit"
+              @remove="removeBatch"
+              @batchMove="openMove"
+            />
+          </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'image'">
+              <a-image :src="record.image" :width="50" />
+            </template>
+            <template v-if="column.key === 'status'">
+              <a-tag v-if="record.status === 0" color="green">显示</a-tag>
+              <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
+            </template>
+            <template v-if="column.key === 'action'">
+              <a-space>
+                <a @click="openEdit(record)">修改</a>
+                <a-divider type="vertical" />
+                <a-popconfirm
+                  title="确定要删除此记录吗？"
+                  @confirm="remove(record)"
+                >
+                  <a class="ele-text-danger">删除</a>
+                </a-popconfirm>
+              </a-space>
+            </template>
+          </template>
+        </ele-pro-table>
+      </a-card>
+
+      <!-- 编辑弹窗 -->
+      <GoodsIncomeConfigEdit v-model:visible="showEdit" :data="current" @done="reload" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { createVNode, ref } from 'vue';
+  import { message, Modal } from 'ant-design-vue';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import type { EleProTable } from 'ele-admin-pro';
+  import { toDateString } from 'ele-admin-pro';
+  import type {
+    DatasourceFunction,
+    ColumnItem
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import Search from './components/search.vue';
+  import GoodsIncomeConfigEdit from './components/goodsIncomeConfigEdit.vue';
+  import { pageGoodsIncomeConfig, removeGoodsIncomeConfig, removeBatchGoodsIncomeConfig } from '@/api/shop/goodsIncomeConfig';
+  import type { GoodsIncomeConfig, GoodsIncomeConfigParam } from '@/api/shop/goodsIncomeConfig/model';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<GoodsIncomeConfig[]>([]);
+  // 当前编辑数据
+  const current = ref<GoodsIncomeConfig | null>(null);
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+  // 是否显示批量移动弹窗
+  const showMove = ref(false);
+  // 加载状态
+  const loading = ref(true);
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({
+    page,
+    limit,
+    where,
+    orders,
+    filters
+  }) => {
+    if (filters) {
+      where.status = filters.status;
+    }
+    return pageGoodsIncomeConfig({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: '商品',
+      dataIndex: ['goods', 'goodsName'],
+      key: 'goodsId',
+      align: 'center',
+    },
+    {
+      title: '店铺类型',
+      dataIndex: 'merchantShopType',
+      key: 'merchantShopType',
+      align: 'center',
+    },
+    {
+      title: 'SKU',
+      dataIndex: ['goodsSku', 'sku'],
+      key: 'spec',
+      align: 'center',
+    },
+    {
+      title: '比例(%)',
+      dataIndex: 'rate',
+      key: 'rate',
+      align: 'center',
+    },
+    {
+      title: '创建时间',
+      dataIndex: 'createTime',
+      key: 'createTime',
+      align: 'center',
+      sorter: true,
+      ellipsis: true,
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
+    },
+    {
+      title: '操作',
+      key: 'action',
+      width: 180,
+      fixed: 'right',
+      align: 'center',
+      hideInSetting: true
+    }
+  ]);
+
+  /* 搜索 */
+  const reload = (where?: GoodsIncomeConfigParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: GoodsIncomeConfig) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: GoodsIncomeConfig) => {
+    const hide = message.loading('请求中..', 0);
+    removeGoodsIncomeConfig(row.id)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  /* 批量删除 */
+  const removeBatch = () => {
+    if (!selection.value.length) {
+      message.error('请至少选择一条数据');
+      return;
+    }
+    Modal.confirm({
+      title: '提示',
+      content: '确定要删除选中的记录吗?',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = message.loading('请求中..', 0);
+        removeBatchGoodsIncomeConfig(selection.value.map((d) => d.goodsIncomeConfigId))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 查询 */
+  const query = () => {
+    loading.value = true;
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: GoodsIncomeConfig) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+  query();
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'GoodsIncomeConfig'
+  };
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/shop/goodsStockInMerchant/components/goodsStockInMerchantEdit.vue b/src/views/shop/goodsStockInMerchant/components/goodsStockInMerchantEdit.vue
new file mode 100644
index 0000000..956aecb
--- /dev/null
+++ b/src/views/shop/goodsStockInMerchant/components/goodsStockInMerchantEdit.vue
@@ -0,0 +1,161 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑商户商品库存' : '添加商户商品库存'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="商品" name="goodsId">
+        <a-select v-model:value="form.goodsId" placeholder="请选择商品" style="width: 100%">
+          <a-select-option v-for="(item, index) in goodsList" :value="item.goodsId" :key="index">{{
+              item.goodsName
+            }}
+          </a-select-option>
+        </a-select>
+      </a-form-item>
+      <a-form-item label="库存数量" name="stock">
+        <a-input
+          allow-clear
+          placeholder="请输入库存"
+          v-model:value="form.stock"
+        />
+      </a-form-item>
+
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+import {ref, reactive, watch} from 'vue';
+import {Form, message} from 'ant-design-vue';
+import {assignObject} from 'ele-admin-pro';
+import {addGoodsStockInMerchant, updateGoodsStockInMerchant} from '@/api/shop/goodsStockInMerchant';
+import {GoodsStockInMerchant} from '@/api/shop/goodsStockInMerchant/model';
+import {useThemeStore} from '@/store/modules/theme';
+import {storeToRefs} from 'pinia';
+import {FormInstance} from 'ant-design-vue/es/form';
+import {Goods} from "@/api/shop/goods/model";
+import {listGoods} from "@/api/shop/goods";
+
+// 是否是修改
+const isUpdate = ref(false);
+const useForm = Form.useForm;
+// 是否开启响应式布局
+const themeStore = useThemeStore();
+const {styleResponsive} = storeToRefs(themeStore);
+
+const props = defineProps<{
+  // 弹窗是否打开
+  visible: boolean;
+  // 修改回显的数据
+  data?: GoodsStockInMerchant | null;
+}>();
+
+const emit = defineEmits<{
+  (e: 'done'): void;
+  (e: 'update:visible', visible: boolean): void;
+}>();
+
+// 提交状态
+const loading = ref(false);
+// 是否显示最大化切换按钮
+const maxable = ref(true);
+// 表格选中数据
+const formRef = ref<FormInstance | null>(null);
+
+// 用户信息
+const form = reactive<GoodsStockInMerchant>({
+  id: undefined,
+  goodsId: undefined,
+  skuId: undefined,
+  num: undefined,
+  merchantId: undefined,
+  stock: undefined,
+  status: undefined,
+  comments: undefined,
+  sortNumber: undefined,
+  userId: undefined,
+  deleted: undefined,
+  tenantId: undefined,
+  createTime: undefined,
+  updateTime: undefined,
+});
+
+/* 更新visible */
+const updateVisible = (value: boolean) => {
+  emit('update:visible', value);
+};
+
+// 表单验证规则
+const rules = reactive({
+
+});
+
+const {resetFields} = useForm(form, rules);
+
+/* 保存编辑 */
+const save = () => {
+  if (!formRef.value) {
+    return;
+  }
+  formRef.value
+    .validate()
+    .then(() => {
+      loading.value = true;
+      const formData = {
+        ...form
+      };
+      const saveOrUpdate = isUpdate.value ? updateGoodsStockInMerchant : addGoodsStockInMerchant;
+      saveOrUpdate(formData)
+        .then((msg) => {
+          loading.value = false;
+          message.success(msg);
+          updateVisible(false);
+          emit('done');
+        })
+        .catch((e) => {
+          loading.value = false;
+          message.error(e.message);
+        });
+    })
+    .catch(() => {
+    });
+};
+
+const goodsList = ref<Goods[]>([])
+const getGoodsList = async () => {
+  goodsList.value = await listGoods()
+}
+
+watch(
+  () => props.visible,
+  async (visible) => {
+    if (visible) {
+      await getGoodsList()
+      if (props.data) {
+        assignObject(form, props.data);
+        isUpdate.value = true;
+      } else {
+        isUpdate.value = false;
+      }
+    } else {
+      resetFields();
+    }
+  },
+  {immediate: true}
+);
+</script>
diff --git a/src/views/shop/goodsStockInMerchant/components/search.vue b/src/views/shop/goodsStockInMerchant/components/search.vue
new file mode 100644
index 0000000..82fea9d
--- /dev/null
+++ b/src/views/shop/goodsStockInMerchant/components/search.vue
@@ -0,0 +1,42 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <a-button type="primary" class="ele-btn-icon" @click="add">
+      <template #icon>
+        <PlusOutlined />
+      </template>
+      <span>添加</span>
+    </a-button>
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import type { GradeParam } from '@/api/user/grade/model';
+  import { watch } from 'vue';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: GradeParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>
diff --git a/src/views/shop/goodsStockInMerchant/index.vue b/src/views/shop/goodsStockInMerchant/index.vue
new file mode 100644
index 0000000..0cae725
--- /dev/null
+++ b/src/views/shop/goodsStockInMerchant/index.vue
@@ -0,0 +1,230 @@
+<template>
+  <div class="page">
+    <div class="ele-body">
+      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+        <ele-pro-table
+          ref="tableRef"
+          row-key="goodsStockInMerchantId"
+          :columns="columns"
+          :datasource="datasource"
+          :customRow="customRow"
+          tool-class="ele-toolbar-form"
+          class="sys-org-table"
+        >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              @add="openEdit"
+              @remove="removeBatch"
+              @batchMove="openMove"
+            />
+          </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'image'">
+              <a-image :src="record.image" :width="50"/>
+            </template>
+            <template v-if="column.key === 'status'">
+              <a-tag v-if="record.status === 0" color="green">显示</a-tag>
+              <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
+            </template>
+            <template v-if="column.key === 'action'">
+              <a-space>
+                <a @click="openEdit(record)">修改</a>
+                <a-divider type="vertical"/>
+                <a-popconfirm
+                  title="确定要删除此记录吗？"
+                  @confirm="remove(record)"
+                >
+                  <a class="ele-text-danger">删除</a>
+                </a-popconfirm>
+              </a-space>
+            </template>
+          </template>
+        </ele-pro-table>
+      </a-card>
+
+      <!-- 编辑弹窗 -->
+      <GoodsStockInMerchantEdit v-model:visible="showEdit" :data="current" @done="reload"/>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import {createVNode, ref} from 'vue';
+import {message, Modal} from 'ant-design-vue';
+import {ExclamationCircleOutlined} from '@ant-design/icons-vue';
+import type {EleProTable} from 'ele-admin-pro';
+import {toDateString} from 'ele-admin-pro';
+import type {
+  DatasourceFunction,
+  ColumnItem
+} from 'ele-admin-pro/es/ele-pro-table/types';
+import Search from './components/search.vue';
+import GoodsStockInMerchantEdit from './components/goodsStockInMerchantEdit.vue';
+import {
+  pageGoodsStockInMerchant,
+  removeGoodsStockInMerchant,
+  removeBatchGoodsStockInMerchant
+} from '@/api/shop/goodsStockInMerchant';
+import type {GoodsStockInMerchant, GoodsStockInMerchantParam} from '@/api/shop/goodsStockInMerchant/model';
+
+// 表格实例
+const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+// 表格选中数据
+const selection = ref<GoodsStockInMerchant[]>([]);
+// 当前编辑数据
+const current = ref<GoodsStockInMerchant | null>(null);
+// 是否显示编辑弹窗
+const showEdit = ref(false);
+// 是否显示批量移动弹窗
+const showMove = ref(false);
+// 加载状态
+const loading = ref(true);
+
+// 表格数据源
+const datasource: DatasourceFunction = ({
+                                          page,
+                                          limit,
+                                          where,
+                                          orders,
+                                          filters
+                                        }) => {
+  if (filters) {
+    where.status = filters.status;
+  }
+  return pageGoodsStockInMerchant({
+    ...where,
+    ...orders,
+    page,
+    limit
+  });
+};
+
+// 表格列配置
+const columns = ref<ColumnItem[]>([
+  {
+    title: '商品',
+    dataIndex: ['goods', 'goodsName'],
+    key: 'goodsId',
+    align: 'center',
+  },
+  {
+    title: '库存',
+    dataIndex: 'stock',
+    key: 'stock',
+    align: 'center',
+  },
+  {
+    title: '创建时间',
+    dataIndex: 'createTime',
+    key: 'createTime',
+    align: 'center',
+    sorter: true,
+    ellipsis: true,
+    customRender: ({text}) => toDateString(text, 'yyyy-MM-dd')
+  },
+  {
+    title: '修改时间',
+    dataIndex: 'updateTime',
+    key: 'updateTime',
+    align: 'center',
+  },
+  {
+    title: '操作',
+    key: 'action',
+    width: 180,
+    fixed: 'right',
+    align: 'center',
+    hideInSetting: true
+  }
+]);
+
+/* 搜索 */
+const reload = (where?: GoodsStockInMerchantParam) => {
+  selection.value = [];
+  tableRef?.value?.reload({where: where});
+};
+
+/* 打开编辑弹窗 */
+const openEdit = (row?: GoodsStockInMerchant) => {
+  current.value = row ?? null;
+  showEdit.value = true;
+};
+
+/* 打开批量移动弹窗 */
+const openMove = () => {
+  showMove.value = true;
+};
+
+/* 删除单个 */
+const remove = (row: GoodsStockInMerchant) => {
+  const hide = message.loading('请求中..', 0);
+  removeGoodsStockInMerchant(row.goodsStockInMerchantId)
+    .then((msg) => {
+      hide();
+      message.success(msg);
+      reload();
+    })
+    .catch((e) => {
+      hide();
+      message.error(e.message);
+    });
+};
+
+/* 批量删除 */
+const removeBatch = () => {
+  if (!selection.value.length) {
+    message.error('请至少选择一条数据');
+    return;
+  }
+  Modal.confirm({
+    title: '提示',
+    content: '确定要删除选中的记录吗?',
+    icon: createVNode(ExclamationCircleOutlined),
+    maskClosable: true,
+    onOk: () => {
+      const hide = message.loading('请求中..', 0);
+      removeBatchGoodsStockInMerchant(selection.value.map((d) => d.goodsStockInMerchantId))
+        .then((msg) => {
+          hide();
+          message.success(msg);
+          reload();
+        })
+        .catch((e) => {
+          hide();
+          message.error(e.message);
+        });
+    }
+  });
+};
+
+/* 查询 */
+const query = () => {
+  loading.value = true;
+};
+
+/* 自定义行属性 */
+const customRow = (record: GoodsStockInMerchant) => {
+  return {
+    // 行点击事件
+    onClick: () => {
+      // console.log(record);
+    },
+    // 行双击事件
+    onDblclick: () => {
+      openEdit(record);
+    }
+  };
+};
+query();
+</script>
+
+<script lang="ts">
+export default {
+  name: 'GoodsStockInMerchant'
+};
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/shop/merchant/components/merchantEdit.vue b/src/views/shop/merchant/components/merchantEdit.vue
index 4a3d928..af26df8 100644
--- a/src/views/shop/merchant/components/merchantEdit.vue
+++ b/src/views/shop/merchant/components/merchantEdit.vue
@@ -114,6 +114,9 @@
           v-model:value="form.commission"
         />
       </a-form-item>
+      <a-form-item label="营业时间" required>
+        <a-time-range-picker format="HH:mm" value-format="HH:mm" v-model:value="timeRange"/>
+      </a-form-item>
       <a-form-item label="关键字" name="keywords">
         <a-select
           v-model:value="form.keywords"
@@ -146,6 +149,14 @@
           @update:checked="updateRecommend"
         />
       </a-form-item>
+      <a-form-item label="是否在营业" name="recommend">
+        <a-switch
+          checked-children="是"
+          un-checked-children="否"
+          :checked="form.isOn === 1"
+          @update:checked="updateIsOn"
+        />
+      </a-form-item>
       <a-form-item label="是否需要审核" name="goodsReview">
         <a-switch
           checked-children="是"
@@ -205,7 +216,6 @@ import {FileRecord} from '@/api/system/file/model';
 import {MerchantType} from '@/api/shop/merchantType/model';
 import {CenterPoint} from 'ele-admin-pro/es/ele-map-picker/types';
 import {listRoles} from '@/api/system/role';
-import {getTenantId} from '@/utils/domain';
 import {MerchantCategory} from "@/api/shop/merchantCategory/model";
 import {listMerchantCategory} from "@/api/shop/merchantCategory";
 
@@ -262,6 +272,9 @@ const form = reactive<Merchant>({
   files: undefined,
   ownStore: undefined,
   recommend: undefined,
+  isOn: 1,
+  startTime: undefined,
+  endTime: undefined,
   goodsReview: 1,
   comments: '',
   adminUrl: '',
@@ -414,6 +427,10 @@ const updateRecommend = (value: boolean) => {
   form.recommend = value ? 1 : 0;
 };
 
+const updateIsOn = (value: boolean) => {
+  form.isOn = value ? 1 : 0;
+};
+
 const updateGoodsReview = (value: boolean) => {
   form.goodsReview = value ? 1 : 0;
 };
@@ -422,6 +439,8 @@ const onIndustry = (item: any) => {
   form.category = item[0] + '/' + item[1];
 };
 
+const timeRange = ref<string[]>([])
+
 const {resetFields} = useForm(form, rules);
 
 /* 保存编辑 */
@@ -434,11 +453,16 @@ const save = () => {
     .validate()
     .then(() => {
       loading.value = true;
+      if (!timeRange.value || !timeRange.value.length) {
+        return message.error('营业时间不能为空')
+      }
       const formData = {
         ...form,
         keywords: JSON.stringify(form.keywords),
         files: JSON.stringify(files.value)
       };
+      formData.startTime = timeRange.value[0];
+      formData.endTime = timeRange.value[1];
       const saveOrUpdate = isUpdate.value ? updateMerchant : addMerchant;
       saveOrUpdate(formData)
         .then((msg) => {
diff --git a/src/views/shop/merchant/index.vue b/src/views/shop/merchant/index.vue
index a3f850a..b6eb0b2 100644
--- a/src/views/shop/merchant/index.vue
+++ b/src/views/shop/merchant/index.vue
@@ -22,16 +22,35 @@
           </template>
           <template #bodyCell="{ column, record }">
             <template v-if="column.key === 'image'">
-              <a-image :src="record.image" :width="50" />
+              <a-image :src="record.image" :width="50"/>
+            </template>
+            <template v-if="column.key === 'timeRange'">
+              <span v-if="record.startTime && record.endTime">{{ `${record.startTime}~${record.endTime}` }}</span>
             </template>
             <template v-if="column.key === 'status'">
               <a-tag v-if="record.status === 0" color="green">显示</a-tag>
               <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
             </template>
+            <template v-if="column.key === 'canExpress'">
+              <a-tag class="cursor-pointer" v-if="record.canExpress === 1" color="green"
+                     @click="changeFiled(record.merchantId, 'canExpress', 0)">可以
+              </a-tag>
+              <a-tag class="cursor-pointer" v-if="record.canExpress === 0" color="red"
+                     @click="changeFiled(record.merchantId, 'canExpress', 1)">不可以
+              </a-tag>
+            </template>
+            <template v-if="column.key === 'isOn'">
+              <a-tag class="cursor-pointer" v-if="record.isOn === 1" color="green"
+                     @click="changeFiled(record.merchantId, 'isOn', 0)">营业
+              </a-tag>
+              <a-tag class="cursor-pointer" v-if="record.isOn === 0" color="red"
+                     @click="changeFiled(record.merchantId, 'isOn', 1)">闭店
+              </a-tag>
+            </template>
             <template v-if="column.key === 'action'">
               <a-space>
                 <a @click="openEdit(record)">修改</a>
-                <a-divider type="vertical" />
+                <a-divider type="vertical"/>
                 <a-popconfirm
                   v-if="!merchantId"
                   title="确定要删除此记录吗？"
@@ -46,227 +65,250 @@
       </a-card>
 
       <!-- 编辑弹窗 -->
-      <MerchantEdit v-model:visible="showEdit" :data="current" @done="reload" />
+      <MerchantEdit v-model:visible="showEdit" :data="current" @done="reload"/>
     </div>
   </div>
 </template>
 
 <script lang="ts" setup>
-  import { createVNode, ref, watch } from 'vue';
-  import { message, Modal } from 'ant-design-vue';
-  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
-  import type { EleProTable } from 'ele-admin-pro';
-  import { toDateString } from 'ele-admin-pro';
-  import type {
-    DatasourceFunction,
-    ColumnItem
-  } from 'ele-admin-pro/es/ele-pro-table/types';
-  import Search from './components/search.vue';
-  import MerchantEdit from './components/merchantEdit.vue';
-  import {
-    pageMerchant,
-    removeMerchant,
-    removeBatchMerchant
-  } from '@/api/shop/merchant';
-  import type { Merchant, MerchantParam } from '@/api/shop/merchant/model';
-  import { getMerchantId, openUrl } from "@/utils/common";
-  import router from '@/router';
+import {createVNode, ref, watch} from 'vue';
+import {message, Modal} from 'ant-design-vue';
+import {ExclamationCircleOutlined} from '@ant-design/icons-vue';
+import type {EleProTable} from 'ele-admin-pro';
+import {toDateString} from 'ele-admin-pro';
+import type {
+  DatasourceFunction,
+  ColumnItem
+} from 'ele-admin-pro/es/ele-pro-table/types';
+import Search from './components/search.vue';
+import MerchantEdit from './components/merchantEdit.vue';
+import {
+  pageMerchant,
+  removeMerchant,
+  removeBatchMerchant, updateMerchant
+} from '@/api/shop/merchant';
+import type {Merchant, MerchantParam} from '@/api/shop/merchant/model';
+import {getMerchantId} from "@/utils/common";
+import router from '@/router';
 
-  // 表格实例
-  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+// 表格实例
+const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
 
-  // 表格选中数据
-  const selection = ref<Merchant[]>([]);
-  // 当前编辑数据
-  const current = ref<Merchant | null>(null);
-  // 是否显示编辑弹窗
-  const showEdit = ref(false);
-  // 是否显示批量移动弹窗
-  const showMove = ref(false);
-  // 商户ID
-  const merchantId = getMerchantId();
+// 表格选中数据
+const selection = ref<Merchant[]>([]);
+// 当前编辑数据
+const current = ref<Merchant | null>(null);
+// 是否显示编辑弹窗
+const showEdit = ref(false);
+// 是否显示批量移动弹窗
+const showMove = ref(false);
+// 商户ID
+const merchantId = getMerchantId();
 
-  // 表格数据源
-  const datasource: DatasourceFunction = ({
+// 表格数据源
+const datasource: DatasourceFunction = ({
+                                          page,
+                                          limit,
+                                          where,
+                                          orders,
+                                          filters
+                                        }) => {
+  if (filters) {
+    where.status = filters.status;
+  }
+  where.merchantId = getMerchantId();
+  return pageMerchant({
+    ...where,
+    ...orders,
     page,
-    limit,
-    where,
-    orders,
-    filters
-  }) => {
-    if (filters) {
-      where.status = filters.status;
-    }
-    where.merchantId = getMerchantId();
-    return pageMerchant({
-      ...where,
-      ...orders,
-      page,
-      limit
+    limit
+  });
+};
+
+// 表格列配置
+const columns = ref<ColumnItem[]>([
+  {
+    title: 'ID',
+    dataIndex: 'merchantId',
+    key: 'merchantId',
+    width: 90
+  },
+  {
+    title: '店铺名称',
+    dataIndex: 'merchantName',
+    key: 'merchantName',
+    align: 'center'
+  },
+  {
+    title: '商户图标',
+    dataIndex: 'image',
+    key: 'image',
+    align: 'center'
+  },
+  {
+    title: '商户姓名',
+    dataIndex: 'realName',
+    key: 'realName',
+    align: 'center'
+  },
+  {
+    title: '商户手机号',
+    dataIndex: 'phone',
+    key: 'phone',
+    align: 'center'
+  },
+  {
+    title: '店铺类型',
+    dataIndex: 'shopType',
+    key: 'shopType',
+    align: 'center'
+  },
+  {
+    title: '状态',
+    dataIndex: 'status',
+    key: 'status',
+    align: 'center'
+  },
+  {
+    title: '是否可以发货',
+    key: 'canExpress',
+    align: 'center'
+  },
+  {
+    title: '是否营业',
+    key: 'isOn',
+    align: 'center'
+  },
+  {
+    title: '营业时间',
+    key: 'timeRange',
+    align: 'center'
+  },
+  {
+    title: '排序号',
+    dataIndex: 'sortNumber',
+    key: 'sortNumber',
+    align: 'center'
+  },
+  {
+    title: '创建时间',
+    dataIndex: 'createTime',
+    key: 'createTime',
+    align: 'center',
+    sorter: true,
+    ellipsis: true,
+    customRender: ({text}) => toDateString(text, 'yyyy-MM-dd')
+  },
+  {
+    title: '操作',
+    key: 'action',
+    width: 240,
+    fixed: 'right',
+    align: 'center',
+    hideInSetting: true
+  }
+]);
+
+/* 搜索 */
+const reload = (where?: MerchantParam) => {
+  selection.value = [];
+  tableRef?.value?.reload({where: where});
+};
+
+/* 打开编辑弹窗 */
+const openEdit = (row?: Merchant) => {
+  current.value = row ?? null;
+  showEdit.value = true;
+};
+
+/* 打开批量移动弹窗 */
+const openMove = () => {
+  showMove.value = true;
+};
+
+/* 删除单个 */
+const remove = (row: Merchant) => {
+  const hide = message.loading('请求中..', 0);
+  removeMerchant(row.merchantId)
+    .then((msg) => {
+      hide();
+      message.success(msg);
+      reload();
+    })
+    .catch((e) => {
+      hide();
+      message.error(e.message);
     });
-  };
+};
 
-  // 表格列配置
-  const columns = ref<ColumnItem[]>([
-    {
-      title: 'ID',
-      dataIndex: 'merchantId',
-      key: 'merchantId',
-      width: 90
-    },
-    {
-      title: '店铺名称',
-      dataIndex: 'merchantName',
-      key: 'merchantName',
-      align: 'center'
-    },
-    {
-      title: '商户图标',
-      dataIndex: 'image',
-      key: 'image',
-      align: 'center'
-    },
-    {
-      title: '商户姓名',
-      dataIndex: 'realName',
-      key: 'realName',
-      align: 'center'
-    },
-    {
-      title: '商户手机号',
-      dataIndex: 'phone',
-      key: 'phone',
-      align: 'center'
-    },
-    {
-      title: '店铺类型',
-      dataIndex: 'shopType',
-      key: 'shopType',
-      align: 'center'
-    },
-    {
-      title: '状态',
-      dataIndex: 'status',
-      key: 'status',
-      align: 'center'
-    },
-    {
-      title: '排序号',
-      dataIndex: 'sortNumber',
-      key: 'sortNumber',
-      align: 'center'
-    },
-    {
-      title: '创建时间',
-      dataIndex: 'createTime',
-      key: 'createTime',
-      align: 'center',
-      sorter: true,
-      ellipsis: true,
-      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
-    },
-    {
-      title: '操作',
-      key: 'action',
-      width: 240,
-      fixed: 'right',
-      align: 'center',
-      hideInSetting: true
+/* 批量删除 */
+const removeBatch = () => {
+  if (!selection.value.length) {
+    message.error('请至少选择一条数据');
+    return;
+  }
+  Modal.confirm({
+    title: '提示',
+    content: '确定要删除选中的记录吗?',
+    icon: createVNode(ExclamationCircleOutlined),
+    maskClosable: true,
+    onOk: () => {
+      const hide = message.loading('请求中..', 0);
+      removeBatchMerchant(selection.value.map((d) => d.merchantId))
+        .then((msg) => {
+          hide();
+          message.success(msg);
+          reload();
+        })
+        .catch((e) => {
+          hide();
+          message.error(e.message);
+        });
     }
-  ]);
+  });
+};
 
-  /* 搜索 */
-  const reload = (where?: MerchantParam) => {
-    selection.value = [];
-    tableRef?.value?.reload({ where: where });
-  };
+const changeFiled = async (merchantId, field, value) => {
+  const data = {merchantId}
+  data[field] = value
+  await updateMerchant(data)
+  message.success('操作成功');
+  reload()
+}
 
-  /* 打开编辑弹窗 */
-  const openEdit = (row?: Merchant) => {
-    current.value = row ?? null;
-    showEdit.value = true;
-  };
-
-  /* 打开批量移动弹窗 */
-  const openMove = () => {
-    showMove.value = true;
-  };
-
-  /* 删除单个 */
-  const remove = (row: Merchant) => {
-    const hide = message.loading('请求中..', 0);
-    removeMerchant(row.merchantId)
-      .then((msg) => {
-        hide();
-        message.success(msg);
-        reload();
-      })
-      .catch((e) => {
-        hide();
-        message.error(e.message);
-      });
-  };
-
-  /* 批量删除 */
-  const removeBatch = () => {
-    if (!selection.value.length) {
-      message.error('请至少选择一条数据');
-      return;
-    }
-    Modal.confirm({
-      title: '提示',
-      content: '确定要删除选中的记录吗?',
-      icon: createVNode(ExclamationCircleOutlined),
-      maskClosable: true,
-      onOk: () => {
-        const hide = message.loading('请求中..', 0);
-        removeBatchMerchant(selection.value.map((d) => d.merchantId))
-          .then((msg) => {
-            hide();
-            message.success(msg);
-            reload();
-          })
-          .catch((e) => {
-            hide();
-            message.error(e.message);
-          });
-      }
-    });
-  };
-
-  /* 自定义行属性 */
-  const customRow = (record: Merchant) => {
-    return {
-      // 行点击事件
-      onClick: () => {
-        // console.log(record);
-      },
-      // 行双击事件
-      onDblclick: () => {
-        openEdit(record);
-      }
-    };
-  };
-
-  watch(
-    () => router.currentRoute.value.params.id,
-    (id) => {
-      if (id) {
-        if (id == ':id') {
-          merchantId.value = 0;
-        } else {
-          merchantId.value = Number(id);
-        }
-      }
+/* 自定义行属性 */
+const customRow = (record: Merchant) => {
+  return {
+    // 行点击事件
+    onClick: () => {
+      // console.log(record);
     },
-    { immediate: true }
-  );
+    // 行双击事件
+    onDblclick: () => {
+      openEdit(record);
+    }
+  };
+};
+
+watch(
+  () => router.currentRoute.value.params.id,
+  (id) => {
+    if (id) {
+      if (id == ':id') {
+        merchantId.value = 0;
+      } else {
+        merchantId.value = Number(id);
+      }
+    }
+  },
+  {immediate: true}
+);
 </script>
 
 <script lang="ts">
-  export default {
-    name: 'Merchant'
-  };
+export default {
+  name: 'Merchant'
+};
 </script>
 
 <style lang="less" scoped></style>
diff --git a/src/views/shop/merchantCategory/index.vue b/src/views/shop/merchantCategory/index.vue
index 9616cce..0406278 100644
--- a/src/views/shop/merchantCategory/index.vue
+++ b/src/views/shop/merchantCategory/index.vue
@@ -34,18 +34,21 @@
             <span class="ele-text-placeholder">{{ record.component }}</span>
           </template>
           <template v-else-if="column.key === 'title'">
-            <a-avatar
-              :size="26"
-              shape="square"
-              :src="`${record.image}`"
-              style="margin-right: 10px"
-              v-if="record.image"
-            />
-            <a
-              :href="`${domain}/product/${record.categoryId}`"
-              target="_blank"
-            >{{ record.title }}</a
-            >
+            <div class="flex justify-start items-center">
+              <div class="bg-gray-300 w-[30px]">
+                <a-avatar
+                  :size="26"
+                  shape="square"
+                  :src="`${record.image}`"
+                  style="margin-right: 10px"
+                  v-if="record.image"
+                />
+              </div>
+              <a
+                :href="`${domain}/product/${record.categoryId}`"
+                target="_blank"
+              >{{ record.title }}</a>
+            </div>
           </template>
           <template v-if="column.key === 'status'">
             <a-tag v-if="record.status === 0" color="green">显示</a-tag>
diff --git a/src/views/shop/merchantType/index.vue b/src/views/shop/merchantType/index.vue
index 9b919ce..ec7de86 100644
--- a/src/views/shop/merchantType/index.vue
+++ b/src/views/shop/merchantType/index.vue
@@ -22,7 +22,9 @@
           </template>
           <template #bodyCell="{ column, record }">
             <template v-if="column.key === 'image'">
-              <a-image :src="record.image" :width="50" />
+              <div class="bg-gray-300">
+                <a-image :src="record.image" :width="50"/>
+              </div>
             </template>
             <template v-if="column.key === 'status'">
               <a-tag v-if="record.status === 0" color="green">显示</a-tag>
@@ -31,7 +33,7 @@
             <template v-if="column.key === 'action'">
               <a-space>
                 <a @click="openEdit(record)">修改</a>
-                <a-divider type="vertical" />
+                <a-divider type="vertical"/>
                 <a-popconfirm
                   title="确定要删除此记录吗？"
                   @confirm="remove(record)"
@@ -55,195 +57,195 @@
 </template>
 
 <script lang="ts" setup>
-  import { createVNode, ref } from 'vue';
-  import { message, Modal } from 'ant-design-vue';
-  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
-  import type { EleProTable } from 'ele-admin-pro';
-  import { toDateString } from 'ele-admin-pro';
-  import type {
-    DatasourceFunction,
-    ColumnItem
-  } from 'ele-admin-pro/es/ele-pro-table/types';
-  import Search from '../merchant/components/search.vue';
-  import MerchantTypeEdit from './components/merchantTypeEdit.vue';
-  import {
-    pageMerchantType,
-    removeMerchantType,
-    removeBatchMerchantType
-  } from '@/api/shop/merchantType';
-  import type {
-    MerchantType,
-    MerchantTypeParam
-  } from '@/api/shop/merchantType/model';
+import {createVNode, ref} from 'vue';
+import {message, Modal} from 'ant-design-vue';
+import {ExclamationCircleOutlined} from '@ant-design/icons-vue';
+import type {EleProTable} from 'ele-admin-pro';
+import {toDateString} from 'ele-admin-pro';
+import type {
+  DatasourceFunction,
+  ColumnItem
+} from 'ele-admin-pro/es/ele-pro-table/types';
+import Search from '../merchant/components/search.vue';
+import MerchantTypeEdit from './components/merchantTypeEdit.vue';
+import {
+  pageMerchantType,
+  removeMerchantType,
+  removeBatchMerchantType
+} from '@/api/shop/merchantType';
+import type {
+  MerchantType,
+  MerchantTypeParam
+} from '@/api/shop/merchantType/model';
 
-  // 表格实例
-  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+// 表格实例
+const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
 
-  // 表格选中数据
-  const selection = ref<MerchantType[]>([]);
-  // 当前编辑数据
-  const current = ref<MerchantType | null>(null);
-  // 是否显示编辑弹窗
-  const showEdit = ref(false);
-  // 是否显示批量移动弹窗
-  const showMove = ref(false);
-  // 加载状态
-  const loading = ref(true);
+// 表格选中数据
+const selection = ref<MerchantType[]>([]);
+// 当前编辑数据
+const current = ref<MerchantType | null>(null);
+// 是否显示编辑弹窗
+const showEdit = ref(false);
+// 是否显示批量移动弹窗
+const showMove = ref(false);
+// 加载状态
+const loading = ref(true);
 
-  // 表格数据源
-  const datasource: DatasourceFunction = ({
+// 表格数据源
+const datasource: DatasourceFunction = ({
+                                          page,
+                                          limit,
+                                          where,
+                                          orders,
+                                          filters
+                                        }) => {
+  if (filters) {
+    where.status = filters.status;
+  }
+  return pageMerchantType({
+    ...where,
+    ...orders,
     page,
-    limit,
-    where,
-    orders,
-    filters
-  }) => {
-    if (filters) {
-      where.status = filters.status;
-    }
-    return pageMerchantType({
-      ...where,
-      ...orders,
-      page,
-      limit
+    limit
+  });
+};
+
+// 表格列配置
+const columns = ref<ColumnItem[]>([
+  {
+    title: 'ID',
+    dataIndex: 'id',
+    key: 'id',
+    align: 'center',
+    width: 90
+  },
+  {
+    title: '店铺类型',
+    dataIndex: 'name',
+    key: 'name',
+    align: 'center'
+  },
+  {
+    title: '店铺入驻条件',
+    dataIndex: 'comments',
+    key: 'comments',
+    align: 'center'
+  },
+  {
+    title: '状态',
+    dataIndex: 'status',
+    key: 'status',
+    align: 'center'
+  },
+  {
+    title: '排序号',
+    dataIndex: 'sortNumber',
+    key: 'sortNumber',
+    align: 'center'
+  },
+  {
+    title: '创建时间',
+    dataIndex: 'createTime',
+    key: 'createTime',
+    align: 'center',
+    sorter: true,
+    ellipsis: true
+  },
+  {
+    title: '操作',
+    key: 'action',
+    width: 180,
+    fixed: 'right',
+    align: 'center',
+    hideInSetting: true
+  }
+]);
+
+/* 搜索 */
+const reload = (where?: MerchantTypeParam) => {
+  selection.value = [];
+  tableRef?.value?.reload({where: where});
+};
+
+/* 打开编辑弹窗 */
+const openEdit = (row?: MerchantType) => {
+  current.value = row ?? null;
+  showEdit.value = true;
+};
+
+/* 打开批量移动弹窗 */
+const openMove = () => {
+  showMove.value = true;
+};
+
+/* 删除单个 */
+const remove = (row: MerchantType) => {
+  const hide = message.loading('请求中..', 0);
+  removeMerchantType(row.id)
+    .then((msg) => {
+      hide();
+      message.success(msg);
+      reload();
+    })
+    .catch((e) => {
+      hide();
+      message.error(e.message);
     });
-  };
+};
 
-  // 表格列配置
-  const columns = ref<ColumnItem[]>([
-    {
-      title: 'ID',
-      dataIndex: 'id',
-      key: 'id',
-      align: 'center',
-      width: 90
-    },
-    {
-      title: '店铺类型',
-      dataIndex: 'name',
-      key: 'name',
-      align: 'center'
-    },
-    {
-      title: '店铺入驻条件',
-      dataIndex: 'comments',
-      key: 'comments',
-      align: 'center'
-    },
-    {
-      title: '状态',
-      dataIndex: 'status',
-      key: 'status',
-      align: 'center'
-    },
-    {
-      title: '排序号',
-      dataIndex: 'sortNumber',
-      key: 'sortNumber',
-      align: 'center'
-    },
-    {
-      title: '创建时间',
-      dataIndex: 'createTime',
-      key: 'createTime',
-      align: 'center',
-      sorter: true,
-      ellipsis: true
-    },
-    {
-      title: '操作',
-      key: 'action',
-      width: 180,
-      fixed: 'right',
-      align: 'center',
-      hideInSetting: true
+/* 批量删除 */
+const removeBatch = () => {
+  if (!selection.value.length) {
+    message.error('请至少选择一条数据');
+    return;
+  }
+  Modal.confirm({
+    title: '提示',
+    content: '确定要删除选中的记录吗?',
+    icon: createVNode(ExclamationCircleOutlined),
+    maskClosable: true,
+    onOk: () => {
+      const hide = message.loading('请求中..', 0);
+      removeBatchMerchantType(selection.value.map((d) => d.id))
+        .then((msg) => {
+          hide();
+          message.success(msg);
+          reload();
+        })
+        .catch((e) => {
+          hide();
+          message.error(e.message);
+        });
     }
-  ]);
+  });
+};
 
-  /* 搜索 */
-  const reload = (where?: MerchantTypeParam) => {
-    selection.value = [];
-    tableRef?.value?.reload({ where: where });
-  };
+/* 查询 */
+const query = () => {
+  loading.value = true;
+};
 
-  /* 打开编辑弹窗 */
-  const openEdit = (row?: MerchantType) => {
-    current.value = row ?? null;
-    showEdit.value = true;
-  };
-
-  /* 打开批量移动弹窗 */
-  const openMove = () => {
-    showMove.value = true;
-  };
-
-  /* 删除单个 */
-  const remove = (row: MerchantType) => {
-    const hide = message.loading('请求中..', 0);
-    removeMerchantType(row.id)
-      .then((msg) => {
-        hide();
-        message.success(msg);
-        reload();
-      })
-      .catch((e) => {
-        hide();
-        message.error(e.message);
-      });
-  };
-
-  /* 批量删除 */
-  const removeBatch = () => {
-    if (!selection.value.length) {
-      message.error('请至少选择一条数据');
-      return;
+/* 自定义行属性 */
+const customRow = (record: MerchantType) => {
+  return {
+    // 行点击事件
+    onClick: () => {
+      // console.log(record);
+    },
+    // 行双击事件
+    onDblclick: () => {
+      openEdit(record);
     }
-    Modal.confirm({
-      title: '提示',
-      content: '确定要删除选中的记录吗?',
-      icon: createVNode(ExclamationCircleOutlined),
-      maskClosable: true,
-      onOk: () => {
-        const hide = message.loading('请求中..', 0);
-        removeBatchMerchantType(selection.value.map((d) => d.id))
-          .then((msg) => {
-            hide();
-            message.success(msg);
-            reload();
-          })
-          .catch((e) => {
-            hide();
-            message.error(e.message);
-          });
-      }
-    });
   };
-
-  /* 查询 */
-  const query = () => {
-    loading.value = true;
-  };
-
-  /* 自定义行属性 */
-  const customRow = (record: MerchantType) => {
-    return {
-      // 行点击事件
-      onClick: () => {
-        // console.log(record);
-      },
-      // 行双击事件
-      onDblclick: () => {
-        openEdit(record);
-      }
-    };
-  };
-  query();
+};
+query();
 </script>
 
 <script lang="ts">
-  export default {
-    name: 'MerchantType'
-  };
+export default {
+  name: 'MerchantType'
+};
 </script>
 
 <style lang="less" scoped></style>
diff --git a/src/views/shop/order/components/delivery.vue b/src/views/shop/order/components/delivery.vue
index c6d5d78..ff2b768 100644
--- a/src/views/shop/order/components/delivery.vue
+++ b/src/views/shop/order/components/delivery.vue
@@ -18,156 +18,157 @@
         styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
       "
     >
-      <a-form-item label="物流公司" name="expressName">
-        <SelectExpress
-          :placeholder="`选择物流公司`"
-          v-model:value="form.expressName"
-          @done="chooseExpressId"
-        />
-      </a-form-item>
-      <a-form-item label="快递单号" name="expressNo">
-        <a-input
-          allow-clear
-          placeholder="快递单号"
-          v-model:value="form.expressNo"
-        />
+      <a-form-item label="物流公司" name="expressId">
+        <a-select v-model:value="form.expressId" placeholder="点击选择物流公司">
+          <a-select-option v-for="(item, index) in expressList" :key="index" :value="item.expressId">
+            {{ item.expressName }}
+          </a-select-option>
+        </a-select>
       </a-form-item>
+<!--      <a-form-item label="快递单号" name="expressNo">-->
+<!--        <a-input-->
+<!--          allow-clear-->
+<!--          placeholder="快递单号"-->
+<!--          v-model:value="form.expressNo"-->
+<!--        />-->
+<!--      </a-form-item>-->
     </a-form>
   </ele-modal>
 </template>
 
 <script lang="ts" setup>
-  import { ref, reactive, watch } from 'vue';
-  import { Form, message } from 'ant-design-vue';
-  import { assignObject } from 'ele-admin-pro';
-  import { Order } from '@/api/shop/order/model';
-  import { useThemeStore } from '@/store/modules/theme';
-  import { storeToRefs } from 'pinia';
-  import { OrderDelivery } from '@/api/shop/orderDelivery/model';
-  import { Express } from '@/api/shop/express/model';
-  import {
-    addOrderDelivery,
-    updateOrderDelivery
-  } from '@/api/shop/orderDelivery';
-  import { FormInstance } from 'ant-design-vue/es/form';
+import {ref, reactive, watch} from 'vue';
+import {Form, message} from 'ant-design-vue';
+import {assignObject} from 'ele-admin-pro';
+import {Order} from '@/api/shop/order/model';
+import {useThemeStore} from '@/store/modules/theme';
+import {storeToRefs} from 'pinia';
+// import { OrderDelivery } from '@/api/shop/orderDelivery/model';
+import {Express} from '@/api/shop/express/model';
+// import {
+//   addOrderDelivery,
+//   updateOrderDelivery
+// } from '@/api/shop/orderDelivery';
+import {FormInstance} from 'ant-design-vue/es/form';
+import {listExpress} from "@/api/shop/express";
+import {addOrderDelivery} from "@/api/shop/orderDelivery";
 
-  const useForm = Form.useForm;
+const useForm = Form.useForm;
 
-  const props = defineProps<{
-    // 弹窗是否打开
-    visible: boolean;
-    // 修改回显的数据
-    data?: Order | null;
-  }>();
+const props = defineProps<{
+  // 弹窗是否打开
+  visible: boolean;
+  // 修改回显的数据
+  data?: Order | null;
+}>();
 
-  export interface step {
-    title?: String | undefined;
-    subTitle?: String | undefined;
-    description?: String | undefined;
+export interface step {
+  title?: String | undefined;
+  subTitle?: String | undefined;
+  description?: String | undefined;
+}
+
+// 是否是修改
+const isUpdate = ref(false);
+// 是否开启响应式布局
+const themeStore = useThemeStore();
+const {styleResponsive} = storeToRefs(themeStore);
+
+// 表单验证规则
+const rules = reactive({
+  expressId: [
+    {
+      required: true,
+      type: 'number',
+      message: '请选择物流公司',
+      trigger: 'blur'
+    }
+  ],
+  expressNo: [
+    {
+      required: true,
+      type: 'string',
+      message: '请填写快递单号',
+      trigger: 'blur'
+    }
+  ]
+});
+
+const emit = defineEmits<{
+  (e: 'done'): void;
+  (e: 'update:visible', visible: boolean): void;
+}>();
+
+// 订单信息
+const form = reactive<OrderDeliver>({
+  deliveryId: undefined,
+  orderId: undefined,
+  deliveryMethod: undefined,
+  packMethod: undefined,
+  expressId: undefined,
+  expressName: undefined,
+  expressNo: undefined,
+  eorderHtml: undefined,
+  sortNumber: undefined,
+  tenantId: undefined
+});
+
+// 请求状态
+const loading = ref(true);
+// 表格选中数据
+const formRef = ref<FormInstance | null>(null);
+const {resetFields} = useForm(form, rules);
+
+/* 更新visible */
+const updateVisible = (value: boolean) => {
+  emit('update:visible', value);
+};
+
+const expressList = ref<Express[]>([])
+const getExpressList = async () => {
+  expressList.value = await listExpress();
+}
+
+/* 保存编辑 */
+const save = () => {
+  if (!formRef.value) {
+    return;
   }
+  formRef.value
+    .validate()
+    .then(() => {
+      loading.value = true;
+      const formData = {
+        ...form
+      };
+      addOrderDelivery(formData)
+        .then((msg) => {
+          loading.value = false;
+          message.success(msg);
+          updateVisible(false);
+          emit('done');
+        })
+        .catch((e) => {
+          loading.value = false;
+          message.error(e.message);
+        });
+    })
+    .catch(() => {
+    });
+};
 
-  // 是否是修改
-  const isUpdate = ref(false);
-  // 是否开启响应式布局
-  const themeStore = useThemeStore();
-  const { styleResponsive } = storeToRefs(themeStore);
-
-  // 表单验证规则
-  const rules = reactive({
-    expressName: [
-      {
-        required: true,
-        type: 'string',
-        message: '请选择物流公司',
-        trigger: 'blur'
-      }
-    ],
-    expressNo: [
-      {
-        required: true,
-        type: 'string',
-        message: '请填写快递单号',
-        trigger: 'blur'
-      }
-    ]
-  });
-
-  const emit = defineEmits<{
-    (e: 'done'): void;
-    (e: 'update:visible', visible: boolean): void;
-  }>();
-
-  // 订单信息
-  const form = reactive<OrderDelivery>({
-    deliveryId: undefined,
-    orderId: undefined,
-    deliveryMethod: undefined,
-    packMethod: undefined,
-    expressId: undefined,
-    expressName: undefined,
-    expressNo: undefined,
-    eorderHtml: undefined,
-    sortNumber: undefined,
-    tenantId: undefined
-  });
-
-  // 请求状态
-  const loading = ref(true);
-  // 表格选中数据
-  const formRef = ref<FormInstance | null>(null);
-  const { resetFields } = useForm(form, rules);
-
-  /* 更新visible */
-  const updateVisible = (value: boolean) => {
-    emit('update:visible', value);
-  };
-
-  const chooseExpressId = (data: Express) => {
-    form.expressName = data.expressName;
-    form.expressId = data.expressId;
-  };
-
-  /* 保存编辑 */
-  const save = () => {
-    if (!formRef.value) {
-      return;
-    }
-    formRef.value
-      .validate()
-      .then(() => {
+watch(
+  () => props.visible,
+  (visible) => {
+    if (visible) {
+      getExpressList()
+      if (props.data) {
         loading.value = true;
-        const formData = {
-          ...form
-        };
-        const saveOrUpdate = isUpdate.value
-          ? updateOrderDelivery
-          : addOrderDelivery;
-        saveOrUpdate(formData)
-          .then((msg) => {
-            loading.value = false;
-            message.success(msg);
-            updateVisible(false);
-            emit('done');
-          })
-          .catch((e) => {
-            loading.value = false;
-            message.error(e.message);
-          });
-      })
-      .catch(() => {});
-  };
-
-  watch(
-    () => props.visible,
-    (visible) => {
-      if (visible) {
-        if (props.data) {
-          loading.value = true;
-          assignObject(form, props.data);
-        }
-      } else {
-        resetFields();
+        assignObject(form, props.data);
       }
+    } else {
+      resetFields();
     }
-  );
+  }
+);
 </script>
diff --git a/src/views/shop/order/components/orderInfo.vue b/src/views/shop/order/components/orderInfo.vue
index 8e0d037..1492ccf 100644
--- a/src/views/shop/order/components/orderInfo.vue
+++ b/src/views/shop/order/components/orderInfo.vue
@@ -26,17 +26,29 @@
         >
           {{ form.orderNo }}
         </a-descriptions-item>
+        <a-descriptions-item
+          label="物流方式"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          {{ form.deliveryType === 0 ? '快递' : '自提' }}
+        </a-descriptions-item>
         <a-descriptions-item
           label="订单状态"
           :labelStyle="{ width: '90px', color: '#808080' }"
         >
-          <a-tag v-if="form.orderStatus == 0">未使用</a-tag>
-          <a-tag v-if="form.orderStatus == 1">已付款</a-tag>
-          <a-tag v-if="form.orderStatus == 3">已取消</a-tag>
-          <a-tag v-if="form.orderStatus == 4">退款申请中</a-tag>
-          <a-tag v-if="form.orderStatus == 5">退款被拒绝</a-tag>
-          <a-tag v-if="form.orderStatus == 6">退款成功</a-tag>
-          <a-tag v-if="form.orderStatus == 7">客户端申请退款</a-tag>
+          <a-tag v-if="form.orderStatus === 0">未使用</a-tag>
+          <a-tag v-if="form.orderStatus === 1">已付款</a-tag>
+          <a-tag v-if="form.orderStatus === 3">已取消</a-tag>
+          <a-tag v-if="form.orderStatus === 4">退款申请中</a-tag>
+          <a-tag v-if="form.orderStatus === 5">退款被拒绝</a-tag>
+          <a-tag v-if="form.orderStatus === 6">退款成功</a-tag>
+          <a-tag v-if="form.orderStatus === 7">客户端申请退款</a-tag>
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="订单类型"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          {{ ['商品', '外卖'][form?.type] }}
         </a-descriptions-item>
         <a-descriptions-item
           label="买家信息"
@@ -78,25 +90,12 @@
           label="支付方式"
           :labelStyle="{ width: '90px', color: '#808080' }"
         >
-          <template v-if="form.payStatus == 1">
-            <a-tag v-if="form.payType == 0">余额支付</a-tag>
-            <a-tag v-if="form.payType == 1">微信支付</a-tag>
-            <a-tag v-if="form.payType == 2">积分</a-tag>
-            <a-tag v-if="form.payType == 3">支付宝</a-tag>
-            <a-tag v-if="form.payType == 4">现金</a-tag>
-            <a-tag v-if="form.payType == 5">POS机</a-tag>
-            <a-tag v-if="form.payType == 6">VIP月卡</a-tag>
-            <a-tag v-if="form.payType == 7">formVIP年卡</a-tag>
-            <a-tag v-if="form.payType == 8">formVIP次卡</a-tag>
-            <a-tag v-if="form.payType == 9">formIC月卡</a-tag>
-            <a-tag v-if="form.payType == 10">formIC年卡</a-tag>
-            <a-tag v-if="form.payType == 11">formIC次卡</a-tag>
-            <a-tag v-if="form.payType == 12">form免费</a-tag>
-            <a-tag v-if="form.payType == 13">formVIP充值卡</a-tag>
-            <a-tag v-if="form.payType == 14">formIC充值卡</a-tag>
-            <a-tag v-if="form.payType == 15">form积分支付</a-tag>
-            <a-tag v-if="form.payType == 16">formVIP季卡</a-tag>
-            <a-tag v-if="form.payType == 17">formIC季卡</a-tag>
+          <template v-if="form.payStatus === 1">
+            <a-tag v-if="form.payType === 0">余额支付</a-tag>
+            <a-tag v-if="form.payType === 1">微信支付</a-tag>
+            <a-tag v-if="form.payType === 2">积分</a-tag>
+            <a-tag v-if="form.payType === 3">支付宝</a-tag>
+            <a-tag v-if="form.payType === 18">代付</a-tag>
           </template>
           <template v-else>
             <span></span>
@@ -106,14 +105,23 @@
           label="支付状态"
           :labelStyle="{ width: '90px', color: '#808080' }"
         >
-          <a-tag v-if="form.payStatus == 1" color="green"
-            ><CheckOutlined class="tag-icon" />已付款</a-tag
+          <a-tag v-if="form.payStatus === 1" color="green"
           >
-          <a-tag v-if="form.payStatus == 0" color="error"
-            ><CloseOutlined class="tag-icon" />未付款</a-tag
+            <CheckOutlined class="tag-icon"/>
+            已付款
+          </a-tag
           >
-          <a-tag v-if="form.payStatus == 3" color="cyan"
-            ><CoffeeOutlined class="tag-icon" />未付款,占场中</a-tag
+          <a-tag v-if="form.payStatus === 0" color="error"
+          >
+            <CloseOutlined class="tag-icon"/>
+            未付款
+          </a-tag
+          >
+          <a-tag v-if="form.payStatus === 3" color="cyan"
+          >
+            <CoffeeOutlined class="tag-icon"/>
+            未付款,占场中
+          </a-tag
           >
         </a-descriptions-item>
         <a-descriptions-item
@@ -136,6 +144,95 @@
         </a-descriptions-item>
       </a-descriptions>
     </a-card>
+    <a-card class="order-card" :bordered="false" v-if="form && form.type === 0 && form.deliveryType === 0 && form.orderDelivery">
+      <a-descriptions title="物流信息" :column="3">
+        <a-descriptions-item
+          label="发货店铺"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          {{ form.expressMerchantName }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="物流公司"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          {{ form.orderDelivery?.express?.expressName }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="物流单号"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          {{ form.orderDelivery?.expressNo }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="发货时间"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          {{ form.orderDelivery?.createTime }}
+        </a-descriptions-item>
+      </a-descriptions>
+    </a-card>
+    <a-card class="order-card" :bordered="false" v-if="form && form.type === 0 && form.deliveryType === 1 && form.selfTakeMerchant">
+      <a-descriptions title="自提信息" :column="3">
+        <a-descriptions-item
+          label="自提店铺"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          {{ form.selfTakeMerchant.merchantName }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="店铺地址"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          {{ form.selfTakeMerchant.province }}{{ form.selfTakeMerchant.city }}{{
+            form.selfTakeMerchant.region
+          }}{{ form.selfTakeMerchant.address }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="联系方式"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          {{ form.selfTakeMerchant.phone }}
+        </a-descriptions-item>
+      </a-descriptions>
+    </a-card>
+    <a-card class="order-card" :bordered="false" v-if="form && form.type === 1">
+      <a-descriptions title="门店信息" :column="3">
+        <a-descriptions-item
+          label="名称"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          {{ form?.merchant?.merchantName }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="店铺地址"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          {{ form?.merchant?.province }}{{ form?.merchant?.city }}{{
+            form?.merchant?.region
+          }}{{ form?.merchant?.address }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="联系方式"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          {{ form?.merchant?.phone }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="配送时间"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          {{ form.sendStartTime }}~{{ form.sendEndTime }}
+        </a-descriptions-item>
+        <a-descriptions-item v-if="form.orderStatus === 1"
+          label="是否已收到赠品"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          <a-tag v-if="form.hasTakeGift === 1" color="green">已收到</a-tag>
+          <a-tag v-if="form.hasTakeGift === 0" color="red">未收到</a-tag>
+        </a-descriptions-item>
+      </a-descriptions>
+    </a-card>
     <a-card class="order-card" :bordered="false">
       <a-spin :spinning="loading">
         <a-table
@@ -152,7 +249,7 @@
         >
           <template #bodyCell="{ column, record }">
             <template v-if="column.key === 'goodsName'">
-              <a-avatar :src="record.image" :size="40" />
+              <a-avatar :src="record.image" :size="40"/>
               <span style="margin-left: 8px">{{ record.goodsName }}</span>
             </template>
           </template>
@@ -163,278 +260,294 @@
 </template>
 
 <script lang="ts" setup>
-  import { ref, reactive, watch } from 'vue';
-  import { Form } from 'ant-design-vue';
-  import { assignObject } from 'ele-admin-pro';
-  import { Order } from '@/api/shop/order/model';
-  import { ColumnItem } from 'ele-admin-pro/es/ele-pro-table/types';
-  import {
-    CheckOutlined,
-    CloseOutlined,
-    CoffeeOutlined
-  } from '@ant-design/icons-vue';
-  import { pageOrderInfo } from '@/api/shop/orderInfo';
-  import { pageOrderGoods } from '@/api/shop/orderGoods';
-  import record from "@/views/cms/design/record/index.vue";
+import {ref, reactive, watch} from 'vue';
+import {Form} from 'ant-design-vue';
+import {assignObject} from 'ele-admin-pro';
+import {Order} from '@/api/shop/order/model';
+import {ColumnItem} from 'ele-admin-pro/es/ele-pro-table/types';
+import {
+  CheckOutlined,
+  CloseOutlined,
+  CoffeeOutlined
+} from '@ant-design/icons-vue';
+import {pageOrderInfo} from '@/api/shop/orderInfo';
+import {pageOrderGoods} from '@/api/shop/orderGoods';
 
-  const useForm = Form.useForm;
+const useForm = Form.useForm;
 
-  const props = defineProps<{
-    // 弹窗是否打开
-    visible: boolean;
-    // 修改回显的数据
-    data?: Order | null;
-  }>();
+const props = defineProps<{
+  // 弹窗是否打开
+  visible: boolean;
+  // 修改回显的数据
+  data?: Order | null;
+}>();
 
-  export interface step {
-    title?: String | undefined;
-    subTitle?: String | undefined;
-    description?: String | undefined;
+export interface step {
+  title?: String | undefined;
+  subTitle?: String | undefined;
+  description?: String | undefined;
+}
+
+// 是否是修改
+const isUpdate = ref(false);
+// 是否显示最大化切换按钮
+const maxAble = ref(true);
+
+// 步骤条
+const steps = ref<step[]>([
+  {
+    title: '报餐',
+    description: undefined
+  },
+  {
+    title: '付款',
+    description: undefined
+  },
+  {
+    title: '发餐',
+    description: undefined
+  },
+  {
+    title: '取餐',
+    description: undefined
+  },
+  {
+    title: '完成',
+    description: undefined
   }
+]);
+const active = ref(2);
 
-  // 是否是修改
-  const isUpdate = ref(false);
-  // 是否显示最大化切换按钮
-  const maxAble = ref(true);
+const emit = defineEmits<{
+  (e: 'done'): void;
+  (e: 'update:visible', visible: boolean): void;
+}>();
 
-  // 步骤条
-  const steps = ref<step[]>([
-    {
-      title: '报餐',
-      description: undefined
-    },
-    {
-      title: '付款',
-      description: undefined
-    },
-    {
-      title: '发餐',
-      description: undefined
-    },
-    {
-      title: '取餐',
-      description: undefined
-    },
-    {
-      title: '完成',
-      description: undefined
-    }
-  ]);
-  const active = ref(2);
+// 订单信息
+const form = reactive<Order>({
+  orderId: undefined,
+  orderNo: undefined,
+  transactionId: undefined,
+  refundOrder: undefined,
+  merchantId: undefined,
+  couponId: undefined,
+  cardId: undefined,
+  adminId: undefined,
+  confirmId: undefined,
+  icCard: undefined,
+  realName: undefined,
+  phone: undefined,
+  totalPrice: undefined,
+  reducePrice: undefined,
+  payPrice: undefined,
+  price: undefined,
+  money: undefined,
+  payType: undefined,
+  refundMoney: undefined,
+  coachPrice: undefined,
+  coachId: undefined,
+  orderStatus: undefined,
+  payStatus: undefined,
+  couponType: undefined,
+  couponDesc: undefined,
+  qrcode: undefined,
+  returnNum: undefined,
+  returnMoney: undefined,
+  startTime: undefined,
+  isInvoice: undefined,
+  payTime: undefined,
+  refundTime: undefined,
+  refundApplyTime: undefined,
+  checkBill: undefined,
+  isSettled: undefined,
+  version: undefined,
+  userId: undefined,
+  updateTime: undefined,
+  comments: '',
+  sortNumber: 100,
+  deliveryType: undefined,
+  orderDelivery: undefined,
+  selfTakeMerchantId: undefined,
+  selfTakeMerchantName: undefined,
+  expressMerchantId: undefined,
+  expressMerchantName: undefined,
+  type: undefined,
+  sendStartTime: undefined,
+  sendEndTime: undefined,
+  merchant: undefined,
+  hasTakeGift: undefined,
+  orderGoods: [],
+  orderInfo: [],
+  selfTakeMerchant: undefined
+});
 
-  const emit = defineEmits<{
-    (e: 'done'): void;
-    (e: 'update:visible', visible: boolean): void;
-  }>();
+// 请求状态
+const loading = ref(true);
 
-  // 订单信息
-  const form = reactive<Order>({
-    orderId: undefined,
-    orderNo: undefined,
-    transactionId: undefined,
-    refundOrder: undefined,
-    merchantId: undefined,
-    couponId: undefined,
-    cardId: undefined,
-    adminId: undefined,
-    confirmId: undefined,
-    icCard: undefined,
-    realName: undefined,
-    phone: undefined,
-    totalPrice: undefined,
-    reducePrice: undefined,
-    payPrice: undefined,
-    price: undefined,
-    money: undefined,
-    payType: undefined,
-    refundMoney: undefined,
-    coachPrice: undefined,
-    coachId: undefined,
-    orderStatus: undefined,
-    payStatus: undefined,
-    couponType: undefined,
-    couponDesc: undefined,
-    qrcode: undefined,
-    returnNum: undefined,
-    returnMoney: undefined,
-    startTime: undefined,
-    isInvoice: undefined,
-    payTime: undefined,
-    refundTime: undefined,
-    refundApplyTime: undefined,
-    checkBill: undefined,
-    isSettled: undefined,
-    version: undefined,
-    userId: undefined,
-    updateTime: undefined,
-    comments: '',
-    sortNumber: 100,
-    orderGoods: [],
-    orderInfo: []
+const {resetFields} = useForm(form);
+
+/* 更新visible */
+const updateVisible = (value: boolean) => {
+  emit('update:visible', value);
+};
+
+const columns = ref<ColumnItem[]>([
+  {
+    title: '场馆名称',
+    dataIndex: 'merchantName',
+    key: 'merchantName'
+  },
+  {
+    title: '场地',
+    dataIndex: 'fieldName'
+  },
+  {
+    title: '预定信息',
+    dataIndex: 'comments',
+    key: 'comments'
+  },
+  {
+    title: '金额',
+    dataIndex: 'price',
+    customRender: ({text}) => '￥' + text
+  }
+]);
+
+const columnsGoods = ref<ColumnItem[]>([
+  {
+    title: '商品名称',
+    dataIndex: 'goodsName',
+    key: 'goodsName'
+  },
+  {
+    title: '商品规格',
+    dataIndex: 'spec'
+  },
+  {
+    title: '购买数量',
+    dataIndex: 'totalNum',
+    key: 'totalNum'
+  },
+  {
+    title: '金额',
+    dataIndex: 'price',
+    customRender: ({text}) => '￥' + text
+  }
+]);
+
+/* 制作步骤条 */
+const loadSteps = (order) => {
+  steps.value = [];
+  steps.value.push({
+    title: '下单'
+  });
+  steps.value.push({
+    title: '付款'
+  });
+  steps.value.push({
+    title: '发货'
+  });
+  steps.value.push({
+    title: '收货'
+  });
+  steps.value.push({
+    title: '完成'
   });
 
-  // 请求状态
-  const loading = ref(true);
+  // 下单
+  if (order.payStatus == 10) {
+    active.value = 0;
+    steps.value[0].description = order.createTime;
+  }
+  // 付款
+  if (order.payStatus == 20) {
+    active.value = 1;
+    steps.value[0].description = order.createTime;
+    steps.value[1].description = order.payTime;
+  }
+  // 发货
+  if (order.payStatus == 20 && order.deliveryStatus == 20) {
+    active.value = 2;
+    steps.value[0].description = order.createTime;
+    steps.value[1].description = order.payTime;
+    steps.value[2].description = order.deliveryTime;
+  }
+  // 收货
+  if (order.payStatus == 20 && order.receiptStatus == 20) {
+    active.value = 3;
+    steps.value[0].description = order.createTime;
+    steps.value[1].description = order.payTime;
+    steps.value[2].description = order.deliveryTime;
+    steps.value[3].description = order.receiptTime;
+  }
+  // 完成
+  if (order.payStatus == 20 && order.orderStatus == 30) {
+    active.value = 4;
+    steps.value[0].description = order.createTime;
+    steps.value[1].description = order.payTime;
+    steps.value[2].description = order.deliveryTime;
+    steps.value[3].description = order.receiptTime;
+  }
+  // 已取消
+  if (order.orderStatus == 20) {
+    active.value = 4;
+  }
+};
 
-  const { resetFields } = useForm(form);
+// const getOrderInfo = () => {
+//   const orderId = props.data?.orderId;
+//   listOrderInfo({ orderId }).then((data) => {
+//     orderInfo.value = data.filter((d) => d.totalNum > 0);
+//   });
+// };
 
-  /* 更新visible */
-  const updateVisible = (value: boolean) => {
-    emit('update:visible', value);
-  };
+/* 保存编辑 */
+const save = () => {
+};
 
-  const columns = ref<ColumnItem[]>([
-    {
-      title: '场馆名称',
-      dataIndex: 'merchantName',
-      key: 'merchantName'
-    },
-    {
-      title: '场地',
-      dataIndex: 'fieldName'
-    },
-    {
-      title: '预定信息',
-      dataIndex: 'comments',
-      key: 'comments'
-    },
-    {
-      title: '金额',
-      dataIndex: 'price',
-      customRender: ({ text }) => '￥' + text
-    }
-  ]);
-
-  const columnsGoods = ref<ColumnItem[]>([
-    {
-      title: '商品名称',
-      dataIndex: 'goodsName',
-      key: 'goodsName'
-    },
-    {
-      title: '商品规格',
-      dataIndex: 'spec'
-    },
-    {
-      title: '购买数量',
-      dataIndex: 'totalNum',
-      key: 'totalNum'
-    },
-    {
-      title: '金额',
-      dataIndex: 'price',
-      customRender: ({ text }) => '￥' + text
-    }
-  ]);
-
-  /* 制作步骤条 */
-  const loadSteps = (order) => {
-    steps.value = [];
-    steps.value.push({
-      title: '下单'
-    });
-    steps.value.push({
-      title: '付款'
-    });
-    steps.value.push({
-      title: '发货'
-    });
-    steps.value.push({
-      title: '收货'
-    });
-    steps.value.push({
-      title: '完成'
-    });
-
-    // 下单
-    if (order.payStatus == 10) {
-      active.value = 0;
-      steps.value[0].description = order.createTime;
-    }
-    // 付款
-    if (order.payStatus == 20) {
-      active.value = 1;
-      steps.value[0].description = order.createTime;
-      steps.value[1].description = order.payTime;
-    }
-    // 发货
-    if (order.payStatus == 20 && order.deliveryStatus == 20) {
-      active.value = 2;
-      steps.value[0].description = order.createTime;
-      steps.value[1].description = order.payTime;
-      steps.value[2].description = order.deliveryTime;
-    }
-    // 收货
-    if (order.payStatus == 20 && order.receiptStatus == 20) {
-      active.value = 3;
-      steps.value[0].description = order.createTime;
-      steps.value[1].description = order.payTime;
-      steps.value[2].description = order.deliveryTime;
-      steps.value[3].description = order.receiptTime;
-    }
-    // 完成
-    if (order.payStatus == 20 && order.orderStatus == 30) {
-      active.value = 4;
-      steps.value[0].description = order.createTime;
-      steps.value[1].description = order.payTime;
-      steps.value[2].description = order.deliveryTime;
-      steps.value[3].description = order.receiptTime;
-    }
-    // 已取消
-    if (order.orderStatus == 20) {
-      active.value = 4;
-    }
-  };
-
-  // const getOrderInfo = () => {
-  //   const orderId = props.data?.orderId;
-  //   listOrderInfo({ orderId }).then((data) => {
-  //     orderInfo.value = data.filter((d) => d.totalNum > 0);
-  //   });
-  // };
-
-  /* 保存编辑 */
-  const save = () => {};
-
-  watch(
-    () => props.visible,
-    (visible) => {
-      if (visible) {
-        if (props.data) {
-          loading.value = true;
-          assignObject(form, props.data);
-          pageOrderGoods({ orderId: form.orderId }).then((res) => {
-            form.orderGoods = res?.list;
-            loading.value = false;
-          });
-          pageOrderInfo({ oid: form.orderId }).then((res) => {
-            form.orderInfo = res?.list;
-            loading.value = false;
-          });
-          loadSteps(props.data);
-        }
-      } else {
-        resetFields();
+watch(
+  () => props.visible,
+  (visible) => {
+    if (visible) {
+      if (props.data) {
+        loading.value = true;
+        assignObject(form, props.data);
+        pageOrderGoods({orderId: form.orderId}).then((res) => {
+          form.orderGoods = res?.list;
+          loading.value = false;
+        });
+        pageOrderInfo({oid: form.orderId}).then((res) => {
+          form.orderInfo = res?.list;
+          loading.value = false;
+        });
+        loadSteps(props.data);
       }
+    } else {
+      resetFields();
     }
-  );
+  }
+);
 </script>
 <style lang="less" scoped>
-  .order-card {
-    margin-bottom: 20px;
-  }
-  .ant-form-item {
-    margin-bottom: 5px;
-  }
-  .order-info {
+.order-card {
+  margin-bottom: 20px;
+}
+
+.ant-form-item {
+  margin-bottom: 5px;
+}
+
+.order-info {
+  display: flex;
+
+  .info {
+    padding-left: 5px;
     display: flex;
-    .info {
-      padding-left: 5px;
-      display: flex;
-      flex-direction: column;
-    }
-  }
-  .tag-icon {
-    padding-right: 6px;
+    flex-direction: column;
   }
+}
+
+.tag-icon {
+  padding-right: 6px;
+}
 </style>
diff --git a/src/views/shop/order/index.vue b/src/views/shop/order/index.vue
index 9405d44..b3d2e04 100644
--- a/src/views/shop/order/index.vue
+++ b/src/views/shop/order/index.vue
@@ -82,6 +82,7 @@
                 <a-tag v-if="record.payType == 17"
                   ><IdcardOutlined class="tag-icon" />IC季卡</a-tag
                 >
+                <a-tag v-if="record.payType == 18">代付</a-tag>
               </template>
               <template v-else>
                 <span></span>
@@ -154,7 +155,7 @@
                 >未使用</span
               >
               <span v-if="record.orderStatus == 2" class="ele-text-placeholder"
-                >已取消</span
+                >已完成</span
               >
               <span v-if="record.orderStatus == 1" class="ele-text-success"
                 >已完成</span
@@ -186,11 +187,11 @@
             </template>
             <template v-if="column.key === 'action'">
               <a-space>
-                <a @click="openEdit(record)">详情</a>
-                <template v-if="record.deliveryStatus === 10">
-                  <a-divider type="vertical" />
+                <template v-if="record.type === 0 && record.deliveryStatus === 10 && record.deliveryType === 0 && record.payStatus === 1">
                   <a @click="openDelivery(record)">发货</a>
+                  <a-divider type="vertical" />
                 </template>
+                <a @click="openEdit(record)">详情</a>
                 <a-divider type="vertical" />
                 <a-dropdown>
                   <a class="ant-dropdown-link" @click.prevent>
@@ -232,7 +233,6 @@
     CheckOutlined,
     CloseOutlined,
     AlipayCircleOutlined,
-    EllipsisOutlined,
     DownOutlined
   } from '@ant-design/icons-vue';
 
@@ -356,24 +356,19 @@
       align: 'center'
     },
     {
-      title: '优惠类型',
-      dataIndex: 'couponType',
-      key: 'couponType',
-      align: 'center'
-    },
-    {
-      title: '是否已开票',
-      dataIndex: 'isInvoice',
-      key: 'isInvoice',
-      align: 'center'
-    },
-    {
-      title: '类型',
+      title: '订单类型',
       dataIndex: 'type',
       key: 'type',
       align: 'center',
       customRender: ({ text }) =>
-        ['商城订单', '客户预定', '俱乐部训练场', '活动订场'][text]
+        ['商品', '外卖'][text]
+    },
+    {
+      title: '物流类型',
+      dataIndex: 'deliveryType',
+      align: 'center',
+      customRender: ({ text }) =>
+        ['快递/配送', '自提'][text]
     },
     // {
     //   title: '申请退款时间',
diff --git a/src/views/shop/splash/components/search.vue b/src/views/shop/splash/components/search.vue
new file mode 100644
index 0000000..82fea9d
--- /dev/null
+++ b/src/views/shop/splash/components/search.vue
@@ -0,0 +1,42 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <a-button type="primary" class="ele-btn-icon" @click="add">
+      <template #icon>
+        <PlusOutlined />
+      </template>
+      <span>添加</span>
+    </a-button>
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import type { GradeParam } from '@/api/user/grade/model';
+  import { watch } from 'vue';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: GradeParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>
diff --git a/src/views/shop/splash/components/splashEdit.vue b/src/views/shop/splash/components/splashEdit.vue
new file mode 100644
index 0000000..f21fec4
--- /dev/null
+++ b/src/views/shop/splash/components/splashEdit.vue
@@ -0,0 +1,193 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑开屏广告' : '添加开屏广告'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="标题" name="title">
+        <a-input
+          allow-clear
+          placeholder="请输入标题"
+          v-model:value="form.title"
+        />
+      </a-form-item>
+      <a-form-item
+        label="图片"
+        name="image">
+        <SelectFile
+          :placeholder="`请选择图片`"
+          :limit="1"
+          :data="images"
+          @done="chooseImage"
+          @del="onDeleteItem"
+        />
+      </a-form-item>
+      <a-form-item label="跳转类型" name="jumpType">
+        <a-select v-model:value="form.jumpType" placeholder="请选择跳转类型">
+          <a-select-option v-for="item in SplashJumpType" :key="item" :value="item.value">
+            {{ item.label }}
+          </a-select-option>
+        </a-select>
+      </a-form-item>
+      <a-form-item label="跳转主键" name="jumpPk">
+        <a-input-number style="width: 200px;"
+                        allow-clear
+                        placeholder="请输入跳转主键"
+                        v-model:value="form.jumpPk"
+        />
+      </a-form-item>
+      <a-form-item label="排序">
+        <a-input-number style="width: 200px;"
+                        allow-clear
+                        placeholder="请输入排序"
+                        v-model:value="form.sortNumber"
+        />
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+import {ref, reactive, watch} from 'vue';
+import {Form, message} from 'ant-design-vue';
+import {assignObject, uuid} from 'ele-admin-pro';
+import {addSplash, updateSplash} from '@/api/shop/splash';
+import {Splash, SplashJumpType} from '@/api/shop/splash/model';
+import {useThemeStore} from '@/store/modules/theme';
+import {storeToRefs} from 'pinia';
+import {ItemType} from 'ele-admin-pro/es/ele-image-upload/types';
+import {FormInstance} from 'ant-design-vue/es/form';
+import {FileRecord} from '@/api/system/file/model';
+
+// 是否是修改
+const isUpdate = ref(false);
+const useForm = Form.useForm;
+// 是否开启响应式布局
+const themeStore = useThemeStore();
+const {styleResponsive} = storeToRefs(themeStore);
+
+const props = defineProps<{
+  // 弹窗是否打开
+  visible: boolean;
+  // 修改回显的数据
+  data?: Splash | null;
+}>();
+
+const emit = defineEmits<{
+  (e: 'done'): void;
+  (e: 'update:visible', visible: boolean): void;
+}>();
+
+// 提交状态
+const loading = ref(false);
+// 是否显示最大化切换按钮
+const maxable = ref(true);
+// 表格选中数据
+const formRef = ref<FormInstance | null>(null);
+const images = ref<ItemType[]>([]);
+
+// 用户信息
+const form = reactive<Splash>({
+  id: undefined,
+  title: undefined,
+  image: undefined,
+  jumpType: undefined,
+  jumpPk: undefined,
+});
+
+/* 更新visible */
+const updateVisible = (value: boolean) => {
+  emit('update:visible', value);
+};
+
+// 表单验证规则
+const rules = reactive({
+  title: [{required: true, message: '请输入标题', trigger: 'blur'}],
+  image: [{required: true, message: '请选择图片', trigger: 'blur'}],
+});
+
+const chooseImage = (data: FileRecord) => {
+  images.value.push({
+    uid: data.id,
+    url: data.path,
+    status: 'done'
+  });
+  form.image = data.path;
+};
+
+const onDeleteItem = (index: number) => {
+  images.value.splice(index, 1);
+  form.image = '';
+};
+
+const {resetFields} = useForm(form, rules);
+
+/* 保存编辑 */
+const save = () => {
+  if (!formRef.value) {
+    return;
+  }
+  formRef.value
+    .validate()
+    .then(() => {
+      loading.value = true;
+      const formData = {
+        ...form
+      };
+      const saveOrUpdate = isUpdate.value ? updateSplash : addSplash;
+      saveOrUpdate(formData)
+        .then((msg) => {
+          loading.value = false;
+          message.success(msg);
+          updateVisible(false);
+          emit('done');
+        })
+        .catch((e) => {
+          loading.value = false;
+          message.error(e.message);
+        });
+    })
+    .catch(() => {
+    });
+};
+
+watch(
+  () => props.visible,
+  (visible) => {
+    if (visible) {
+      images.value = [];
+      if (props.data) {
+        assignObject(form, props.data);
+        if (props.data.image) {
+          images.value.push({
+            uid: uuid(),
+            url: props.data.image,
+            status: 'done'
+          })
+        }
+        isUpdate.value = true;
+      } else {
+        isUpdate.value = false;
+      }
+    } else {
+      resetFields();
+    }
+  },
+  {immediate: true}
+);
+</script>
diff --git a/src/views/shop/splash/index.vue b/src/views/shop/splash/index.vue
new file mode 100644
index 0000000..00aacb4
--- /dev/null
+++ b/src/views/shop/splash/index.vue
@@ -0,0 +1,234 @@
+<template>
+  <div class="page">
+    <div class="ele-body">
+      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+        <ele-pro-table
+          ref="tableRef"
+          row-key="splashId"
+          :columns="columns"
+          :datasource="datasource"
+          :customRow="customRow"
+          tool-class="ele-toolbar-form"
+          class="sys-org-table"
+        >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              @add="openEdit"
+              @remove="removeBatch"
+              @batchMove="openMove"
+            />
+          </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'image'">
+              <a-image :src="record.image" :width="50"/>
+            </template>
+            <template v-if="column.key === 'jumpType'">
+              <span v-if="record.jumpType"> {{
+                  SplashJumpType.find(item => item.value === record.jumpType).label
+                }}</span>
+            </template>
+            <template v-if="column.key === 'action'">
+              <a-space>
+                <a @click="openEdit(record)">修改</a>
+                <a-divider type="vertical"/>
+                <a-popconfirm
+                  title="确定要删除此记录吗？"
+                  @confirm="remove(record)"
+                >
+                  <a class="ele-text-danger">删除</a>
+                </a-popconfirm>
+              </a-space>
+            </template>
+          </template>
+        </ele-pro-table>
+      </a-card>
+
+      <!-- 编辑弹窗 -->
+      <SplashEdit v-model:visible="showEdit" :data="current" @done="reload"/>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import {createVNode, ref} from 'vue';
+import {message, Modal} from 'ant-design-vue';
+import {ExclamationCircleOutlined} from '@ant-design/icons-vue';
+import type {EleProTable} from 'ele-admin-pro';
+import {toDateString} from 'ele-admin-pro';
+import type {
+  DatasourceFunction,
+  ColumnItem
+} from 'ele-admin-pro/es/ele-pro-table/types';
+import Search from './components/search.vue';
+import SplashEdit from './components/splashEdit.vue';
+import {pageSplash, removeSplash, removeBatchSplash} from '@/api/shop/splash';
+import {Splash, SplashJumpType, SplashParam} from '@/api/shop/splash/model';
+
+// 表格实例
+const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+// 表格选中数据
+const selection = ref<Splash[]>([]);
+// 当前编辑数据
+const current = ref<Splash | null>(null);
+// 是否显示编辑弹窗
+const showEdit = ref(false);
+// 是否显示批量移动弹窗
+const showMove = ref(false);
+// 加载状态
+const loading = ref(true);
+
+// 表格数据源
+const datasource: DatasourceFunction = ({
+                                          page,
+                                          limit,
+                                          where,
+                                          orders,
+                                          filters
+                                        }) => {
+  if (filters) {
+    where.status = filters.status;
+  }
+  return pageSplash({
+    ...where,
+    ...orders,
+    page,
+    limit
+  });
+};
+
+// 表格列配置
+const columns = ref<ColumnItem[]>([
+  {
+    title: 'ID',
+    dataIndex: 'id',
+    key: 'id',
+    align: 'center',
+    width: 90,
+  },
+  {
+    title: '标题',
+    dataIndex: 'title',
+    key: 'title',
+    align: 'center',
+  },
+  {
+    title: '图片',
+    dataIndex: 'image',
+    key: 'image',
+    align: 'center',
+  },
+  {
+    title: '跳转类型',
+    dataIndex: 'jumpType',
+    key: 'jumpType',
+    align: 'center',
+  },
+  {
+    title: '创建时间',
+    dataIndex: 'createTime',
+    key: 'createTime',
+    align: 'center',
+    sorter: true,
+    ellipsis: true,
+    customRender: ({text}) => toDateString(text, 'yyyy-MM-dd')
+  },
+  {
+    title: '操作',
+    key: 'action',
+    width: 180,
+    fixed: 'right',
+    align: 'center',
+    hideInSetting: true
+  }
+]);
+
+/* 搜索 */
+const reload = (where?: SplashParam) => {
+  selection.value = [];
+  tableRef?.value?.reload({where: where});
+};
+
+/* 打开编辑弹窗 */
+const openEdit = (row?: Splash) => {
+  current.value = row ?? null;
+  showEdit.value = true;
+};
+
+/* 打开批量移动弹窗 */
+const openMove = () => {
+  showMove.value = true;
+};
+
+/* 删除单个 */
+const remove = (row: Splash) => {
+  const hide = message.loading('请求中..', 0);
+  removeSplash(row.splashId)
+    .then((msg) => {
+      hide();
+      message.success(msg);
+      reload();
+    })
+    .catch((e) => {
+      hide();
+      message.error(e.message);
+    });
+};
+
+/* 批量删除 */
+const removeBatch = () => {
+  if (!selection.value.length) {
+    message.error('请至少选择一条数据');
+    return;
+  }
+  Modal.confirm({
+    title: '提示',
+    content: '确定要删除选中的记录吗?',
+    icon: createVNode(ExclamationCircleOutlined),
+    maskClosable: true,
+    onOk: () => {
+      const hide = message.loading('请求中..', 0);
+      removeBatchSplash(selection.value.map((d) => d.splashId))
+        .then((msg) => {
+          hide();
+          message.success(msg);
+          reload();
+        })
+        .catch((e) => {
+          hide();
+          message.error(e.message);
+        });
+    }
+  });
+};
+
+/* 查询 */
+const query = () => {
+  loading.value = true;
+};
+
+/* 自定义行属性 */
+const customRow = (record: Splash) => {
+  return {
+    // 行点击事件
+    onClick: () => {
+      // console.log(record);
+    },
+    // 行双击事件
+    onDblclick: () => {
+      openEdit(record);
+    }
+  };
+};
+query();
+</script>
+
+<script lang="ts">
+export default {
+  name: 'Splash'
+};
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/shop/swiper/components/search.vue b/src/views/shop/swiper/components/search.vue
new file mode 100644
index 0000000..82fea9d
--- /dev/null
+++ b/src/views/shop/swiper/components/search.vue
@@ -0,0 +1,42 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <a-button type="primary" class="ele-btn-icon" @click="add">
+      <template #icon>
+        <PlusOutlined />
+      </template>
+      <span>添加</span>
+    </a-button>
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import type { GradeParam } from '@/api/user/grade/model';
+  import { watch } from 'vue';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: GradeParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>
diff --git a/src/views/shop/swiper/components/swiperEdit.vue b/src/views/shop/swiper/components/swiperEdit.vue
new file mode 100644
index 0000000..3108195
--- /dev/null
+++ b/src/views/shop/swiper/components/swiperEdit.vue
@@ -0,0 +1,227 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑轮播图' : '添加轮播图'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-spin :spinning="loading">
+      <a-form
+        ref="formRef"
+        :model="form"
+        :rules="rules"
+        :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+        :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+      >
+        <a-form-item label="所属页面" name="type">
+          <a-select v-model:value="form.type" placeholder="请选择所属页面">
+            <a-select-option v-for="(item, index) in SwiperType" :key="index" :value="item.value">
+              {{ item.label }}
+            </a-select-option>
+          </a-select>
+        </a-form-item>
+        <a-form-item
+          label="图片"
+          name="image">
+          <SelectFile
+            :placeholder="`请选择图片`"
+            :limit="1"
+            :data="images"
+            @done="chooseImage"
+            @del="onDeleteItem"
+          />
+        </a-form-item>
+        <a-form-item label="跳转商品" name="jumpPk">
+          <a-select v-model:value="form.jumpPk" placeholder="请选择跳转商品">
+            <a-select-option v-for="(item, index) in goodsList" :key="index" :value="item.goodsId">
+              {{ item.goodsName }}
+            </a-select-option>
+          </a-select>
+        </a-form-item>
+        <a-form-item label="背景颜色">
+          <div
+            class=" w-10 h-10 rounded-full m-2 cursor-pointer border-2 border-solid flex justify-center items-center text-red-600"
+            :class="[form.color ? 'border-none' : 'border-red-300']"
+            :style="{backgroundColor: form.color ?? 'red'}"
+          >{{ form.color ? '' : '选色' }}
+          </div>
+          <span v-if="form.color" class="text-sm cursor-pointer" @click="form.color = ''">清除</span>
+          <Vue3ColorPicker v-model="form.color" mode="solid"
+                           :showColorList="false" :showEyeDrop="false" type="RGBA"/>
+        </a-form-item>
+        <a-form-item label="排序号" name="sortNumber">
+          <a-input-number
+            :min="0"
+            :max="9999"
+            class="ele-fluid"
+            placeholder="请输入排序号"
+            v-model:value="form.sortNumber"
+          />
+        </a-form-item>
+      </a-form>
+    </a-spin>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+import {ref, reactive, watch} from 'vue';
+import {Form, message} from 'ant-design-vue';
+import {assignObject, uuid} from 'ele-admin-pro';
+import {addSwiper, updateSwiper} from '@/api/shop/swiper';
+import {Swiper, SwiperType} from '@/api/shop/swiper/model';
+import {useThemeStore} from '@/store/modules/theme';
+import {storeToRefs} from 'pinia';
+import {ItemType} from 'ele-admin-pro/es/ele-image-upload/types';
+import {FormInstance} from 'ant-design-vue/es/form';
+import {FileRecord} from '@/api/system/file/model';
+import {Goods} from "@/api/shop/goods/model";
+import {listGoods} from "@/api/shop/goods";
+import {Vue3ColorPicker} from "@cyhnkckali/vue3-color-picker";
+
+// 是否是修改
+const isUpdate = ref(false);
+const useForm = Form.useForm;
+// 是否开启响应式布局
+const themeStore = useThemeStore();
+const {styleResponsive} = storeToRefs(themeStore);
+
+const props = defineProps<{
+  // 弹窗是否打开
+  visible: boolean;
+  // 修改回显的数据
+  data?: Swiper | null;
+}>();
+
+const emit = defineEmits<{
+  (e: 'done'): void;
+  (e: 'update:visible', visible: boolean): void;
+}>();
+
+// 提交状态
+const loading = ref(false);
+// 是否显示最大化切换按钮
+const maxable = ref(true);
+// 表格选中数据
+const formRef = ref<FormInstance | null>(null);
+const images = ref<ItemType[]>([]);
+
+// 用户信息
+const form = reactive<Swiper>({
+  id: undefined,
+  type: "会员商城",
+  image: undefined,
+  jumpType: 'goods',
+  jumpPk: undefined,
+  color: undefined,
+  comments: undefined,
+  sortNumber: undefined,
+  userId: undefined,
+  deleted: undefined,
+  tenantId: undefined,
+  createTime: undefined,
+  updateTime: undefined,
+});
+
+/* 更新visible */
+const updateVisible = (value: boolean) => {
+  emit('update:visible', value);
+};
+
+// 表单验证规则
+const rules = reactive({
+  swiperName: [
+    {
+      required: true,
+      type: 'string',
+      message: '请填写轮播图名称',
+      trigger: 'blur'
+    }
+  ]
+});
+
+const chooseImage = (data: FileRecord) => {
+  images.value.push({
+    uid: data.id,
+    url: data.path,
+    status: 'done'
+  });
+  form.image = data.path;
+};
+
+const onDeleteItem = (index: number) => {
+  images.value.splice(index, 1);
+  form.image = '';
+};
+
+const {resetFields} = useForm(form, rules);
+
+/* 保存编辑 */
+const save = () => {
+  if (!formRef.value) {
+    return;
+  }
+  formRef.value
+    .validate()
+    .then(() => {
+      loading.value = true;
+      const formData = {
+        ...form
+      };
+      const saveOrUpdate = isUpdate.value ? updateSwiper : addSwiper;
+      saveOrUpdate(formData)
+        .then((msg) => {
+          loading.value = false;
+          message.success(msg);
+          updateVisible(false);
+          emit('done');
+        })
+        .catch((e) => {
+          loading.value = false;
+          message.error(e.message);
+        });
+    })
+    .catch(() => {
+    });
+};
+
+const goodsList = ref<Goods[]>([]);
+const getGoodsList = async () => {
+  goodsList.value = await listGoods()
+}
+
+watch(
+  () => props.visible,
+  async (visible) => {
+    if (visible) {
+      images.value = [];
+      loading.value = true
+      await getGoodsList()
+      if (props.data) {
+        assignObject(form, props.data);
+        if (props.data.image) {
+          images.value.push({
+            uid: uuid(),
+            url: props.data.image,
+            status: 'done'
+          })
+        }
+        isUpdate.value = true;
+      } else {
+        isUpdate.value = false;
+      }
+      loading.value = false
+      console.log(form.color)
+    } else {
+      resetFields();
+    }
+  },
+  {immediate: true}
+);
+</script>
diff --git a/src/views/shop/swiper/index.vue b/src/views/shop/swiper/index.vue
new file mode 100644
index 0000000..2661e19
--- /dev/null
+++ b/src/views/shop/swiper/index.vue
@@ -0,0 +1,232 @@
+<template>
+  <div class="page">
+    <div class="ele-body">
+      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+        <ele-pro-table
+          ref="tableRef"
+          row-key="swiperId"
+          :columns="columns"
+          :datasource="datasource"
+          :customRow="customRow"
+          tool-class="ele-toolbar-form"
+          class="sys-org-table"
+        >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              @add="openEdit"
+              @remove="removeBatch"
+              @batchMove="openMove"
+            />
+          </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'image'">
+              <a-image :src="record.image" :width="50" />
+            </template>
+            <template v-if="column.key === 'status'">
+              <a-tag v-if="record.status === 0" color="green">显示</a-tag>
+              <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
+            </template>
+            <template v-if="column.key === 'action'">
+              <a-space>
+                <a @click="openEdit(record)">修改</a>
+                <a-divider type="vertical" />
+                <a-popconfirm
+                  title="确定要删除此记录吗？"
+                  @confirm="remove(record)"
+                >
+                  <a class="ele-text-danger">删除</a>
+                </a-popconfirm>
+              </a-space>
+            </template>
+          </template>
+        </ele-pro-table>
+      </a-card>
+
+      <!-- 编辑弹窗 -->
+      <SwiperEdit v-model:visible="showEdit" :data="current" @done="reload" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { createVNode, ref } from 'vue';
+  import { message, Modal } from 'ant-design-vue';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import type { EleProTable } from 'ele-admin-pro';
+  import { toDateString } from 'ele-admin-pro';
+  import type {
+    DatasourceFunction,
+    ColumnItem
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import Search from './components/search.vue';
+  import SwiperEdit from './components/swiperEdit.vue';
+  import { pageSwiper, removeSwiper, removeBatchSwiper } from '@/api/shop/swiper';
+  import {Swiper, SwiperParam, SwiperType} from '@/api/shop/swiper/model';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<Swiper[]>([]);
+  // 当前编辑数据
+  const current = ref<Swiper | null>(null);
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+  // 是否显示批量移动弹窗
+  const showMove = ref(false);
+  // 加载状态
+  const loading = ref(true);
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({
+    page,
+    limit,
+    where,
+    orders,
+    filters
+  }) => {
+    if (filters) {
+      where.status = filters.status;
+    }
+    return pageSwiper({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: '所属页面',
+      dataIndex: 'type',
+      key: 'type',
+      align: 'center'
+    },
+    {
+      title: '图片',
+      dataIndex: 'image',
+      key: 'image',
+      align: 'center',
+    },
+    {
+      title: '排序号',
+      dataIndex: 'sortNumber',
+      key: 'sortNumber',
+      align: 'center',
+    },
+    {
+      title: '创建时间',
+      dataIndex: 'createTime',
+      key: 'createTime',
+      align: 'center',
+      sorter: true,
+      ellipsis: true,
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
+    },
+    {
+      title: '修改时间',
+      dataIndex: 'updateTime',
+      key: 'updateTime',
+      align: 'center',
+    },
+    {
+      title: '操作',
+      key: 'action',
+      width: 180,
+      fixed: 'right',
+      align: 'center',
+      hideInSetting: true
+    }
+  ]);
+
+  /* 搜索 */
+  const reload = (where?: SwiperParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: Swiper) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: Swiper) => {
+    const hide = message.loading('请求中..', 0);
+    removeSwiper(row.swiperId)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  /* 批量删除 */
+  const removeBatch = () => {
+    if (!selection.value.length) {
+      message.error('请至少选择一条数据');
+      return;
+    }
+    Modal.confirm({
+      title: '提示',
+      content: '确定要删除选中的记录吗?',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = message.loading('请求中..', 0);
+        removeBatchSwiper(selection.value.map((d) => d.swiperId))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 查询 */
+  const query = () => {
+    loading.value = true;
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: Swiper) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+  query();
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'Swiper'
+  };
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/shop/userCollection/components/search.vue b/src/views/shop/userCollection/components/search.vue
new file mode 100644
index 0000000..82fea9d
--- /dev/null
+++ b/src/views/shop/userCollection/components/search.vue
@@ -0,0 +1,42 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <a-button type="primary" class="ele-btn-icon" @click="add">
+      <template #icon>
+        <PlusOutlined />
+      </template>
+      <span>添加</span>
+    </a-button>
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import type { GradeParam } from '@/api/user/grade/model';
+  import { watch } from 'vue';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: GradeParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>
diff --git a/src/views/shop/userCollection/components/userCollectionEdit.vue b/src/views/shop/userCollection/components/userCollectionEdit.vue
new file mode 100644
index 0000000..3114495
--- /dev/null
+++ b/src/views/shop/userCollection/components/userCollectionEdit.vue
@@ -0,0 +1,186 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑我的收藏' : '添加我的收藏'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="0店铺，1商品" name="type">
+        <a-input
+          allow-clear
+          placeholder="请输入0店铺，1商品"
+          v-model:value="form.type"
+        />
+      </a-form-item>
+      <a-form-item label="租户ID" name="tid">
+        <a-input
+          allow-clear
+          placeholder="请输入租户ID"
+          v-model:value="form.tid"
+        />
+      </a-form-item>
+      <a-form-item label="用户ID" name="userId">
+        <a-input
+          allow-clear
+          placeholder="请输入用户ID"
+          v-model:value="form.userId"
+        />
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from 'ant-design-vue';
+  import { assignObject, uuid } from 'ele-admin-pro';
+  import { addUserCollection, updateUserCollection } from '@/api/shop/userCollection';
+  import { UserCollection } from '@/api/shop/userCollection/model';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { FormInstance } from 'ant-design-vue/es/form';
+  import { FileRecord } from '@/api/system/file/model';
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: UserCollection | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 提交状态
+  const loading = ref(false);
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+  const images = ref<ItemType[]>([]);
+
+  // 用户信息
+  const form = reactive<UserCollection>({
+    id: undefined,
+    type: undefined,
+    tid: undefined,
+    userId: undefined,
+    tenantId: undefined,
+    createTime: undefined,
+    userCollectionId: undefined,
+    userCollectionName: '',
+    status: 0,
+    comments: '',
+    sortNumber: 100
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    userCollectionName: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写我的收藏名称',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  const chooseImage = (data: FileRecord) => {
+    images.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+    form.image = data.path;
+  };
+
+  const onDeleteItem = (index: number) => {
+    images.value.splice(index, 1);
+    form.image = '';
+  };
+
+  const { resetFields } = useForm(form, rules);
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const formData = {
+          ...form
+        };
+        const saveOrUpdate = isUpdate.value ? updateUserCollection : addUserCollection;
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        images.value = [];
+        if (props.data) {
+          assignObject(form, props.data);
+          if(props.data.image){
+            images.value.push({
+              uid: uuid(),
+              url: props.data.image,
+              status: 'done'
+            })
+          }
+          isUpdate.value = true;
+        } else {
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>
diff --git a/src/views/shop/userCollection/index.vue b/src/views/shop/userCollection/index.vue
new file mode 100644
index 0000000..45125f0
--- /dev/null
+++ b/src/views/shop/userCollection/index.vue
@@ -0,0 +1,233 @@
+<template>
+  <div class="page">
+    <div class="ele-body">
+      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+        <ele-pro-table
+          ref="tableRef"
+          row-key="userCollectionId"
+          :columns="columns"
+          :datasource="datasource"
+          :customRow="customRow"
+          tool-class="ele-toolbar-form"
+          class="sys-org-table"
+        >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              @add="openEdit"
+              @remove="removeBatch"
+              @batchMove="openMove"
+            />
+          </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'image'">
+              <a-image :src="record.image" :width="50" />
+            </template>
+            <template v-if="column.key === 'status'">
+              <a-tag v-if="record.status === 0" color="green">显示</a-tag>
+              <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
+            </template>
+            <template v-if="column.key === 'action'">
+              <a-space>
+                <a @click="openEdit(record)">修改</a>
+                <a-divider type="vertical" />
+                <a-popconfirm
+                  title="确定要删除此记录吗？"
+                  @confirm="remove(record)"
+                >
+                  <a class="ele-text-danger">删除</a>
+                </a-popconfirm>
+              </a-space>
+            </template>
+          </template>
+        </ele-pro-table>
+      </a-card>
+
+      <!-- 编辑弹窗 -->
+      <UserCollectionEdit v-model:visible="showEdit" :data="current" @done="reload" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { createVNode, ref } from 'vue';
+  import { message, Modal } from 'ant-design-vue';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import type { EleProTable } from 'ele-admin-pro';
+  import { toDateString } from 'ele-admin-pro';
+  import type {
+    DatasourceFunction,
+    ColumnItem
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import Search from './components/search.vue';
+  import UserCollectionEdit from './components/userCollectionEdit.vue';
+  import { pageUserCollection, removeUserCollection, removeBatchUserCollection } from '@/api/shop/userCollection';
+  import type { UserCollection, UserCollectionParam } from '@/api/shop/userCollection/model';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<UserCollection[]>([]);
+  // 当前编辑数据
+  const current = ref<UserCollection | null>(null);
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+  // 是否显示批量移动弹窗
+  const showMove = ref(false);
+  // 加载状态
+  const loading = ref(true);
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({
+    page,
+    limit,
+    where,
+    orders,
+    filters
+  }) => {
+    if (filters) {
+      where.status = filters.status;
+    }
+    return pageUserCollection({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: '主键ID',
+      dataIndex: 'id',
+      key: 'id',
+      align: 'center',
+      width: 90,
+    },
+    {
+      title: '0店铺，1商品',
+      dataIndex: 'type',
+      key: 'type',
+      align: 'center',
+    },
+    {
+      title: '租户ID',
+      dataIndex: 'tid',
+      key: 'tid',
+      align: 'center',
+    },
+    {
+      title: '用户ID',
+      dataIndex: 'userId',
+      key: 'userId',
+      align: 'center',
+    },
+    {
+      title: '注册时间',
+      dataIndex: 'createTime',
+      key: 'createTime',
+      align: 'center',
+      sorter: true,
+      ellipsis: true,
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
+    },
+    {
+      title: '操作',
+      key: 'action',
+      width: 180,
+      fixed: 'right',
+      align: 'center',
+      hideInSetting: true
+    }
+  ]);
+
+  /* 搜索 */
+  const reload = (where?: UserCollectionParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: UserCollection) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: UserCollection) => {
+    const hide = message.loading('请求中..', 0);
+    removeUserCollection(row.userCollectionId)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  /* 批量删除 */
+  const removeBatch = () => {
+    if (!selection.value.length) {
+      message.error('请至少选择一条数据');
+      return;
+    }
+    Modal.confirm({
+      title: '提示',
+      content: '确定要删除选中的记录吗?',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = message.loading('请求中..', 0);
+        removeBatchUserCollection(selection.value.map((d) => d.userCollectionId))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 查询 */
+  const query = () => {
+    loading.value = true;
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: UserCollection) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+  query();
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'UserCollection'
+  };
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/system/domain/components/search.vue~merged b/src/views/system/domain/components/search.vue~merged
new file mode 100644
index 0000000..180b9c1
--- /dev/null
+++ b/src/views/system/domain/components/search.vue~merged
@@ -0,0 +1,53 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <a-input-search
+      allow-clear
+      v-model:value="where.keywords"
+      placeholder="租户ID|域名"
+      @search="search"
+      @pressEnter="search"
+    />
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { watch } from 'vue';
+  import useSearch from '@/utils/use-search';
+  import { DomainParam } from '@/api/system/domain/model';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: DomainParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  /* 搜索 */
+  const search = () => {
+    emit('search', where);
+  };
+
+  // 表单数据
+  const { where } = useSearch<DomainParam>({
+    keywords: ''
+  });
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>
diff --git a/src/views/system/payment/components/paymentEdit.vue b/src/views/system/payment/components/paymentEdit.vue
index af1a6ac..ae61125 100644
--- a/src/views/system/payment/components/paymentEdit.vue
+++ b/src/views/system/payment/components/paymentEdit.vue
@@ -28,7 +28,7 @@
         />
       </a-form-item>
       <!--微信支付-->
-      <template v-if="form.code == 1">
+      <template v-if="form.code === 1">
         <a-form-item label="微信商户号类型" name="wechatType">
           <a-radio-group v-model:value="form.wechatType">
             <a-radio :value="0">