From ad19d1764460c04da69483f4f779f3cd130d7497 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Wed, 12 Jul 2023 14:05:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/index.js              | 4 ++--
 pages/empower/buy.vue      | 3 +--
 pages/pay/pay.vue          | 2 +-
 pages/synthesis/feePay.vue | 6 +++---
 router/index.js            | 4 ++--
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/apis/index.js b/apis/index.js
index 1912f23..fa7c693 100644
--- a/apis/index.js
+++ b/apis/index.js
@@ -9,8 +9,8 @@ import { router } from '@/router/index.js'
 
 // 基础配置
 const config = {
-    apiUrl    : 'https://api.douhuotest.douhuofalv.com/api/', // 测试环境
-	// apiUrl    : 'https://douhuo.douhuofalv.com/api/',  // 正式环境
+    // apiUrl    : 'https://api.douhuotest.douhuofalv.com/api/', // 测试环境
+	apiUrl    : 'https://douhuo.douhuofalv.com/api/',  // 正式环境
 	timeout	: 60000
 }
 
diff --git a/pages/empower/buy.vue b/pages/empower/buy.vue
index 2bf737e..139036b 100644
--- a/pages/empower/buy.vue
+++ b/pages/empower/buy.vue
@@ -116,8 +116,7 @@
 						params: {
 							orderId		: order_id,
 							orderType	: order_type,
-							price		: this.allPrice
-						}
+						},
 					})
 				}).catch(err => {
 					uni.showToast({
diff --git a/pages/pay/pay.vue b/pages/pay/pay.vue
index be2cee0..a294b60 100644
--- a/pages/pay/pay.vue
+++ b/pages/pay/pay.vue
@@ -39,7 +39,7 @@
 			<!-- web.douhuotest.douhuofalv dev=0是线上  dev=1是线下 -->
 			<wx-open-launch-weapp
 				username="gh_918c81628d6f"
-				:path="'pages/pay/pay?type=h5&dev=1&trade_id=' + tradeId + '&token=' + token"
+				:path="'pages/pay/pay?type=h5&dev=0&trade_id=' + tradeId + '&token=' + token"
 			>
 				<script type="text/wxtag-template">
 					<style>
diff --git a/pages/synthesis/feePay.vue b/pages/synthesis/feePay.vue
index 37c55b1..ed90169 100644
--- a/pages/synthesis/feePay.vue
+++ b/pages/synthesis/feePay.vue
@@ -61,7 +61,7 @@
 			<!-- web.douhuotest.douhuofalv dev=0是线上  dev=1是线下 -->
 			<wx-open-launch-weapp
 				username="gh_918c81628d6f"
-				:path="'pages/pay/pay?type=h5&dev=1&trade_id=' + tradeId + '&token=' + token"
+				:path="'pages/pay/pay?type=h5&dev=0&trade_id=' + tradeId + '&token=' + token"
 			>
 				<script type="text/wxtag-template">
 					<style>
@@ -349,8 +349,8 @@
 				
 				// 获取微信授权信息-获取oppid
 				authFollow({
-					// url: 'https://web.douhuofalv.com/webWechat/index?id=' + this.$Route.query.id + '&style=' + this.$Route.query.style + '&price=' + this.$Route.query.price
-					url: 'https://web.douhuotest.douhuofalv.com/webWechat/index?id=' + this.orderId + '&style=' + this.$Route.query.style + '&price=' + this.$Route.query.price
+					url: 'https://web.douhuofalv.com/webWechat/index?id=' + this.$Route.query.id + '&style=' + this.$Route.query.style + '&price=' + this.$Route.query.price
+					// url: 'https://web.douhuotest.douhuofalv.com/webWechat/index?id=' + this.orderId + '&style=' + this.$Route.query.style + '&price=' + this.$Route.query.price
 				}).then(res => {
 				    window.location.href = res
 				}).catch(err => {
diff --git a/router/index.js b/router/index.js
index 714ff38..a63fd1b 100644
--- a/router/index.js
+++ b/router/index.js
@@ -32,8 +32,8 @@ router.beforeEach((to, from, next) => {
 	// 检查用户是否授权了微信
 	if(to.name != 'webWechatIndex' && openId === ''){
 		authFollow({
-			url: 'https://web.douhuotest.douhuofalv.com/webWechat/index'
-			// url: 'https://web.douhuofalv.com/webWechat/index'
+			// url: 'https://web.douhuotest.douhuofalv.com/webWechat/index'
+			url: 'https://web.douhuofalv.com/webWechat/index'
 		}).then(res => {
 			window.location.href = res
 		}).catch(err => {