From 110ecd547bcf59ee5f18b22a2bdf52a5379d7469 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Fri, 10 Jun 2022 18:15:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=AB=8B=E5=8D=B3?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=8A=A5=E8=AE=A2=E5=8D=95=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/BsPay.vue         | 36 ++++++++++++++++++++++--------------
 pages/order/submit/index.vue |  4 ++--
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/components/BsPay.vue b/components/BsPay.vue
index 790b00a..b8fc4b2 100644
--- a/components/BsPay.vue
+++ b/components/BsPay.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-08 00:39:50
  * @LastEditors: ch
- * @LastEditTime: 2022-05-12 11:44:04
+ * @LastEditTime: 2022-06-10 18:12:14
  * @Description: file content
 -->
 <template>
@@ -11,7 +11,7 @@
 		<div class="pay">
 			<span class="pay--timer">{{timerTxt}}</span>
 			<UiMoney class="money" sufSize="14px" preSize="14px" size="20px" 
-				float suffix prefix :money="orderInfo.payAmount"/>
+				float suffix prefix :money="orderDetail.payAmount"/>
 			<div class="pay--code">
 				<img :src="imgUrl" v-if="imgUrl"/>
 				<!-- <p v-if="!timer">已超时，请重新下单</p> -->
@@ -34,11 +34,15 @@ export default {
 		orderId : {
 			type : Number | String,
 			default : ''
+		},
+		orderInfo:{
+			type : Object,
+			default : () => ({})
 		}
 	},
 	data(){
 		return {
-			orderInfo: {},
+			orderDetail: {},
 			imgUrl : '',
 			timerTxt : '',
 			startSecondNum : 0,
@@ -57,20 +61,24 @@ export default {
 	},
 	methods : {
 		open(){
-			this.getOrderInfo();
+			this.getOrderDetail();
 			this.getCodeImg();
 		},
 		/**
 		 * 获取订单最新信息
 		 */
-		async getOrderInfo(){
-			const {error, result} = await ApiGetOrderDetail(this.orderId);
-			if(error){
-				this.$message.warning(error.message);
-				return false;
+		async getOrderDetail(){
+			if(this.orderInfo.orderId){
+				this.orderDetail = this.orderInfo;
+			}else{
+				const {error, result} = await ApiGetOrderDetail(this.orderId);
+				if(error){
+					this.$message.warning(error.message);
+					return false;
+				}
+				this.orderDetail = result;
 			}
-			this.orderInfo = result;
-			if(this.orderInfo.orderStatus === 1){
+			if(this.orderDetail.orderStatus === 1 || !this.orderDetail.orderStatus){
 				// 待支付 开始倒计时
 				if(this.timerStop){
 					clearInterval(this.timerStop);
@@ -81,7 +89,7 @@ export default {
 			}
 		},
 		async getCodeImg(){
-			const {error, result} = await ApiPostPayCdoeImg({orderId : this.orderId});
+			const {error, result} = await ApiPostPayCdoeImg({orderId : this.orderId || this.orderInfo.orderId});
 			if(error){
 				return false;
 			}
@@ -92,8 +100,8 @@ export default {
 		 * 计算倒计时开始秒数
 		 */
 		calcTimerStartSecondNum(){
-			let expireTime = (new Date(this.orderInfo.expireTime.replace(/-/g,'/'))).getTime(),
-				curTime = (new Date(this.orderInfo.serverTime.replace(/-/g,'/'))).getTime(),
+			let expireTime = (new Date(this.orderDetail.expireTime.replace(/-/g,'/'))).getTime(),
+				curTime = (new Date(this.orderDetail.serverTime.replace(/-/g,'/'))).getTime(),
 				second = Math.floor((expireTime - curTime) / 1000);
 			this.startSecondNum = second > 0 ? second : 0;
 			this.timerStop = setInterval(()=> {
diff --git a/pages/order/submit/index.vue b/pages/order/submit/index.vue
index 65332df..5b3b43d 100644
--- a/pages/order/submit/index.vue
+++ b/pages/order/submit/index.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-04 17:30:58
  * @LastEditors: ch
- * @LastEditTime: 2022-05-27 19:54:39
+ * @LastEditTime: 2022-06-10 18:05:11
  * @Description: file content
 -->
 
@@ -24,7 +24,7 @@
 		<div class="pay">
 			<UiButton radius type="red_panel" @click="submit">立即支付</UiButton>
 		</div>
-		<BsPay :visible.sync="payVisible" :orderId="payOrder.orderId"
+		<BsPay :visible.sync="payVisible" :orderInfo="payOrder"
 			@cancel="cancelPay" @finish="finishPay" />
 	</div>
 </template>