Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/api/shop/shopCoupon/model/index.ts
This commit is contained in:
2025-08-12 09:29:42 +08:00
26 changed files with 226 additions and 482 deletions

View File

@@ -1,14 +1,13 @@
import request from '@/utils/request';
import type { ApiResult, PageResult } from '@/api/index';
import type { ApiResult, PageResult } from '@/api';
import type { ShopCoupon, ShopCouponParam } from './model';
import { MODULES_API_URL } from '@/config/setting';
/**
* 分页查询优惠券
*/
export async function pageShopCoupon(params: ShopCouponParam) {
const res = await request.get<ApiResult<PageResult<ShopCoupon>>>(
MODULES_API_URL + '/shop/shop-coupon/page',
'/shop/shop-coupon/page',
{
params
}
@@ -24,7 +23,7 @@ export async function pageShopCoupon(params: ShopCouponParam) {
*/
export async function listShopCoupon(params?: ShopCouponParam) {
const res = await request.get<ApiResult<ShopCoupon[]>>(
MODULES_API_URL + '/shop/shop-coupon',
'/shop/shop-coupon',
{
params
}
@@ -40,7 +39,7 @@ export async function listShopCoupon(params?: ShopCouponParam) {
*/
export async function addShopCoupon(data: ShopCoupon) {
const res = await request.post<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-coupon',
'/shop/shop-coupon',
data
);
if (res.data.code === 0) {
@@ -54,7 +53,7 @@ export async function addShopCoupon(data: ShopCoupon) {
*/
export async function updateShopCoupon(data: ShopCoupon) {
const res = await request.put<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-coupon',
'/shop/shop-coupon',
data
);
if (res.data.code === 0) {
@@ -68,7 +67,7 @@ export async function updateShopCoupon(data: ShopCoupon) {
*/
export async function removeShopCoupon(id?: number) {
const res = await request.delete<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-coupon/' + id
'/shop/shop-coupon/' + id
);
if (res.data.code === 0) {
return res.data.message;
@@ -81,7 +80,7 @@ export async function removeShopCoupon(id?: number) {
*/
export async function removeBatchShopCoupon(data: (number | undefined)[]) {
const res = await request.delete<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-coupon/batch',
'/shop/shop-coupon/batch',
{
data
}
@@ -97,7 +96,7 @@ export async function removeBatchShopCoupon(data: (number | undefined)[]) {
*/
export async function getShopCoupon(id: number) {
const res = await request.get<ApiResult<ShopCoupon>>(
MODULES_API_URL + '/shop/shop-coupon/' + id
'/shop/shop-coupon/' + id
);
if (res.data.code === 0 && res.data.data) {
return res.data.data;