diff --git a/.env.development b/.env.development
index e774d25..dc23e2f 100644
--- a/.env.development
+++ b/.env.development
@@ -1,10 +1,10 @@
 VITE_APP_NAME=后台管理系统
 VITE_SOCKET_URL=wss://server.gxwebsoft.com
 VITE_SERVER_URL=https://server.gxwebsoft.com/api
-#VITE_API_URL=https://cms-api.websoft.top/api
+VITE_API_URL=https://cms-api.websoft.top/api
 
 
 #VITE_SOCKET_URL=ws://127.0.0.1:9191
 #VITE_SERVER_URL=http://127.0.0.1:8000/api
-VITE_API_URL=http://127.0.0.1:9000/api
+#VITE_API_URL=http://127.0.0.1:9000/api
 #/booking/bookingItem
diff --git a/src/api/hjm/hjmCar/model/index.ts b/src/api/hjm/hjmCar/model/index.ts
index b0438eb..3cfd34f 100644
--- a/src/api/hjm/hjmCar/model/index.ts
+++ b/src/api/hjm/hjmCar/model/index.ts
@@ -23,6 +23,8 @@ export interface HjmCar {
   driverId?: number;
   // 操作员名称
   driver?: string;
+  // 操作员名称
+  driverName?: string;
   // 操作员手机号
   driverPhone?: string;
   // 保险状态
@@ -53,6 +55,8 @@ export interface HjmCar {
   organizationParentId?: number;
   // 用户ID
   userId?: number;
+  // 认领状态
+  claim?: number;
   // 绑定用户
   toUser?: string;
   // 排序(数字越小越靠前)
diff --git a/src/api/shop/shopCommissionRole/index.ts b/src/api/shop/shopCommissionRole/index.ts
new file mode 100644
index 0000000..60db05d
--- /dev/null
+++ b/src/api/shop/shopCommissionRole/index.ts
@@ -0,0 +1,105 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api';
+import type { ShopCommissionRole, ShopCommissionRoleParam } from './model';
+
+/**
+ * 分页查询分红角色
+ */
+export async function pageShopCommissionRole(params: ShopCommissionRoleParam) {
+  const res = await request.get<ApiResult<PageResult<ShopCommissionRole>>>(
+    '/shop/shop-commission-role/page',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 查询分红角色列表
+ */
+export async function listShopCommissionRole(params?: ShopCommissionRoleParam) {
+  const res = await request.get<ApiResult<ShopCommissionRole[]>>(
+    '/shop/shop-commission-role',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 添加分红角色
+ */
+export async function addShopCommissionRole(data: ShopCommissionRole) {
+  const res = await request.post<ApiResult<unknown>>(
+    '/shop/shop-commission-role',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 修改分红角色
+ */
+export async function updateShopCommissionRole(data: ShopCommissionRole) {
+  const res = await request.put<ApiResult<unknown>>(
+    '/shop/shop-commission-role',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 删除分红角色
+ */
+export async function removeShopCommissionRole(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    '/shop/shop-commission-role/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 批量删除分红角色
+ */
+export async function removeBatchShopCommissionRole(data: (number | undefined)[]) {
+  const res = await request.delete<ApiResult<unknown>>(
+    '/shop/shop-commission-role/batch',
+    {
+      data
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 根据id查询分红角色
+ */
+export async function getShopCommissionRole(id: number) {
+  const res = await request.get<ApiResult<ShopCommissionRole>>(
+    '/shop/shop-commission-role/' + 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/shopCommissionRole/model/index.ts b/src/api/shop/shopCommissionRole/model/index.ts
new file mode 100644
index 0000000..4309104
--- /dev/null
+++ b/src/api/shop/shopCommissionRole/model/index.ts
@@ -0,0 +1,35 @@
+import type { PageParam } from '@/api';
+
+/**
+ * 分红角色
+ */
+export interface ShopCommissionRole {
+  // 
+  id?: number;
+  // 
+  title?: string;
+  // 
+  provinceId?: number;
+  // 
+  cityId?: number;
+  // 
+  regionId?: number;
+  // 状态, 0正常, 1异常
+  status?: number;
+  // 备注
+  comments?: string;
+  // 租户id
+  tenantId?: number;
+  // 创建时间
+  createTime?: string;
+  // 
+  sortNumber?: number;
+}
+
+/**
+ * 分红角色搜索条件
+ */
+export interface ShopCommissionRoleParam extends PageParam {
+  id?: number;
+  keywords?: string;
+}
diff --git a/src/api/shop/shopExpress/index.ts b/src/api/shop/shopExpress/index.ts
new file mode 100644
index 0000000..6ded8bb
--- /dev/null
+++ b/src/api/shop/shopExpress/index.ts
@@ -0,0 +1,106 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api';
+import type { ShopExpress, ShopExpressParam } from './model';
+import { MODULES_API_URL } from '@/config/setting';
+
+/**
+ * 分页查询物流公司
+ */
+export async function pageShopExpress(params: ShopExpressParam) {
+  const res = await request.get<ApiResult<PageResult<ShopExpress>>>(
+    MODULES_API_URL + '/shop/shop-express/page',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 查询物流公司列表
+ */
+export async function listShopExpress(params?: ShopExpressParam) {
+  const res = await request.get<ApiResult<ShopExpress[]>>(
+    MODULES_API_URL + '/shop/shop-express',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 添加物流公司
+ */
+export async function addShopExpress(data: ShopExpress) {
+  const res = await request.post<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-express',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 修改物流公司
+ */
+export async function updateShopExpress(data: ShopExpress) {
+  const res = await request.put<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-express',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 删除物流公司
+ */
+export async function removeShopExpress(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-express/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 批量删除物流公司
+ */
+export async function removeBatchShopExpress(data: (number | undefined)[]) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-express/batch',
+    {
+      data
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 根据id查询物流公司
+ */
+export async function getShopExpress(id: number) {
+  const res = await request.get<ApiResult<ShopExpress>>(
+    MODULES_API_URL + '/shop/shop-express/' + 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/shopExpress/model/index.ts b/src/api/shop/shopExpress/model/index.ts
new file mode 100644
index 0000000..24d2098
--- /dev/null
+++ b/src/api/shop/shopExpress/model/index.ts
@@ -0,0 +1,35 @@
+import type { PageParam } from '@/api';
+
+/**
+ * 物流公司
+ */
+export interface ShopExpress {
+  // 物流公司ID
+  expressId?: number;
+  // 物流公司名称
+  expressName?: string;
+  // 物流公司编码 (微信)
+  wxCode?: string;
+  // 物流公司编码 (快递100)
+  kuaidi100Code?: string;
+  // 物流公司编码 (快递鸟)
+  kdniaoCode?: string;
+  // 排序号
+  sortNumber?: number;
+  // 是否删除, 0否, 1是
+  deleted?: number;
+  // 租户id
+  tenantId?: number;
+  // 创建时间
+  createTime?: string;
+  // 修改时间
+  updateTime?: string;
+}
+
+/**
+ * 物流公司搜索条件
+ */
+export interface ShopExpressParam extends PageParam {
+  expressId?: number;
+  keywords?: string;
+}
diff --git a/src/api/shop/shopExpressTemplate/index.ts b/src/api/shop/shopExpressTemplate/index.ts
new file mode 100644
index 0000000..b9c556f
--- /dev/null
+++ b/src/api/shop/shopExpressTemplate/index.ts
@@ -0,0 +1,106 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api';
+import type { ShopExpressTemplate, ShopExpressTemplateParam } from './model';
+import { MODULES_API_URL } from '@/config/setting';
+
+/**
+ * 分页查询运费模板
+ */
+export async function pageShopExpressTemplate(params: ShopExpressTemplateParam) {
+  const res = await request.get<ApiResult<PageResult<ShopExpressTemplate>>>(
+    MODULES_API_URL + '/shop/shop-express-template/page',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 查询运费模板列表
+ */
+export async function listShopExpressTemplate(params?: ShopExpressTemplateParam) {
+  const res = await request.get<ApiResult<ShopExpressTemplate[]>>(
+    MODULES_API_URL + '/shop/shop-express-template',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 添加运费模板
+ */
+export async function addShopExpressTemplate(data: ShopExpressTemplate) {
+  const res = await request.post<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-express-template',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 修改运费模板
+ */
+export async function updateShopExpressTemplate(data: ShopExpressTemplate) {
+  const res = await request.put<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-express-template',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 删除运费模板
+ */
+export async function removeShopExpressTemplate(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-express-template/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 批量删除运费模板
+ */
+export async function removeBatchShopExpressTemplate(data: (number | undefined)[]) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-express-template/batch',
+    {
+      data
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 根据id查询运费模板
+ */
+export async function getShopExpressTemplate(id: number) {
+  const res = await request.get<ApiResult<ShopExpressTemplate>>(
+    MODULES_API_URL + '/shop/shop-express-template/' + 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/shopExpressTemplate/model/index.ts b/src/api/shop/shopExpressTemplate/model/index.ts
new file mode 100644
index 0000000..efbf3ee
--- /dev/null
+++ b/src/api/shop/shopExpressTemplate/model/index.ts
@@ -0,0 +1,41 @@
+import type { PageParam } from '@/api';
+
+/**
+ * 运费模板
+ */
+export interface ShopExpressTemplate {
+  // 
+  id?: number;
+  // 
+  type?: string;
+  // 
+  title?: string;
+  // 收件价格
+  firstAmount?: string;
+  // 续件价格
+  extraAmount?: string;
+  // 状态, 0已发布, 1待审核 2已驳回 3违规内容
+  status?: number;
+  // 是否删除, 0否, 1是
+  deleted?: number;
+  // 租户id
+  tenantId?: number;
+  // 创建时间
+  createTime?: string;
+  // 修改时间
+  updateTime?: string;
+  // 
+  sortNumber?: number;
+  // 首件数量/重量
+  firstNum?: string;
+  // 续件数量/重量
+  extraNum?: string;
+}
+
+/**
+ * 运费模板搜索条件
+ */
+export interface ShopExpressTemplateParam extends PageParam {
+  id?: number;
+  keywords?: string;
+}
diff --git a/src/api/shop/shopExpressTemplateDetail/index.ts b/src/api/shop/shopExpressTemplateDetail/index.ts
new file mode 100644
index 0000000..9ca4f8f
--- /dev/null
+++ b/src/api/shop/shopExpressTemplateDetail/index.ts
@@ -0,0 +1,106 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api';
+import type { ShopExpressTemplateDetail, ShopExpressTemplateDetailParam } from './model';
+import { MODULES_API_URL } from '@/config/setting';
+
+/**
+ * 分页查询运费模板
+ */
+export async function pageShopExpressTemplateDetail(params: ShopExpressTemplateDetailParam) {
+  const res = await request.get<ApiResult<PageResult<ShopExpressTemplateDetail>>>(
+    MODULES_API_URL + '/shop/shop-express-template-detail/page',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 查询运费模板列表
+ */
+export async function listShopExpressTemplateDetail(params?: ShopExpressTemplateDetailParam) {
+  const res = await request.get<ApiResult<ShopExpressTemplateDetail[]>>(
+    MODULES_API_URL + '/shop/shop-express-template-detail',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 添加运费模板
+ */
+export async function addShopExpressTemplateDetail(data: ShopExpressTemplateDetail) {
+  const res = await request.post<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-express-template-detail',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 修改运费模板
+ */
+export async function updateShopExpressTemplateDetail(data: ShopExpressTemplateDetail) {
+  const res = await request.put<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-express-template-detail',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 删除运费模板
+ */
+export async function removeShopExpressTemplateDetail(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-express-template-detail/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 批量删除运费模板
+ */
+export async function removeBatchShopExpressTemplateDetail(data: (number | undefined)[]) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-express-template-detail/batch',
+    {
+      data
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 根据id查询运费模板
+ */
+export async function getShopExpressTemplateDetail(id: number) {
+  const res = await request.get<ApiResult<ShopExpressTemplateDetail>>(
+    MODULES_API_URL + '/shop/shop-express-template-detail/' + 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/shopExpressTemplateDetail/model/index.ts b/src/api/shop/shopExpressTemplateDetail/model/index.ts
new file mode 100644
index 0000000..5b74dcc
--- /dev/null
+++ b/src/api/shop/shopExpressTemplateDetail/model/index.ts
@@ -0,0 +1,45 @@
+import type { PageParam } from '@/api';
+
+/**
+ * 运费模板
+ */
+export interface ShopExpressTemplateDetail {
+  // 
+  id?: number;
+  // 
+  templateId?: number;
+  // 0按件
+  type?: string;
+  // 
+  provinceId?: number;
+  // 
+  cityId?: number;
+  // 首件数量/重量
+  firstNum?: string;
+  // 收件价格
+  firstAmount?: string;
+  // 续件价格
+  extraAmount?: string;
+  // 续件数量/重量
+  extraNum?: string;
+  // 状态, 0已发布, 1待审核 2已驳回 3违规内容
+  status?: number;
+  // 是否删除, 0否, 1是
+  deleted?: number;
+  // 租户id
+  tenantId?: number;
+  // 创建时间
+  createTime?: string;
+  // 修改时间
+  updateTime?: string;
+  // 
+  sortNumber?: number;
+}
+
+/**
+ * 运费模板搜索条件
+ */
+export interface ShopExpressTemplateDetailParam extends PageParam {
+  id?: number;
+  keywords?: string;
+}
diff --git a/src/api/shop/shopGoods/index.ts b/src/api/shop/shopGoods/index.ts
new file mode 100644
index 0000000..580cd69
--- /dev/null
+++ b/src/api/shop/shopGoods/index.ts
@@ -0,0 +1,116 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api';
+import type { ShopGoods, ShopGoodsParam } from './model';
+import { MODULES_API_URL } from '@/config/setting';
+
+/**
+ * 分页查询商品
+ */
+export async function pageShopGoods(params: ShopGoodsParam) {
+  const res = await request.get<ApiResult<PageResult<ShopGoods>>>(
+    MODULES_API_URL + '/shop/shop-goods/page',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 查询商品列表
+ */
+export async function listShopGoods(params?: ShopGoodsParam) {
+  const res = await request.get<ApiResult<ShopGoods[]>>(
+    MODULES_API_URL + '/shop/shop-goods',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 添加商品
+ */
+export async function addShopGoods(data: ShopGoods) {
+  const res = await request.post<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-goods',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 修改商品
+ */
+export async function updateShopGoods(data: ShopGoods) {
+  const res = await request.put<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-goods',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 删除商品
+ */
+export async function removeShopGoods(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-goods/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 批量删除商品
+ */
+export async function removeBatchShopGoods(data: (number | undefined)[]) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-goods/batch',
+    {
+      data
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 根据id查询商品
+ */
+export async function getShopGoods(id: number) {
+  const res = await request.get<ApiResult<ShopGoods>>(
+    MODULES_API_URL + '/shop/shop-goods/' + id
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+export async function getCount(params: ShopGoodsParam) {
+  const res = await request.get(MODULES_API_URL + '/shop/shop-goods/data', {
+    params
+  });
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
diff --git a/src/api/shop/shopGoods/model/index.ts b/src/api/shop/shopGoods/model/index.ts
new file mode 100644
index 0000000..ecc1057
--- /dev/null
+++ b/src/api/shop/shopGoods/model/index.ts
@@ -0,0 +1,147 @@
+import type { PageParam } from '@/api';
+import { ShopGoodsSpec } from '@/api/shop/shopGoodsSpec/model';
+import { ShopGoodsSku } from '@/api/shop/shopGoodsSku/model';
+import { ShopGoodsRoleCommission } from '@/api/shop/shopGoodsRoleCommission/model';
+
+export interface GoodsCount {
+  totalNum: number;
+  totalNum2: number;
+  totalNum3: number;
+  totalNum4: number;
+}
+/**
+ * 商品记录表
+ */
+export interface ShopGoods {
+  // 自增ID
+  goodsId?: number;
+  // 类型 1实物商品 2虚拟商品
+  type?: number;
+  // 商品编码
+  code?: string;
+  // 商品名称
+  name?: string;
+  // 商品标题
+  goodsName?: string;
+  // 商品封面图
+  image?: string;
+  video?: string;
+  // 商品详情
+  content?: string;
+  canExpress?: number;
+  // 商品分类
+  category?: string;
+  // 商品分类ID
+  categoryId?: number;
+  parentName?: string;
+  categoryName?: string;
+  // 一级分类
+  categoryParent?: string;
+  // 二级分类
+  categoryChildren?: string;
+  // 商品规格 0单规格 1多规格
+  specs?: number;
+  commissionRole?: number;
+  // 货架
+  position?: string;
+  // 进货价
+  buyingPrice?: string;
+  // 商品价格
+  price?: string;
+  originPrice?: string;
+  // 销售价格
+  salePrice?: string;
+  chainStorePrice?: string;
+  chainStoreRate?: string;
+  memberStoreRate?: string;
+  memberMarketRate?: string;
+  memberStoreCommission?: string;
+  supplierCommission?: string;
+  coopCommission?: string;
+  memberStorePrice?: string;
+  memberMarketPrice?: string;
+  // 经销商价格
+  dealerPrice?: string;
+  // 有赠品
+  buyingGift?: boolean;
+  // 有赠品
+  priceGift?: boolean;
+  // 有赠品
+  dealerGift?: boolean;
+  buyingGiftNum?: number;
+  priceGiftNum?: number;
+  priceGiftName?: string;
+  dealerGiftNum?: number;
+  // 库存计算方式(10下单减库存 20付款减库存)
+  deductStockType?: number;
+  // 封面图
+  files?: string;
+  // 销量
+  sales?: number;
+  isNew?: number;
+  // 库存
+  stock?: number;
+  // 商品重量
+  goodsWeight?: number;
+  // 消费赚取积分
+  gainIntegral?: number;
+  // 推荐
+  recommend?: number;
+  // 商户ID
+  merchantId?: number;
+  // 商户名称
+  merchantName?: string;
+  supplierMerchantId?: number;
+  supplierName?: string;
+  // 状态（0：未上架，1：上架）
+  isShow?: 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;
+  // 显示规格名
+  specName?: string;
+  // 商品规格
+  goodsSpecs?: ShopGoodsSpec[];
+  goodsRoleCommission?: ShopGoodsRoleCommission[];
+  // 商品sku列表
+  goodsSkus?: ShopGoodsSku[];
+  // 单位名称
+  unitName?: string;
+  expressTemplateId?: number;
+  canUseDate?: string;
+  ensureTag?: string;
+  expiredDay?: number;
+}
+
+export interface BathSet {
+  price?: number;
+  salePrice?: number;
+  stock?: number;
+  skuNo?: string;
+}
+
+/**
+ * 商品记录表搜索条件
+ */
+export interface ShopGoodsParam extends PageParam {
+  parentId?: number;
+  categoryId?: number;
+  goodsId?: number;
+  goodsName?: string;
+  isShow?: number;
+  stock?: number;
+  keywords?: string;
+}
diff --git a/src/api/shop/shopGoodsCategory/index.ts b/src/api/shop/shopGoodsCategory/index.ts
new file mode 100644
index 0000000..dbdf598
--- /dev/null
+++ b/src/api/shop/shopGoodsCategory/index.ts
@@ -0,0 +1,106 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api';
+import type { ShopGoodsCategory, ShopGoodsCategoryParam } from './model';
+import { MODULES_API_URL } from '@/config/setting';
+
+/**
+ * 分页查询商品分类
+ */
+export async function pageShopGoodsCategory(params: ShopGoodsCategoryParam) {
+  const res = await request.get<ApiResult<PageResult<ShopGoodsCategory>>>(
+    MODULES_API_URL + '/shop/shop-goods-category/page',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 查询商品分类列表
+ */
+export async function listShopGoodsCategory(params?: ShopGoodsCategoryParam) {
+  const res = await request.get<ApiResult<ShopGoodsCategory[]>>(
+    MODULES_API_URL + '/shop/shop-goods-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 addShopGoodsCategory(data: ShopGoodsCategory) {
+  const res = await request.post<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-goods-category',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 修改商品分类
+ */
+export async function updateShopGoodsCategory(data: ShopGoodsCategory) {
+  const res = await request.put<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-goods-category',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 删除商品分类
+ */
+export async function removeShopGoodsCategory(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-goods-category/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 批量删除商品分类
+ */
+export async function removeBatchShopGoodsCategory(data: (number | undefined)[]) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-goods-category/batch',
+    {
+      data
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 根据id查询商品分类
+ */
+export async function getShopGoodsCategory(id: number) {
+  const res = await request.get<ApiResult<ShopGoodsCategory>>(
+    MODULES_API_URL + '/shop/shop-goods-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/shop/shopGoodsCategory/model/index.ts b/src/api/shop/shopGoodsCategory/model/index.ts
new file mode 100644
index 0000000..13fefa1
--- /dev/null
+++ b/src/api/shop/shopGoodsCategory/model/index.ts
@@ -0,0 +1,64 @@
+import type { PageParam } from '@/api';
+
+/**
+ * 商品分类
+ */
+export interface ShopGoodsCategory {
+  // 商品分类ID
+  categoryId?: number;
+  // 分类标识
+  categoryCode?: string;
+  // 分类名称
+  title?: string;
+  // 类型 0商城分类 1外卖分类
+  type?: number;
+  // 分类图片
+  image?: string;
+  // 上级分类ID
+  parentId?: number;
+  // 路由/链接地址
+  path?: string;
+  // 组件路径
+  component?: string;
+  // 绑定的页面
+  pageId?: number;
+  // 用户ID
+  userId?: number;
+  // 商品数量
+  count?: number;
+  // 排序(数字越小越靠前)
+  sortNumber?: number;
+  // 备注
+  comments?: string;
+  // 是否隐藏, 0否, 1是(仅注册路由不显示在左侧菜单)
+  hide?: number;
+  // 是否推荐
+  recommend?: number;
+  // 是否显示在首页
+  showIndex?: number;
+  // 商铺ID
+  merchantId?: number;
+  // 状态, 0正常, 1禁用
+  status?: number;
+  // 是否删除, 0否, 1是
+  deleted?: number;
+  // 租户id
+  tenantId?: number;
+  // 注册时间
+  createTime?: string;
+  // 修改时间
+  updateTime?: string;
+  // 子菜单
+  children?: ShopGoodsCategory[];
+  key?: number;
+  value?: number;
+  label?: string;
+}
+
+/**
+ * 商品分类搜索条件
+ */
+export interface ShopGoodsCategoryParam extends PageParam {
+  categoryId?: number;
+  keywords?: string;
+}
diff --git a/src/api/shop/shopGoodsRoleCommission/index.ts b/src/api/shop/shopGoodsRoleCommission/index.ts
new file mode 100644
index 0000000..ac3c88b
--- /dev/null
+++ b/src/api/shop/shopGoodsRoleCommission/index.ts
@@ -0,0 +1,106 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api';
+import { MODULES_API_URL } from '@/config/setting';
+import { ShopGoodsRoleCommission, ShopGoodsRoleCommissionParam } from '@/api/shop/shopGoodsRoleCommission/model';
+
+/**
+ * 分页查询商品绑定角色的分润金额
+ */
+export async function pageShopGoodsRoleCommission(params: ShopGoodsRoleCommissionParam) {
+  const res = await request.get<ApiResult<PageResult<ShopGoodsRoleCommission>>>(
+    MODULES_API_URL + '/shop/shop-goods-role-commission/page',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 查询商品绑定角色的分润金额列表
+ */
+export async function listShopGoodsRoleCommission(params?: ShopGoodsRoleCommissionParam) {
+  const res = await request.get<ApiResult<ShopGoodsRoleCommission[]>>(
+    MODULES_API_URL + '/shop/shop-goods-role-commission',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 添加商品绑定角色的分润金额
+ */
+export async function addShopGoodsRoleCommission(data: ShopGoodsRoleCommission) {
+  const res = await request.post<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-goods-role-commission',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 修改商品绑定角色的分润金额
+ */
+export async function updateShopGoodsRoleCommission(data: ShopGoodsRoleCommission) {
+  const res = await request.put<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-goods-role-commission',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 删除商品绑定角色的分润金额
+ */
+export async function removeShopGoodsRoleCommission(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-goods-role-commission/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 批量删除商品绑定角色的分润金额
+ */
+export async function removeBatchShopGoodsRoleCommission(data: (number | undefined)[]) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-goods-role-commission/batch',
+    {
+      data
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 根据id查询商品绑定角色的分润金额
+ */
+export async function getShopGoodsRoleCommission(id: number) {
+  const res = await request.get<ApiResult<ShopGoodsRoleCommission>>(
+    MODULES_API_URL + '/shop/shop-goods-role-commission/' + 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/shopGoodsRoleCommission/model/index.ts b/src/api/shop/shopGoodsRoleCommission/model/index.ts
new file mode 100644
index 0000000..54384fc
--- /dev/null
+++ b/src/api/shop/shopGoodsRoleCommission/model/index.ts
@@ -0,0 +1,35 @@
+import type { PageParam } from '@/api';
+
+/**
+ * 商品绑定角色的分润金额
+ */
+export interface ShopGoodsRoleCommission {
+  //
+  id?: number;
+  //
+  roleId?: number;
+  //
+  goodsId?: number;
+  //
+  sku?: string;
+  //
+  amount?: string;
+  // 状态, 0正常, 1异常
+  status?: number;
+  // 备注
+  comments?: string;
+  // 租户id
+  tenantId?: number;
+  // 创建时间
+  createTime?: string;
+  //
+  sortNumber?: number;
+}
+
+/**
+ * 商品绑定角色的分润金额搜索条件
+ */
+export interface ShopGoodsRoleCommissionParam extends PageParam {
+  id?: number;
+  keywords?: string;
+}
diff --git a/src/api/shop/shopGoodsSku/index.ts b/src/api/shop/shopGoodsSku/index.ts
new file mode 100644
index 0000000..2d0d926
--- /dev/null
+++ b/src/api/shop/shopGoodsSku/index.ts
@@ -0,0 +1,118 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api';
+import { MODULES_API_URL } from '@/config/setting';
+import { ShopGoodsSpec } from '@/api/shop/shopGoodsSpec/model';
+import { ShopGoodsSku, ShopGoodsSkuParam } from '@/api/shop/shopGoodsSku/model';
+
+export async function generateGoodsSku(data: ShopGoodsSpec) {
+  const res = await request.post<ApiResult<ShopGoodsSku[]>>(
+    MODULES_API_URL + '/shop/goods-sku/generateGoodsSku',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 分页查询商品sku列表
+ */
+export async function pageShopGoodsSku(params: ShopGoodsSkuParam) {
+  const res = await request.get<ApiResult<PageResult<ShopGoodsSku>>>(
+    MODULES_API_URL + '/shop/shop-goods-sku/page',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 查询商品sku列表列表
+ */
+export async function listShopGoodsSku(params?: ShopGoodsSkuParam) {
+  const res = await request.get<ApiResult<ShopGoodsSku[]>>(
+    MODULES_API_URL + '/shop/shop-goods-sku',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 添加商品sku列表
+ */
+export async function addShopGoodsSku(data: ShopGoodsSku) {
+  const res = await request.post<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-goods-sku',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 修改商品sku列表
+ */
+export async function updateShopGoodsSku(data: ShopGoodsSku) {
+  const res = await request.put<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-goods-sku',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 删除商品sku列表
+ */
+export async function removeShopGoodsSku(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-goods-sku/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 批量删除商品sku列表
+ */
+export async function removeBatchShopGoodsSku(data: (number | undefined)[]) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-goods-sku/batch',
+    {
+      data
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 根据id查询商品sku列表
+ */
+export async function getShopGoodsSku(id: number) {
+  const res = await request.get<ApiResult<ShopGoodsSku>>(
+    MODULES_API_URL + '/shop/shop-goods-sku/' + 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/shopGoodsSku/model/index.ts b/src/api/shop/shopGoodsSku/model/index.ts
new file mode 100644
index 0000000..0880d7f
--- /dev/null
+++ b/src/api/shop/shopGoodsSku/model/index.ts
@@ -0,0 +1,50 @@
+import type { PageParam } from '@/api';
+
+/**
+ * 商品sku列表
+ */
+export interface ShopGoodsSku {
+  // 主键ID
+  id?: number;
+  // 商品ID
+  goodsId?: number;
+  // 商品属性索引值 (attr_value|attr_value[|....])
+  sku?: string;
+  // 商品图片
+  image?: string;
+  // 商品价格
+  price?: string;
+  // 市场价格
+  salePrice?: string;
+  // 成本价
+  cost?: string;
+  // 库存
+  stock?: number;
+  // sku编码
+  skuNo?: string;
+  // 商品条码
+  barCode?: string;
+  // 重量
+  weight?: string;
+  // 体积
+  volume?: string;
+  // 唯一值
+  uuid?: string;
+  // 状态, 0正常, 1异常
+  status?: number;
+  // 备注
+  comments?: string;
+  // 租户id
+  tenantId?: number;
+  // 创建时间
+  createTime?: string;
+  images?: string;
+}
+
+/**
+ * 商品sku列表搜索条件
+ */
+export interface ShopGoodsSkuParam extends PageParam {
+  id?: number;
+  keywords?: string;
+}
diff --git a/src/api/shop/shopGoodsSpec/index.ts b/src/api/shop/shopGoodsSpec/index.ts
new file mode 100644
index 0000000..d7d9ef9
--- /dev/null
+++ b/src/api/shop/shopGoodsSpec/index.ts
@@ -0,0 +1,105 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api';
+import type { ShopGoodsSpec, ShopGoodsSpecParam } from './model';
+
+/**
+ * 分页查询商品多规格
+ */
+export async function pageShopGoodsSpec(params: ShopGoodsSpecParam) {
+  const res = await request.get<ApiResult<PageResult<ShopGoodsSpec>>>(
+    '/shop/shop-goods-spec/page',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 查询商品多规格列表
+ */
+export async function listShopGoodsSpec(params?: ShopGoodsSpecParam) {
+  const res = await request.get<ApiResult<ShopGoodsSpec[]>>(
+    '/shop/shop-goods-spec',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 添加商品多规格
+ */
+export async function addShopGoodsSpec(data: ShopGoodsSpec) {
+  const res = await request.post<ApiResult<unknown>>(
+    '/shop/shop-goods-spec',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 修改商品多规格
+ */
+export async function updateShopGoodsSpec(data: ShopGoodsSpec) {
+  const res = await request.put<ApiResult<unknown>>(
+    '/shop/shop-goods-spec',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 删除商品多规格
+ */
+export async function removeShopGoodsSpec(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    '/shop/shop-goods-spec/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 批量删除商品多规格
+ */
+export async function removeBatchShopGoodsSpec(data: (number | undefined)[]) {
+  const res = await request.delete<ApiResult<unknown>>(
+    '/shop/shop-goods-spec/batch',
+    {
+      data
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 根据id查询商品多规格
+ */
+export async function getShopGoodsSpec(id: number) {
+  const res = await request.get<ApiResult<ShopGoodsSpec>>(
+    '/shop/shop-goods-spec/' + 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/shopGoodsSpec/model/index.ts b/src/api/shop/shopGoodsSpec/model/index.ts
new file mode 100644
index 0000000..44a6644
--- /dev/null
+++ b/src/api/shop/shopGoodsSpec/model/index.ts
@@ -0,0 +1,29 @@
+import type { PageParam } from '@/api';
+
+/**
+ * 商品多规格
+ */
+export interface ShopGoodsSpec {
+  // 主键
+  id?: number;
+  // 商品ID
+  goodsId?: number;
+  // 规格ID
+  specId?: number;
+  // 规格名称
+  specName?: string;
+  // 规格值
+  specValue?: string;
+  // 活动类型 0=商品，1=秒杀，2=砍价，3=拼团
+  type?: string;
+  // 租户id
+  tenantId?: number;
+}
+
+/**
+ * 商品多规格搜索条件
+ */
+export interface ShopGoodsSpecParam extends PageParam {
+  id?: number;
+  keywords?: string;
+}
diff --git a/src/api/shop/shopMerchant/index.ts b/src/api/shop/shopMerchant/index.ts
new file mode 100644
index 0000000..1904a92
--- /dev/null
+++ b/src/api/shop/shopMerchant/index.ts
@@ -0,0 +1,105 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api';
+import type { ShopMerchant, ShopMerchantParam } from './model';
+
+/**
+ * 分页查询商户
+ */
+export async function pageShopMerchant(params: ShopMerchantParam) {
+  const res = await request.get<ApiResult<PageResult<ShopMerchant>>>(
+    '/shop/shop-merchant/page',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 查询商户列表
+ */
+export async function listShopMerchant(params?: ShopMerchantParam) {
+  const res = await request.get<ApiResult<ShopMerchant[]>>(
+    '/shop/shop-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 addShopMerchant(data: ShopMerchant) {
+  const res = await request.post<ApiResult<unknown>>(
+    '/shop/shop-merchant',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 修改商户
+ */
+export async function updateShopMerchant(data: ShopMerchant) {
+  const res = await request.put<ApiResult<unknown>>(
+    '/shop/shop-merchant',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 删除商户
+ */
+export async function removeShopMerchant(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    '/shop/shop-merchant/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 批量删除商户
+ */
+export async function removeBatchShopMerchant(data: (number | undefined)[]) {
+  const res = await request.delete<ApiResult<unknown>>(
+    '/shop/shop-merchant/batch',
+    {
+      data
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 根据id查询商户
+ */
+export async function getShopMerchant(id: number) {
+  const res = await request.get<ApiResult<ShopMerchant>>(
+    '/shop/shop-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/shopMerchant/model/index.ts b/src/api/shop/shopMerchant/model/index.ts
new file mode 100644
index 0000000..612ca6c
--- /dev/null
+++ b/src/api/shop/shopMerchant/model/index.ts
@@ -0,0 +1,90 @@
+import type { PageParam } from '@/api';
+
+/**
+ * 商户
+ */
+export interface ShopMerchant {
+  // ID
+  merchantId?: number;
+  // 商户名称
+  merchantName?: string;
+  // 商户编号
+  merchantCode?: string;
+  // 商户类型
+  type?: number;
+  // 商户图标
+  image?: string;
+  // 商户手机号
+  phone?: string;
+  // 商户姓名
+  realName?: string;
+  // 店铺类型
+  shopType?: string;
+  // 项目分类
+  itemType?: string;
+  // 商户分类
+  category?: string;
+  // 商户经营分类
+  merchantCategoryId?: number;
+  // 商户分类
+  merchantCategoryTitle?: string;
+  // 经纬度
+  lngAndLat?: string;
+  //
+  lng?: string;
+  //
+  lat?: string;
+  // 所在省份
+  province?: string;
+  // 所在城市
+  city?: string;
+  // 所在辖区
+  region?: string;
+  // 详细地址
+  address?: string;
+  // 手续费
+  commission?: string;
+  // 关键字
+  keywords?: string;
+  // 资质图片
+  files?: string;
+  // 营业时间
+  businessTime?: string;
+  // 文章内容
+  content?: string;
+  // 每小时价格
+  price?: string;
+  // 是否自营
+  ownStore?: number;
+  // 是否推荐
+  recommend?: number;
+  // 是否需要审核
+  goodsReview?: number;
+  // 管理入口
+  adminUrl?: string;
+  // 备注
+  comments?: string;
+  // 所有人
+  userId?: number;
+  // 是否删除, 0否, 1是
+  deleted?: number;
+  // 状态
+  status?: number;
+  // 排序号
+  sortNumber?: number;
+  // 租户id
+  tenantId?: number;
+  // 创建时间
+  createTime?: string;
+}
+
+/**
+ * 商户搜索条件
+ */
+export interface ShopMerchantParam extends PageParam {
+  merchantId?: number;
+  phone?: string;
+  userId?: number;
+  shopType?: string;
+  keywords?: string;
+}
diff --git a/src/api/shop/shopMerchantAccount/index.ts b/src/api/shop/shopMerchantAccount/index.ts
new file mode 100644
index 0000000..eff50c4
--- /dev/null
+++ b/src/api/shop/shopMerchantAccount/index.ts
@@ -0,0 +1,106 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api';
+import type { ShopMerchantAccount, ShopMerchantAccountParam } from './model';
+import { MODULES_API_URL } from '@/config/setting';
+
+/**
+ * 分页查询商户账号
+ */
+export async function pageShopMerchantAccount(params: ShopMerchantAccountParam) {
+  const res = await request.get<ApiResult<PageResult<ShopMerchantAccount>>>(
+    MODULES_API_URL + '/shop/shop-merchant-account/page',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 查询商户账号列表
+ */
+export async function listShopMerchantAccount(params?: ShopMerchantAccountParam) {
+  const res = await request.get<ApiResult<ShopMerchantAccount[]>>(
+    MODULES_API_URL + '/shop/shop-merchant-account',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 添加商户账号
+ */
+export async function addShopMerchantAccount(data: ShopMerchantAccount) {
+  const res = await request.post<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-merchant-account',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 修改商户账号
+ */
+export async function updateShopMerchantAccount(data: ShopMerchantAccount) {
+  const res = await request.put<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-merchant-account',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 删除商户账号
+ */
+export async function removeShopMerchantAccount(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-merchant-account/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 批量删除商户账号
+ */
+export async function removeBatchShopMerchantAccount(data: (number | undefined)[]) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-merchant-account/batch',
+    {
+      data
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 根据id查询商户账号
+ */
+export async function getShopMerchantAccount(id: number) {
+  const res = await request.get<ApiResult<ShopMerchantAccount>>(
+    MODULES_API_URL + '/shop/shop-merchant-account/' + 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/shopMerchantAccount/model/index.ts b/src/api/shop/shopMerchantAccount/model/index.ts
new file mode 100644
index 0000000..6dbada0
--- /dev/null
+++ b/src/api/shop/shopMerchantAccount/model/index.ts
@@ -0,0 +1,39 @@
+import type { PageParam } from '@/api';
+
+/**
+ * 商户账号
+ */
+export interface ShopMerchantAccount {
+  // ID
+  id?: number;
+  // 商户手机号
+  phone?: string;
+  // 真实姓名
+  realName?: string;
+  // 商户ID
+  merchantId?: number;
+  // 角色ID
+  roleId?: number;
+  // 角色名称
+  roleName?: string;
+  // 用户ID
+  userId?: number;
+  // 备注
+  comments?: string;
+  // 状态
+  status?: number;
+  // 排序号
+  sortNumber?: number;
+  // 租户id
+  tenantId?: number;
+  // 创建时间
+  createTime?: string;
+}
+
+/**
+ * 商户账号搜索条件
+ */
+export interface ShopMerchantAccountParam extends PageParam {
+  id?: number;
+  keywords?: string;
+}
diff --git a/src/api/shop/shopMerchantApply/index.ts b/src/api/shop/shopMerchantApply/index.ts
new file mode 100644
index 0000000..1a725f6
--- /dev/null
+++ b/src/api/shop/shopMerchantApply/index.ts
@@ -0,0 +1,120 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api';
+import type { ShopMerchantApply, ShopMerchantApplyParam } from './model';
+import { SERVER_API_URL } from '@/config/setting';
+
+/**
+ * 分页查询商户入驻申请
+ */
+export async function pageShopMerchantApply(params: ShopMerchantApplyParam) {
+  const res = await request.get<ApiResult<PageResult<ShopMerchantApply>>>(
+    SERVER_API_URL + '/shop/shop-merchant-apply/page',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 查询商户入驻申请列表
+ */
+export async function listShopMerchantApply(params?: ShopMerchantApplyParam) {
+  const res = await request.get<ApiResult<ShopMerchantApply[]>>(
+    SERVER_API_URL + '/shop/shop-merchant-apply',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 添加商户入驻申请
+ */
+export async function addShopMerchantApply(data: ShopMerchantApply) {
+  const res = await request.post<ApiResult<unknown>>(
+    SERVER_API_URL + '/shop/shop-merchant-apply',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 修改商户入驻申请
+ */
+export async function updateShopMerchantApply(data: ShopMerchantApply) {
+  const res = await request.put<ApiResult<unknown>>(
+    SERVER_API_URL + '/shop/shop-merchant-apply',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+// 审核通过
+export async function checkShopMerchantApply(data: ShopMerchantApply) {
+  const res = await request.put<ApiResult<unknown>>(
+    SERVER_API_URL + '/shop/shop-merchant-apply/check',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 删除商户入驻申请
+ */
+export async function removeShopMerchantApply(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    SERVER_API_URL + '/shop/shop-merchant-apply/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 批量删除商户入驻申请
+ */
+export async function removeBatchShopMerchantApply(
+  data: (number | undefined)[]
+) {
+  const res = await request.delete<ApiResult<unknown>>(
+    SERVER_API_URL + '/shop/shop-merchant-apply/batch',
+    {
+      data
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 根据id查询商户入驻申请
+ */
+export async function getShopMerchantApply(id: number) {
+  const res = await request.get<ApiResult<ShopMerchantApply>>(
+    SERVER_API_URL + '/shop/shop-merchant-apply/' + 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/shopMerchantApply/model/index.ts b/src/api/shop/shopMerchantApply/model/index.ts
new file mode 100644
index 0000000..6e02334
--- /dev/null
+++ b/src/api/shop/shopMerchantApply/model/index.ts
@@ -0,0 +1,72 @@
+import type { PageParam } from '@/api';
+
+/**
+ * 商户入驻申请
+ */
+export interface ShopMerchantApply {
+  // ID
+  applyId?: number;
+  // 类型
+  type?: number;
+  // 主体名称
+  merchantName?: string;
+  // 证件号码
+  merchantCode?: string;
+  // 商户图标
+  image?: string;
+  // 商户手机号
+  phone?: string;
+  // 商户姓名
+  realName?: string;
+  // 身份证号码
+  idCard?: string;
+  // 店铺类型
+  shopType?: string;
+  // 商户分类
+  category?: string;
+  // 手续费
+  commission?: string;
+  // 关键字
+  keywords?: string;
+  // 营业执照
+  yyzz?: string;
+  // 身份证正面
+  sfz1?: string;
+  // 身份证反面
+  sfz2?: string;
+  // 资质图片
+  files?: string;
+  // 所有人
+  userId?: number;
+  // 是否自营
+  ownStore?: number;
+  // 是否推荐
+  recommend?: number;
+  // 是否需要审核
+  goodsReview?: number;
+  // 工作负责人
+  name2?: string;
+  // 驳回原因
+  reason?: string;
+  // 备注
+  comments?: string;
+  // 状态
+  status?: number;
+  // 排序号
+  sortNumber?: number;
+  // 租户id
+  tenantId?: number;
+  // 创建时间
+  createTime?: string;
+}
+
+/**
+ * 商户入驻申请搜索条件
+ */
+export interface ShopMerchantApplyParam extends PageParam {
+  applyId?: number;
+  userId?: number;
+  shopType?: string;
+  phone?: string;
+  keywords?: string;
+}
diff --git a/src/api/shop/shopMerchantCount/index.ts b/src/api/shop/shopMerchantCount/index.ts
new file mode 100644
index 0000000..c859b1b
--- /dev/null
+++ b/src/api/shop/shopMerchantCount/index.ts
@@ -0,0 +1,108 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api';
+import type { ShopMerchantCount, ShopMerchantCountParam } from './model';
+import { MODULES_API_URL } from '@/config/setting';
+
+/**
+ * 分页查询门店销售统计表
+ */
+export async function pageShopMerchantCount(params: ShopMerchantCountParam) {
+  const res = await request.get<ApiResult<PageResult<ShopMerchantCount>>>(
+    MODULES_API_URL + '/shop/shop-merchant-count/page',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 查询门店销售统计表列表
+ */
+export async function listShopMerchantCount(params?: ShopMerchantCountParam) {
+  const res = await request.get<ApiResult<ShopMerchantCount[]>>(
+    MODULES_API_URL + '/shop/shop-merchant-count',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 添加门店销售统计表
+ */
+export async function addShopMerchantCount(data: ShopMerchantCount) {
+  const res = await request.post<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-merchant-count',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 修改门店销售统计表
+ */
+export async function updateShopMerchantCount(data: ShopMerchantCount) {
+  const res = await request.put<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-merchant-count',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 删除门店销售统计表
+ */
+export async function removeShopMerchantCount(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-merchant-count/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 批量删除门店销售统计表
+ */
+export async function removeBatchShopMerchantCount(
+  data: (number | undefined)[]
+) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-merchant-count/batch',
+    {
+      data
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 根据id查询门店销售统计表
+ */
+export async function getShopMerchantCount(id: number) {
+  const res = await request.get<ApiResult<ShopMerchantCount>>(
+    MODULES_API_URL + '/shop/shop-merchant-count/' + 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/shopMerchantCount/model/index.ts b/src/api/shop/shopMerchantCount/model/index.ts
new file mode 100644
index 0000000..ea27a60
--- /dev/null
+++ b/src/api/shop/shopMerchantCount/model/index.ts
@@ -0,0 +1,29 @@
+import type { PageParam } from '@/api';
+
+/**
+ * 门店销售统计表
+ */
+export interface ShopMerchantCount {
+  // ID
+  id?: number;
+  // 店铺名称
+  name?: string;
+  // 店铺说明
+  comments?: string;
+  // 状态
+  status?: number;
+  // 排序号
+  sortNumber?: number;
+  // 租户id
+  tenantId?: number;
+  // 创建时间
+  createTime?: string;
+}
+
+/**
+ * 门店销售统计表搜索条件
+ */
+export interface ShopMerchantCountParam extends PageParam {
+  id?: number;
+  keywords?: string;
+}
diff --git a/src/api/shop/shopMerchantType/index.ts b/src/api/shop/shopMerchantType/index.ts
new file mode 100644
index 0000000..8d7a054
--- /dev/null
+++ b/src/api/shop/shopMerchantType/index.ts
@@ -0,0 +1,108 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api';
+import type { ShopMerchantType, ShopMerchantTypeParam } from './model';
+import { SERVER_API_URL } from '@/config/setting';
+
+/**
+ * 分页查询商户类型
+ */
+export async function pageShopMerchantType(params: ShopMerchantTypeParam) {
+  const res = await request.get<ApiResult<PageResult<ShopMerchantType>>>(
+    SERVER_API_URL + '/shop/shop-merchant-type/page',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 查询商户类型列表
+ */
+export async function listShopMerchantType(params?: ShopMerchantTypeParam) {
+  const res = await request.get<ApiResult<ShopMerchantType[]>>(
+    SERVER_API_URL + '/shop/shop-merchant-type',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 添加商户类型
+ */
+export async function addShopMerchantType(data: ShopMerchantType) {
+  const res = await request.post<ApiResult<unknown>>(
+    SERVER_API_URL + '/shop/shop-merchant-type',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 修改商户类型
+ */
+export async function updateShopMerchantType(data: ShopMerchantType) {
+  const res = await request.put<ApiResult<unknown>>(
+    SERVER_API_URL + '/shop/shop-merchant-type',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 删除商户类型
+ */
+export async function removeShopMerchantType(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    SERVER_API_URL + '/shop/shop-merchant-type/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 批量删除商户类型
+ */
+export async function removeBatchShopMerchantType(
+  data: (number | undefined)[]
+) {
+  const res = await request.delete<ApiResult<unknown>>(
+    SERVER_API_URL + '/shop/shop-merchant-type/batch',
+    {
+      data
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 根据id查询商户类型
+ */
+export async function getShopMerchantType(id: number) {
+  const res = await request.get<ApiResult<ShopMerchantType>>(
+    SERVER_API_URL + '/shop/shop-merchant-type/' + 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/shopMerchantType/model/index.ts b/src/api/shop/shopMerchantType/model/index.ts
new file mode 100644
index 0000000..c09be90
--- /dev/null
+++ b/src/api/shop/shopMerchantType/model/index.ts
@@ -0,0 +1,30 @@
+import type { PageParam } from '@/api';
+
+/**
+ * 商户类型
+ */
+export interface ShopMerchantType {
+  // ID
+  id?: number;
+  // 店铺类型
+  name?: string;
+  // 店铺入驻条件
+  comments?: string;
+  // 状态
+  status?: number;
+  // 排序号
+  sortNumber?: number;
+  // 租户id
+  tenantId?: number;
+  // 创建时间
+  createTime?: string;
+  value?: string;
+}
+
+/**
+ * 商户类型搜索条件
+ */
+export interface ShopMerchantTypeParam extends PageParam {
+  id?: number;
+  keywords?: string;
+}
diff --git a/src/api/shop/shopSpec/index.ts b/src/api/shop/shopSpec/index.ts
new file mode 100644
index 0000000..5056ba8
--- /dev/null
+++ b/src/api/shop/shopSpec/index.ts
@@ -0,0 +1,106 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api';
+import { MODULES_API_URL } from '@/config/setting';
+import { ShopSpec, ShopSpecParam } from '@/api/shop/shopSpec/model';
+
+/**
+ * 分页查询规格
+ */
+export async function pageShopSpec(params: ShopSpecParam) {
+  const res = await request.get<ApiResult<PageResult<ShopSpec>>>(
+    MODULES_API_URL + '/shop/shop-spec/page',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 查询规格列表
+ */
+export async function listShopSpec(params?: ShopSpecParam) {
+  const res = await request.get<ApiResult<ShopSpec[]>>(
+    MODULES_API_URL + '/shop/shop-spec',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 添加规格
+ */
+export async function addShopSpec(data: ShopSpec) {
+  const res = await request.post<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-spec',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 修改规格
+ */
+export async function updateShopSpec(data: ShopSpec) {
+  const res = await request.put<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-spec',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 删除规格
+ */
+export async function removeShopSpec(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-spec/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 批量删除规格
+ */
+export async function removeBatchShopSpec(data: (number | undefined)[]) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-spec/batch',
+    {
+      data
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 根据id查询规格
+ */
+export async function getShopSpec(id: number) {
+  const res = await request.get<ApiResult<ShopSpec>>(
+    MODULES_API_URL + '/shop/shop-spec/' + 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/shopSpec/model/index.ts b/src/api/shop/shopSpec/model/index.ts
new file mode 100644
index 0000000..cd52c14
--- /dev/null
+++ b/src/api/shop/shopSpec/model/index.ts
@@ -0,0 +1,38 @@
+import type { PageParam } from '@/api';
+
+/**
+ * 规格
+ */
+export interface ShopSpec {
+  // 规格ID
+  specId?: number;
+  // 规格名称
+  specName?: string;
+  // 规格值
+  specValue?: string;
+  // 商户ID
+  merchantId?: number;
+  // 创建用户
+  userId?: number;
+  // 更新者
+  updater?: number;
+  // 备注
+  comments?: string;
+  // 状态, 0正常, 1待修,2异常已修，3异常未修
+  status?: number;
+  // 排序号
+  sortNumber?: number;
+  // 租户id
+  tenantId?: number;
+  // 创建时间
+  createTime?: string;
+  value?: string;
+}
+
+/**
+ * 规格搜索条件
+ */
+export interface ShopSpecParam extends PageParam {
+  specId?: number;
+  keywords?: string;
+}
diff --git a/src/api/shop/shopSpecValue/index.ts b/src/api/shop/shopSpecValue/index.ts
new file mode 100644
index 0000000..2eab7d1
--- /dev/null
+++ b/src/api/shop/shopSpecValue/index.ts
@@ -0,0 +1,105 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api';
+import type { ShopSpecValue, ShopSpecValueParam } from './model';
+
+/**
+ * 分页查询规格值
+ */
+export async function pageShopSpecValue(params: ShopSpecValueParam) {
+  const res = await request.get<ApiResult<PageResult<ShopSpecValue>>>(
+    '/shop/shop-spec-value/page',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 查询规格值列表
+ */
+export async function listShopSpecValue(params?: ShopSpecValueParam) {
+  const res = await request.get<ApiResult<ShopSpecValue[]>>(
+    '/shop/shop-spec-value',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 添加规格值
+ */
+export async function addShopSpecValue(data: ShopSpecValue) {
+  const res = await request.post<ApiResult<unknown>>(
+    '/shop/shop-spec-value',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 修改规格值
+ */
+export async function updateShopSpecValue(data: ShopSpecValue) {
+  const res = await request.put<ApiResult<unknown>>(
+    '/shop/shop-spec-value',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 删除规格值
+ */
+export async function removeShopSpecValue(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    '/shop/shop-spec-value/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 批量删除规格值
+ */
+export async function removeBatchShopSpecValue(data: (number | undefined)[]) {
+  const res = await request.delete<ApiResult<unknown>>(
+    '/shop/shop-spec-value/batch',
+    {
+      data
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 根据id查询规格值
+ */
+export async function getShopSpecValue(id: number) {
+  const res = await request.get<ApiResult<ShopSpecValue>>(
+    '/shop/shop-spec-value/' + 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/shopSpecValue/model/index.ts b/src/api/shop/shopSpecValue/model/index.ts
new file mode 100644
index 0000000..e911f6c
--- /dev/null
+++ b/src/api/shop/shopSpecValue/model/index.ts
@@ -0,0 +1,29 @@
+import type { PageParam } from '@/api';
+
+/**
+ * 规格值
+ */
+export interface ShopSpecValue {
+  // 规格值ID
+  specValueId?: number;
+  // 规格组ID
+  specId?: number;
+  // 规格值
+  specValue?: string;
+  // 备注
+  comments?: string;
+  // 排序号
+  sortNumber?: number;
+  // 租户id
+  tenantId?: number;
+  // 创建时间
+  createTime?: string;
+}
+
+/**
+ * 规格值搜索条件
+ */
+export interface ShopSpecValueParam extends PageParam {
+  specValueId?: number;
+  keywords?: string;
+}
diff --git a/src/components/SelectGoodsCategory/index.vue b/src/components/SelectGoodsCategory/index.vue
index 6b5d577..a55f356 100644
--- a/src/components/SelectGoodsCategory/index.vue
+++ b/src/components/SelectGoodsCategory/index.vue
@@ -14,15 +14,15 @@
 <script lang="ts" setup>
   import { ref, watch, reactive } from 'vue';
   import type { ValueType } from 'ant-design-vue/es/vc-cascader/Cascader';
-  import { listGoodsCategory } from '@/api/shop/goodsCategory';
+  import { listShopGoodsCategory } from '@/api/shop/shopGoodsCategory';
   import { toTreeData } from 'ele-admin-pro/es';
-  import { GoodsCategory } from '@/api/shop/goodsCategory/model';
+  import { ShopGoodsCategory } from '@/api/shop/shopGoodsCategory/model';
 
   const props = withDefaults(
     defineProps<{
       value?: string[];
       placeholder?: string;
-      options?: GoodsCategory[];
+      options?: ShopGoodsCategory[];
       valueField?: 'label';
       type?: 'provinceCity' | 'province';
       showSearch?: boolean;
@@ -36,16 +36,16 @@
   const emit = defineEmits<{
     (e: 'done', item?: any, value?: ValueType);
     (e: 'update:value', value?: string[]): void;
-    (e: 'load-data-done', value: GoodsCategory[]): void;
+    (e: 'load-data-done', value: ShopGoodsCategory[]): void;
   }>();
 
   // 搜索表单
-  const where = reactive<GoodsCategory>({
+  const where = reactive<ShopGoodsCategory>({
     merchantId: undefined
   });
 
   // 级联选择器数据
-  const regionsData = ref<GoodsCategory[]>([]);
+  const regionsData = ref<ShopGoodsCategory[]>([]);
 
   /* 更新 value */
   const updateValue = (value: ValueType) => {
@@ -58,16 +58,16 @@
   };
 
   /* 级联选择器数据 value 处理 */
-  const formatData = (data: GoodsCategory[]) => {
+  const formatData = (data: ShopGoodsCategory[]) => {
     if (props.valueField === 'label') {
       return data.map((d) => {
-        const item: GoodsCategory = {
+        const item: ShopGoodsCategory = {
           label: d.title,
           value: d.categoryId
         };
         if (d.children) {
           item.children = d.children.map((c) => {
-            const cItem: GoodsCategory = {
+            const cItem: ShopGoodsCategory = {
               label: c.title,
               value: c.categoryId
             };
@@ -90,10 +90,10 @@
   };
 
   /* 省市区数据筛选 */
-  const filterData = (data: GoodsCategory[]) => {
+  const filterData = (data: ShopGoodsCategory[]) => {
     return formatData(
       data.map((d) => {
-        const item: GoodsCategory = {
+        const item: ShopGoodsCategory = {
           label: d.title,
           value: d.categoryId
         };
@@ -117,7 +117,7 @@
       if (props.merchantId) {
         where.merchantId = props.merchantId;
       }
-      listGoodsCategory(where).then((data) => {
+      listShopGoodsCategory(where).then((data) => {
         const list = toTreeData({
           data: data?.map((d) => {
             d.value = d.categoryId;
diff --git a/src/components/SelectSpec/components/select-data.vue b/src/components/SelectSpec/components/select-data.vue
index 64ecc69..a5fed56 100644
--- a/src/components/SelectSpec/components/select-data.vue
+++ b/src/components/SelectSpec/components/select-data.vue
@@ -69,9 +69,9 @@
     ColumnItem,
     DatasourceFunction
   } from 'ele-admin-pro/es/ele-pro-table/types';
-  import { pageSpec } from '@/api/shop/spec';
+  import { pageShopSpec } from '@/api/shop/shopSpec';
   import { EleProTable } from 'ele-admin-pro';
-  import { Spec, SpecParam } from '@/api/shop/spec/model';
+  import { ShopSpec, ShopSpecParam } from '@/api/shop/shopSpec/model';
 
   const props = defineProps<{
     // 弹窗是否打开
@@ -81,11 +81,11 @@
     // 商户类型
     shopType?: string;
     // 修改回显的数据
-    data?: Spec | null;
+    data?: ShopSpec | null;
   }>();
 
   const emit = defineEmits<{
-    (e: 'done', data: Spec): void;
+    (e: 'done', data: ShopSpec): void;
     (e: 'update:visible', visible: boolean): void;
   }>();
 
@@ -132,7 +132,7 @@
     } else {
       where.shopType = props.shopType;
     }
-    return pageSpec({
+    return pageShopSpec({
       ...where,
       ...orders,
       page,
@@ -141,17 +141,17 @@
   };
 
   /* 搜索 */
-  const reload = (where?: SpecParam) => {
+  const reload = (where?: ShopSpecParam) => {
     tableRef?.value?.reload({ page: 1, where });
   };
 
-  const onRadio = (record: Spec) => {
+  const onRadio = (record: ShopSpec) => {
     updateVisible(false);
     emit('done', record);
   };
 
   /* 自定义行属性 */
-  const customRow = (record: Spec) => {
+  const customRow = (record: ShopSpec) => {
     return {
       // 行点击事件
       // onClick: () => {
diff --git a/src/views/hjm/hjmCar/index.vue b/src/views/hjm/hjmCar/index.vue
index b844b30..dab848f 100644
--- a/src/views/hjm/hjmCar/index.vue
+++ b/src/views/hjm/hjmCar/index.vue
@@ -42,9 +42,9 @@
           </template>
 
           <template v-if="column.key === 'status'">
-            <a-tag v-if="record.status === 0" color="red">未安装</a-tag>
-            <a-tag v-if="record.status === 1" color="orange">已安装</a-tag>
-            <a-tag v-if="record.status === 2" color="green">已认领</a-tag>
+            <a-tag v-if="record.status === 0 && record.claim == 0" color="red">未安装</a-tag>
+            <a-tag v-if="record.claim === 0 && record.status == 1"  color="orange">已安装</a-tag>
+            <a-tag v-if="record.claim === 1 && record.status == 1" color="green" @click="updateStatus(record)">已认领</a-tag>
           </template>
           <template v-if="column.key === 'action'">
             <div>
@@ -86,7 +86,7 @@ import Extra from './components/Extra.vue';
 import {toTreeData} from 'ele-admin-pro';
 import Search from './components/search.vue';
 import HjmCarEdit from './components/hjmCarEdit.vue';
-import {pageHjmCar, removeHjmCar, removeBatchHjmCar} from '@/api/hjm/hjmCar';
+import {pageHjmCar, removeHjmCar, removeBatchHjmCar, updateHjmCar} from '@/api/hjm/hjmCar';
 import type {HjmCar, HjmCarParam} from '@/api/hjm/hjmCar/model';
 import {getPageTitle} from "@/utils/common";
 import Qrcode from "./components/qrcode.vue";
@@ -250,7 +250,7 @@ const openMove = () => {
 };
 
 const onShare = (row?: HjmCar) => {
-  qrcode.value = row?.code;
+  qrcode.value = row?.code + '';
   showQrcode.value = true;
 }
 
@@ -258,6 +258,28 @@ const hideShare = () => {
   showQrcode.value = false;
 }
 
+const updateStatus = (row?: HjmCar) => {
+  Modal.confirm({
+    title: '提示',
+    content: '确定要解绑吗?',
+    icon: createVNode(ExclamationCircleOutlined),
+    maskClosable: true,
+    onOk: () => {
+      updateHjmCar({
+        ...row,
+        status: 1,
+        claim: 0,
+        driverId: 0,
+        driverName: ''
+      }).then(res => {
+        message.success(res);
+        reload()
+      })
+    }
+  });
+
+}
+
 /* 删除单个 */
 const remove = (row: HjmCar) => {
   const hide = message.loading('请求中..', 0);
diff --git a/src/views/shop/shopGoods/components/extra.vue b/src/views/shop/shopGoods/components/extra.vue
new file mode 100644
index 0000000..d8887f7
--- /dev/null
+++ b/src/views/shop/shopGoods/components/extra.vue
@@ -0,0 +1,41 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space
+    style="flex-wrap: wrap"
+    v-if="hasRole('superAdmin') || hasRole('admin') || hasRole('foundation')"
+  >
+    <a-button type="text" @click="push('/shop/category')">商品分类</a-button>
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { watch, nextTick } from 'vue';
+  import { CmsWebsite } from '@/api/cms/cmsWebsite/model';
+  import { push } from '@/utils/common';
+  import { hasRole } from '@/utils/permission';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+      website?: CmsWebsite;
+      count?: 0;
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'add'): void;
+  }>();
+
+  nextTick(() => {
+    if (localStorage.getItem('NotActive')) {
+      // IsActive.value = false
+    }
+  });
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>
diff --git a/src/views/shop/shopGoods/components/search.vue b/src/views/shop/shopGoods/components/search.vue
new file mode 100644
index 0000000..b48a085
--- /dev/null
+++ b/src/views/shop/shopGoods/components/search.vue
@@ -0,0 +1,155 @@
+<!-- 搜索表单 -->
+<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-radio-group v-model:value="type" @change="handleSearch">
+      <a-radio-button value="出售中"
+        >出售中({{ goodsCount?.totalNum }})
+      </a-radio-button>
+      <a-radio-button value="待上架"
+        >待上架({{ goodsCount?.totalNum2 }})
+      </a-radio-button>
+      <a-radio-button value="已售罄"
+        >已售罄({{ goodsCount?.totalNum3 }})
+      </a-radio-button>
+    </a-radio-group>
+    <SelectMerchant
+      :placeholder="`商户刷新`"
+      class="input-item"
+      v-if="!merchantId"
+      v-model:value="where.merchantName"
+      @done="chooseMerchantId"
+    />
+    <SelectGoodsCategory
+      class="input-item"
+      :placeholder="`请选择商品分类`"
+      v-model:value="where.categoryId"
+      @done="chooseGoodsCategory"
+    />
+    <a-input-search
+      allow-clear
+      placeholder="请输入关键词"
+      v-model:value="where.keywords"
+      @pressEnter="reload"
+      @search="reload"
+    />
+    <a-button @click="reset">重置</a-button>
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import { ref, watch } from 'vue';
+  import { getCount } from '@/api/shop/shopGoods';
+  import type { GoodsCount, ShopGoodsParam } from '@/api/shop/shopGoods/model';
+  import useSearch from '@/utils/use-search';
+  import { ShopMerchant } from '@/api/shop/shopMerchant/model';
+  import { ShopGoodsCategory } from '@/api/shop/shopGoodsCategory/model';
+  import { getMerchantId } from '@/utils/merchant';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+      merchantId?: number;
+    }>(),
+    {
+      merchantId: getMerchantId()
+    }
+  );
+
+  const type = ref<string>();
+  // 统计数据
+  const goodsCount = ref<GoodsCount>();
+
+  // 表单数据
+  const { where, resetFields } = useSearch<ShopGoodsParam>({
+    goodsId: undefined,
+    isShow: undefined,
+    status: undefined,
+    stock: undefined,
+    categoryId: undefined,
+    merchantId: undefined,
+    keywords: ''
+  });
+
+  const emit = defineEmits<{
+    (e: 'search', where?: ShopGoodsParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  const handleSearch = (e) => {
+    const text = e.target.value;
+    resetFields();
+    if (text === '出售中') {
+      where.sceneType = 'on_sale';
+    }
+    if (text === '待上架') {
+      where.sceneType = 'pending';
+    }
+    if (text === '已售罄') {
+      where.sceneType = 'sold_out';
+    }
+    emit('search', where);
+  };
+
+  const reload = () => {
+    getCount(where).then((data: any) => {
+      goodsCount.value = data;
+    });
+    emit('search', where);
+  };
+
+  /* 搜索 */
+  const chooseMerchantId = (item: ShopMerchant) => {
+    where.merchantName = item.merchantName;
+    where.merchantId = item.merchantId;
+    reload();
+  };
+
+  const chooseGoodsCategory = (
+    category: ShopGoodsCategory,
+    data: ShopGoodsCategory
+  ) => {
+    where.categoryName = data[1].label;
+    where.categoryId = data[1].value;
+    reload();
+  };
+
+  /*  重置 */
+  const reset = () => {
+    resetFields();
+    type.value = '';
+    reload();
+  };
+
+  // watch(
+  //   () => props.selection,
+  //   () => {}
+  // );
+  watch(
+    () => props.merchantId,
+    (id) => {
+      if (Number(id) > 0) {
+        where.merchantId = id;
+        reload();
+      } else {
+        where.merchantId = undefined;
+        reload();
+      }
+    },
+    { immediate: true }
+  );
+</script>
diff --git a/src/views/shop/shopGoods/components/shopGoodsEdit.vue b/src/views/shop/shopGoods/components/shopGoodsEdit.vue
new file mode 100644
index 0000000..98710af
--- /dev/null
+++ b/src/views/shop/shopGoods/components/shopGoodsEdit.vue
@@ -0,0 +1,1557 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="'80%'"
+    :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: 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 v-if="!merchantId" label="选择店铺" name="merchantId">
+            <div class="flex items-center">
+              <SelectMerchant
+                :placeholder="`选择商户`"
+                class="input-item"
+                style="width: 558px"
+                v-model:value="form.merchantName"
+                @done="chooseMerchantId"
+              />
+              <a-button @click="clearMerchant">清除店铺</a-button>
+            </div>
+          </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="name">
+            <a-input
+              allow-clear
+              style="width: 558px"
+              placeholder="请输入商品名称"
+              v-model:value="form.name"
+            />
+          </a-form-item>
+          <a-form-item label="商品分类" name="categoryId" v-if="!merchantId">
+            <SelectGoodsCategory
+              :data="data"
+              placeholder="请选择商品分类"
+              style="width: 558px"
+              v-model:value="category"
+              @done="chooseGoodsCategory"
+            />
+          </a-form-item>
+          <a-form-item label="商品分类" name="categoryId" v-else>
+            <SelectGoodsCategory
+              :merchantId="merchantId"
+              placeholder="请选择商品分类"
+              style="width: 558px"
+              v-model:value="form.categoryId"
+              @done="chooseTakeawayCategory"
+            />
+          </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-form-item label="是否可以快递配送">
+            <a-switch
+              size="small"
+              v-model:checked="form.canExpress"
+              :checked-value="1"
+              :un-checked-value="0"
+            />
+          </a-form-item>
+          <a-form-item label="单位名称" name="unitName">
+            <a-input
+              allow-clear
+              style="width: 558px"
+              placeholder="单位名称，如(个)"
+              v-model:value="form.unitName"
+            />
+          </a-form-item>
+          <a-form-item label="原价(划线价)" name="originPrice">
+            <a-input-number
+              :placeholder="`原价(划线价)`"
+              style="width: 240px"
+              :min="0.01"
+              v-model:value="form.originPrice"
+            />
+          </a-form-item>
+          <a-form-item label="普通会员价" name="salePrice">
+            <a-input-number
+              :placeholder="`普通会员价`"
+              style="width: 240px"
+              :min="0.01"
+              v-model:value="form.salePrice"
+            />
+            <div class="ele-text-placeholder">普通用户购物价格</div>
+          </a-form-item>
+          <a-form-item label="牛八哥会员价" name="price">
+            <a-space>
+              <a-input-number
+                :placeholder="`牛八哥会员价`"
+                style="width: 240px"
+                :min="0.01"
+                v-model:value="form.price"
+              />
+            </a-space>
+            <div class="ele-text-placeholder">牛八哥会员购物价格</div>
+          </a-form-item>
+          <a-form-item label="是否有赠品">
+            <a-checkbox v-model:checked="form.priceGift">有赠品</a-checkbox>
+          </a-form-item>
+          <a-form-item label="赠品">
+            <template v-if="form.priceGift">
+              <a-input
+                v-model:value="form.priceGiftName"
+                style="width: 200px"
+                placeholder="请输入赠品名称"
+              >
+                <template #prefix>名称</template>
+              </a-input>
+              <a-input-number
+                v-model:value="form.priceGiftNum"
+                style="width: 200px"
+                placeholder="请输入赠品数量"
+              >
+                <template #prefix>数量</template>
+              </a-input-number>
+            </template>
+          </a-form-item>
+          <!--          <a-form-item label="经销商价" name="dealerPrice" v-if="!merchantId">-->
+          <!--            <a-space>-->
+          <!--              <a-input-number-->
+          <!--                :placeholder="`经销商价格`"-->
+          <!--                style="width: 240px"-->
+          <!--                :min="0.01"-->
+          <!--                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-space>
+              <a-input-number
+                :placeholder="`会员店/总仓批发价`"
+                :min="0.01"
+                style="width: 240px"
+                v-model:value="form.buyingPrice"
+              />
+            </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="直推收益分配(元)"
+            v-if="!merchantId"
+            name="memberStoreCommission"
+          >
+            <a-input-number
+              :placeholder="`会员店/供应商/总仓直推收益分配`"
+              style="width: 240px"
+              v-model:value="form.memberStoreCommission"
+            />
+          </a-form-item>
+          <a-form-item
+            label="仓储费(元)"
+            v-if="!merchantId"
+            name="supplierCommission"
+          >
+            <a-input-number
+              :placeholder="`请输入仓储费(元)`"
+              style="width: 240px"
+              v-model:value="form.supplierCommission"
+            />
+          </a-form-item>
+          <a-form-item label="运费模板" v-if="!merchantId">
+            <a-select v-model:value="form.expressTemplateId">
+              <a-select-option
+                v-for="(item, index) in expressTemplateList"
+                :key="index"
+                :value="item.id"
+                >{{ item.title }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+          <!--          <a-form-item label="合作伙伴直推分佣(元)" v-if="!merchantId">-->
+          <!--            <a-space>-->
+          <!--              <a-input-number-->
+          <!--                :placeholder="`请输入合作伙伴直推分佣(元)`"-->
+          <!--                style="width: 240px"-->
+          <!--                v-model:value="form.coopCommission"-->
+          <!--              />-->
+          <!--            </a-space>-->
+          <!--          </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="`商品库存`"-->
+          <!--              style="width: 240px"-->
+          <!--              v-model:value="form.stock"-->
+          <!--            />-->
+          <!--            <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="是否开启分红角色功能" v-if="!merchantId">
+            <a-switch
+              size="small"
+              v-model:checked="form.commissionRole"
+              :checked-value="1"
+              :un-checked-value="0"
+            />
+          </a-form-item>
+          <a-form-item label="角色分红配置" v-if="form.commissionRole === 1">
+            <a-space>
+              <a-input
+                v-model:value="form.goodsRoleCommission[index].amount"
+                v-for="(item, index) in form.goodsRoleCommission"
+                :key="index"
+              >
+                <template #addonBefore>{{ item.roleName }}</template>
+                <template #addonAfter>元</template>
+              </a-input>
+            </a-space>
+          </a-form-item>
+          <a-form-item label="商品图片(400x400)" name="image">
+            <!--            <SelectFile-->
+            <!--              :placeholder="`请选择视频文件`"-->
+            <!--              :limit="1"-->
+            <!--              :data="images"-->
+            <!--              @done="chooseImage"-->
+            <!--              @del="onDeleteItem"-->
+            <!--            />-->
+            <a-image
+              width="100px"
+              height="100px"
+              v-if="form.image"
+              :src="form.image"
+              style="margin-right: 10px"
+            />
+            <a-upload
+              :show-upload-list="false"
+              :customRequest="onUploadImage"
+              ref="imageRef"
+            >
+              <a-button class="ele-btn-icon">
+                <template #icon>
+                  <UploadOutlined />
+                </template>
+                <span>上传图标</span>
+              </a-button>
+            </a-upload>
+            <div class="ele-text-placeholder">
+              支持上传视频（mp4格式），视频时长不超过60秒，视频大小不超过200M。
+            </div>
+          </a-form-item>
+          <a-form-item label="轮播图" name="files">
+            <!--            <SelectFile-->
+            <!--              :placeholder="`请选择视频文件`"-->
+            <!--              :limit="9"-->
+            <!--              :data="files"-->
+            <!--              @done="chooseFile"-->
+            <!--              @del="onDeleteFile"-->
+            <!--            />-->
+            <div class="flex flex-wrap justify-start items-start">
+              <div
+                v-for="(item, index) in files"
+                :key="index"
+                style="margin-right: 10px; margin-bottom: 10px"
+                class="relative"
+              >
+                <img style="width: 100px; height: 100px" :src="item.url" />
+                <div
+                  class="absolute right-0 top-0 w-6 h-6 bg-red-400 flex justify-center items-center rounded-bl-lg"
+                  @click="onDeleteFile(index)"
+                >
+                  <delete-outlined style="color: white" />
+                </div>
+              </div>
+            </div>
+            <a-upload
+              :show-upload-list="false"
+              :customRequest="onUploadSwiper"
+              multiple
+              :max-count="9"
+              ref="swiperRef"
+            >
+              <a-button class="ele-btn-icon">
+                <template #icon>
+                  <UploadOutlined />
+                </template>
+                <span>上传轮播图</span>
+              </a-button>
+            </a-upload>
+          </a-form-item>
+          <a-form-item label="状态" name="isShow">
+            <a-radio-group v-model:value="form.isShow">
+              <a-radio :value="1">上架</a-radio>
+              <a-radio :value="0">下架</a-radio>
+            </a-radio-group>
+          </a-form-item>
+        </a-tab-pane>
+        <a-tab-pane tab="商品规格" key="spec">
+          <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 name="multipleSpec" v-if="form.specs == 1">
+            <div class="w-[300px] ml-10">
+              <SelectSpec
+                placeholder="选择规格"
+                :width="130"
+                v-model:value="form.specName"
+                @done="onSpec"
+              />
+            </div>
+          </a-form-item>
+          <a-form-item name="specValue" v-if="form.specs == 1">
+            <a-space direction="vertical" class="ml-[40px]">
+              <template v-for="(item, index) in spec" :key="index">
+                <div
+                  class="text-left flex items-center leading-10 text-gray-400"
+                >
+                  <div class="mr-2">{{ item.value }} :</div>
+                  <CloseCircleOutlined
+                    class="cursor-pointer"
+                    @click="onClose(index)"
+                  />
+                </div>
+                <ele-edit-tag
+                  v-model:data="item.detail"
+                  size="middle"
+                  shape="round"
+                />
+              </template>
+              <a-card class="ml-[40px]" v-if="showSpecForm">
+                <a-form-item name="name">
+                  <a-input
+                    allow-clear
+                    placeholder="请输入规格"
+                    v-model:value="name"
+                  />
+                </a-form-item>
+                <a-form-item name="value">
+                  <a-input
+                    allow-clear
+                    placeholder="请输入规格值"
+                    v-model:value="value"
+                  />
+                </a-form-item>
+                <a-space>
+                  <a-button type="primary" @click="addSpecValue">确定</a-button>
+                  <a-button @click="openSpecForm">取消</a-button>
+                </a-space>
+              </a-card>
+              <a-space v-if="spec.length > 0">
+                <a-button type="primary" class="mt-5" @click="openSpecForm"
+                  >添加新规格
+                </a-button>
+                <a-button type="primary" class="mt-5" @click="generateSku"
+                  >生成SKU
+                </a-button>
+              </a-space>
+            </a-space>
+          </a-form-item>
+          <a-form-item name="oneSpec" v-if="form.specs == 1">
+            <div class="w-full">
+              <div class="sku-table">
+                <a-table
+                  :pagination="false"
+                  :dataSource="skuList"
+                  :columns="columns"
+                  :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="chooseSkuImage"
+                        @del="onDeleteSkuItem"
+                      />
+                    </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 === 'buyingPrice'">
+                      <a-input
+                        :placeholder="`会员店/总仓批发价`"
+                        v-model:value="record.buyingPrice"
+                      />
+                    </template>
+                    <template v-if="column.key === 'chainStorePrice'">
+                      <a-input
+                        :placeholder="`供应价`"
+                        v-model:value="record.chainStorePrice"
+                      />
+                    </template>
+                    <template v-if="column.key === 'memberStoreCommission'">
+                      <a-input
+                        :placeholder="`直推收益分配(元)`"
+                        v-model:value="record.memberStoreCommission"
+                      />
+                    </template>
+                    <template v-if="column.key === 'supplierCommission'">
+                      <a-input
+                        :placeholder="`仓储费(元)`"
+                        v-model:value="record.supplierCommission"
+                      />
+                    </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>
+              </div>
+            </div>
+          </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 name="content">
+            <!-- 编辑器 -->
+            <tinymce-editor
+              ref="editorRef"
+              class="content"
+              v-model:value="content"
+              :disabled="disabled"
+              :init="config"
+              placeholder="图片直接粘贴自动上传"
+              @paste="onPaste"
+            />
+          </a-form-item>
+        </a-tab-pane>
+        <a-tab-pane tab="营销设置" key="coupon">
+          <a-form-item label="商品重量" name="goodsWeight">
+            <a-input
+              allow-clear
+              style="width: 250px"
+              placeholder="请输入商品重量"
+              v-model:value="form.goodsWeight"
+            />
+          </a-form-item>
+          <a-form-item label="销量" name="sales">
+            <a-input-number
+              allow-clear
+              style="width: 250px"
+              placeholder="请输入销量"
+              v-model:value="form.sales"
+            />
+          </a-form-item>
+          <a-form-item label="库存" name="stock">
+            <a-input-number
+              allow-clear
+              style="width: 250px"
+              placeholder="请输入库存"
+              v-model:value="form.stock"
+            />
+          </a-form-item>
+          <a-form-item label="获取积分" name="gainIntegral">
+            <a-input-number
+              :placeholder="`消费获取的积分`"
+              style="width: 250px"
+              v-model:value="form.gainIntegral"
+            />
+          </a-form-item>
+          <a-form-item label="库存计算方式" name="deductStockType">
+            <a-radio-group v-model:value="form.deductStockType">
+              <a-radio :value="20">付款减库存</a-radio>
+              <a-radio :value="10">下单减库存</a-radio>
+            </a-radio-group>
+          </a-form-item>
+          <a-form-item label="货架" name="position">
+            <a-input
+              allow-clear
+              style="width: 250px"
+              placeholder="请输入货架"
+              v-model:value="form.position"
+            />
+          </a-form-item>
+          <template v-if="form.type === 1 || merchantId">
+            <a-form-item label="可用日期">
+              <a-select v-model:value="canUseDate" mode="multiple">
+                <a-select-option
+                  v-for="(item, index) in dayList"
+                  :key="index"
+                  :value="index"
+                  >{{ item }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+            <a-form-item label="服务保障">
+              <div>
+                <a-space>
+                  <a-tag
+                    v-for="item in ensureTag"
+                    :key="item"
+                    closable
+                    @close="onDeleteEnsureTag(item)"
+                    >{{ item }}
+                  </a-tag>
+                  <a-input v-model:value="ensureTagItem"></a-input>
+                  <a-button @click="addEnsureTag()" :disabled="!ensureTagItem"
+                    >添加</a-button
+                  >
+                </a-space>
+              </div>
+              <div class="mt-2">
+                <a-space>
+                  <span @click="addEnsureTag('免预约')">免预约</span>
+                  <span @click="addEnsureTag('随时退')">随时退</span>
+                  <span @click="addEnsureTag('过期自动退')">过期自动退</span>
+                </a-space>
+              </div>
+            </a-form-item>
+            <a-form-item label="有效期限">
+              <a-input-number
+                :min="0"
+                :max="9999"
+                style="width: 250px"
+                placeholder="请输入有效期限"
+                v-model:value="form.expiredDay"
+              />
+            </a-form-item>
+          </template>
+          <a-form-item label="排序号" name="sortNumber">
+            <a-input-number
+              :min="0"
+              :max="9999"
+              style="width: 250px"
+              placeholder="请输入排序号"
+              v-model:value="form.sortNumber"
+            />
+          </a-form-item>
+        </a-tab-pane>
+      </a-tabs>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import {
+    CloseCircleOutlined,
+    DeleteOutlined,
+    UploadOutlined
+  } from '@ant-design/icons-vue';
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from 'ant-design-vue';
+  import { assignObject, messageLoading, uuid } from 'ele-admin-pro';
+  import { addShopGoods, updateShopGoods } from '@/api/shop/shopGoods';
+  import { ShopGoods } from '@/api/shop/shopGoods/model';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { FormInstance, RuleObject } from 'ant-design-vue/es/form';
+  import { FileRecord } from '@/api/system/file/model';
+  import { ShopMerchant } from '@/api/shop/shopMerchant/model';
+  import TinymceEditor from '@/components/TinymceEditor/index.vue';
+  import { uploadFile, uploadOss } from '@/api/system/file';
+  import { ShopSpecValue } from '@/api/shop/shopSpecValue/model';
+  import { ShopSpec } from '@/api/shop/shopSpec/model';
+  import { ShopGoodsSku } from '@/api/shop/shopGoodsSku/model';
+  import { ShopGoodsSpec } from '@/api/shop/shopGoodsSpec/model';
+  import { generateGoodsSku, listShopGoodsSku } from '@/api/shop/shopGoodsSku';
+  import { listShopGoodsSpec } from '@/api/shop/shopGoodsSpec';
+  import { ShopGoodsCategory } from '@/api/shop/shopGoodsCategory/model';
+  import { listShopGoodsCategory } from '@/api/shop/shopGoodsCategory';
+  import { getMerchantId } from '@/utils/merchant';
+  import { ShopExpressTemplate } from '@/api/shop/shopExpressTemplate/model';
+  import { listShopExpressTemplate } from '@/api/shop/shopExpressTemplate';
+  import { listShopCommissionRole } from '@/api/shop/shopCommissionRole';
+  import { listShopGoodsRoleCommission } from '@/api/shop/shopGoodsRoleCommission';
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: ShopGoods | 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 content = ref('');
+  const disabled = ref(false);
+  // 当前选项卡
+  const active = ref('base');
+
+  const spec = ref<ShopSpecValue[]>([]);
+  const showSpecForm = ref(false);
+  const name = ref();
+  const value = ref();
+  const skuList = ref<ShopGoodsSku[]>([]);
+  const files = ref<ItemType[]>([]);
+  const goodsSpec = ref<ShopGoodsSpec>();
+  const category = ref<string[]>([]);
+  const takeaway = ref<ShopGoodsCategory[]>([]);
+  const merchantId = getMerchantId();
+
+  const columns = [
+    {
+      title: '图片',
+      dataIndex: 'image',
+      key: 'image',
+      align: 'center'
+    },
+    {
+      title: 'SKU',
+      dataIndex: 'sku',
+      align: 'center'
+    },
+    {
+      title: '市场价',
+      dataIndex: 'salePrice',
+      key: 'salePrice',
+      align: 'center'
+    },
+    {
+      title: '会员价',
+      dataIndex: 'price',
+      key: 'price',
+      align: 'center'
+    },
+    {
+      title: '会员店/总仓批发价',
+      dataIndex: 'buyingPrice',
+      key: 'buyingPrice',
+      align: 'center'
+    },
+    {
+      title: '供应价',
+      dataIndex: 'chainStorePrice',
+      key: 'chainStorePrice',
+      align: 'center'
+    },
+    {
+      title: '直推收益分配(元)',
+      dataIndex: 'memberStoreCommission',
+      key: 'memberStoreCommission',
+      align: 'center'
+    },
+    {
+      title: '仓储费(元)',
+      dataIndex: 'supplierCommission',
+      key: 'supplierCommission',
+      align: 'center'
+    },
+    {
+      title: '商品编号',
+      dataIndex: 'skuNo',
+      key: 'skuNo',
+      align: 'center'
+    }
+  ];
+
+  const dayList = ['周一', '周二', '周三', '周四', '周五', '周六', '周日'];
+  const canUseDate = ref([]);
+  const ensureTag = ref<string[]>([]);
+  const ensureTagItem = ref('');
+  const addEnsureTag = (item = '') => {
+    const tag = item || ensureTagItem.value;
+    if (ensureTag.value.findIndex((item) => item === tag) !== -1)
+      return message.error('请勿重复添加');
+    ensureTag.value.push(tag);
+    ensureTagItem.value = '';
+  };
+
+  const onDeleteEnsureTag = (tag: string) => {
+    const index = ensureTag.value.findIndex((item) => item === tag);
+    ensureTag.value.splice(index, 1);
+  };
+
+  // 用户信息
+  const form = reactive<ShopGoods>({
+    goodsId: undefined,
+    type: 1,
+    code: undefined,
+    name: undefined,
+    goodsName: undefined,
+    image: undefined,
+    video: undefined,
+    content: undefined,
+    canExpress: 1,
+    unitName: '',
+    categoryId: undefined,
+    parentName: undefined,
+    categoryName: undefined,
+    specs: 0,
+    commissionRole: 0,
+    position: undefined,
+    price: undefined,
+    originPrice: undefined,
+    salePrice: undefined,
+    buyingPrice: undefined,
+    dealerPrice: undefined,
+    priceGift: undefined,
+    dealerGift: undefined,
+    priceGiftNum: undefined,
+    priceGiftName: 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,
+    memberStoreCommission: undefined,
+    supplierCommission: undefined,
+    coopCommission: undefined,
+    expressTemplateId: undefined,
+    canUseDate: undefined,
+    ensureTag: undefined,
+    expiredDay: undefined,
+    stock: 1000,
+    deductStockType: 20,
+    isShow: undefined,
+    status: 0,
+    comments: '',
+    sortNumber: 100,
+    specName: '',
+    goodsRoleCommission: []
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    type: [
+      {
+        required: true,
+        message: '请选择商品类型',
+        type: 'number',
+        trigger: 'blur'
+      }
+    ],
+    image: [
+      {
+        required: true,
+        message: '请上传图片',
+        type: 'string',
+        trigger: 'blur'
+      }
+    ],
+    files: [
+      {
+        required: true,
+        message: '请上传轮播图',
+        type: 'string',
+        trigger: 'blur',
+        validator: async (_rule: RuleObject, value: string) => {
+          if (form.files?.length == 0) {
+            return Promise.reject('选择上传轮播图');
+          }
+          return Promise.resolve();
+        }
+      }
+    ],
+    specs: [
+      {
+        required: true,
+        message: '请选择规格类型',
+        type: 'number',
+        trigger: 'blur'
+      }
+    ],
+    price: [
+      {
+        required: true,
+        message: '请填写会员价',
+        type: 'number',
+        trigger: 'blur'
+      }
+    ],
+    salePrice: [
+      {
+        required: true,
+        message: '请填写市场价',
+        type: 'number',
+        trigger: 'blur'
+      }
+    ],
+    buyingPrice: [
+      {
+        required: true,
+        message: '请填写会员店/总仓批发价',
+        type: 'number',
+        trigger: 'blur'
+      }
+    ],
+    stock: [
+      {
+        required: true,
+        message: '请填写商品库存',
+        type: 'number',
+        trigger: 'blur'
+      }
+    ],
+    // supplierMerchantId: [
+    //   {
+    //     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();
+    //     }
+    //   }
+    // ],
+    name: [
+      {
+        required: true,
+        message: '请选择商品名称',
+        type: 'string',
+        trigger: 'blur'
+      }
+    ],
+    goodsName: [
+      {
+        required: true,
+        message: '请选择商品名称',
+        type: 'string',
+        trigger: 'blur'
+      }
+    ],
+    sortNumber: [
+      {
+        required: true,
+        message: '请输入排序号',
+        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'
+      }
+    ],
+    memberStoreCommission: [
+      {
+        required: true,
+        message: '请输入直推收益分配',
+        type: 'number',
+        trigger: 'blur'
+      }
+    ],
+    supplierCommission: [
+      {
+        required: true,
+        message: '请输入仓储费',
+        type: 'number',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  const onType = (index: number) => {
+    form.type = index;
+  };
+
+  /* 搜索 */
+  const chooseMerchantId = (item: ShopMerchant) => {
+    form.merchantName = item.merchantName;
+    form.merchantId = item.merchantId;
+  };
+
+  const clearMerchant = () => {
+    form.merchantName = '';
+    form.merchantId = 0;
+  };
+
+  const chooseSupplier = (item: ShopMerchant) => {
+    form.supplierName = item.merchantName;
+    form.supplierMerchantId = item.merchantId;
+  };
+
+  const chooseGoodsCategory = (item: ShopGoodsCategory, value: any) => {
+    form.categoryId = value[1].value;
+    form.parentName = value[0].label;
+    form.categoryName = value[1].label;
+  };
+  const chooseTakeawayCategory = (item: ShopGoodsCategory, value: any) => {
+    form.categoryParent = '店铺分类';
+    form.categoryChildren = value[0].label;
+    form.categoryId = item[0];
+  };
+
+  const chooseImage = (data: FileRecord) => {
+    images.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+    form.image = data.path;
+  };
+
+  const chooseSkuImage = (data: FileRecord) => {
+    const index = data?.index;
+    skuList.value[index].images?.push({
+      uid: uuid(),
+      url: data.path,
+      status: 'done'
+    });
+    skuList.value[index].image = data.path;
+  };
+
+  const onDeleteSkuItem = (index: number) => {
+    images.value.splice(index, 1);
+  };
+
+  const videos = ref<ItemType[]>([]);
+  const chooseVideo = (data: FileRecord) => {
+    videos.value = [
+      {
+        uid: uuid(),
+        url: data.path,
+        status: 'done'
+      }
+    ];
+    form.video = data.path;
+  };
+
+  const onDeleteVideo = (index: number) => {
+    images.value.splice(index, 1);
+    form.video = undefined;
+  };
+
+  const onChange = (text: string) => {
+    // 加载商品多规格
+    if (text == 'spec') {
+      const goodsId = props.data?.goodsId;
+      if (goodsId) {
+        listShopGoodsSpec({ goodsId }).then((data) => {
+          if(data.length > 0){
+            const specValue = data[0].specValue;
+            if (specValue) {
+              spec.value = JSON.parse(specValue).map((d) => {
+                console.log(d);
+                return {
+                  value: d.value,
+                  detail: d.detail
+                };
+              });
+            }
+            console.log(spec.value);
+          }
+        });
+        listShopGoodsSku({ goodsId }).then((data) => {
+          skuList.value = data;
+        });
+      }
+    }
+  };
+
+  const onDeleteItem = (index: number) => {
+    images.value.splice(index, 1);
+    form.image = '';
+  };
+
+  const onClose = (index) => {
+    spec.value.splice(index, 1);
+  };
+
+  const openSpecForm = () => {
+    showSpecForm.value = !showSpecForm.value;
+  };
+
+  const onSpec = (row: ShopSpec) => {
+    form.specName = row.specName;
+    goodsSpec.value = row;
+    if (row.specValue) {
+      spec.value = JSON.parse(row?.specValue);
+    }
+  };
+
+  // 新增规格
+  const addSpecValue = () => {
+    if (!name.value || !value.value) {
+      message.error(`请输入规格和规格值`);
+      return false;
+    }
+    const findIndex = spec.value.findIndex((d) => d.value == name.value);
+    if (findIndex == 0) {
+      message.error(`${name.value}已存在)`);
+      return false;
+    }
+    spec.value.push({
+      value: name.value,
+      detail: [value.value]
+    });
+    name.value = '';
+    value.value = '';
+    openSpecForm();
+  };
+
+  const chooseFile = (data: FileRecord) => {
+    files.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+  };
+
+  const onDeleteFile = (index: number) => {
+    files.value.splice(index, 1);
+  };
+
+  /**
+   * 生成商品SKU列表
+   */
+  const generateSku = () => {
+    generateGoodsSku(spec.value).then((data) => {
+      if (data) {
+        skuList.value = data;
+      }
+    });
+  };
+
+  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);
+        });
+    },
+    video_template_callback: function (data) {
+      console.log(data);
+      return `<video width="${data.width}" height="${data.height}" controls="controls" src="${data.source}"></video>`;
+    },
+    // 自定义文件上传(这里使用把选择的文件转成 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;
+        if (form.priceGift && !form.priceGiftNum)
+          return message.error('请输入会员赠品数量');
+        if (ensureTag.value.length) form.ensureTag = ensureTag.value.join();
+        if (canUseDate.value.length) form.canUseDate = canUseDate.value.join();
+
+        // if (form.dealerGift && !form.dealerGiftNum) return message.error('请输入经销商赠品数量');
+        if (form.commissionRole === 1) {
+          for (let i = 0; i < form.goodsRoleCommission.length; i++) {
+            if (
+              form.goodsRoleCommission[i].amount === undefined ||
+              form.goodsRoleCommission[i].amount === '' ||
+              form.goodsRoleCommission[i].amount === null
+            ) {
+              return message.error(
+                '请输入' + form.goodsRoleCommission[i].roleName + '的分红金额'
+              );
+            }
+          }
+        }
+        const formData = {
+          ...form,
+          content: content.value,
+          category: JSON.stringify(category.value),
+          files: JSON.stringify(files.value),
+          goodsSpec: goodsSpec.value,
+          goodsSkus: skuList.value,
+          type: getMerchantId() ? 1 : 0
+        };
+        if (isUpdate.value) {
+          formData.type = props.data.type;
+        }
+        const saveOrUpdate = isUpdate.value ? updateShopGoods : addShopGoods;
+        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 expressTemplateList = ref<ShopExpressTemplate[]>([]);
+  const getExpressTemplateList = async () => {
+    expressTemplateList.value = await listShopExpressTemplate();
+  };
+
+  const getRoleList = async () => {
+    const roleList = await listShopCommissionRole();
+    form.goodsRoleCommission = [];
+    roleList.forEach((d) => {
+      form.goodsRoleCommission.push({
+        roleId: d.id,
+        roleName: d.title,
+        amount: 0
+      });
+    });
+    if (props?.data?.goodsId) {
+      const commissionList = await listShopGoodsRoleCommission({
+        goodsId: props?.data?.goodsId
+      });
+      form.goodsRoleCommission = form.goodsRoleCommission.map((d) => {
+        const find = commissionList.find((c) => c.roleId == d.roleId);
+        return {
+          ...d,
+          amount: find?.amount || 0
+        };
+      });
+    }
+  };
+
+  const onUploadImage = (item) => {
+    const { file } = item;
+    if (file.size / 1024 / 1024 > 10) {
+      message.error('大小不能超过 10MB');
+      return;
+    }
+    const hide = messageLoading({
+      content: '上传中..',
+      duration: 0,
+      mask: true
+    });
+    uploadOss(file)
+      .then((res) => {
+        hide();
+        form.image = res.path;
+      })
+      .catch((e) => {
+        message.error(e.message);
+        hide();
+      });
+  };
+  const onUploadSwiper = (item) => {
+    const { file } = item;
+    if (file.size / 1024 / 1024 > 10) {
+      message.error('大小不能超过 10MB');
+      return;
+    }
+    const hide = messageLoading({
+      content: '上传中..',
+      duration: 0,
+      mask: true
+    });
+    uploadOss(file)
+      .then((data) => {
+        hide();
+        files.value.push({
+          uid: data.id,
+          url: data.path,
+          status: 'done'
+        });
+        setPicker();
+      })
+      .catch((e) => {
+        message.error(e.message);
+        hide();
+      });
+  };
+
+  const swiperRef = ref();
+  const imageRef = ref();
+  const setPicker = () => {
+    const swiperEl = swiperRef.value?.$el?.querySelector('input[type="file"]');
+    if (swiperEl) {
+      swiperEl.removeAttribute('accept'); // 移除 accept 属性
+      swiperEl.removeAttribute('capture'); // 移除 capture 属性
+      swiperEl.setAttribute('name', 'file'); // 添加 name 属性
+    }
+    const imageEl = imageRef.value?.$el?.querySelector('input[type="file"]');
+    if (imageEl) {
+      imageEl.removeAttribute('accept'); // 移除 accept 属性
+      imageEl.removeAttribute('capture'); // 移除 capture 属性
+      imageEl.setAttribute('name', 'file'); // 添加 name 属性
+    }
+  };
+  watch(
+    () => props.visible,
+    async (visible) => {
+      if (visible) {
+        await getExpressTemplateList();
+
+        images.value = [];
+        category.value = [];
+        files.value = [];
+        videos.value = [];
+        canUseDate.value = [];
+        ensureTag.value = [];
+        ensureTagItem.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.files) {
+            files.value = JSON.parse(props.data.files);
+          }
+          if (props.data.goodsSpecs) {
+            goodsSpec.value = props.data.goodsSpecs[0];
+            if (props.data.specs == 1) {
+              form.specName = props.data.goodsSpecs[0].specName;
+            }
+          }
+          if (props.data.goodsSkus) {
+            skuList.value = props.data.goodsSkus.map((d) => {
+              d.images = [];
+              d.images.push({
+                uid: uuid(),
+                url: d.image,
+                status: 'done'
+              });
+              return d;
+            });
+          }
+          if (props.data.video) {
+            videos.value = [
+              {
+                uid: uuid(),
+                url: props.data.video,
+                status: 'done'
+              }
+            ];
+          }
+          // 商品分类
+          if (props.data.parentName) {
+            category.value.push(props.data.parentName);
+          }
+          if (props.data.category) {
+            category.value = JSON.parse(props.data.category);
+          }
+          if (props.data.content) {
+            content.value = props.data.content;
+          }
+          // 外卖商品分类
+          listShopGoodsCategory({ merchantId: props.merchantId }).then((list) => {
+            takeaway.value = list;
+          });
+
+          isUpdate.value = true;
+          if (form.ensureTag) {
+            ensureTag.value = form.ensureTag.split(',');
+          }
+          if (form.canUseDate) {
+            canUseDate.value = form.canUseDate.split(',').map((d) => Number(d));
+          }
+          await getRoleList();
+        } else {
+          await getRoleList();
+          spec.value = [];
+          goodsSpec.value = undefined;
+          skuList.value = [];
+          isUpdate.value = false;
+        }
+        setPicker();
+      } else {
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>
diff --git a/src/views/shop/shopGoods/index.vue b/src/views/shop/shopGoods/index.vue
new file mode 100644
index 0000000..3973646
--- /dev/null
+++ b/src/views/shop/shopGoods/index.vue
@@ -0,0 +1,281 @@
+<template>
+  <a-page-header :title="getPageTitle()" @back="() => $router.go(-1)">
+    <template #extra>
+      <Extra />
+    </template>
+    <a-card :bordered="false" :body-style="{ padding: '16px' }">
+      <ele-pro-table
+        ref="tableRef"
+        row-key="goodsId"
+        :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 === 'name'">
+            <a-space class="flex items-center">
+              <a-image :src="record.image" v-if="record.image" :width="50" />
+              <span class="text-gray-700 font-bold">{{ record.name }}</span>
+            </a-space>
+          </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="orange">待上架</a-tag>
+            <a-tag v-if="record.status === 2" color="purple">待审核</a-tag>
+            <a-tag v-if="record.status === 3" 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>
+
+    <!-- 编辑弹窗 -->
+    <ShopGoodsEdit v-model:visible="showEdit" :data="current" @done="reload" />
+  </a-page-header>
+</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 ShopGoodsEdit from './components/shopGoodsEdit.vue';
+  import {
+    pageShopGoods,
+    removeShopGoods,
+    removeBatchShopGoods
+  } from '@/api/shop/shopGoods';
+  import type { ShopGoods, ShopGoodsParam } from '@/api/shop/shopGoods/model';
+  import { getPageTitle } from '@/utils/common';
+  import Extra from '@/views/shop/shopGoods/components/extra.vue';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<ShopGoods[]>([]);
+  // 当前编辑数据
+  const current = ref<ShopGoods | 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 pageShopGoods({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: 'ID',
+      dataIndex: 'goodsId',
+      key: 'goodsId',
+      align: 'center',
+      width: 90
+    },
+    {
+      title: '商品',
+      dataIndex: 'name',
+      key: 'name',
+      width: 280
+    },
+    // {
+    //   title: '编号',
+    //   dataIndex: 'code',
+    //   key: 'code',
+    //   align: 'center',
+    // },
+    {
+      title: '价格',
+      dataIndex: 'price',
+      key: 'price',
+      align: 'center'
+    },
+    {
+      title: '销量',
+      dataIndex: 'sales',
+      key: 'sales',
+      align: 'center'
+    },
+    {
+      title: '库存',
+      dataIndex: 'stock',
+      key: 'stock',
+      align: 'center'
+    },
+    {
+      title: '推荐',
+      dataIndex: 'recommend',
+      key: 'recommend',
+      align: 'center'
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center'
+    },
+    // {
+    //   title: '备注',
+    //   dataIndex: 'comments',
+    //   key: 'comments',
+    //   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?: ShopGoodsParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: ShopGoods) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: ShopGoods) => {
+    const hide = message.loading('请求中..', 0);
+    removeShopGoods(row.shopGoodsId)
+      .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);
+        removeBatchShopGoods(selection.value.map((d) => d.shopGoodsId))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 查询 */
+  const query = () => {
+    loading.value = true;
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: ShopGoods) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+  query();
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'ShopGoods'
+  };
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/system/setting/components/mp-weixin.vue b/src/views/system/setting/components/mp-weixin.vue
index 8d902e4..7f6c328 100644
--- a/src/views/system/setting/components/mp-weixin.vue
+++ b/src/views/system/setting/components/mp-weixin.vue
@@ -27,9 +27,9 @@
       </div>
       <a-form-item label="request合法域名" name="request">
         <a-input-group compact>
-          <a-input :value="`https://open.gxwebsoft.com`" placeholder="请输入小程序AppSecret" style="width: calc(100% - 50px)" />
+          <a-input :value="`https://server.gxwebsoft.com;https://cms-api.websoft.top;`" placeholder="请输入小程序AppSecret" style="width: calc(100% - 50px)" />
           <a-tooltip title="复制">
-            <a-button @click="onCopyText(`https://open.gxwebsoft.com`)">
+            <a-button @click="onCopyText(`https://server.gxwebsoft.com;https://cms-api.websoft.top;`)">
               <template #icon><CopyOutlined /></template>
             </a-button>
           </a-tooltip>
@@ -37,9 +37,9 @@
       </a-form-item>
       <a-form-item label="socket合法域名" name="socket">
         <a-input-group compact>
-          <a-input :value="`wss://open.gxwebsoft.com`" placeholder="请输入小程序AppSecret" style="width: calc(100% - 50px)" />
+          <a-input :value="`wss://server.gxwebsoft.com`" placeholder="请输入小程序AppSecret" style="width: calc(100% - 50px)" />
           <a-tooltip title="复制">
-            <a-button @click="onCopyText(`wss://open.gxwebsoft.com`)">
+            <a-button @click="onCopyText(`wss://server.gxwebsoft.com`)">
               <template #icon><CopyOutlined /></template>
             </a-button>
           </a-tooltip>
@@ -47,9 +47,9 @@
       </a-form-item>
       <a-form-item label="uploadFile合法域名" name="uploadFile">
         <a-input-group compact>
-          <a-input :value="`https://open.gxwebsoft.com`" style="width: calc(100% - 50px)" />
+          <a-input :value="`https://oss.wsdns.cn;`" style="width: calc(100% - 50px)" />
           <a-tooltip title="复制">
-            <a-button @click="onCopyText(`https://open.gxwebsoft.com`)">
+            <a-button @click="onCopyText(`https://oss.wsdns.cn;`)">
               <template #icon><CopyOutlined /></template>
             </a-button>
           </a-tooltip>
@@ -57,9 +57,9 @@
       </a-form-item>
       <a-form-item label="downloadFile合法域名" name="downloadFile">
         <a-input-group compact>
-          <a-input :value="`https://open.gxwebsoft.com`" style="width: calc(100% - 50px)" />
+          <a-input :value="`https://oss.wsdns.cn;`" style="width: calc(100% - 50px)" />
           <a-tooltip title="复制">
-            <a-button @click="onCopyText(`https://open.gxwebsoft.com`)">
+            <a-button @click="onCopyText(`https://oss.wsdns.cn;`)">
               <template #icon><CopyOutlined /></template>
             </a-button>
           </a-tooltip>