Sfoglia il codice sorgente

fix(订单): 修复地址ID处理逻辑并优化退款跳转

处理地址ID时同时考虑id和addressId字段,确保地址选择功能正常
在退款申请成功后,根据返回数据正确跳转到退款详情页并缩短等待时间
ylong 1 settimana fa
parent
commit
15204292ad
2 ha cambiato i file con 20 aggiunte e 3 eliminazioni
  1. 15 1
      pages-car/pages/apply-refund.vue
  2. 5 2
      pages-car/pages/confirm-order.vue

+ 15 - 1
pages-car/pages/apply-refund.vue

@@ -286,10 +286,24 @@
 				api(params).then(res => {
 					uni.hideLoading();
 					if (res.code === 200) {
+						let refundOrderId = '';
+						if (this.isModify) {
+							refundOrderId = this.refundOrderId;
+						} else if (typeof res.data === 'string' || typeof res.data === 'number') {
+							refundOrderId = String(res.data);
+						} else if (res.data && typeof res.data === 'object') {
+							refundOrderId = res.data.refundOrderId || res.data.orderId || res.data.id || '';
+						}
 						this.$u.toast(this.isModify ? '修改成功' : '提交成功');
 						setTimeout(() => {
+							if (refundOrderId) {
+								uni.redirectTo({
+									url: `/pages-car/pages/refund-detail?refundOrderId=${refundOrderId}`
+								});
+								return;
+							}
 							uni.navigateBack();
-						}, 1500);
+						}, 800);
 					} else {
 						this.$u.toast(res.msg || (this.isModify ? '修改失败' : '提交失败'));
 					}

+ 5 - 2
pages-car/pages/confirm-order.vue

@@ -185,7 +185,7 @@
 
                 //拼接提交数据
                 this.submitData.cartIdList = preSubmitOrderData.cartIdList || [];
-                this.submitData.addressId = this.defaultAddr.id || "";
+                this.submitData.addressId = this.defaultAddr.id || this.defaultAddr.addressId || "";
             }
             if (options.cartIdList) {
                 // 从 URL 参数接收 cartIdList(再来一单场景)
@@ -204,8 +204,9 @@
         methods: {
             //添加或者选择地址
             handleAddress() {
+                const addrId = this.defaultAddr.id || this.defaultAddr.addressId || '';
                 uni.navigateTo({
-                    url: `/pages-mine/pages/address/list?id=${this.defaultAddr.id}&isSelect=1`,
+                    url: `/pages-mine/pages/address/list?id=${addrId}&isSelect=1`,
                 });
             },
 
@@ -251,6 +252,8 @@
                         this.books = res.data.orderDetailList || [];
                         if (res.data.defaultAddress) {
                             this.defaultAddr = res.data.defaultAddress;
+                            const addrId = this.defaultAddr.id || this.defaultAddr.addressId;
+                            this.submitData.addressId = addrId;
                         }
                     } else {
                         this.$u.toast(res.msg || '刷新失败');