fix:修复bug

This commit is contained in:
2026-03-17 12:03:54 +08:00
parent 5d7b973ddd
commit 60df817de5
32 changed files with 654 additions and 528 deletions
+31 -14
View File
@@ -30,8 +30,9 @@ const userStore = useUserStore();
// 送达偏好
const visitMethodRef = ref();
// value 与 visit-method 组件保持一致:0-亲自送达 1-放门口
const visitMethod = ref({
value: 2,
value: 1,
label: t("components.visit.putItAtTheDoor"),
});
function chooseVisitMethod() {
@@ -633,15 +634,14 @@ function getAddressList() {
let data = addressesList.value[0]
// 回显用户地址中的送达偏好
// 回显送达偏好
if(+data.deliveryRemark === 1) {
// 回显送达偏好deliveryType: 1-亲自送达 2-放门口)
if(+data.deliveryType === 1) {
visitMethod.value.label = t('components.visit.leaveItToMePersonally')
visitMethod.value.value = 1
visitMethod.value.value = 0
}
if(+data.deliveryRemark === 2) {
if(+data.deliveryType === 2) {
visitMethod.value.label = t('components.visit.putItAtTheDoor')
visitMethod.value.value = 2
visitMethod.value.value = 1
}
// 如果是批量模式,地址加载完成后重新计算价格
@@ -664,12 +664,14 @@ function chooseAddress() {
// 将新选择的地址id存储到selectedAddressId中
selectedAddressId.value = data.data
// 回显送达偏好
// 回显送达偏好deliveryType: 1-亲自送达 2-放门口)
if(+data.deliveryType === 1) {
visitMethod.value.label = t('components.visit.leaveItToMePersonally')
visitMethod.value.value = 0
}
if(+data.deliveryType === 2) {
visitMethod.value.label = t('components.visit.putItAtTheDoor')
visitMethod.value.value = 1
}
// 重新计算价格
@@ -895,9 +897,16 @@ function appMerchantOrderPayOrder() {
})
setTimeout(()=> {
uni.navigateBack({
delta: 2,
})
// 支付成功后跳转到当前订单详情页
if (resOrderId.value) {
uni.reLaunch({
url: `/pages-store/pages/order/index?id=${resOrderId.value}`
})
} else {
uni.navigateBack({
delta: 2,
})
}
}, 500)
})
}
@@ -920,9 +929,17 @@ function appMerchantOrderPayOrderBatch() {
})
setTimeout(()=> {
uni.navigateBack({
delta: 2,
})
// 批量支付后,优先跳转到第一笔订单详情;若无订单ID则返回
const firstOrderId = resOrderIds.value && resOrderIds.value.length > 0 ? resOrderIds.value[0] : ''
if (firstOrderId) {
uni.redirectTo({
url: `/pages-store/pages/order/index?id=${firstOrderId}`
})
} else {
uni.navigateBack({
delta: 2,
})
}
}, 500)
}).catch(err => {
console.error('批量支付失败', err)