..

2023-05-26 11:50:10 +08:00
parent 6e3c46ea37
commit 93fb92937e
1 changed files with 0 additions and 4 deletions
--- a/pages/synthesis/feePay.vue
+++ b/pages/synthesis/feePay.vue
@@ -138,11 +138,7 @@
 			this.token   = this.$store.getters.getToken
 			this.payPrice = this.$Route.query.price
 			this.payForm  = this.$Route.query.payForm
-<<<<<<< HEAD
-			this.orderId  = this.$Route.query.id ?this.$Route.query.id  : this.$Route.query.orderId
-=======
 			this.orderId  = this.$Route.query.id ?this.$Route.query.id: this.$Route.query.orderId
->>>>>>> b84a866a4e455f2f8d98cc3b564298c15253ed6d
 		},
 		methods: {
 			// 选择支付方式