diff --git a/src/api/shop/shopGoodsFavorite/index.ts b/src/api/shop/shopGoodsFavorite/index.ts index 83be18a..fbb77b9 100644 --- a/src/api/shop/shopGoodsFavorite/index.ts +++ b/src/api/shop/shopGoodsFavorite/index.ts @@ -1,27 +1,44 @@ import request from '@/utils/request' import type { ShopGoodsFavorite, ShopGoodsFavoriteParam } from './model' +/** + * 解包 API 响应 + * request 工具默认 returnRaw=true,返回完整 {code, message, data} 包装 + * 此函数提取内层 data 字段,兼容 data 为 null/undefined 的情况 + */ +function unwrap(res: any): T { + if (res && typeof res === 'object' && 'data' in res) { + return res.data as T + } + return res as T +} + // 添加收藏 -export function addShopGoodsFavorite(data: { goodsId: number }) { - return request.post('/shop/goods/favorite/add', data) +export async function addShopGoodsFavorite(data: { goodsId: number }) { + const res = await request.post('/shop/goods/favorite/add', data) + return unwrap(res) } // 取消收藏 -export function removeShopGoodsFavorite(data: { goodsId: number }) { - return request.post('/shop/goods/favorite/remove', data) +export async function removeShopGoodsFavorite(data: { goodsId: number }) { + const res = await request.post('/shop/goods/favorite/remove', data) + return unwrap(res) } -// 查询收藏状态 -export function getShopGoodsFavoriteStatus(params: { goodsId: number }) { - return request.get('/shop/goods/favorite/status', params) +// 查询收藏状态(返回 boolean:true=已收藏, false=未收藏) +export async function getShopGoodsFavoriteStatus(params: { goodsId: number }) { + const res = await request.get('/shop/goods/favorite/status', params) + return !!unwrap(res) // 确保返回纯布尔值 } // 收藏列表 -export function listShopGoodsFavorite(params: ShopGoodsFavoriteParam) { - return request.get('/shop/goods/favorite/list', params) +export async function listShopGoodsFavorite(params: ShopGoodsFavoriteParam) { + const res = await request.get('/shop/goods/favorite/list', params) + return unwrap(res) || [] } // 收藏列表(分页) -export function pageShopGoodsFavorite(params: ShopGoodsFavoriteParam) { - return request.get<{ list: ShopGoodsFavorite[]; total: number }>('/shop/goods/favorite/page', 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 } } diff --git a/src/pages/shop/product-detail.tsx b/src/pages/shop/product-detail.tsx index ee3bc16..df9f7eb 100644 --- a/src/pages/shop/product-detail.tsx +++ b/src/pages/shop/product-detail.tsx @@ -164,22 +164,13 @@ const ProductDetailPage: React.FC = () => { } const handleGoCart = () => { + // 购物车不是 tabBar 页面,使用 navigateTo;路径与 app.config.ts 中注册的 'pages/shop/cart' 对应 Taro.navigateTo({ url: '/pages/shop/cart' }) } const handleContactService = () => { - // 微信小程序客服:优先尝试打开客服会话 - if (Taro.openCustomerServiceChat) { - Taro.openCustomerServiceChat({ - extInfo: { url: '' }, // 需要在小程序后台配置客服链接 - fail: () => { - // 降级:跳转到客服页面 - Taro.navigateTo({ url: '/pages/user/customer-service/index' }) - }, - }) - } else { - Taro.navigateTo({ url: '/pages/user/customer-service/index' }) - } + // 直接跳转到在线客服页面(已实现完整功能:微信客服按钮 + 历史消息 + 热线 + 微信留言) + Taro.navigateTo({ url: '/pages/user/customer-service/index' }) } if (!product) {