|
|
@@ -97,41 +97,41 @@ export default function OrderSubmitPage() {
|
|
|
})
|
|
|
|
|
|
// 页面显示时检查是否有新选择的地址
|
|
|
- useEffect(() => {
|
|
|
- const handlePageShow = () => {
|
|
|
- console.log('pageShow 事件触发')
|
|
|
- const storedAddress = Taro.getStorageSync('selectedAddressData')
|
|
|
- console.log("get selectedAddressData:", storedAddress);
|
|
|
- if (storedAddress) {
|
|
|
- setSelectedAddress(storedAddress)
|
|
|
- setIsUserSelected(true) // 标记为用户手动选择
|
|
|
- Taro.removeStorageSync('selectedAddressData')
|
|
|
- console.log("selectedAddress00:", storedAddress)
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- // 监听页面显示事件
|
|
|
- Taro.eventCenter.on('pageShow', handlePageShow)
|
|
|
-
|
|
|
- // 组件挂载时也检查一次存储
|
|
|
- const initialAddress = Taro.getStorageSync('selectedAddressData')
|
|
|
- if (initialAddress) {
|
|
|
- setSelectedAddress(initialAddress)
|
|
|
- setIsUserSelected(true) // 标记为用户手动选择
|
|
|
- Taro.removeStorageSync('selectedAddressData')
|
|
|
- }
|
|
|
-
|
|
|
- return () => {
|
|
|
- Taro.eventCenter.off('pageShow', handlePageShow)
|
|
|
- }
|
|
|
- }, [])
|
|
|
+ // useEffect(() => {
|
|
|
+ // const handlePageShow = () => {
|
|
|
+ // console.log('pageShow 事件触发')
|
|
|
+ // const storedAddress = Taro.getStorageSync('selectedAddressData')
|
|
|
+ // console.log("get selectedAddressData:", storedAddress);
|
|
|
+ // if (storedAddress) {
|
|
|
+ // setSelectedAddress(storedAddress)
|
|
|
+ // setIsUserSelected(true) // 标记为用户手动选择
|
|
|
+ // Taro.removeStorageSync('selectedAddressData')
|
|
|
+ // console.log("selectedAddress00:", storedAddress)
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+
|
|
|
+ // // 监听页面显示事件
|
|
|
+ // Taro.eventCenter.on('pageShow', handlePageShow)
|
|
|
+
|
|
|
+ // // 组件挂载时也检查一次存储
|
|
|
+ // const initialAddress = Taro.getStorageSync('selectedAddressData')
|
|
|
+ // if (initialAddress) {
|
|
|
+ // setSelectedAddress(initialAddress)
|
|
|
+ // setIsUserSelected(true) // 标记为用户手动选择
|
|
|
+ // Taro.removeStorageSync('selectedAddressData')
|
|
|
+ // }
|
|
|
+
|
|
|
+ // return () => {
|
|
|
+ // Taro.eventCenter.off('pageShow', handlePageShow)
|
|
|
+ // }
|
|
|
+ // }, [])
|
|
|
|
|
|
// 页面加载时获取订单数据 - 只执行一次
|
|
|
useEffect(() => {
|
|
|
// 从立即购买获取数据
|
|
|
const buyNowData = Taro.getStorageSync('buyNow')
|
|
|
const checkoutData = Taro.getStorageSync('checkoutItems')
|
|
|
- const cartData = Taro.getStorageSync('mini_cart')
|
|
|
+ // const cartData = Taro.getStorageSync('mini_cart')
|
|
|
|
|
|
// console.log("buyNowData",buyNowData)
|
|
|
// console.log("checkoutItems",checkoutData)
|
|
|
@@ -156,18 +156,17 @@ export default function OrderSubmitPage() {
|
|
|
// 从购物车获取数据
|
|
|
setOrderItems(checkoutData.items)
|
|
|
setTotalAmount(checkoutData.totalAmount)
|
|
|
-
|
|
|
- }
|
|
|
- else if (cartData && cartData.items) {
|
|
|
- // 使用购物车数据
|
|
|
- const items = cartData.items
|
|
|
- const total = items.reduce((sum: number, item: CheckoutItem) =>
|
|
|
- sum + (item.price * item.quantity), 0)
|
|
|
- setOrderItems(items)
|
|
|
- setTotalAmount(total)
|
|
|
-
|
|
|
- // Taro.removeStorageSync('mini_cart')
|
|
|
- }
|
|
|
+ }
|
|
|
+ // else if (cartData && cartData.items) {
|
|
|
+ // // 使用购物车数据
|
|
|
+ // const items = cartData.items
|
|
|
+ // const total = items.reduce((sum: number, item: CheckoutItem) =>
|
|
|
+ // sum + (item.price * item.quantity), 0)
|
|
|
+ // setOrderItems(items)
|
|
|
+ // setTotalAmount(total)
|
|
|
+
|
|
|
+ // // Taro.removeStorageSync('mini_cart')
|
|
|
+ // }
|
|
|
else
|
|
|
{
|
|
|
// 如果没有立即购买数据,清空订单项
|
|
|
@@ -211,7 +210,7 @@ export default function OrderSubmitPage() {
|
|
|
createOrderMutation.mutate()
|
|
|
}
|
|
|
|
|
|
- console.log("渲染时 selectedAddress:", selectedAddress)
|
|
|
+ // console.log("渲染时 selectedAddress:", selectedAddress)
|
|
|
|
|
|
return (
|
|
|
<View className="order-sure">
|
|
|
@@ -221,7 +220,13 @@ export default function OrderSubmitPage() {
|
|
|
onClickLeft={() => Taro.navigateBack()}
|
|
|
/>
|
|
|
|
|
|
- <ScrollView className="h-screen pt-12">
|
|
|
+ <ScrollView
|
|
|
+ className="h-screen pt-12"
|
|
|
+ scrollY={true}
|
|
|
+ scrollWithAnimation={true}
|
|
|
+ enableFlex={true}
|
|
|
+ >
|
|
|
+ <View className="content-wrapper">
|
|
|
{/* 收货地址区域 */}
|
|
|
<View className="address-card">
|
|
|
{selectedAddress ? (
|
|
|
@@ -323,6 +328,7 @@ export default function OrderSubmitPage() {
|
|
|
</View>
|
|
|
|
|
|
|
|
|
+ </View>
|
|
|
</ScrollView>
|
|
|
|
|
|
{/* 底部提交栏 */}
|