From fd06e76e171ba33b2da7ca5e630e3f03605380d3 Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Thu, 26 Aug 2021 15:32:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/api.js                 |  4 ++--
 pages/order/confirm_order.vue |  1 +
 pages/order/order_details.vue | 22 ++++++++++++++++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/common/api.js b/common/api.js
index b4fb3cd..54fd627 100644
--- a/common/api.js
+++ b/common/api.js
@@ -1,8 +1,8 @@
 // appId: 正式 null | 测试 wxb35ef055a4dd8ad4
 export const DEV = "dev"; // dev 测试 | prod 正式
 export const VERSION = '1.0.0'; // 版本号
-// export const DEVURL = 'http://hainan.lanzulive.com'; // 测试服请求地址
-export const DEVURL = 'http://hainan.com'; // 测试服请求地址
+export const DEVURL = 'http://hainan.lanzulive.com'; // 测试服请求地址
+// export const DEVURL = 'http://hainan.com'; // 测试服请求地址
 export const PRODURL = ''; // 正式服请求地址
 
 
diff --git a/pages/order/confirm_order.vue b/pages/order/confirm_order.vue
index 755e97a..d23ee3a 100644
--- a/pages/order/confirm_order.vue
+++ b/pages/order/confirm_order.vue
@@ -130,6 +130,7 @@
 				this.getGoodsData(this.pay_type);
 			}
 			if(this.order_id && this.enter_type == 1) {
+				console.log('立即付款')
 				this.payOnce();
 			}
 		},
diff --git a/pages/order/order_details.vue b/pages/order/order_details.vue
index f345ce8..27bc4a9 100644
--- a/pages/order/order_details.vue
+++ b/pages/order/order_details.vue
@@ -104,6 +104,10 @@
 						<text class="lf-font-32 text-white">立即使用</text>
 					</button>
 					
+					<button class="btn bg-green" v-if="orderDetails.status == 0" @click="payAtonce()">
+						<text class="lf-font-32 text-white">立即付款</text>
+					</button>
+					
 					<button class="btn bg-blue" v-if="orderDetails.status == 16">
 						<text class="lf-font-32 text-white">已使用</text>
 					</button>
@@ -176,6 +180,24 @@
 				this.getOrderDetails()
 				this.$msg('刷新成功')
 			},
+			payAtonce() {
+				this.$http(this.API.API_ORDERPAY,{id: this.order_id}).then(res => {
+					uni.requestPayment({
+						orderInfo: res.data.order_num,
+						timeStamp: res.data.timeStamp,
+						nonceStr: res.data.nonceStr,
+						package: res.data.package,
+						signType: res.data.signType,
+						paySign: res.data.paySign,
+						success: (res) => {
+							this.$url('/pages/payState/paystate?ifSuccess=1&order_id='+this.order_id,{type: 'redirect'})
+						},
+						fail: (err) => {
+							this.$url('/pages/payState/paystate?ifSuccess=2&order_id='+this.order_id,{type: 'redirect'})
+						},
+					})
+				}).catch(err => {})
+			},
 			//二维码回调
 			qrR(data) {
 				this.base64Img = data;