|
|
@@ -402,9 +402,10 @@ const loadPetAndCustomer = async (order) => {
|
|
|
try {
|
|
|
const res = await getPet(petId)
|
|
|
const pet = res?.data
|
|
|
+ console.log('Web商户端 - 宠物详情:', pet)
|
|
|
if (pet) {
|
|
|
next.petName = pet.name ?? next.petName
|
|
|
- next.petAvatar = pet.avatarUrl ?? next.petAvatar
|
|
|
+ next.petAvatar = pet.avatarUrl || pet.avatar || next.petAvatar
|
|
|
next.petGender = pet.gender ?? next.petGender
|
|
|
next.petAge = (pet.age !== undefined && pet.age !== null) ? `${pet.age}岁` : next.petAge
|
|
|
next.petWeight = (pet.weight !== undefined && pet.weight !== null) ? `${pet.weight}kg` : next.petWeight
|
|
|
@@ -413,7 +414,7 @@ const loadPetAndCustomer = async (order) => {
|
|
|
? (Number(pet.isSterilized) === 1)
|
|
|
: next.petSterilized
|
|
|
next.petVaccine = pet.vaccineStatus ?? next.petVaccine
|
|
|
- next.petCharacter = pet.personality ?? next.petCharacter
|
|
|
+ next.petCharacter = (pet.cutePersonality || pet.personality) ?? next.petCharacter
|
|
|
next.petHealth = pet.healthStatus ?? next.petHealth
|
|
|
}
|
|
|
} catch {
|
|
|
@@ -425,9 +426,10 @@ const loadPetAndCustomer = async (order) => {
|
|
|
try {
|
|
|
const res = await getCustomer(customerId)
|
|
|
const customer = res?.data
|
|
|
+ console.log('Web商户端 - 客户详情:', customer)
|
|
|
if (customer) {
|
|
|
next.userName = customer.name ?? next.userName
|
|
|
- next.userAvatar = customer.avatarUrl ?? next.userAvatar
|
|
|
+ next.userAvatar = customer.avatarUrl || customer.avatar || next.userAvatar
|
|
|
next.contactPhone = customer.phone ?? next.contactPhone
|
|
|
next.city = customer.areaName ?? next.city
|
|
|
next.address = customer.address ?? next.address
|
|
|
@@ -441,8 +443,9 @@ const loadPetAndCustomer = async (order) => {
|
|
|
try {
|
|
|
const res = await getFulfillerDetail(fulfillerId)
|
|
|
const fulfillerData = res?.data?.data || res?.data
|
|
|
+ console.log('Web商户端 - 履约者详情:', fulfillerData)
|
|
|
if (fulfillerData) {
|
|
|
- next.fulfillerAvatar = fulfillerData.avatarUrl ?? next.fulfillerAvatar
|
|
|
+ next.fulfillerAvatar = fulfillerData.avatarUrl || fulfillerData.avatar || next.fulfillerAvatar
|
|
|
next.fulfillerPhone = fulfillerData.phone ?? next.fulfillerPhone
|
|
|
next.fulfillerStation = fulfillerData.stationName ?? next.fulfillerStation
|
|
|
next.fulfillerName = fulfillerData.name ?? next.fulfillerName
|