@@ -515,11 +515,7 @@
refundMoney(){
console.log('退款');
uni.navigateTo({
-<<<<<<< HEAD
url:'../refundMoney/refundMoney?sheetId='+this.id +'&maxMoney=' + this.orderData.PayMoney
-=======
- url:'../refundMoney/refundMoney?id='+this.id
->>>>>>> 22e6aaaee76a8b173ef79e423f41fb1bcfbd9808
})
},
orderPay() {
