gxwebsoft/mp-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	src/api/shop/shopCoupon/model/index.ts
This commit is contained in:
b2894lxlx
2025-08-12 09:29:42 +08:00
parent 25c7c3e984 df910e4344
commit ff0eeeee30
26 changed files with 226 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/api/shop/shopCoupon/index.ts
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;

17
src/api/shop/shopDealerApply/index.ts
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 { ShopDealerApply, ShopDealerApplyParam } from './model';
import { MODULES_API_URL } from '@/config/setting';
/**
* 分页查询分销商申请记录表
*/
export async function pageShopDealerApply(params: ShopDealerApplyParam) {
const res = await request.get<ApiResult<PageResult<ShopDealerApply>>>(
MODULES_API_URL + '/shop/shop-dealer-apply/page',
'/shop/shop-dealer-apply/page',
{
params
}
@@ -24,7 +23,7 @@ export async function pageShopDealerApply(params: ShopDealerApplyParam) {
*/
export async function listShopDealerApply(params?: ShopDealerApplyParam) {
const res = await request.get<ApiResult<ShopDealerApply[]>>(
MODULES_API_URL + '/shop/shop-dealer-apply',
'/shop/shop-dealer-apply',
{
params
}
@@ -40,7 +39,7 @@ export async function listShopDealerApply(params?: ShopDealerApplyParam) {
*/
export async function addShopDealerApply(data: ShopDealerApply) {
const res = await request.post<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-dealer-apply',
'/shop/shop-dealer-apply',
data
);
if (res.data.code === 0) {
@@ -54,7 +53,7 @@ export async function addShopDealerApply(data: ShopDealerApply) {
*/
export async function updateShopDealerApply(data: ShopDealerApply) {
const res = await request.put<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-dealer-apply',
'/shop/shop-dealer-apply',
data
);
if (res.data.code === 0) {
@@ -68,7 +67,7 @@ export async function updateShopDealerApply(data: ShopDealerApply) {
*/
export async function removeShopDealerApply(id?: number) {
const res = await request.delete<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-dealer-apply/' + id
'/shop/shop-dealer-apply/' + id
);
if (res.data.code === 0) {
return res.data.message;
@@ -81,7 +80,7 @@ export async function removeShopDealerApply(id?: number) {
*/
export async function removeBatchShopDealerApply(data: (number | undefined)[]) {
const res = await request.delete<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-dealer-apply/batch',
'/shop/shop-dealer-apply/batch',
{
data
}
@@ -97,7 +96,7 @@ export async function removeBatchShopDealerApply(data: (number | undefined)[]) {
*/
export async function getShopDealerApply(id: number) {
const res = await request.get<ApiResult<ShopDealerApply>>(
MODULES_API_URL + '/shop/shop-dealer-apply/' + id
'/shop/shop-dealer-apply/' + id
);
if (res.data.code === 0 && res.data.data) {
return res.data.data;

2
src/api/shop/shopDealerApply/model/index.ts
View File

@@ -1,4 +1,4 @@
import type { PageParam } from '@/api/index';
import type { PageParam } from '@/api';
/**
* 分销商申请记录表

17
src/api/shop/shopDealerCapital/index.ts
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 { ShopDealerCapital, ShopDealerCapitalParam } from './model';
import { MODULES_API_URL } from '@/config/setting';
/**
* 分页查询分销商资金明细表
*/
export async function pageShopDealerCapital(params: ShopDealerCapitalParam) {
const res = await request.get<ApiResult<PageResult<ShopDealerCapital>>>(
MODULES_API_URL + '/shop/shop-dealer-capital/page',
'/shop/shop-dealer-capital/page',
{
params
}
@@ -24,7 +23,7 @@ export async function pageShopDealerCapital(params: ShopDealerCapitalParam) {
*/
export async function listShopDealerCapital(params?: ShopDealerCapitalParam) {
const res = await request.get<ApiResult<ShopDealerCapital[]>>(
MODULES_API_URL + '/shop/shop-dealer-capital',
'/shop/shop-dealer-capital',
{
params
}
@@ -40,7 +39,7 @@ export async function listShopDealerCapital(params?: ShopDealerCapitalParam) {
*/
export async function addShopDealerCapital(data: ShopDealerCapital) {
const res = await request.post<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-dealer-capital',
'/shop/shop-dealer-capital',
data
);
if (res.data.code === 0) {
@@ -54,7 +53,7 @@ export async function addShopDealerCapital(data: ShopDealerCapital) {
*/
export async function updateShopDealerCapital(data: ShopDealerCapital) {
const res = await request.put<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-dealer-capital',
'/shop/shop-dealer-capital',
data
);
if (res.data.code === 0) {
@@ -68,7 +67,7 @@ export async function updateShopDealerCapital(data: ShopDealerCapital) {
*/
export async function removeShopDealerCapital(id?: number) {
const res = await request.delete<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-dealer-capital/' + id
'/shop/shop-dealer-capital/' + id
);
if (res.data.code === 0) {
return res.data.message;
@@ -81,7 +80,7 @@ export async function removeShopDealerCapital(id?: number) {
*/
export async function removeBatchShopDealerCapital(data: (number | undefined)[]) {
const res = await request.delete<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-dealer-capital/batch',
'/shop/shop-dealer-capital/batch',
{
data
}
@@ -97,7 +96,7 @@ export async function removeBatchShopDealerCapital(data: (number | undefined)[])
*/
export async function getShopDealerCapital(id: number) {
const res = await request.get<ApiResult<ShopDealerCapital>>(
MODULES_API_URL + '/shop/shop-dealer-capital/' + id
'/shop/shop-dealer-capital/' + id
);
if (res.data.code === 0 && res.data.data) {
return res.data.data;

2
src/api/shop/shopDealerCapital/model/index.ts
View File

@@ -1,4 +1,4 @@
import type { PageParam } from '@/api/index';
import type { PageParam } from '@/api';
/**
* 分销商资金明细表

17
src/api/shop/shopDealerOrder/index.ts
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 { ShopDealerOrder, ShopDealerOrderParam } from './model';
import { MODULES_API_URL } from '@/config/setting';
/**
* 分页查询分销商订单记录表
*/
export async function pageShopDealerOrder(params: ShopDealerOrderParam) {
const res = await request.get<ApiResult<PageResult<ShopDealerOrder>>>(
MODULES_API_URL + '/shop/shop-dealer-order/page',
'/shop/shop-dealer-order/page',
{
params
}
@@ -24,7 +23,7 @@ export async function pageShopDealerOrder(params: ShopDealerOrderParam) {
*/
export async function listShopDealerOrder(params?: ShopDealerOrderParam) {
const res = await request.get<ApiResult<ShopDealerOrder[]>>(
MODULES_API_URL + '/shop/shop-dealer-order',
'/shop/shop-dealer-order',
{
params
}
@@ -40,7 +39,7 @@ export async function listShopDealerOrder(params?: ShopDealerOrderParam) {
*/
export async function addShopDealerOrder(data: ShopDealerOrder) {
const res = await request.post<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-dealer-order',
'/shop/shop-dealer-order',
data
);
if (res.data.code === 0) {
@@ -54,7 +53,7 @@ export async function addShopDealerOrder(data: ShopDealerOrder) {
*/
export async function updateShopDealerOrder(data: ShopDealerOrder) {
const res = await request.put<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-dealer-order',
'/shop/shop-dealer-order',
data
);
if (res.data.code === 0) {
@@ -68,7 +67,7 @@ export async function updateShopDealerOrder(data: ShopDealerOrder) {
*/
export async function removeShopDealerOrder(id?: number) {
const res = await request.delete<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-dealer-order/' + id
'/shop/shop-dealer-order/' + id
);
if (res.data.code === 0) {
return res.data.message;
@@ -81,7 +80,7 @@ export async function removeShopDealerOrder(id?: number) {
*/
export async function removeBatchShopDealerOrder(data: (number | undefined)[]) {
const res = await request.delete<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-dealer-order/batch',
'/shop/shop-dealer-order/batch',
{
data
}
@@ -97,7 +96,7 @@ export async function removeBatchShopDealerOrder(data: (number | undefined)[]) {
*/
export async function getShopDealerOrder(id: number) {
const res = await request.get<ApiResult<ShopDealerOrder>>(
MODULES_API_URL + '/shop/shop-dealer-order/' + id
'/shop/shop-dealer-order/' + id
);
if (res.data.code === 0 && res.data.data) {
return res.data.data;

2
src/api/shop/shopDealerOrder/model/index.ts
View File

@@ -1,4 +1,4 @@
import type { PageParam } from '@/api/index';
import type { PageParam } from '@/api';
/**
* 分销商订单记录表

17
src/api/shop/shopDealerReferee/index.ts
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 { ShopDealerReferee, ShopDealerRefereeParam } from './model';
import { MODULES_API_URL } from '@/config/setting';
/**
* 分页查询分销商推荐关系表
*/
export async function pageShopDealerReferee(params: ShopDealerRefereeParam) {
const res = await request.get<ApiResult<PageResult<ShopDealerReferee>>>(
MODULES_API_URL + '/shop/shop-dealer-referee/page',
'/shop/shop-dealer-referee/page',
{
params
}
@@ -24,7 +23,7 @@ export async function pageShopDealerReferee(params: ShopDealerRefereeParam) {
*/
export async function listShopDealerReferee(params?: ShopDealerRefereeParam) {
const res = await request.get<ApiResult<ShopDealerReferee[]>>(
MODULES_API_URL + '/shop/shop-dealer-referee',
'/shop/shop-dealer-referee',
{
params
}
@@ -40,7 +39,7 @@ export async function listShopDealerReferee(params?: ShopDealerRefereeParam) {
*/
export async function addShopDealerReferee(data: ShopDealerReferee) {
const res = await request.post<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-dealer-referee',
'/shop/shop-dealer-referee',
data
);
if (res.data.code === 0) {
@@ -54,7 +53,7 @@ export async function addShopDealerReferee(data: ShopDealerReferee) {
*/
export async function updateShopDealerReferee(data: ShopDealerReferee) {
const res = await request.put<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-dealer-referee',
'/shop/shop-dealer-referee',
data
);
if (res.data.code === 0) {
@@ -68,7 +67,7 @@ export async function updateShopDealerReferee(data: ShopDealerReferee) {
*/
export async function removeShopDealerReferee(id?: number) {
const res = await request.delete<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-dealer-referee/' + id
'/shop/shop-dealer-referee/' + id
);
if (res.data.code === 0) {
return res.data.message;
@@ -81,7 +80,7 @@ export async function removeShopDealerReferee(id?: number) {
*/
export async function removeBatchShopDealerReferee(data: (number | undefined)[]) {
const res = await request.delete<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-dealer-referee/batch',
'/shop/shop-dealer-referee/batch',
{
data
}
@@ -97,7 +96,7 @@ export async function removeBatchShopDealerReferee(data: (number | undefined)[])
*/
export async function getShopDealerReferee(id: number) {
const res = await request.get<ApiResult<ShopDealerReferee>>(
MODULES_API_URL + '/shop/shop-dealer-referee/' + id
'/shop/shop-dealer-referee/' + id
);
if (res.data.code === 0 && res.data.data) {
return res.data.data;

2
src/api/shop/shopDealerReferee/model/index.ts
View File

@@ -1,4 +1,4 @@
import type { PageParam } from '@/api/index';
import type { PageParam } from '@/api';
/**
* 分销商推荐关系表

17
src/api/shop/shopDealerSetting/index.ts
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 { ShopDealerSetting, ShopDealerSettingParam } from './model';
import { MODULES_API_URL } from '@/config/setting';
/**
* 分页查询分销商设置表
*/
export async function pageShopDealerSetting(params: ShopDealerSettingParam) {
const res = await request.get<ApiResult<PageResult<ShopDealerSetting>>>(
MODULES_API_URL + '/shop/shop-dealer-setting/page',
'/shop/shop-dealer-setting/page',
{
params
}
@@ -24,7 +23,7 @@ export async function pageShopDealerSetting(params: ShopDealerSettingParam) {
*/
export async function listShopDealerSetting(params?: ShopDealerSettingParam) {
const res = await request.get<ApiResult<ShopDealerSetting[]>>(
MODULES_API_URL + '/shop/shop-dealer-setting',
'/shop/shop-dealer-setting',
{
params
}
@@ -40,7 +39,7 @@ export async function listShopDealerSetting(params?: ShopDealerSettingParam) {
*/
export async function addShopDealerSetting(data: ShopDealerSetting) {
const res = await request.post<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-dealer-setting',
'/shop/shop-dealer-setting',
data
);
if (res.data.code === 0) {
@@ -54,7 +53,7 @@ export async function addShopDealerSetting(data: ShopDealerSetting) {
*/
export async function updateShopDealerSetting(data: ShopDealerSetting) {
const res = await request.put<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-dealer-setting',
'/shop/shop-dealer-setting',
data
);
if (res.data.code === 0) {
@@ -68,7 +67,7 @@ export async function updateShopDealerSetting(data: ShopDealerSetting) {
*/
export async function removeShopDealerSetting(id?: number) {
const res = await request.delete<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-dealer-setting/' + id
'/shop/shop-dealer-setting/' + id
);
if (res.data.code === 0) {
return res.data.message;
@@ -81,7 +80,7 @@ export async function removeShopDealerSetting(id?: number) {
*/
export async function removeBatchShopDealerSetting(data: (number | undefined)[]) {
const res = await request.delete<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-dealer-setting/batch',
'/shop/shop-dealer-setting/batch',
{
data
}
@@ -97,7 +96,7 @@ export async function removeBatchShopDealerSetting(data: (number | undefined)[])
*/
export async function getShopDealerSetting(id: number) {
const res = await request.get<ApiResult<ShopDealerSetting>>(
MODULES_API_URL + '/shop/shop-dealer-setting/' + id
'/shop/shop-dealer-setting/' + id
);
if (res.data.code === 0 && res.data.data) {
return res.data.data;

2
src/api/shop/shopDealerSetting/model/index.ts
View File

@@ -1,4 +1,4 @@
import type { PageParam } from '@/api/index';
import type { PageParam } from '@/api';
/**
* 分销商设置表

17
src/api/shop/shopDealerUser/index.ts
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 { ShopDealerUser, ShopDealerUserParam } from './model';
import { MODULES_API_URL } from '@/config/setting';
/**
* 分页查询分销商用户记录表
*/
export async function pageShopDealerUser(params: ShopDealerUserParam) {
const res = await request.get<ApiResult<PageResult<ShopDealerUser>>>(
MODULES_API_URL + '/shop/shop-dealer-user/page',
'/shop/shop-dealer-user/page',
{
params
}
@@ -24,7 +23,7 @@ export async function pageShopDealerUser(params: ShopDealerUserParam) {
*/
export async function listShopDealerUser(params?: ShopDealerUserParam) {
const res = await request.get<ApiResult<ShopDealerUser[]>>(
MODULES_API_URL + '/shop/shop-dealer-user',
'/shop/shop-dealer-user',
{
params
}
@@ -40,7 +39,7 @@ export async function listShopDealerUser(params?: ShopDealerUserParam) {
*/
export async function addShopDealerUser(data: ShopDealerUser) {
const res = await request.post<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-dealer-user',
'/shop/shop-dealer-user',
data
);
if (res.data.code === 0) {
@@ -54,7 +53,7 @@ export async function addShopDealerUser(data: ShopDealerUser) {
*/
export async function updateShopDealerUser(data: ShopDealerUser) {
const res = await request.put<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-dealer-user',
'/shop/shop-dealer-user',
data
);
if (res.data.code === 0) {
@@ -68,7 +67,7 @@ export async function updateShopDealerUser(data: ShopDealerUser) {
*/
export async function removeShopDealerUser(id?: number) {
const res = await request.delete<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-dealer-user/' + id
'/shop/shop-dealer-user/' + id
);
if (res.data.code === 0) {
return res.data.message;
@@ -81,7 +80,7 @@ export async function removeShopDealerUser(id?: number) {
*/
export async function removeBatchShopDealerUser(data: (number | undefined)[]) {
const res = await request.delete<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-dealer-user/batch',
'/shop/shop-dealer-user/batch',
{
data
}
@@ -97,7 +96,7 @@ export async function removeBatchShopDealerUser(data: (number | undefined)[]) {
*/
export async function getShopDealerUser(id: number) {
const res = await request.get<ApiResult<ShopDealerUser>>(
MODULES_API_URL + '/shop/shop-dealer-user/' + id
'/shop/shop-dealer-user/' + id
);
if (res.data.code === 0 && res.data.data) {
return res.data.data;

2
src/api/shop/shopDealerUser/model/index.ts
View File

@@ -1,4 +1,4 @@
import type { PageParam } from '@/api/index';
import type { PageParam } from '@/api';
/**
* 分销商用户记录表

17
src/api/shop/shopDealerWithdraw/index.ts
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 { ShopDealerWithdraw, ShopDealerWithdrawParam } from './model';
import { MODULES_API_URL } from '@/config/setting';
/**
* 分页查询分销商提现明细表
*/
export async function pageShopDealerWithdraw(params: ShopDealerWithdrawParam) {
const res = await request.get<ApiResult<PageResult<ShopDealerWithdraw>>>(
MODULES_API_URL + '/shop/shop-dealer-withdraw/page',
'/shop/shop-dealer-withdraw/page',
{
params
}
@@ -24,7 +23,7 @@ export async function pageShopDealerWithdraw(params: ShopDealerWithdrawParam) {
*/
export async function listShopDealerWithdraw(params?: ShopDealerWithdrawParam) {
const res = await request.get<ApiResult<ShopDealerWithdraw[]>>(
MODULES_API_URL + '/shop/shop-dealer-withdraw',
'/shop/shop-dealer-withdraw',
{
params
}
@@ -40,7 +39,7 @@ export async function listShopDealerWithdraw(params?: ShopDealerWithdrawParam) {
*/
export async function addShopDealerWithdraw(data: ShopDealerWithdraw) {
const res = await request.post<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-dealer-withdraw',
'/shop/shop-dealer-withdraw',
data
);
if (res.data.code === 0) {
@@ -54,7 +53,7 @@ export async function addShopDealerWithdraw(data: ShopDealerWithdraw) {
*/
export async function updateShopDealerWithdraw(data: ShopDealerWithdraw) {
const res = await request.put<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-dealer-withdraw',
'/shop/shop-dealer-withdraw',
data
);
if (res.data.code === 0) {
@@ -68,7 +67,7 @@ export async function updateShopDealerWithdraw(data: ShopDealerWithdraw) {
*/
export async function removeShopDealerWithdraw(id?: number) {
const res = await request.delete<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-dealer-withdraw/' + id
'/shop/shop-dealer-withdraw/' + id
);
if (res.data.code === 0) {
return res.data.message;
@@ -81,7 +80,7 @@ export async function removeShopDealerWithdraw(id?: number) {
*/
export async function removeBatchShopDealerWithdraw(data: (number | undefined)[]) {
const res = await request.delete<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-dealer-withdraw/batch',
'/shop/shop-dealer-withdraw/batch',
{
data
}
@@ -97,7 +96,7 @@ export async function removeBatchShopDealerWithdraw(data: (number | undefined)[]
*/
export async function getShopDealerWithdraw(id: number) {
const res = await request.get<ApiResult<ShopDealerWithdraw>>(
MODULES_API_URL + '/shop/shop-dealer-withdraw/' + id
'/shop/shop-dealer-withdraw/' + id
);
if (res.data.code === 0 && res.data.data) {
return res.data.data;

2
src/api/shop/shopDealerWithdraw/model/index.ts
View File

@@ -1,4 +1,4 @@
import type { PageParam } from '@/api/index';
import type { PageParam } from '@/api';
/**
* 分销商提现明细表

17
src/api/shop/shopUserCoupon/index.ts
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 { ShopUserCoupon, ShopUserCouponParam } from './model';
import { MODULES_API_URL } from '@/config/setting';
/**
* 分页查询用户优惠券
*/
export async function pageShopUserCoupon(params: ShopUserCouponParam) {
const res = await request.get<ApiResult<PageResult<ShopUserCoupon>>>(
MODULES_API_URL + '/shop/shop-user-coupon/page',
'/shop/shop-user-coupon/page',
{
params
}
@@ -24,7 +23,7 @@ export async function pageShopUserCoupon(params: ShopUserCouponParam) {
*/
export async function listShopUserCoupon(params?: ShopUserCouponParam) {
const res = await request.get<ApiResult<ShopUserCoupon[]>>(
MODULES_API_URL + '/shop/shop-user-coupon',
'/shop/shop-user-coupon',
{
params
}
@@ -40,7 +39,7 @@ export async function listShopUserCoupon(params?: ShopUserCouponParam) {
*/
export async function addShopUserCoupon(data: ShopUserCoupon) {
const res = await request.post<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-user-coupon',
'/shop/shop-user-coupon',
data
);
if (res.data.code === 0) {
@@ -54,7 +53,7 @@ export async function addShopUserCoupon(data: ShopUserCoupon) {
*/
export async function updateShopUserCoupon(data: ShopUserCoupon) {
const res = await request.put<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-user-coupon',
'/shop/shop-user-coupon',
data
);
if (res.data.code === 0) {
@@ -68,7 +67,7 @@ export async function updateShopUserCoupon(data: ShopUserCoupon) {
*/
export async function removeShopUserCoupon(id?: number) {
const res = await request.delete<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-user-coupon/' + id
'/shop/shop-user-coupon/' + id
);
if (res.data.code === 0) {
return res.data.message;
@@ -81,7 +80,7 @@ export async function removeShopUserCoupon(id?: number) {
*/
export async function removeBatchShopUserCoupon(data: (number | undefined)[]) {
const res = await request.delete<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-user-coupon/batch',
'/shop/shop-user-coupon/batch',
{
data
}
@@ -97,7 +96,7 @@ export async function removeBatchShopUserCoupon(data: (number | undefined)[]) {
*/
export async function getShopUserCoupon(id: number) {
const res = await request.get<ApiResult<ShopUserCoupon>>(
MODULES_API_URL + '/shop/shop-user-coupon/' + id
'/shop/shop-user-coupon/' + id
);
if (res.data.code === 0 && res.data.data) {
return res.data.data;

2
src/api/shop/shopUserCoupon/model/index.ts
View File

@@ -1,4 +1,4 @@
import type { PageParam } from '@/api/index';
import type { PageParam } from '@/api';
/**
* 用户优惠券

15
src/api/shop/shopUserReferee/index.ts
View File

@@ -1,14 +1,13 @@
import request from '@/utils/request';
import type { ApiResult, PageResult } from '@/api';
import type { ShopUserReferee, ShopUserRefereeParam } from './model';
import { MODULES_API_URL } from '@/config/setting';
/**
* 分页查询用户推荐关系表
*/
export async function pageShopUserReferee(params: ShopUserRefereeParam) {
const res = await request.get<ApiResult<PageResult<ShopUserReferee>>>(
MODULES_API_URL + '/shop/shop-user-referee/page',
'/shop/shop-user-referee/page',
{
params
}
@@ -24,7 +23,7 @@ export async function pageShopUserReferee(params: ShopUserRefereeParam) {
*/
export async function listShopUserReferee(params?: ShopUserRefereeParam) {
const res = await request.get<ApiResult<ShopUserReferee[]>>(
MODULES_API_URL + '/shop/shop-user-referee',
'/shop/shop-user-referee',
{
params
}
@@ -40,7 +39,7 @@ export async function listShopUserReferee(params?: ShopUserRefereeParam) {
*/
export async function addShopUserReferee(data: ShopUserReferee) {
const res = await request.post<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-user-referee',
'/shop/shop-user-referee',
data
);
if (res.data.code === 0) {
@@ -54,7 +53,7 @@ export async function addShopUserReferee(data: ShopUserReferee) {
*/
export async function updateShopUserReferee(data: ShopUserReferee) {
const res = await request.put<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-user-referee',
'/shop/shop-user-referee',
data
);
if (res.data.code === 0) {
@@ -68,7 +67,7 @@ export async function updateShopUserReferee(data: ShopUserReferee) {
*/
export async function removeShopUserReferee(id?: number) {
const res = await request.delete<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-user-referee/' + id
'/shop/shop-user-referee/' + id
);
if (res.data.code === 0) {
return res.data.message;
@@ -81,7 +80,7 @@ export async function removeShopUserReferee(id?: number) {
*/
export async function removeBatchShopUserReferee(data: (number | undefined)[]) {
const res = await request.delete<ApiResult<unknown>>(
MODULES_API_URL + '/shop/shop-user-referee/batch',
'/shop/shop-user-referee/batch',
{
data
}
@@ -97,7 +96,7 @@ export async function removeBatchShopUserReferee(data: (number | undefined)[]) {
*/
export async function getShopUserReferee(id: number) {
const res = await request.get<ApiResult<ShopUserReferee>>(
MODULES_API_URL + '/shop/shop-user-referee/' + id
'/shop/shop-user-referee/' + id
);
if (res.data.code === 0 && res.data.data) {
return res.data.data;

1
src/api/system/user/model/index.ts
View File

@@ -152,6 +152,7 @@ export interface UserParam extends PageParam {
sexName?: string;
roleId?: string;
isAdmin?: number;
isSuperAdmin?: boolean;
showProfile?: boolean;
isStaff?: boolean;
templateId?: number;

15
src/styles/component.less
View File

@@ -1,2 +1,17 @@
/** 组件样式 */
//@input-item: 300px;
/* ele-pro-table 全局美化样式 */
.ele-pro-table .ant-table-thead > tr > th {
border-bottom: 2px solid #f0f0f0;
background-color: #fafafa;
font-weight: 600;
}
.ele-pro-table .ant-table-tbody > tr > td {
border-bottom: 1px solid #f5f5f5;
}
.ele-pro-table .ant-table-tbody > tr:hover > td {
background-color: #f8f9fa;
}

382
src/views/shop/shopAdmin/components/admin.vue
View File

@@ -1,368 +1,42 @@
<template>
<!-- 表格 -->
<ele-pro-table
ref="tableRef"
row-key="userId"
:columns="columns"
:datasource="datasource"
:where="defaultWhere"
:toolbar="false"
:needPage="false"
cache-key="proSystemUserTable"
>
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'avatar'">
<a-avatar
:size="30"
:src="`${record.avatar}`"
style="margin-right: 4px"
>
<template #icon>
<UserOutlined/>
</template>
</a-avatar>
</template>
<template v-if="column.key === 'nickname'">
<span>{{ record.nickname }}</span>
</template>
<template v-if="column.key === 'mobile'">
<span v-if="hasRole('superAdmin')">{{ record.phone }}</span>
<span v-else>{{ record.mobile }}</span>
</template>
<template v-if="column.key === 'roles'">
<a-tag v-for="item in record.roles" :key="item.roleId" color="blue">
{{ item.roleName }}
</a-tag>
</template>
<template v-if="column.key === 'platform'">
<WechatOutlined v-if="record.platform === 'MP-WEIXIN'"/>
<Html5Outlined v-if="record.platform === 'H5'"/>
<ChromeOutlined v-if="record.platform === 'WEB'"/>
</template>
<template v-if="column.key === 'balance'">
<span class="ele-text-success">
￥{{ formatNumber(record.balance) }}
</span>
</template>
<template v-if="column.key === 'expendMoney'">
<span class="ele-text-warning">
￥{{ formatNumber(record.expendMoney) }}
</span>
</template>
<template v-if="column.key === 'isAdmin'">
<a-tag v-if="record.isAdmin">是</a-tag>
<a-tag v-else>否</a-tag>
<!-- <a-switch-->
<!-- :checked="record.isAdmin == 1"-->
<!-- @change="updateIsAdmin(record)"-->
<!-- />-->
</template>
<template v-if="column.key === 'action'">
<div>
<a @click="openEdit(record)">修改</a>
<a-divider type="vertical"/>
<!-- <a @click="resetPsw(record)">重置</a>-->
<!-- <a-divider type="vertical" />-->
<a-popconfirm
placement="topRight"
title="确定要删除此用户吗？"
@confirm="remove(record)"
>
<a class="ele-text-danger">删除</a>
</a-popconfirm>
</div>
</template>
<a-card title="项目成员" style="margin-bottom: 20px">
<template #extra>
<a-space>
<a-button>编辑</a-button>
<a-button type="primary">添加</a-button>
</a-space>
</template>
</ele-pro-table>
<template v-for="(item,_) in list" class="bg-gray-50 rounded-lg w-80 p-4 flex justify-between items-center">
<a-space>
<a-avatar size="large" :src="item.avatar"/>
<div class="text-gray-400 flex flex-col">
<span>{{ item.nickname }}</span>
<span>{{ item.createTime }}</span>
</div>
</a-space>
</template>
</a-card>
</template>
<script lang="ts" setup>
import {createVNode, ref, reactive} from 'vue';
import {message, Modal} from 'ant-design-vue/es';
import {ref, onMounted} from 'vue';
import {
PlusOutlined,
DeleteOutlined,
UploadOutlined,
EditOutlined,
UserOutlined,
Html5Outlined,
ChromeOutlined,
WechatOutlined,
ExclamationCircleOutlined
} from '@ant-design/icons-vue';
import type {EleProTable} from 'ele-admin-pro/es';
import type {
DatasourceFunction,
ColumnItem
} from 'ele-admin-pro/es/ele-pro-table/types';
import {messageLoading, formatNumber} from 'ele-admin-pro/es';
import UserEdit from './components/user-edit.vue';
import UserImport from './components/user-import.vue';
import UserInfo from './components/user-info.vue';
import {toDateString} from 'ele-admin-pro';
import {
pageUsers,
removeUser,
removeUsers,
updateUserPassword,
updateUser
listUsers
} from '@/api/system/user';
import type {User, UserParam} from '@/api/system/user/model';
import {toTreeData, uuid} from 'ele-admin-pro';
import {listRoles} from '@/api/system/role';
import {listOrganizations} from '@/api/system/organization';
import {Organization} from '@/api/system/organization/model';
import {hasRole} from '@/utils/permission';
import {getPageTitle} from "@/utils/common";
import Extra from "./components/Extra.vue";
import {User} from "@/api/system/user/model";
// 加载状态
const loading = ref(true);
// 树形数据
const data = ref<Organization[]>([]);
// 树展开的key
const expandedRowKeys = ref<number[]>([]);
// 树选中的key
const selectedRowKeys = ref<number[]>([]);
// 表格选中数据
const selection = ref<User[]>([]);
// 当前编辑数据
const current = ref<User | null>(null);
// 是否显示编辑弹窗
const showEdit = ref(false);
// 是否显示用户详情
const showInfo = ref(false);
// 是否显示用户导入弹窗
const showImport = ref(false);
const userType = ref<number>();
const searchText = ref('');
const list = ref<User[]>([]);
// 加载角色
const roles = ref<any[]>([]);
const filters = () => {
listRoles().then((result) => {
result.map((d) => {
roles.value.push({
text: d.roleName,
value: d.roleId
});
});
const reload = async () => {
const data = await listUsers({
isAdmin: 1
});
};
filters();
// 加载机构
listOrganizations()
.then((list) => {
loading.value = false;
const eks: number[] = [];
list.forEach((d) => {
d.key = d.organizationId;
d.value = d.organizationId;
d.title = d.organizationName;
if (typeof d.key === 'number') {
eks.push(d.key);
}
});
expandedRowKeys.value = eks;
data.value = toTreeData({
data: list,
idField: 'organizationId',
parentIdField: 'parentId'
});
if (list.length) {
if (typeof list[0].key === 'number') {
selectedRowKeys.value = [list[0].key];
}
// current.value = list[0];
} else {
selectedRowKeys.value = [];
// current.value = null;
}
})
.catch((e) => {
loading.value = false;
message.error(e.message);
});
// 表格实例
const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
// 表格列配置
const columns = ref<ColumnItem[]>([
{
title: 'ID',
dataIndex: 'userId',
width: 90,
showSorterTooltip: false
},
{
title: '头像',
key: 'avatar',
dataIndex: 'avatar',
align: 'center',
width: 90
},
{
title: '手机号码',
dataIndex: 'mobile',
align: 'center',
key: 'mobile',
showSorterTooltip: false
},
{
title: '注册时间',
dataIndex: 'createTime',
sorter: true,
showSorterTooltip: false,
ellipsis: true,
customRender: ({text}) => toDateString(text, 'yyyy-MM-dd')
},
{
title: '操作',
key: 'action',
width: 120,
fixed: 'right',
align: 'center'
if (data.length > 0) {
list.value = data;
}
]);
}
// 默认搜索条件
const defaultWhere = reactive({
username: '',
nickname: ''
});
// 表格数据源
const datasource: DatasourceFunction = ({
page,
limit,
where,
orders,
filters
}) => {
where = {};
where.roleId = filters.roles;
where.keywords = searchText.value;
where.isAdmin = 1;
return pageUsers({page, limit, ...where, ...orders});
};
/* 搜索 */
const reload = (where?: UserParam) => {
selection.value = [];
tableRef?.value?.reload({where});
};
/* 打开编辑弹窗 */
const openEdit = (row?: User) => {
current.value = row ?? null;
showEdit.value = true;
};
/* 打开用户详情弹窗 */
const openInfo = (row?: User) => {
current.value = row ?? null;
showInfo.value = true;
};
/* 打开编辑弹窗 */
const openImport = () => {
showImport.value = true;
};
const handleTabs = (e) => {
userType.value = Number(e.target.value);
onMounted(() => {
reload();
};
/* 删除单个 */
const remove = (row: User) => {
const hide = messageLoading('请求中..', 0);
removeUser(row.userId)
.then((msg) => {
hide();
message.success(msg);
reload();
})
.catch((e) => {
hide();
message.error(e.message);
});
};
/* 批量删除 */
const removeBatch = () => {
if (!selection.value.length) {
message.error('请至少选择一条数据');
return;
}
Modal.confirm({
title: '提示',
content: '确定要删除选中的用户吗?',
icon: createVNode(ExclamationCircleOutlined),
maskClosable: true,
onOk: () => {
const hide = messageLoading('请求中..', 0);
removeUsers(selection.value.map((d) => d.userId))
.then((msg) => {
hide();
message.success(msg);
reload();
})
.catch((e) => {
hide();
message.error(e.message);
});
}
});
};
/* 重置用户密码 */
const resetPsw = (row: User) => {
Modal.confirm({
title: '提示',
content: '确定要重置此用户的密码吗?',
icon: createVNode(ExclamationCircleOutlined),
maskClosable: true,
onOk: () => {
const hide = message.loading('请求中..', 0);
const password = uuid(8);
updateUserPassword(row.userId, password)
.then((msg) => {
hide();
message.success(msg + '，新密码：' + password);
})
.catch((e) => {
hide();
message.error(e.message);
});
}
});
};
/* 修改用户状态 */
const updateIsAdmin = (row: User) => {
row.isAdmin = !row.isAdmin;
updateUser(row)
.then((msg) => {
message.success(msg);
})
.catch((e) => {
message.error(e.message);
});
};
/* 自定义行属性 */
const customRow = (record: User) => {
return {
// 行点击事件
onClick: () => {
// console.log(record);
},
// 行双击事件
onDblclick: () => {
openEdit(record);
}
};
};
})
</script>

41
src/views/shop/shopAdmin/components/super-admin.vue Normal file
View File

@@ -0,0 +1,41 @@
<template>
<a-card title="管理员" style="margin-bottom: 20px">
<div class="title flex flex-col">
<div class="text-gray-400 pb-2">系统所有者，拥有全部权限</div>
</div>
<div v-if="item" class="bg-gray-50 rounded-lg w-80 p-4 flex justify-between items-center">
<a-space>
<a-avatar size="large" :src="item.avatar"/>
<div class="text-gray-400 flex flex-col">
<span>{{ item.nickname }}</span>
<span>{{ item.createTime }}</span>
</div>
</a-space>
<a>更换</a>
</div>
</a-card>
</template>
<script lang="ts" setup>
import {ref, onMounted} from 'vue';
import {
listUsers
} from '@/api/system/user';
import {User} from "@/api/system/user/model";
const item = ref<User>();
const reload = async () => {
const list = await listUsers({
isSuperAdmin: true
});
console.log(list)
if (list.length > 0) {
item.value = list[0];
}
}
onMounted(() => {
reload();
})
</script>

70
src/views/shop/shopAdmin/index.vue
View File

@@ -1,16 +1,6 @@
<template>
<a-page-header :title="getPageTitle()" @back="() => $router.go(-1)">
<!-- <a-card title="超级管理员" style="margin-bottom: 20px">-->
<!-- <Admin />-->
<!-- </a-card>-->
<!-- <a-card title="项目成员" style="margin-bottom: 20px">-->
<!-- <template #extra>-->
<!-- <a-button class="ele-btn-icon" @click="openEdit()">-->
<!-- <span>添加</span>-->
<!-- </a-button>-->
<!-- </template>-->
<!-- <Admin />-->
<!-- </a-card>-->
<SuperAdmin/>
<a-card :bordered="false">
<!-- 表格 -->
<ele-pro-table
@@ -18,6 +8,7 @@
row-key="userId"
:columns="columns"
:datasource="datasource"
class="sys-org-table"
:scroll="{ x: 1300 }"
:where="defaultWhere"
:customRow="customRow"
@@ -29,7 +20,7 @@
<template #icon>
<plus-outlined/>
</template>
<span>新建</span>
<span>添加</span>
</a-button>
<a-input-search
allow-clear
@@ -153,6 +144,8 @@ import {Organization} from '@/api/system/organization/model';
import {hasRole} from '@/utils/permission';
import {getPageTitle, push} from "@/utils/common";
import router from "@/router";
import SuperAdmin from './components/super-admin.vue';
import Admin from './components/admin.vue';
// 加载状态
const loading = ref(true);
@@ -386,7 +379,7 @@ const resetPsw = (row: User) => {
/* 修改用户状态 */
const updateIsAdmin = (row: User) => {
row.isAdmin = row.isAdmin ? 0 : 1;
row.isAdmin = !row.isAdmin;
updateUser(row)
.then((msg) => {
message.success(msg);
@@ -412,7 +405,7 @@ const customRow = (record: User) => {
const query = async () => {
const info = await listRoles({})
if(info){
if (info) {
roles.value = info
}
}
@@ -432,15 +425,48 @@ export default {
};
</script>
<style lang="less" scoped>
.user-box {
display: flex;
align-items: center;
.user-info {
display: flex;
flex-direction: column;
align-items: start;
<style lang="less" scoped>
.sys-org-table {
:deep(.ant-table) {
.ant-table-thead > tr > th {
background: #fafafa;
font-weight: 600;
color: #262626;
border-bottom: 2px solid #f0f0f0;
}
.ant-table-tbody > tr > td {
padding: 12px 8px;
border-bottom: 1px solid #f5f5f5;
}
.ant-table-tbody > tr:hover > td {
background: #f8f9ff;
}
.ant-tag {
margin: 0;
border-radius: 4px;
font-size: 12px;
padding: 2px 8px;
}
}
}
.ele-text-primary {
color: #1890ff;
&:hover {
color: #40a9ff;
}
}
.ele-text-danger {
color: #ff4d4f;
&:hover {
color: #ff7875;
}
}
</style>

4
src/views/shop/shopOrder/index.vue
View File

@@ -16,10 +16,8 @@
<a-tab-pane key="undelivered" tab="待发货"/>
<a-tab-pane key="unreceived" tab="待收货"/>
<a-tab-pane key="completed" tab="已完成"/>
<a-tab-pane key="cancelled" tab="已取消"/>
<!-- <a-tab-pane key="unevaluated" tab="待评价"/>-->
<a-tab-pane key="refunded" tab="已退款"/>
<!-- <a-tab-pane key="deleted" tab="已删除"/>-->
<a-tab-pane key="cancelled" tab="已取消"/>
</a-tabs>
<ele-pro-table
ref="tableRef"

7
src/views/shop/shopUserReferee/index.vue
View File

@@ -1,6 +1,5 @@
<template>
<div class="page">
<div class="ele-body">
<a-page-header :title="getPageTitle()" @back="() => $router.go(-1)">
<a-card :bordered="false" :body-style="{ padding: '16px' }">
<ele-pro-table
ref="tableRef"
@@ -46,8 +45,7 @@
<!-- 编辑弹窗 -->
<ShopUserRefereeEdit v-model:visible="showEdit" :data="current" @done="reload" />
</div>
</div>
</a-page-header>
</template>
<script lang="ts" setup>
@@ -61,6 +59,7 @@
ColumnItem
} from 'ele-admin-pro/es/ele-pro-table/types';
import Search from './components/search.vue';
import {getPageTitle} from '@/utils/common';
import ShopUserRefereeEdit from './components/shopUserRefereeEdit.vue';
import { pageShopUserReferee, removeShopUserReferee, removeBatchShopUserReferee } from '@/api/shop/shopUserReferee';
import type { ShopUserReferee, ShopUserRefereeParam } from '@/api/shop/shopUserReferee/model';