赵忠林
e47a0d3d3e
- 结算页新增线下付款异常友好提示，避免支付配置中appid缺失错误 - 后端修复支付类型判断，防止线下付款仍试图创建微信支付订单 - 结算页默认支付方式调整为线下付款，货到付款选项注释 - 新增门店订单“修改金额”功能，支持弹窗输入新金额和修改原因 - 订单修改支持追加操作记录，接口复用updateShopOrder，无需新接口 - 重构多处页面和组件，使用响应式useVipStatus替代同步isVipMember缓存 - 新增OrderGoodsItem.price字段，下单时传VIP dealerPrice确保价格准确 - 购物车、商品详情、分类页、SkuSelector、商品卡片等支持动态VIP价格展示 - 修改购物车上下文calcPrice函数，响应VIP状态变更自动更新价格显示 - 提升前端VIP状态管理一致性，防止过期缓存导致VIP特权价格显示异常 - 验证构建通过，后端服务重启后生效线下付款修复和订单修改功能
356 lines
12 KiB
TypeScript
356 lines
12 KiB
TypeScript
import React, { useState, useEffect, useMemo } from 'react'
|
||
import { View, Text, Image, ScrollView } from '@tarojs/components'
|
||
import Taro from '@tarojs/taro'
|
||
import type { ShopGoods, ShopGoodsSku } from '@/api/shop/shopGoods/model'
|
||
import type { ShopGoodsSpec } from '@/api/shop/shopGoodsSpec/model'
|
||
import Price from '@/components/common/Price'
|
||
import { useVipStatus } from '@/hooks/useVipStatus'
|
||
import { getCompressedImageUrl } from '@/utils/image'
|
||
|
||
interface SkuSelectorProps {
|
||
visible: boolean
|
||
product: ShopGoods | null
|
||
mode?: 'cart' | 'buy'
|
||
onClose: () => void
|
||
onConfirm: (sku: ShopGoodsSku, quantity: number) => void
|
||
}
|
||
|
||
// 将平铺的规格值列表转换为按规格ID分组的格式
|
||
interface SpecGroup {
|
||
specId: number
|
||
specName: string
|
||
values: Array<{ specValueId: number; specValue: string }>
|
||
}
|
||
|
||
// 解析可能为JSON字符串的规格值
|
||
const parseSpecValue = (value: string | undefined): string => {
|
||
if (!value) return ''
|
||
const trimmed = value.trim()
|
||
// 处理带引号的JSON字符串，如 "红色" -> 红色
|
||
if (trimmed.startsWith('"') && trimmed.endsWith('"') && trimmed.length >= 2) {
|
||
try {
|
||
return JSON.parse(trimmed)
|
||
} catch {
|
||
return trimmed.slice(1, -1)
|
||
}
|
||
}
|
||
return trimmed
|
||
}
|
||
|
||
const SkuSelector: React.FC<SkuSelectorProps> = ({
|
||
visible,
|
||
product,
|
||
mode = 'cart',
|
||
onClose,
|
||
onConfirm,
|
||
}) => {
|
||
const [selectedSpecs, setSelectedSpecs] = useState<Record<number, number>>({})
|
||
const [selectedSku, setSelectedSku] = useState<ShopGoodsSku | null>(null)
|
||
const [quantity, setQuantity] = useState(1)
|
||
const [showOverlay, setShowOverlay] = useState(false)
|
||
const [slideUp, setSlideUp] = useState(false)
|
||
// VIP 状态：异步校验并更新缓存，isVip 变化时触发重渲染
|
||
const { isVip } = useVipStatus()
|
||
|
||
// 控制动画
|
||
useEffect(() => {
|
||
if (visible) {
|
||
setShowOverlay(true)
|
||
// 延迟一帧触发滑入动画
|
||
setTimeout(() => setSlideUp(true), 10)
|
||
} else {
|
||
setSlideUp(false)
|
||
setTimeout(() => setShowOverlay(false), 300)
|
||
}
|
||
}, [visible])
|
||
|
||
// 将平铺的goodsSpecs转换为按规格分组的格式
|
||
const specGroups = useMemo<SpecGroup[]>(() => {
|
||
if (!product?.goodsSpecs?.length) return []
|
||
|
||
const groupMap = new Map<number, SpecGroup>()
|
||
|
||
product.goodsSpecs.forEach((spec: ShopGoodsSpec, idx: number) => {
|
||
if (!groupMap.has(spec.specId!)) {
|
||
groupMap.set(spec.specId!, {
|
||
specId: spec.specId!,
|
||
specName: spec.specName || `规格${groupMap.size + 1}`,
|
||
values: []
|
||
})
|
||
}
|
||
groupMap.get(spec.specId!)!.values.push({
|
||
specValueId: spec.id || idx, // 优先使用规格值ID，否则用索引
|
||
specValue: parseSpecValue(spec.specValue)
|
||
})
|
||
})
|
||
|
||
return Array.from(groupMap.values())
|
||
}, [product?.goodsSpecs])
|
||
|
||
// 当弹窗重新打开时，重置状态
|
||
useEffect(() => {
|
||
if (visible) {
|
||
setSelectedSpecs({})
|
||
setSelectedSku(null)
|
||
setQuantity(1)
|
||
}
|
||
}, [visible])
|
||
|
||
// 根据已选规格查找匹配的 SKU
|
||
useEffect(() => {
|
||
if (!product?.goodsSkus?.length) {
|
||
// 单规格商品，使用商品本身的价格
|
||
setSelectedSku(null)
|
||
return
|
||
}
|
||
|
||
const specValues = Object.values(selectedSpecs)
|
||
const specCount = specGroups.length
|
||
|
||
if (specValues.length < specCount) {
|
||
setSelectedSku(null)
|
||
return
|
||
}
|
||
|
||
// 根据选中的 specValueId 找到对应的中文值，拼接后排序匹配
|
||
const selectedValues: string[] = []
|
||
specGroups.forEach(group => {
|
||
const valueId = selectedSpecs[group.specId]
|
||
if (valueId !== undefined) {
|
||
const value = group.values.find(v => v.specValueId === valueId)
|
||
if (value) selectedValues.push(value.specValue)
|
||
}
|
||
})
|
||
const selectedStr = selectedValues.sort().join('|')
|
||
|
||
const matched = product.goodsSkus.find(sku => {
|
||
const skuValue = sku.sku || ''
|
||
const skuParts = skuValue.split('|').map(s => parseSpecValue(s.trim()))
|
||
const skuStr = skuParts.sort().join('|')
|
||
return skuStr === selectedStr
|
||
})
|
||
|
||
setSelectedSku(matched || null)
|
||
}, [selectedSpecs, product, specGroups])
|
||
|
||
const handleSpecClick = (specId: number, valueId: number) => {
|
||
setSelectedSpecs(prev => {
|
||
const next = { ...prev }
|
||
if (next[specId] === valueId) {
|
||
delete next[specId]
|
||
} else {
|
||
next[specId] = valueId
|
||
}
|
||
return next
|
||
})
|
||
setQuantity(1)
|
||
}
|
||
|
||
const handleClose = () => {
|
||
setSlideUp(false)
|
||
setTimeout(() => {
|
||
setShowOverlay(false)
|
||
onClose()
|
||
}, 300)
|
||
}
|
||
|
||
const handleConfirm = () => {
|
||
try {
|
||
// 单规格商品（无SKU列表 或 SKU列表为空数组）
|
||
if ((!product?.goodsSkus || product.goodsSkus.length === 0) && product) {
|
||
// VIP 会员使用 dealerPrice 作为结算价
|
||
const vipPrice = isVip && product.dealerPrice ? product.dealerPrice : undefined
|
||
const fakeSku: ShopGoodsSku = {
|
||
id: 0,
|
||
goodsId: product.goodsId!,
|
||
// price 字段是到手价（主价格），salePrice 是划掉的"市场价"
|
||
price: vipPrice || product.price,
|
||
salePrice: product.salePrice,
|
||
stock: product.stock,
|
||
image: product.image,
|
||
}
|
||
handleClose()
|
||
onConfirm(fakeSku, quantity)
|
||
return
|
||
}
|
||
|
||
// 多规格商品 - 必须已选择 SKU
|
||
if (selectedSku) {
|
||
handleClose()
|
||
onConfirm(selectedSku, quantity)
|
||
return
|
||
}
|
||
|
||
// 有规格但未选择完整
|
||
if (specGroups.length > 0) {
|
||
Taro.showToast({ title: '请选择完整的规格', icon: 'none' })
|
||
return
|
||
}
|
||
|
||
// 其他情况
|
||
Taro.showToast({ title: '无法添加商品', icon: 'none' })
|
||
} catch (err) {
|
||
Taro.showToast({ title: '操作失败', icon: 'none' })
|
||
}
|
||
}
|
||
|
||
// 价格字段约定：
|
||
// - product.salePrice / sku.salePrice : 划掉的"市场价"
|
||
// - product.price / sku.price : 实际"到手价"（详情页主价格）
|
||
// - product.dealerPrice : VIP 会员专享价
|
||
// VIP 会员优先使用 dealerPrice
|
||
const vipPrice = isVip ? (product?.dealerPrice || selectedSku?.price) : null
|
||
const currentPrice = vipPrice || selectedSku?.price || product?.price || selectedSku?.salePrice || product?.salePrice || '0'
|
||
const currentStock = selectedSku?.stock ?? product?.stock ?? 0
|
||
const currentImage = selectedSku?.image || product?.image || (product?.files?.split(',')[0]) || ''
|
||
|
||
// 单规格商品可以确认，或者多规格商品已选择了 SKU
|
||
const canConfirm = (!product?.goodsSkus || product.goodsSkus.length === 0) || selectedSku !== null
|
||
|
||
// 获取未选择完整的规格提示
|
||
const getUnselectedSpec = () => {
|
||
if (specGroups.length === 0) return null
|
||
const unselected = specGroups.find(
|
||
spec => !selectedSpecs[spec.specId]
|
||
)
|
||
return unselected?.specName
|
||
}
|
||
|
||
// 获取选中的规格文字描述
|
||
const getSelectedText = () => {
|
||
const selected: string[] = []
|
||
specGroups.forEach(group => {
|
||
const valueId = selectedSpecs[group.specId]
|
||
if (valueId !== undefined) {
|
||
const value = group.values.find(v => v.specValueId === valueId)
|
||
if (value) selected.push(value.specValue)
|
||
}
|
||
})
|
||
return selected.length > 0 ? selected.join(', ') : '默认'
|
||
}
|
||
|
||
// 如果不需要显示，直接返回null
|
||
if (!showOverlay) return null
|
||
|
||
return (
|
||
<View className='sku-selector-overlay'>
|
||
{/* 遮罩层 */}
|
||
<View
|
||
className={`absolute inset-0 bg-black/50 ${slideUp ? 'opacity-100' : 'opacity-0'}`}
|
||
style={{ zIndex: 110 }}
|
||
onClick={handleClose}
|
||
/>
|
||
|
||
{/* 弹窗内容 */}
|
||
<View
|
||
className={`absolute bottom-0 left-0 right-0 bg-white rounded-t-2xl ${slideUp ? '' : 'hidden'}`}
|
||
style={{ maxHeight: '70vh', zIndex: 110, paddingBottom: 'env(safe-area-inset-bottom)' }}
|
||
>
|
||
<View className='p-4'>
|
||
{/* 关闭按钮 */}
|
||
<View className='flex justify-end mb-2'>
|
||
<View
|
||
className='w-6 h-6 rounded-full bg-gray-100 flex items-center justify-center'
|
||
onClick={handleClose}
|
||
>
|
||
<Text className='text-gray-400 text-sm'>×</Text>
|
||
</View>
|
||
</View>
|
||
|
||
{/* 商品信息 */}
|
||
<View className='flex gap-3 pb-4 border-b border-gray-100'>
|
||
<Image className='w-20 h-20 rounded-md bg-gray-100' src={getCompressedImageUrl(currentImage)} mode='aspectFill' />
|
||
<View className='flex-1'>
|
||
<Price price={currentPrice} size='large' />
|
||
<Text className='text-xs text-gray-500 block' style={{ marginTop: '4px' }}>库存: {currentStock}</Text>
|
||
<Text className='text-xs text-gray-400 block' style={{ marginTop: '2px' }}>
|
||
已选: {getSelectedText()}
|
||
</Text>
|
||
</View>
|
||
</View>
|
||
|
||
{/* 规格选择 */}
|
||
<ScrollView scrollY style={{ maxHeight: '40vh' }}>
|
||
{specGroups.map((group) => (
|
||
<View key={group.specId} className='py-3 border-b border-gray-50'>
|
||
<Text className='text-sm font-medium text-gray-700 block' style={{ marginBottom: '8px' }}>
|
||
{group.specName}
|
||
</Text>
|
||
<View className='flex flex-wrap' style={{ gap: '8px' }}>
|
||
{group.values.map((value) => {
|
||
const isActive = selectedSpecs[group.specId] === value.specValueId
|
||
return (
|
||
<View
|
||
key={value.specValueId}
|
||
className={`px-3 py-1 rounded-full text-sm ${
|
||
isActive
|
||
? 'bg-green-50 text-green-600 border border-green-500'
|
||
: 'bg-gray-50 text-gray-600 border border-gray-200'
|
||
}`}
|
||
onClick={() => handleSpecClick(group.specId, value.specValueId)}
|
||
>
|
||
<Text className={isActive ? 'text-green-600' : 'text-gray-600'}>{value.specValue}</Text>
|
||
</View>
|
||
)
|
||
})}
|
||
</View>
|
||
</View>
|
||
))}
|
||
|
||
{/* 无规格时显示提示 */}
|
||
{specGroups.length === 0 && product?.goodsSkus?.length === 0 && (
|
||
<View className='py-4 text-center'>
|
||
<Text className='text-sm text-gray-400'>单规格商品</Text>
|
||
</View>
|
||
)}
|
||
</ScrollView>
|
||
|
||
{/* 数量 */}
|
||
<View className='py-3 flex items-center justify-between'>
|
||
<Text className='text-sm text-gray-700'>数量</Text>
|
||
<View className='flex items-center' style={{ gap: '12px' }}>
|
||
<View
|
||
className={`w-7 h-7 rounded-full border flex items-center justify-center ${
|
||
quantity <= 1 ? 'border-gray-200 text-gray-300' : 'border-gray-300 text-gray-500'
|
||
}`}
|
||
onClick={() => quantity > 1 && setQuantity(prev => prev - 1)}
|
||
>
|
||
<Text className={quantity <= 1 ? 'text-gray-300' : 'text-gray-500'}>-</Text>
|
||
</View>
|
||
<Text className='text-sm font-medium w-8 text-center'>{quantity}</Text>
|
||
<View
|
||
className={`w-7 h-7 rounded-full border flex items-center justify-center ${
|
||
quantity >= currentStock ? 'border-gray-200 text-gray-300' : 'border-gray-300 text-gray-500'
|
||
}`}
|
||
onClick={() => quantity < currentStock && setQuantity(prev => prev + 1)}
|
||
>
|
||
<Text className={quantity >= currentStock ? 'text-gray-300' : 'text-gray-500'}>+</Text>
|
||
</View>
|
||
</View>
|
||
</View>
|
||
|
||
{/* 确认按钮 */}
|
||
<View className='pt-3'>
|
||
<View
|
||
className={`w-full py-3 rounded-full text-center text-sm font-medium ${
|
||
canConfirm ? 'text-white' : 'text-white/60'
|
||
}`}
|
||
style={{
|
||
backgroundColor: canConfirm ? '#0e932e' : '#ccc',
|
||
opacity: canConfirm ? 1 : 0.7
|
||
}}
|
||
onClick={canConfirm ? handleConfirm : undefined}
|
||
>
|
||
<Text className={canConfirm ? 'text-white' : 'text-white/60'}>
|
||
{getUnselectedSpec() ? `请选择${getUnselectedSpec()}` : (mode === 'cart' ? '加入购物车' : '立即购买')}
|
||
</Text>
|
||
</View>
|
||
</View>
|
||
</View>
|
||
</View>
|
||
</View>
|
||
)
|
||
}
|
||
|
||
export default SkuSelector
|