Skip to content

Commit 8e5f053

Browse files
committed
Merge remote-tracking branch 'origin/master' into feature/vue3
2 parents 9d05c8d + caf33c8 commit 8e5f053

File tree

28 files changed

+3447
-954
lines changed

28 files changed

+3447
-954
lines changed

src/api/mall/CouponTemplete/CouponTemplete.js

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

src/api/mall/product/property.js

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,25 @@ export function getPropertyPage(query) {
4343
})
4444
}
4545

46+
// 获得规格名称列表
47+
export function getPropertyList(query) {
48+
return request({
49+
url: '/product/property/list',
50+
method: 'get',
51+
params: query
52+
})
53+
}
54+
55+
// 获得规格名称列表
56+
export function getPropertyListAndValue(query) {
57+
return request({
58+
url: '/product/property/listAndValue',
59+
method: 'get',
60+
params: query
61+
})
62+
}
63+
64+
4665
// 导出规格名称 Excel
4766
export function exportPropertyExcel(query) {
4867
return request({
@@ -52,3 +71,49 @@ export function exportPropertyExcel(query) {
5271
responseType: 'blob'
5372
})
5473
}
74+
75+
// ------------------------ 规格名称值 -------------------
76+
77+
// 获得规格名称值分页
78+
export function getPropertyValuePage(query) {
79+
return request({
80+
url: '/product/property/value/page',
81+
method: 'get',
82+
params: query
83+
})
84+
}
85+
86+
// 获得规格名称值
87+
export function getPropertyValue(id) {
88+
return request({
89+
url: '/product/property/value/get?id=' + id,
90+
method: 'get'
91+
})
92+
}
93+
94+
95+
// 创建规格名称值
96+
export function createPropertyValue(data) {
97+
return request({
98+
url: '/product/property/value/create',
99+
method: 'post',
100+
data: data
101+
})
102+
}
103+
104+
// 更新规格名称值
105+
export function updatePropertyValue(data) {
106+
return request({
107+
url: '/product/property/value/update',
108+
method: 'put',
109+
data: data
110+
})
111+
}
112+
113+
// 删除规格名称
114+
export function deletePropertyValue(id) {
115+
return request({
116+
url: '/product/property/value/delete?id=' + id,
117+
method: 'delete'
118+
})
119+
}

src/api/mall/product/sku.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import request from '@/utils/request'
2+
3+
// 获得商品 SKU 选项的列表
4+
export function getSkuOptionList() {
5+
return request({
6+
url: '/product/sku/get-option-list',
7+
method: 'get',
8+
})
9+
}

src/api/mall/product/spu.js

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import request from '@/utils/request'
22

3-
// 创建商品spu
3+
// 创建商品 SPU
44
export function createSpu(data) {
55
return request({
66
url: '/product/spu/create',
@@ -9,7 +9,7 @@ export function createSpu(data) {
99
})
1010
}
1111

12-
// 更新商品spu
12+
// 更新商品 SPU
1313
export function updateSpu(data) {
1414
return request({
1515
url: '/product/spu/update',
@@ -18,7 +18,7 @@ export function updateSpu(data) {
1818
})
1919
}
2020

21-
// 删除商品spu
21+
// 删除商品 SPU
2222
export function deleteSpu(id) {
2323
return request({
2424
url: '/product/spu/delete?id=' + id,
@@ -34,11 +34,27 @@ export function getSpu(id) {
3434
})
3535
}
3636

37-
// 获得商品spu分页
37+
// 获得商品 SPU 详情
38+
export function getSpuDetail(id) {
39+
return request({
40+
url: '/product/spu/get/detail?id=' + id,
41+
method: 'get'
42+
})
43+
}
44+
45+
// 获得商品 SPU 分页
3846
export function getSpuPage(query) {
3947
return request({
4048
url: '/product/spu/page',
4149
method: 'get',
4250
params: query
4351
})
4452
}
53+
54+
// 获得商品 SPU 精简列表
55+
export function getSpuSimpleList() {
56+
return request({
57+
url: '/product/spu/get-simple-list',
58+
method: 'get',
59+
})
60+
}

src/api/mall/promotion/coupon.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import request from '@/utils/request'
2+
3+
// 删除优惠劵
4+
export function deleteCoupon(id) {
5+
return request({
6+
url: '/promotion/coupon/delete?id=' + id,
7+
method: 'delete'
8+
})
9+
}
10+
11+
// 获得优惠劵分页
12+
export function getCouponPage(query) {
13+
return request({
14+
url: '/promotion/coupon/page',
15+
method: 'get',
16+
params: query
17+
})
18+
}
Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
import request from '@/utils/request'
2+
3+
// 创建优惠劵模板
4+
export function createCouponTemplate(data) {
5+
return request({
6+
url: '/promotion/coupon-template/create',
7+
method: 'post',
8+
data: data
9+
})
10+
}
11+
12+
// 更新优惠劵模板
13+
export function updateCouponTemplate(data) {
14+
return request({
15+
url: '/promotion/coupon-template/update',
16+
method: 'put',
17+
data: data
18+
})
19+
}
20+
21+
// 更新优惠劵模板的状态
22+
export function updateCouponTemplateStatus(id, status) {
23+
const data = {
24+
id,
25+
status
26+
}
27+
return request({
28+
url: '/promotion/coupon-template/update-status',
29+
method: 'put',
30+
data: data
31+
})
32+
}
33+
34+
// 删除优惠劵模板
35+
export function deleteCouponTemplate(id) {
36+
return request({
37+
url: '/promotion/coupon-template/delete?id=' + id,
38+
method: 'delete'
39+
})
40+
}
41+
42+
// 获得优惠劵模板
43+
export function getCouponTemplate(id) {
44+
return request({
45+
url: '/promotion/coupon-template/get?id=' + id,
46+
method: 'get'
47+
})
48+
}
49+
50+
// 获得优惠劵模板分页
51+
export function getCouponTemplatePage(query) {
52+
return request({
53+
url: '/promotion/coupon-template/page',
54+
method: 'get',
55+
params: query
56+
})
57+
}
58+
59+
// 导出优惠劵模板 Excel
60+
export function exportCouponTemplateExcel(query) {
61+
return request({
62+
url: '/promotion/coupon-template/export-excel',
63+
method: 'get',
64+
params: query,
65+
responseType: 'blob'
66+
})
67+
}
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
import request from '@/utils/request'
2+
3+
// 创建限时折扣活动
4+
export function createDiscountActivity(data) {
5+
return request({
6+
url: '/promotion/discount-activity/create',
7+
method: 'post',
8+
data: data
9+
})
10+
}
11+
12+
// 更新限时折扣活动
13+
export function updateDiscountActivity(data) {
14+
return request({
15+
url: '/promotion/discount-activity/update',
16+
method: 'put',
17+
data: data
18+
})
19+
}
20+
21+
// 关闭限时折扣活动
22+
export function closeDiscountActivity(id) {
23+
return request({
24+
url: '/promotion/discount-activity/close?id=' + id,
25+
method: 'put'
26+
})
27+
}
28+
29+
// 删除限时折扣活动
30+
export function deleteDiscountActivity(id) {
31+
return request({
32+
url: '/promotion/discount-activity/delete?id=' + id,
33+
method: 'delete'
34+
})
35+
}
36+
37+
// 获得限时折扣活动
38+
export function getDiscountActivity(id) {
39+
return request({
40+
url: '/promotion/discount-activity/get?id=' + id,
41+
method: 'get'
42+
})
43+
}
44+
45+
// 获得限时折扣活动分页
46+
export function getDiscountActivityPage(query) {
47+
return request({
48+
url: '/promotion/discount-activity/page',
49+
method: 'get',
50+
params: query
51+
})
52+
}
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
import request from '@/utils/request'
2+
3+
// 创建满减送活动
4+
export function createRewardActivity(data) {
5+
return request({
6+
url: '/promotion/reward-activity/create',
7+
method: 'post',
8+
data: data
9+
})
10+
}
11+
12+
// 更新满减送活动
13+
export function updateRewardActivity(data) {
14+
return request({
15+
url: '/promotion/reward-activity/update',
16+
method: 'put',
17+
data: data
18+
})
19+
}
20+
21+
// 关闭满减送活动
22+
export function closeRewardActivity(id) {
23+
return request({
24+
url: '/promotion/reward-activity/close?id=' + id,
25+
method: 'put'
26+
})
27+
}
28+
29+
// 删除满减送活动
30+
export function deleteRewardActivity(id) {
31+
return request({
32+
url: '/promotion/reward-activity/delete?id=' + id,
33+
method: 'delete'
34+
})
35+
}
36+
37+
// 获得满减送活动
38+
export function getRewardActivity(id) {
39+
return request({
40+
url: '/promotion/reward-activity/get?id=' + id,
41+
method: 'get'
42+
})
43+
}
44+
45+
// 获得满减送活动分页
46+
export function getRewardActivityPage(query) {
47+
return request({
48+
url: '/promotion/reward-activity/page',
49+
method: 'get',
50+
params: query
51+
})
52+
}

src/assets/icons/svg/map.svg

Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)