Skip to content

Commit fa6bcac

Browse files
YunaiVgitee-org
authored andcommitted
!157 合并商城部分功能
Merge pull request !157 from 芋道源码/dev
2 parents ee12fa0 + 70c5082 commit fa6bcac

File tree

27 files changed

+1741
-697
lines changed

27 files changed

+1741
-697
lines changed

build/vite/optimize.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ const include = [
102102
'element-plus/es/components/timeline-item/style/css',
103103
'element-plus/es/components/collapse/style/css',
104104
'element-plus/es/components/collapse-item/style/css',
105-
'element-plus/es/components/button-group/style/css'
105+
'element-plus/es/components/button-group/style/css',
106+
'element-plus/es/components/text/style/css'
106107
]
107108

108109
const exclude = ['@iconify/json']

src/api/mall/product/brand.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,8 @@ export const getBrand = (id: number) => {
5454
export const getBrandParam = (params: PageParam) => {
5555
return request.get({ url: '/product/brand/page', params })
5656
}
57+
58+
// 获得商品品牌精简信息列表
59+
export const getSimpleBrandList = () => {
60+
return request.get({ url: '/product/brand/list-all-simple' })
61+
}

src/api/mall/product/management/spu.ts

Lines changed: 0 additions & 39 deletions
This file was deleted.

src/api/mall/product/management/type/skuType.ts

Lines changed: 0 additions & 79 deletions
This file was deleted.

src/api/mall/product/management/type/spuType.ts

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/api/mall/product/spu.ts

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
import request from '@/config/axios'
2+
3+
export interface Property {
4+
propertyId?: number // 属性编号
5+
propertyName?: string // 属性名称
6+
valueId?: number // 属性值编号
7+
valueName?: string // 属性值名称
8+
}
9+
10+
// TODO puhui999:是不是直接叫 Sku 更简洁一点哈。type 待后面,总感觉有个类型?
11+
export interface SkuType {
12+
id?: number // 商品 SKU 编号
13+
spuId?: number // SPU 编号
14+
properties?: Property[] // 属性数组
15+
price?: number // 商品价格
16+
marketPrice?: number // 市场价
17+
costPrice?: number // 成本价
18+
barCode?: string // 商品条码
19+
picUrl?: string // 图片地址
20+
stock?: number // 库存
21+
weight?: number // 商品重量,单位:kg 千克
22+
volume?: number // 商品体积,单位:m^3 平米
23+
subCommissionFirstPrice?: number // 一级分销的佣金
24+
subCommissionSecondPrice?: number // 二级分销的佣金
25+
salesCount?: number // 商品销量
26+
}
27+
28+
// TODO puhui999:是不是直接叫 Spu 更简洁一点哈。type 待后面,总感觉有个类型?
29+
export interface SpuType {
30+
id?: number
31+
name?: string // 商品名称
32+
categoryId?: number | null // 商品分类
33+
keyword?: string // 关键字
34+
unit?: number | null // 单位
35+
picUrl?: string // 商品封面图
36+
sliderPicUrls?: string[] // 商品轮播图
37+
introduction?: string // 商品简介
38+
deliveryTemplateId?: number | null // 运费模版
39+
brandId?: number | null // 商品品牌编号
40+
specType?: boolean // 商品规格
41+
subCommissionType?: boolean // 分销类型
42+
skus: SkuType[] // sku数组
43+
description?: string // 商品详情
44+
sort?: string // 商品排序
45+
giveIntegral?: number // 赠送积分
46+
virtualSalesCount?: number // 虚拟销量
47+
recommendHot?: boolean // 是否热卖
48+
recommendBenefit?: boolean // 是否优惠
49+
recommendBest?: boolean // 是否精品
50+
recommendNew?: boolean // 是否新品
51+
recommendGood?: boolean // 是否优品
52+
}
53+
54+
// 获得 Spu 列表
55+
export const getSpuPage = (params: PageParam) => {
56+
return request.get({ url: '/product/spu/page', params })
57+
}
58+
59+
// 获得 Spu 列表 tabsCount
60+
export const getTabsCount = () => {
61+
return request.get({ url: '/product/spu/get-count' })
62+
}
63+
64+
// 创建商品 Spu
65+
export const createSpu = (data: SpuType) => {
66+
return request.post({ url: '/product/spu/create', data })
67+
}
68+
69+
// 更新商品 Spu
70+
export const updateSpu = (data: SpuType) => {
71+
return request.put({ url: '/product/spu/update', data })
72+
}
73+
74+
// 更新商品 Spu status
75+
export const updateStatus = (data: { id: number; status: number }) => {
76+
return request.put({ url: '/product/spu/update-status', data })
77+
}
78+
79+
// 获得商品 Spu
80+
export const getSpu = (id: number) => {
81+
return request.get({ url: `/product/spu/get-detail?id=${id}` })
82+
}
83+
84+
// 删除商品 Spu
85+
export const deleteSpu = (id: number) => {
86+
return request.delete({ url: `/product/spu/delete?id=${id}` })
87+
}
88+
89+
// 导出商品 Spu Excel
90+
export const exportSpu = async (params) => {
91+
return await request.download({ url: '/product/spu/export', params })
92+
}
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
import request from '@/config/axios'
2+
3+
export interface DeliveryExpressVO {
4+
id: number
5+
code: string
6+
name: string
7+
logo: string
8+
sort: number
9+
status: number
10+
}
11+
12+
// 查询快递公司列表
13+
export const getDeliveryExpressPage = async (params: PageParam) => {
14+
return await request.get({ url: '/trade/delivery/express/page', params })
15+
}
16+
17+
// 查询快递公司详情
18+
export const getDeliveryExpress = async (id: number) => {
19+
return await request.get({ url: '/trade/delivery/express/get?id=' + id })
20+
}
21+
22+
// 新增快递公司
23+
export const createDeliveryExpress = async (data: DeliveryExpressVO) => {
24+
return await request.post({ url: '/trade/delivery/express/create', data })
25+
}
26+
27+
// 修改快递公司
28+
export const updateDeliveryExpress = async (data: DeliveryExpressVO) => {
29+
return await request.put({ url: '/trade/delivery/express/update', data })
30+
}
31+
32+
// 删除快递公司
33+
export const deleteDeliveryExpress = async (id: number) => {
34+
return await request.delete({ url: '/trade/delivery/express/delete?id=' + id })
35+
}
36+
37+
// 导出快递公司 Excel
38+
export const exportDeliveryExpressApi = async (params) => {
39+
return await request.download({ url: '/trade/delivery/express/export-excel', params })
40+
}
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
import request from '@/config/axios'
2+
3+
export interface DeliveryExpressTemplateVO {
4+
id: number
5+
name: string
6+
chargeMode: number
7+
sort: number
8+
templateCharge: ExpressTemplateChargeVO[]
9+
templateFree: ExpressTemplateFreeVO[]
10+
}
11+
12+
export declare type ExpressTemplateChargeVO = {
13+
areaIds: number[]
14+
startCount: number
15+
startPrice: number
16+
extraCount: number
17+
extraPrice: number
18+
}
19+
20+
export declare type ExpressTemplateFreeVO = {
21+
areaIds: number[]
22+
freeCount: number
23+
freePrice: number
24+
}
25+
26+
// 查询快递运费模板列表
27+
export const getDeliveryExpressTemplatePage = async (params: PageParam) => {
28+
return await request.get({ url: '/trade/delivery/express-template/page', params })
29+
}
30+
31+
// 查询快递运费模板详情
32+
export const getDeliveryExpressTemplate = async (id: number) => {
33+
return await request.get({ url: '/trade/delivery/express-template/get?id=' + id })
34+
}
35+
36+
// 新增快递运费模板
37+
export const createDeliveryExpressTemplate = async (data: DeliveryExpressTemplateVO) => {
38+
return await request.post({ url: '/trade/delivery/express-template/create', data })
39+
}
40+
41+
// 修改快递运费模板
42+
export const updateDeliveryExpressTemplate = async (data: DeliveryExpressTemplateVO) => {
43+
return await request.put({ url: '/trade/delivery/express-template/update', data })
44+
}
45+
46+
// 删除快递运费模板
47+
export const deleteDeliveryExpressTemplate = async (id: number) => {
48+
return await request.delete({ url: '/trade/delivery/express-template/delete?id=' + id })
49+
}
50+
51+
// 导出快递运费模板 Excel
52+
export const exportDeliveryExpressTemplateApi = async (params) => {
53+
return await request.download({ url: '/trade/delivery/express-template/export-excel', params })
54+
}

src/api/system/area/index.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ export const getAreaTree = async () => {
55
return await request.get({ url: '/system/area/tree' })
66
}
77

8+
export const getChildrenArea = async (id: number) => {
9+
return await request.get({ url: '/system/area/get-children?id=' + id })
10+
}
11+
12+
export const getAreaListByIds = async (ids) => {
13+
return await request.get({ url: '/system/area/get-by-ids?ids=' + ids })
14+
}
15+
816
// 获得 IP 对应的地区名
917
export const getAreaByIp = async (ip: string) => {
1018
return await request.get({ url: '/system/area/get-by-ip?ip=' + ip })

0 commit comments

Comments
 (0)