diff --git a/pages/synthesis/feePay.vue b/pages/synthesis/feePay.vue
index a47f79f..3f0aea7 100644
--- a/pages/synthesis/feePay.vue
+++ b/pages/synthesis/feePay.vue
@@ -138,7 +138,11 @@
 			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: {
 			// 选择支付方式