From 93fb92937eefc2fbcc677ee6ed17fc54dce194dd Mon Sep 17 00:00:00 2001
From: zhangjing <zhangjing@uztech.com>
Date: Fri, 26 May 2023 11:50:10 +0800
Subject: [PATCH] ..

---
 pages/synthesis/feePay.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pages/synthesis/feePay.vue b/pages/synthesis/feePay.vue
index 3f0aea7..46672c6 100644
--- 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: {
 			// 选择支付方式