|
|
@@ -1,6 +1,6 @@
|
|
|
import { View, ScrollView, Text, Textarea } from '@tarojs/components'
|
|
|
import { useQuery, useMutation, useQueries } from '@tanstack/react-query'
|
|
|
-import React, { useState, useEffect } from 'react'
|
|
|
+import { useState, useEffect } from 'react'
|
|
|
import Taro from '@tarojs/taro'
|
|
|
import { deliveryAddressClient, orderClient, goodsClient } from '@/api'
|
|
|
import { InferResponseType, InferRequestType } from 'hono'
|
|
|
@@ -29,8 +29,7 @@ export default function OrderSubmitPage() {
|
|
|
const [selectedAddress, setSelectedAddress] = useState<Address | null>(null)
|
|
|
const [orderItems, setOrderItems] = useState<CheckoutItem[]>([])
|
|
|
const [totalAmount, setTotalAmount] = useState(0)
|
|
|
- const [remark, setRemark] = useState("")
|
|
|
- const [isUserSelected, setIsUserSelected] = useState(false)
|
|
|
+ const [remark, setRemark] = useState("")
|
|
|
|
|
|
// 获取地址列表
|
|
|
const { data: addresses } = useQuery({
|
|
|
@@ -71,13 +70,14 @@ export default function OrderSubmitPage() {
|
|
|
})
|
|
|
|
|
|
// 创建商品ID到最新商品信息的映射
|
|
|
- const goodsMap = new Map()
|
|
|
- goodsQueries.forEach((query, index) => {
|
|
|
- if (query.data && orderItems[index]) {
|
|
|
- const itemId = orderItems[index].id
|
|
|
- goodsMap.set(itemId, query.data)
|
|
|
- }
|
|
|
- })
|
|
|
+ const goodsMap = new Map<number, any>()
|
|
|
+ if (orderItems.length > 0) {
|
|
|
+ goodsQueries.forEach((query: any) => {
|
|
|
+ if (query.data) {
|
|
|
+ goodsMap.set(query.data.id, query.data)
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
|
|
|
// 创建订单
|
|
|
const createOrderMutation = useMutation({
|