1

Merge branch 'master' of http://8.140.253.224:3000/root/school-manage
# Conflicts: # src/views/app/business/luckey/luckey.vue
1 changed files with 2 additions and 2 deletions
--- a/src/views/sys/order-manage/logisticsAddress.vue
+++ b/src/views/sys/order-manage/logisticsAddress.vue
@ -251,8 +251,8 @@
 			},
 			returnOrder(){
 				returnOrder({
-					orderId:orderData.id,
-					userId:orderData.userId
+					orderId:this.orderData.id,
+					userId:this.orderData.userId
 				}).then((res) => {
 					this.loading = false;
 					if (res.success) {
Author	SHA1	Message	Date
tianyi	56f75606e0	1	5 days ago
tianyi	3153801c79	Merge branch 'master' of http://8.140.253.224:3000/root/school-manage # Conflicts: # src/views/app/business/luckey/luckey.vue	5 days ago
tianyi	7d9a0e2e85	1	5 days ago