feat(user): 新增收货地址管理及售后申请页面
- 新增地址类型定义,增强前端地址数据结构 - 新增地址编辑页面,支持地址智能识别和定位选点功能 - 地址编辑支持省市区选择及默认地址设置 - 新增地址列表页面,支持地址展示、删除、编辑和选择功能 - 实现售后申请页面,支持选择售后类型和退款原因 - 售后申请支持商品选择、退款金额计算和凭证上传 - 新增售后详情页面,支持售后状态展示及申请取消 - 优化页面加载和用户交互体验,增加错误提示和权限处理
This commit is contained in:
@@ -1,44 +1,40 @@
|
||||
import request from '@/utils/request'
|
||||
import type { ApiResult } from '@/api'
|
||||
import type { ShopGoodsFavorite, ShopGoodsFavoriteParam } from './model'
|
||||
|
||||
/**
|
||||
* 解包 API 响应
|
||||
* request 工具默认 returnRaw=true,返回完整 {code, message, data} 包装
|
||||
* 此函数提取内层 data 字段,兼容 data 为 null/undefined 的情况
|
||||
*/
|
||||
function unwrap<T>(res: any): T {
|
||||
if (res && typeof res === 'object' && 'data' in res) {
|
||||
return res.data as T
|
||||
}
|
||||
return res as T
|
||||
}
|
||||
|
||||
// 添加收藏
|
||||
// 添加收藏(关闭全局错误提示,由调用方自行处理)
|
||||
export async function addShopGoodsFavorite(data: { goodsId: number }) {
|
||||
const res = await request.post('/shop/goods/favorite/add', data)
|
||||
return unwrap<boolean>(res)
|
||||
const res = await request.post<ApiResult<boolean>>('/shop/goods/favorite/add', data, { showError: false })
|
||||
if (res.code === 0) {
|
||||
return res.data
|
||||
}
|
||||
return Promise.reject(new Error(res.message))
|
||||
}
|
||||
|
||||
// 取消收藏
|
||||
// 取消收藏(关闭全局错误提示,由调用方自行处理)
|
||||
export async function removeShopGoodsFavorite(data: { goodsId: number }) {
|
||||
const res = await request.post('/shop/goods/favorite/remove', data)
|
||||
return unwrap<boolean>(res)
|
||||
const res = await request.post<ApiResult<boolean>>('/shop/goods/favorite/remove', data, { showError: false })
|
||||
if (res.code === 0) {
|
||||
return res.data
|
||||
}
|
||||
return Promise.reject(new Error(res.message))
|
||||
}
|
||||
|
||||
// 查询收藏状态(返回 boolean:true=已收藏, false=未收藏)
|
||||
// 查询收藏状态
|
||||
export async function getShopGoodsFavoriteStatus(params: { goodsId: number }) {
|
||||
const res = await request.get('/shop/goods/favorite/status', params)
|
||||
return !!unwrap<boolean>(res) // 确保返回纯布尔值
|
||||
const res = await request.get<ApiResult<boolean>>('/shop/goods/favorite/status', params)
|
||||
if (res.code === 0) {
|
||||
return res.data
|
||||
}
|
||||
return Promise.reject(new Error(res.message))
|
||||
}
|
||||
|
||||
// 收藏列表
|
||||
export async function listShopGoodsFavorite(params: ShopGoodsFavoriteParam) {
|
||||
const res = await request.get('/shop/goods/favorite/list', params)
|
||||
return unwrap<ShopGoodsFavorite[]>(res) || []
|
||||
export function listShopGoodsFavorite(params: ShopGoodsFavoriteParam) {
|
||||
return request.get<ShopGoodsFavorite[]>('/shop/goods/favorite/list', params)
|
||||
}
|
||||
|
||||
// 收藏列表(分页)
|
||||
export async function pageShopGoodsFavorite(params: ShopGoodsFavoriteParam) {
|
||||
const res = await request.get('/shop/goods/favorite/page', params)
|
||||
return unwrap<{ list: ShopGoodsFavorite[]; total: number }>(res) || { list: [], total: 0 }
|
||||
export function pageShopGoodsFavorite(params: ShopGoodsFavoriteParam) {
|
||||
return request.get<{ list: ShopGoodsFavorite[]; total: number }>('/shop/goods/favorite/page', params)
|
||||
}
|
||||
|
||||
@@ -1,42 +1,8 @@
|
||||
import request from '@/utils/request';
|
||||
import type { ShopUserAddress } from './shopUserAddress/model';
|
||||
|
||||
/**
|
||||
* 解析地址列表响应
|
||||
* 兼容多种后端返回格式:
|
||||
* 1. 直接数组 ShopUserAddress[]
|
||||
* 2. 标准包装 { code, message, data: ShopUserAddress[] }
|
||||
* 3. 标准包装 + 分页 { code, message, data: { list: [], count } }
|
||||
* 4. code 为 0 或 200 都视为成功
|
||||
*/
|
||||
function parseAddressList(res: any): ShopUserAddress[] {
|
||||
if (Array.isArray(res)) {
|
||||
return res as ShopUserAddress[];
|
||||
}
|
||||
if (res && typeof res === 'object') {
|
||||
const code = (res as any).code;
|
||||
if (code === 0 || code === 200) {
|
||||
const data = (res as any).data;
|
||||
if (Array.isArray(data)) {
|
||||
return data as ShopUserAddress[];
|
||||
}
|
||||
if (data && Array.isArray(data.list)) {
|
||||
return data.list as ShopUserAddress[];
|
||||
}
|
||||
// code 成功但 data 为空
|
||||
return [];
|
||||
}
|
||||
}
|
||||
return [];
|
||||
}
|
||||
|
||||
/** 收货地址列表 */
|
||||
export async function listShopUserAddress(params?: any) {
|
||||
const res: any = await request.get('/shop/shop-user-address', params);
|
||||
// 调试日志:微信开发者工具 console 可见,便于核对返回结构
|
||||
// eslint-disable-next-line no-console
|
||||
console.log('[listShopUserAddress] raw response:', JSON.stringify(res)?.substring(0, 500));
|
||||
return parseAddressList(res);
|
||||
export function listShopUserAddress(params?: any) {
|
||||
return request.get('/shop/shop-user-address', params);
|
||||
}
|
||||
|
||||
/** 获取收货地址详情 */
|
||||
@@ -66,7 +32,7 @@ export function removeBatchShopUserAddress(ids: number[]) {
|
||||
|
||||
/** 设置默认收货地址 */
|
||||
export function setDefaultAddress(id: number) {
|
||||
return request.post(`/shop/shop-user-address/set-default/${id}`);
|
||||
return request.put(`/shop/shop-user-address/set-default/${id}`);
|
||||
}
|
||||
|
||||
/** 获取默认收货地址 */
|
||||
|
||||
@@ -24,30 +24,10 @@ export async function listShopUserAddress(params?: ShopUserAddressParam) {
|
||||
'/shop/shop-user-address',
|
||||
params
|
||||
);
|
||||
console.log('[listShopUserAddress] raw response:', JSON.stringify(res)?.substring(0, 300))
|
||||
// 兼容多种响应格式
|
||||
// 1. 直接返回数组
|
||||
if (Array.isArray(res)) {
|
||||
return res as ShopUserAddress[];
|
||||
if (res.code === 0 && res.data) {
|
||||
return res.data;
|
||||
}
|
||||
// 2. 标准包装 { code, data, message }
|
||||
if (res && typeof res === 'object') {
|
||||
// 兼容 code: 0 和 code: 200
|
||||
const isSuccess = res.code === 0 || res.code === 200
|
||||
if (isSuccess) {
|
||||
// data 是数组
|
||||
if (Array.isArray(res.data)) {
|
||||
return res.data;
|
||||
}
|
||||
// data 是分页对象 { list, count }
|
||||
if (res.data && Array.isArray((res.data as any).list)) {
|
||||
return (res.data as any).list as ShopUserAddress[];
|
||||
}
|
||||
// data 为 null/undefined 但 code 成功,返回空数组
|
||||
return [];
|
||||
}
|
||||
}
|
||||
return Promise.reject(new Error((res as any)?.message || '获取地址列表失败'));
|
||||
return Promise.reject(new Error(res.message));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
17
src/api/shop/shopUserAddress/model.ts
Normal file
17
src/api/shop/shopUserAddress/model.ts
Normal file
@@ -0,0 +1,17 @@
|
||||
/** 收货地址 */
|
||||
export interface ShopUserAddress {
|
||||
id?: number;
|
||||
userId?: number;
|
||||
name?: string; // 收货人姓名
|
||||
phone?: string; // 收货人电话
|
||||
province?: string; // 省份
|
||||
city?: string; // 城市
|
||||
district?: string; // 区县
|
||||
region?: string; // 区域(部分接口用 region)
|
||||
detail?: string; // 详细地址
|
||||
lng?: string; // 经度
|
||||
lat?: string; // 纬度
|
||||
isDefault?: number; // 是否默认 0-否 1-是
|
||||
createTime?: string;
|
||||
updateTime?: string;
|
||||
}
|
||||
Reference in New Issue
Block a user