From 8e3b894d105e0e3ebfcef9495f7d0883281b06bb Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Mon, 9 May 2022 21:41:43 +0800
Subject: [PATCH] pay

---
 components/BsPay.vue                                   | 8 ++++++--
 pages/account/index/order/detail/index.vue             | 4 ++--
 pages/account/index/order/detail/module/GoodsInfo.vue  | 3 +--
 pages/account/index/order/detail/module/StatusInfo.vue | 7 +++++--
 pages/order/submit/index.vue                           | 6 +++---
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/components/BsPay.vue b/components/BsPay.vue
index 090930f..44fcead 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-09 21:17:10
+ * @LastEditTime: 2022-05-09 21:37:07
  * @Description: file content
 -->
 <template>
@@ -16,7 +16,7 @@
 				<img :src="imgUrl" v-if="imgUrl"/>
 				<p v-if="!startSecondNum">已超时，请重新下单</p>
 			</div>
-			<p class="pay--tips">如支付后没有自动跳转，请点击 <span class="pay--finish">完成付款</span></p>
+			<p class="pay--tips">如支付后没有自动跳转，请点击 <span class="pay--finish" @click="finish">完成付款</span></p>
 		</div>
 	</el-dialog>
 </template>
@@ -87,6 +87,10 @@ export default {
 		},
 		close(){
 			this.$emit('cancel');
+		},
+		finish(){
+			this.myVisible = false;
+			this.$emit('finish')
 		}
 	}
 }
diff --git a/pages/account/index/order/detail/index.vue b/pages/account/index/order/detail/index.vue
index 213f690..7870766 100644
--- a/pages/account/index/order/detail/index.vue
+++ b/pages/account/index/order/detail/index.vue
@@ -2,14 +2,14 @@
  * @Author: ch
  * @Date: 2022-05-08 01:14:03
  * @LastEditors: ch
- * @LastEditTime: 2022-05-09 20:50:56
+ * @LastEditTime: 2022-05-09 21:39:31
  * @Description: file content
 -->
 <template>
 	<div>
 		<div class="box">
 			<StatusInfo :orderInfo="orderInfo" @cancel="getOrderInfo"
-				@receive="getOrderInfo"/>
+				@receive="getOrderInfo" @payFinish="getOrderInfo"/>
 			<StatusStep :orderInfo="orderInfo" />
 		</div>
 		<LogisitcsInfo :orderInfo="orderInfo" />
diff --git a/pages/account/index/order/detail/module/GoodsInfo.vue b/pages/account/index/order/detail/module/GoodsInfo.vue
index 6591f31..88b3e26 100644
--- a/pages/account/index/order/detail/module/GoodsInfo.vue
+++ b/pages/account/index/order/detail/module/GoodsInfo.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-09 16:24:49
  * @LastEditors: ch
- * @LastEditTime: 2022-05-09 21:26:52
+ * @LastEditTime: 2022-05-09 21:31:33
  * @Description: file content
 -->
 <template>
@@ -51,7 +51,6 @@
 				<p>
 					<label>运费</label>
 					<UiMoney :money="orderInfo.shippingAmount" float/>
-					
 				</p>
 				<p>
 					<label>
diff --git a/pages/account/index/order/detail/module/StatusInfo.vue b/pages/account/index/order/detail/module/StatusInfo.vue
index a80b002..4443fd6 100644
--- a/pages/account/index/order/detail/module/StatusInfo.vue
+++ b/pages/account/index/order/detail/module/StatusInfo.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-09 14:41:37
  * @LastEditors: ch
- * @LastEditTime: 2022-05-09 21:12:47
+ * @LastEditTime: 2022-05-09 21:38:57
  * @Description: file content
 -->
 <template>
@@ -20,7 +20,7 @@
 			</template>
 			</div>
 			<Cancel :visible.sync="cancelVisible" :orderId="orderInfo.orderId" @cancel="cancel"/>
-			<BsPay :visible.sync="payVisible" :orderId="orderInfo.orderId"/>
+			<BsPay :visible.sync="payVisible" :orderId="orderInfo.orderId" @finish="payFinish"/>
 		</div>
 </template>
 <script>
@@ -125,6 +125,9 @@ export default {
 		},
 		cancel(){
 			this.$emit('cancel')
+		},
+		payFinish(){
+			this.$emit('payFinish')
 		}
 	}
 	
diff --git a/pages/order/submit/index.vue b/pages/order/submit/index.vue
index 66bda4c..8b76385 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-09 14:33:52
+ * @LastEditTime: 2022-05-09 21:41:07
  * @Description: file content
 -->
 
@@ -20,7 +20,7 @@
 		<div class="pay">
 			<UiButton radius type="red_panel" @click="submit">立即支付</UiButton>
 		</div>
-		<BsPay :visible.sync="payVisible" :orderId="orderId" @cancel="cancelPay"/>
+		<BsPay :visible.sync="payVisible" :orderId="orderId" @cancel="finishPay" @finish="finishPay"/>
 	</div>
 </template>
 <script>
@@ -112,7 +112,7 @@ export default {
 			this.orderId = result.orderId;
 
 		},
-		cancelPay(){
+		finishPay(){
 			this.$router.replace(`/account/order/detail?id=${this.orderId}`)
 		}
 	}