From b8eae56db6393a23af5379a598a4950c0ceb93d4 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Tue, 10 May 2022 15:50:11 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?=E9=A1=B5=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/payResult.vue    | 22 +++++++++++++++++-----
 pages/order/submit/index.vue |  6 +++---
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/pages/order/payResult.vue b/pages/order/payResult.vue
index ca5562c..ed40fdd 100644
--- a/pages/order/payResult.vue
+++ b/pages/order/payResult.vue
@@ -2,15 +2,17 @@
  * @Author: ch
  * @Date: 2022-05-08 01:11:33
  * @LastEditors: ch
- * @LastEditTime: 2022-05-09 22:27:35
+ * @LastEditTime: 2022-05-10 15:48:51
  * @Description: file content
 -->
 <template>
-	<div class="c-white-main" style="padding-top:350px">
+	<div class="main">
 		<img class="icon" src="@/assets/img/order/pay_success.png" />
-		<p>交易成功</p>
+		<b>交易成功</b>
+		<p>您的包裹整装待发~</p>
 		<div>
 			<UiButton type="grey" @click="goHome" :radius="true">返回首页</UiButton>
+			<UiButton type="yellow_gradual" @click="goDetail" :radius="true">查看订单</UiButton>
 		</div>
 	</div>
 </template>
@@ -43,20 +45,30 @@ export default {
 		},
 		goHome(){
 			this.$router.replace('/');
+		},
+		goDetail(){
+			this.$router.replace(`/account/order/detail?id=${this.$route.query.id}`)
 		}
 	}
 }
 </script>
 <style lang="scss" scoped>
-.c-white-main{
+.main{
+	@include layout-box; 
 	text-align: center;
-	padding-bottom: 40px;
+	padding: 100px 0 40px;
 }
 .icon{
 	width: 239px;
 }
+b{
+	display: block;
+}
 p{
 	margin: 10px 0 25px 0;
 	color: #999;
 }
+button{
+	margin: 0 10px;
+}
 </style>
\ No newline at end of file
diff --git a/pages/order/submit/index.vue b/pages/order/submit/index.vue
index 111e9f3..c9aece6 100644
--- a/pages/order/submit/index.vue
+++ b/pages/order/submit/index.vue
@@ -2,17 +2,17 @@
  * @Author: ch
  * @Date: 2022-05-04 17:30:58
  * @LastEditors: ch
- * @LastEditTime: 2022-05-10 12:22:53
+ * @LastEditTime: 2022-05-10 15:49:36
  * @Description: file content
 -->
 
 <template>
 	<div class="main">
-		<h3 class="title">支付方式</h3>
+		<!-- <h3 class="title">支付方式</h3>
 		<div class="pay-type">
 			<el-radio label="微信支付" />
 			<el-radio label="支付宝支付" />
-		</div>
+		</div> -->
 		<h3 class="title">确认商品信息</h3>
 		<OrderInfo :products="orderInfo.products" />
 		<Message :orderInfo="orderInfo" :message.sync="userMessage"/>

From 21532de9b9d8f78eebc2ea92dabf1a5ae7d81ef7 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Tue, 10 May 2022 17:42:21 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/submit/index.vue | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pages/order/submit/index.vue b/pages/order/submit/index.vue
index c9aece6..2eee7ce 100644
--- a/pages/order/submit/index.vue
+++ b/pages/order/submit/index.vue
@@ -2,12 +2,14 @@
  * @Author: ch
  * @Date: 2022-05-04 17:30:58
  * @LastEditors: ch
- * @LastEditTime: 2022-05-10 15:49:36
+ * @LastEditTime: 2022-05-10 17:41:16
  * @Description: file content
 -->
 
 <template>
 	<div class="main">
+		<h3 class="title">收货地址</h3>
+		<BsAddress v-model="address"/>
 		<!-- <h3 class="title">支付方式</h3>
 		<div class="pay-type">
 			<el-radio label="微信支付" />
@@ -32,11 +34,12 @@ import OrderInfo from './module/OrderInfo.vue';
 import Message from './module/Message.vue';
 import Amount from './module/Amount.vue';
 import UiButton from '../../../components/UiButton.vue';
+import BsAddress from '../../../components/BsAddress.vue';
 export default {
-	components: { BsPay, UIGoodsInfo, OrderInfo, Message, Amount, UiButton },
+	components: { BsPay, UIGoodsInfo, OrderInfo, Message, Amount, UiButton, BsAddress },
 	data(){
 		return {
-			address : {id:3},
+			address : {},
 			orderInfo : {},
 			userMessage : '',
 			payOrder : {},
@@ -125,7 +128,7 @@ export default {
 		 */
 		calcTimerStartSecondNum(){
 			let expireTime = (new Date(this.payOrder.expireTime.replace(/-/g,'/'))).getTime(),
-				curTime = (new Date(this.payOrder.serverTime.replace(/-/g,'/'))).getTime(),
+				curTime = (this.payOrder.serverTime ? new Date(this.payOrder.serverTime.replace(/-/g,'/')) : new Date()).getTime(),
 				second = Math.floor((expireTime - curTime) / 1000);
 			this.payStartSecondNum = second > 0 ? second : 0;
 			this.timer();
@@ -155,7 +158,8 @@ export default {
 </script>
 <style lang="scss" scoped>
 .main{
-	@include layout-box
+	@include layout-box;
+	padding: 30px 0;
 }
 .title{
 	margin: 24px 0 13px;

From ccbfd52580e0770a5035071dbe895c66ce7e7abc Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Wed, 11 May 2022 19:26:51 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/components/BsPay.vue b/components/BsPay.vue
index f4120ac..5b94598 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-10 14:12:29
+ * @LastEditTime: 2022-05-10 18:06:34
  * @Description: file content
 -->
 <template>
@@ -11,10 +11,10 @@
 		<div class="pay">
 			<span class="pay--timer">{{timer}}</span>
 			<UiMoney class="money" sufSize="14px" preSize="14px" size="20px" 
-				float suffix prefix :money="39"/>
+				float suffix prefix :money="money"/>
 			<div class="pay--code">
 				<img :src="imgUrl" v-if="imgUrl"/>
-				<p v-if="!timer">已超时，请重新下单</p>
+				<!-- <p v-if="!timer">已超时，请重新下单</p> -->
 			</div>
 			<p class="pay--tips">如支付后没有自动跳转，请点击 <span class="pay--finish" @click="finish">完成付款</span></p>
 		</div>
diff --git a/pages/account/index/order/detail/module/StatusInfo.vue b/pages/account/index/order/detail/module/StatusInfo.vue
index 1ef4e18..0aebb13 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-10 11:38:35
+ * @LastEditTime: 2022-05-10 18:05:07
  * @Description: file content
 -->
 <template>
@@ -20,7 +20,8 @@
 			</template>
 			</div>
 			<Cancel :visible.sync="cancelVisible" :orderId="orderInfo.orderId" @cancel="cancel"/>
-			<BsPay :visible.sync="payVisible" :orderId="orderInfo.orderId" :timer="ctxCon.tips" @finish="payFinish"/>
+			<BsPay :visible.sync="payVisible" :orderId="orderInfo.orderId" 
+				:timer="ctxCon.tips" @finish="payFinish" :money="orderInfo.payAmount"/>
 		</div>
 </template>
 <script>
diff --git a/pages/order/submit/index.vue b/pages/order/submit/index.vue
index 2eee7ce..97925b1 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-10 17:41:16
+ * @LastEditTime: 2022-05-10 18:06:21
  * @Description: file content
 -->
 
@@ -23,7 +23,7 @@
 			<UiButton radius type="red_panel" @click="submit">立即支付</UiButton>
 		</div>
 		<BsPay :visible.sync="payVisible" :orderId="payOrder.orderId" :timer="payTimerTxt"
-			@cancel="cancelPay" @finish="finishPay"/>
+			@cancel="cancelPay" @finish="finishPay" :money="orderInfo.payAmount"/>
 	</div>
 </template>
 <script>
@@ -145,7 +145,7 @@ export default {
 			let minute = parseInt(this.payStartSecondNum / 60);
 			let second = parseInt(this.payStartSecondNum % 60);
 			this.payTimerTxt = `剩余${minute > 0 ? `${minute}分` : ''} ${second}秒`;
-			this.payTimerStop = setTimeout(()=>this.timer(),1000)
+			this.payTimerStop = setTimeout(()=>this.timer(),1000);
 		},
 		cancelPay(){
 			this.$router.replace(`/account/order/detail?id=${this.payOrder.orderId}`)

From 3ab78fe8cd68e671a0ddc1260b80b3e630fd2ab2 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Thu, 12 May 2022 11:47:28 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/img/account/order/empty.png            | Bin 0 -> 10979 bytes
 .../account/{ => order}/order_status_1.png    | Bin
 .../{ => order}/order_status_1_active.png     | Bin
 .../account/{ => order}/order_status_2.png    | Bin
 .../{ => order}/order_status_2_active.png     | Bin
 .../account/{ => order}/order_status_3.png    | Bin
 .../{ => order}/order_status_3_active.png     | Bin
 .../account/{ => order}/order_status_4.png    | Bin
 .../{ => order}/order_status_4_active.png     | Bin
 .../account/{ => order}/order_status_5.png    | Bin
 .../{ => order}/order_status_5_active.png     | Bin
 .../{ => order}/order_status_close.png        | Bin
 .../BsCancelOrder.vue                         |   5 +-
 components/BsPay.vue                          |  72 +++++-
 components/UIGoodsInfo.vue                    |   5 +-
 components/UiEmptyAccount.vue                 |  37 +++
 pages/account/index/order/detail/index.vue    |   5 +-
 .../index/order/detail/module/StatusInfo.vue  |  26 +-
 .../index/order/detail/module/StatusStep.vue  |  28 +--
 pages/account/index/order/list/index.vue      | 231 +++++++++++-------
 pages/account/index/order/list/module/Tab.vue |  83 +++++++
 pages/order/submit/index.vue                  |  36 +--
 22 files changed, 363 insertions(+), 165 deletions(-)
 create mode 100644 assets/img/account/order/empty.png
 rename assets/img/account/{ => order}/order_status_1.png (100%)
 rename assets/img/account/{ => order}/order_status_1_active.png (100%)
 rename assets/img/account/{ => order}/order_status_2.png (100%)
 rename assets/img/account/{ => order}/order_status_2_active.png (100%)
 rename assets/img/account/{ => order}/order_status_3.png (100%)
 rename assets/img/account/{ => order}/order_status_3_active.png (100%)
 rename assets/img/account/{ => order}/order_status_4.png (100%)
 rename assets/img/account/{ => order}/order_status_4_active.png (100%)
 rename assets/img/account/{ => order}/order_status_5.png (100%)
 rename assets/img/account/{ => order}/order_status_5_active.png (100%)
 rename assets/img/account/{ => order}/order_status_close.png (100%)
 rename pages/account/index/order/detail/module/Cancel.vue => components/BsCancelOrder.vue (95%)
 create mode 100644 components/UiEmptyAccount.vue

diff --git a/assets/img/account/order/empty.png b/assets/img/account/order/empty.png
new file mode 100644
index 0000000000000000000000000000000000000000..f79cd30a66fc0eac5dcbedbce0b33df7724eda98
GIT binary patch
literal 10979
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
RYX|@U002ovPDHLkV1fx2R09A2

literal 0
HcmV?d00001

diff --git a/assets/img/account/order_status_1.png b/assets/img/account/order/order_status_1.png
similarity index 100%
rename from assets/img/account/order_status_1.png
rename to assets/img/account/order/order_status_1.png
diff --git a/assets/img/account/order_status_1_active.png b/assets/img/account/order/order_status_1_active.png
similarity index 100%
rename from assets/img/account/order_status_1_active.png
rename to assets/img/account/order/order_status_1_active.png
diff --git a/assets/img/account/order_status_2.png b/assets/img/account/order/order_status_2.png
similarity index 100%
rename from assets/img/account/order_status_2.png
rename to assets/img/account/order/order_status_2.png
diff --git a/assets/img/account/order_status_2_active.png b/assets/img/account/order/order_status_2_active.png
similarity index 100%
rename from assets/img/account/order_status_2_active.png
rename to assets/img/account/order/order_status_2_active.png
diff --git a/assets/img/account/order_status_3.png b/assets/img/account/order/order_status_3.png
similarity index 100%
rename from assets/img/account/order_status_3.png
rename to assets/img/account/order/order_status_3.png
diff --git a/assets/img/account/order_status_3_active.png b/assets/img/account/order/order_status_3_active.png
similarity index 100%
rename from assets/img/account/order_status_3_active.png
rename to assets/img/account/order/order_status_3_active.png
diff --git a/assets/img/account/order_status_4.png b/assets/img/account/order/order_status_4.png
similarity index 100%
rename from assets/img/account/order_status_4.png
rename to assets/img/account/order/order_status_4.png
diff --git a/assets/img/account/order_status_4_active.png b/assets/img/account/order/order_status_4_active.png
similarity index 100%
rename from assets/img/account/order_status_4_active.png
rename to assets/img/account/order/order_status_4_active.png
diff --git a/assets/img/account/order_status_5.png b/assets/img/account/order/order_status_5.png
similarity index 100%
rename from assets/img/account/order_status_5.png
rename to assets/img/account/order/order_status_5.png
diff --git a/assets/img/account/order_status_5_active.png b/assets/img/account/order/order_status_5_active.png
similarity index 100%
rename from assets/img/account/order_status_5_active.png
rename to assets/img/account/order/order_status_5_active.png
diff --git a/assets/img/account/order_status_close.png b/assets/img/account/order/order_status_close.png
similarity index 100%
rename from assets/img/account/order_status_close.png
rename to assets/img/account/order/order_status_close.png
diff --git a/pages/account/index/order/detail/module/Cancel.vue b/components/BsCancelOrder.vue
similarity index 95%
rename from pages/account/index/order/detail/module/Cancel.vue
rename to components/BsCancelOrder.vue
index d8f52da..9271efd 100644
--- a/pages/account/index/order/detail/module/Cancel.vue
+++ b/components/BsCancelOrder.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-09 20:20:02
  * @LastEditors: ch
- * @LastEditTime: 2022-05-09 20:41:46
+ * @LastEditTime: 2022-05-12 11:18:03
  * @Description: file content
 -->
 <template>
@@ -19,7 +19,7 @@
 </template>
 <script>
 import {ApiPutCancelOrder,ApiPutOrderReceive} from '@/plugins/api/order'
-import UiButton from '../../../../../../components/UiButton.vue';
+import UiButton from '@/components/UiButton.vue';
 export default {
 	components: { UiButton },
 	props : {
@@ -105,6 +105,7 @@ export default {
 	}
 	.el-dialog__header{
 		padding: 30px 0 15px;
+		text-align: center;
 	}
 	.el-dialog__title{
 		font-size: 20px;
diff --git a/components/BsPay.vue b/components/BsPay.vue
index 5b94598..790b00a 100644
--- a/components/BsPay.vue
+++ b/components/BsPay.vue
@@ -2,16 +2,16 @@
  * @Author: ch
  * @Date: 2022-05-08 00:39:50
  * @LastEditors: ch
- * @LastEditTime: 2022-05-10 18:06:34
+ * @LastEditTime: 2022-05-12 11:44:04
  * @Description: file content
 -->
 <template>
 	<el-dialog title="打开微信扫描付款" width="380px" class="box" center
-		 :visible.sync="myVisible" @open="getCodeImg" @close="close">
+		 :visible.sync="myVisible" @open="open" @close="close">
 		<div class="pay">
-			<span class="pay--timer">{{timer}}</span>
+			<span class="pay--timer">{{timerTxt}}</span>
 			<UiMoney class="money" sufSize="14px" preSize="14px" size="20px" 
-				float suffix prefix :money="money"/>
+				float suffix prefix :money="orderInfo.payAmount"/>
 			<div class="pay--code">
 				<img :src="imgUrl" v-if="imgUrl"/>
 				<!-- <p v-if="!timer">已超时，请重新下单</p> -->
@@ -22,6 +22,7 @@
 </template>
 <script>
 import {ApiPostPayCdoeImg} from '@/plugins/api/wx'
+import {ApiGetOrderDetail} from '@/plugins/api/order'
 import UiMoney from './UiMoney.vue'
 export default {
 	components: { UiMoney },
@@ -33,20 +34,15 @@ export default {
 		orderId : {
 			type : Number | String,
 			default : ''
-		},
-		timer : {
-			type : String,
-			default : '',
-		},
-		money : {
-			type : String | Number,
-			default : 0
 		}
 	},
 	data(){
 		return {
+			orderInfo: {},
 			imgUrl : '',
 			timerTxt : '',
+			startSecondNum : 0,
+			timerStop : null,
 		}
 	},
 	computed:{
@@ -60,6 +56,30 @@ export default {
 		}
 	},
 	methods : {
+		open(){
+			this.getOrderInfo();
+			this.getCodeImg();
+		},
+		/**
+		 * 获取订单最新信息
+		 */
+		async getOrderInfo(){
+			const {error, result} = await ApiGetOrderDetail(this.orderId);
+			if(error){
+				this.$message.warning(error.message);
+				return false;
+			}
+			this.orderInfo = result;
+			if(this.orderInfo.orderStatus === 1){
+				// 待支付 开始倒计时
+				if(this.timerStop){
+					clearInterval(this.timerStop);
+				}
+				this.calcTimerStartSecondNum();
+				this.timer();
+
+			}
+		},
 		async getCodeImg(){
 			const {error, result} = await ApiPostPayCdoeImg({orderId : this.orderId});
 			if(error){
@@ -67,7 +87,35 @@ export default {
 			}
 			this.imgUrl = result.dataInfo.codeImgData;
 		},
+
+		/**
+		 * 计算倒计时开始秒数
+		 */
+		calcTimerStartSecondNum(){
+			let expireTime = (new Date(this.orderInfo.expireTime.replace(/-/g,'/'))).getTime(),
+				curTime = (new Date(this.orderInfo.serverTime.replace(/-/g,'/'))).getTime(),
+				second = Math.floor((expireTime - curTime) / 1000);
+			this.startSecondNum = second > 0 ? second : 0;
+			this.timerStop = setInterval(()=> {
+				this.timer()
+			},1000)
+		},
+		/**
+		 * 待付款的倒计时
+		 */
+		timer(){
+			if(this.startSecondNum == 0){
+				this.close();
+				return;
+			}
+			this.startSecondNum--;
+			let minute = parseInt(this.startSecondNum / 60);
+			let second = parseInt(this.startSecondNum % 60);
+			this.timerTxt = `剩余${minute > 0 ? `${minute}分` : ''} ${second}秒`;
+		},
 		close(){
+			clearInterval(this.timerStop);
+			this.timerStop = null;
 			this.$emit('cancel');
 		},
 		finish(){
diff --git a/components/UIGoodsInfo.vue b/components/UIGoodsInfo.vue
index 97cb992..21cff59 100644
--- a/components/UIGoodsInfo.vue
+++ b/components/UIGoodsInfo.vue
@@ -2,11 +2,11 @@
  * @Author: ch
  * @Date: 2022-05-08 14:41:42
  * @LastEditors: ch
- * @LastEditTime: 2022-05-09 22:01:52
+ * @LastEditTime: 2022-05-12 10:00:52
  * @Description: file content
 -->
 <template>
-	<div class="ui-goods-info">
+	<div class="ui-goods-info" @click="$router.push(`/goods/detail/${goods.productId}`)">
 		<div class="ui-goods-info--img">
 			<img :src="goods.productImageUrl"/>
 		</div>
@@ -29,6 +29,7 @@ export default {
 <style lang="scss" scoped>
 .ui-goods-info{
 	display: flex;
+	cursor: pointer;
 	&--img{
 		width: 100px;
 		height: 100px;
diff --git a/components/UiEmptyAccount.vue b/components/UiEmptyAccount.vue
new file mode 100644
index 0000000..2d64302
--- /dev/null
+++ b/components/UiEmptyAccount.vue
@@ -0,0 +1,37 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-05-12 10:30:07
+ * @LastEditors: ch
+ * @LastEditTime: 2022-05-12 11:01:57
+ * @Description: file content
+-->
+<template>
+	<div class="ui-empty">
+		<img class="ui-empty--icon" :src="icon"/>
+		<p class="ui-empty--desc">{{desc}}</p>
+		<slot></slot>
+	</div>
+</template>
+<script>
+export default {
+	props : {
+		title : String,
+		desc : String,
+		icon : String
+	},
+}
+</script>
+<style lang="scss" scoped>
+.ui-empty{
+	margin-top: 30px;
+	text-align: center;
+	padding: 80px 0;
+	&--icon{
+		width: 228px;
+	}
+	&--desc{
+		margin: 20px 0;
+		color: #999;
+	}
+}
+</style>
\ No newline at end of file
diff --git a/pages/account/index/order/detail/index.vue b/pages/account/index/order/detail/index.vue
index 7870766..6a7cc3c 100644
--- a/pages/account/index/order/detail/index.vue
+++ b/pages/account/index/order/detail/index.vue
@@ -2,14 +2,13 @@
  * @Author: ch
  * @Date: 2022-05-08 01:14:03
  * @LastEditors: ch
- * @LastEditTime: 2022-05-09 21:39:31
+ * @LastEditTime: 2022-05-11 22:22:15
  * @Description: file content
 -->
 <template>
 	<div>
 		<div class="box">
-			<StatusInfo :orderInfo="orderInfo" @cancel="getOrderInfo"
-				@receive="getOrderInfo" @payFinish="getOrderInfo"/>
+			<StatusInfo :orderInfo="orderInfo" @changeStatus="getOrderInfo"/>
 			<StatusStep :orderInfo="orderInfo" />
 		</div>
 		<LogisitcsInfo :orderInfo="orderInfo" />
diff --git a/pages/account/index/order/detail/module/StatusInfo.vue b/pages/account/index/order/detail/module/StatusInfo.vue
index 0aebb13..9bac0d1 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-10 18:05:07
+ * @LastEditTime: 2022-05-12 11:08:57
  * @Description: file content
 -->
 <template>
@@ -19,17 +19,16 @@
 				<UiButton type="grey" :radius="true" @click="cancelVisible=true">取消</UiButton>
 			</template>
 			</div>
-			<Cancel :visible.sync="cancelVisible" :orderId="orderInfo.orderId" @cancel="cancel"/>
-			<BsPay :visible.sync="payVisible" :orderId="orderInfo.orderId" 
-				:timer="ctxCon.tips" @finish="payFinish" :money="orderInfo.payAmount"/>
+			<BsCancelOrder :visible.sync="cancelVisible" :orderId="orderInfo.orderId" @cancel="emitStatus"/>
+			<BsPay :visible.sync="payVisible" :orderId="orderInfo.orderId" @finish="emitStatus" @cancel="emitStatus"/>
 		</div>
 </template>
 <script>
-import BsPay from '../../../../../../components/BsPay.vue'
-import UiButton from '../../../../../../components/UiButton.vue'
-import Cancel from './Cancel.vue'
+import BsPay from '@/components/BsPay.vue'
+import UiButton from '@/components/UiButton.vue'
+import BsCancelOrder from '../../../../../../components/BsCancelOrder.vue'
 export default {
-	components: { UiButton, Cancel, BsPay },
+	components: { UiButton, BsPay, BsCancelOrder },
 	props: {
 		orderInfo : {
 			type : Object,
@@ -93,7 +92,7 @@ export default {
 		 */
 		timer(){
 			if(this.startSecondNum == 0){
-				this.$emit('close');
+				this.emitStatus()
 				return;
 			}
 			this.startSecondNum--;
@@ -121,14 +120,11 @@ export default {
 					type: 'success',
 					message: '成功收货!'
 				});
-				this.$emit('receive')
+				this.emitStatus()
 			});
 		},
-		cancel(){
-			this.$emit('cancel')
-		},
-		payFinish(){
-			this.$emit('payFinish')
+		emitStatus(){
+			this.$emit('changeStatus')
 		}
 	}
 	
diff --git a/pages/account/index/order/detail/module/StatusStep.vue b/pages/account/index/order/detail/module/StatusStep.vue
index 2755456..2fc82a2 100644
--- a/pages/account/index/order/detail/module/StatusStep.vue
+++ b/pages/account/index/order/detail/module/StatusStep.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-09 14:41:37
  * @LastEditors: ch
- * @LastEditTime: 2022-05-10 13:33:57
+ * @LastEditTime: 2022-05-12 10:43:37
  * @Description: file content
 -->
 <template>
@@ -18,7 +18,7 @@
 	</ul>
 </template>
 <script>
-import UiButton from '../../../../../../components/UiButton.vue';
+import UiButton from '@/components/UiButton.vue';
 import {FormatDate} from '@/plugins/utils'
 export default {
 	components: { UiButton },
@@ -37,23 +37,23 @@ export default {
 			const defaultStep = [
 				{
 					id : 1, name : '提交订单', 
-					icon: require('@/assets/img/account/order_status_1.png'),
-					iconActive : require('@/assets/img/account/order_status_1_active.png')
+					icon: require('@/assets/img/account/order/order_status_1.png'),
+					iconActive : require('@/assets/img/account/order/order_status_1_active.png')
 				},
 				{
 					id : 6, name : '支付订单' , 
-					icon: require('@/assets/img/account/order_status_2.png'),
-					iconActive : require('@/assets/img/account/order_status_2_active.png')
+					icon: require('@/assets/img/account/order/order_status_2.png'),
+					iconActive : require('@/assets/img/account/order/order_status_2_active.png')
 				},
 				{
 					id : 7, name : '平台发货' , 
-					icon: require('@/assets/img/account/order_status_3.png'),
-					iconActive : require('@/assets/img/account/order_status_3_active.png')
+					icon: require('@/assets/img/account/order/order_status_3.png'),
+					iconActive : require('@/assets/img/account/order/order_status_3_active.png')
 				},
 				{
 					id : 8, name : '确认收货' , 
-					icon: require('@/assets/img/account/order_status_4.png'),
-					iconActive : require('@/assets/img/account/order_status_4_active.png')
+					icon: require('@/assets/img/account/order/order_status_4.png'),
+					iconActive : require('@/assets/img/account/order/order_status_4_active.png')
 				},
 			];
 			let showStep = [];
@@ -78,8 +78,8 @@ export default {
 					type:-1, name: '交易关闭', active: true,
 					date : FormatDate(createTime,'yyyy-mm-dd'),
 					time : FormatDate(createTime, 'hh:ii:ss'),  
-					icon: require('@/assets/img/account/order_status_close.png'),
-					iconActive : require('@/assets/img/account/order_status_close.png')
+					icon: require('@/assets/img/account/order/order_status_close.png'),
+					iconActive : require('@/assets/img/account/order/order_status_close.png')
 				});
 				
 			}else{
@@ -96,8 +96,8 @@ export default {
 				let lastLog = logs[logs.length - 1];
 				let lastStep = {
 					type:-1, name: '交易完成', 
-					icon: require('@/assets/img/account/order_status_5.png'),
-					iconActive : require('@/assets/img/account/order_status_5_active.png')
+					icon: require('@/assets/img/account/order/order_status_5.png'),
+					iconActive : require('@/assets/img/account/order/order_status_5_active.png')
 				}
 				if(lastLog.id === 8){
 					lastStep.createTime = lastLog.createTime;
diff --git a/pages/account/index/order/list/index.vue b/pages/account/index/order/list/index.vue
index 2ff5887..0b9fe07 100644
--- a/pages/account/index/order/list/index.vue
+++ b/pages/account/index/order/list/index.vue
@@ -2,78 +2,106 @@
  * @Author: ch
  * @Date: 2022-05-04 20:47:29
  * @LastEditors: ch
- * @LastEditTime: 2022-05-10 13:16:44
+ * @LastEditTime: 2022-05-12 11:29:24
  * @Description: file content
 -->
 <template>
-	<div>
-		<ul class="tab">
-			<li v-for="item in tabs" :key="item.value" @click="changeTab(item.value)"
-				:class="tabActive == item.value && 'tab__active'">
-				{{item.label}}
-				<span>6</span>
-			</li>
-		</ul>
-		<div class="order" v-for="item in orderList" :key="item.orderId">
-			<div class="order--head"></div>
-			<table class="order--table">
-				<tbody>
-					<tr v-for="(i, idx) in item.products" :key="i.orderProductId">
-						<td width="620px">
-							<div class="order--product">
-								<UIGoodsInfo :goods="i"/>
-								<p>{{i.realAmount}}</p>
-								<p>{{i.quantity}}</p>
-							</div>
-						</td>
-						<template  v-if="!idx">
-							<td width="119px" :rowspan="item.products.length">{{item.payAmount}}</td>
-							<td width="110px" :rowspan="item.products.length">{{item.orderStatusDesc}}</td>
-							<td :rowspan="item.products.length">
-								<button v-if="item.orderStatus === 1" @click="pay(item)">去支付</button>
-								<button v-if="[2,3].includes(item.orderStatus)" 
-									@click="$router.push(`./detail?id=${item.orderId}`)">查看详情</button>
-								<button  v-if="item.orderStatus >= 4" 
-									@click="$router.push(`/logisitcsInfo?orderId=${item.orderId}`)">查看物流</button>
-								<button  v-if="item.orderStatus === 4" @click="receive(item)">确认收货</button>
-							</td>
-						</template>
+	<div class="main">
+		<Tab :active="tabActive" @change="changeTab"></Tab>
+		<div class="loading" v-if="loading">正在查询数据...</div>
+		<UiEmptyAccount v-if="!orderTotal && !loading" desc="暂无订单数据" :icon="require('@/assets/img/account/order/empty.png')">
+			<UiButton type="grey" @click="$router.push('/')">去逛逛</UiButton>
+		</UiEmptyAccount>
+		<template v-if="!loading">
+			<table v-if="orderTotal" class="order--table order--table-head">
+				<thead>
+					<tr>
+						<th>商品信息</th>
+						<th width="96">单价</th>
+						<th width="96">数量</th>
+						<th width="120">实付款</th>
+						<th width="110">交易状态</th>
+						<th width="145">操作</th>
 					</tr>
-				</tbody>
+				</thead>
 			</table>
-		</div>
-		<el-pagination v-if=" orderTotal > pageSize" background layout="prev, pager, next" 
-			:current-page.sync="pageIndex"
-			:total="orderTotal" @current-change="getOrderList"></el-pagination>
+			<div class="order" v-for="item in orderList" :key="item.orderId">
+				<div class="order--head">
+					<p>
+						<span>订单编号：{{item.orderNo || '9c665dc0b20b 假的'}}</span>
+						<span>下单时间：{{item.submitTime || `2011-01-01 00:00:00 假的`}}</span>
+					</p>
+					<router-link :to="`./detail?id=${item.orderId}`">订单详情 ></router-link>
+				</div>
+				<table class="order--table">
+					<tbody>
+						<tr v-for="(i, idx) in item.products" :key="i.orderProductId">
+							<td class="not-border">
+								<UIGoodsInfo :goods="i"/>
+							</td>
+							<td class="not-border" width="96">{{i.realAmount}}</td>
+							<td class="not-border" width="96">{{i.quantity}}</td>
+							<template  v-if="!idx">
+								<td width="120" :rowspan="item.products.length">{{item.payAmount}}</td>
+								<td width="110" :rowspan="item.products.length">{{item.orderStatusDesc}}</td>
+								<td width="145" :rowspan="item.products.length">
+									<template v-if="item.orderStatus === 1">
+										<UiButton type="yellow_gradual" @click="pay(item)">去支付</UiButton>
+										<span class="link-btn" @click="canvelPay(item)">取消支付</span>
+									</template>
+									<router-link :to="`./detail?id=${item.orderId}`" v-if="item.orderStatus > 4">查看物流</router-link>
+									<template v-if="item.orderStatus === 4">
+										<UiButton type="yellow_gradual" @click="receive(item)">确认收货</UiButton>
+										<router-link class="link-btn" :to="`./detail?id=${item.orderId}`">查看物流</router-link>
+									</template>
+									
+								</td>
+							</template>
+						</tr>
+					</tbody>
+				</table>
+			</div>
+			<el-pagination class="pagination" v-if=" orderTotal > pageSize" background layout="prev, pager, next" 
+				:current-page.sync="pageIndex" :page-size="pageSize"
+				:total="orderTotal" @current-change="getOrderList"></el-pagination>
+		</template>
+		
+			
+		<BsCancelOrder :visible.sync="cancelVisible" :orderId="operationOrder.orderId"/>
+		<BsPay :visible.sync="payVisible" :orderId="operationOrder.orderId" @finish="getOrderList"/>
 	</div>
 </template>
 <script>
-import {ApiGetOrderList, ApiPutOrderReceive} from '~/plugins/api/order';
+import {ApiGetOrderList, ApiPutOrderReceive, ApiGetOrderStatistics} from '~/plugins/api/order';
+import BsCancelOrder from '../../../../../components/BsCancelOrder.vue';
+import BsPay from '../../../../../components/BsPay.vue';
+import UiButton from '../../../../../components/UiButton.vue';
+import UiEmptyAccount from '../../../../../components/UiEmptyAccount.vue';
 import UIGoodsInfo from '../../../../../components/UIGoodsInfo.vue';
 import UiLineBox from '../../../../../components/UiLineBox.vue';
+import Tab from './module/Tab.vue';
 export default {
-	components: { UiLineBox, UIGoodsInfo },
+	components: { UiLineBox, UIGoodsInfo, Tab, UiButton, BsPay, UiEmptyAccount, BsCancelOrder },
 	data(){
 		return {
-			tabs : [
-				{label : '全部', value : -1},
-				{label : '待付款', value : 1},
-				{label : '待发货', value : 3},
-				{label : '待收货', value : 4},
-			],
 			tabActive : this.$route.query.type || -1,
 			pageIndex : 1,
 			pageSize : 15,
 			orderList : [],
-			orderTotal : 0
+			orderTotal : 0,
+			loading : true,
+			
+			payVisible : false,
+			cancelVisible : false,
+			operationOrder : {}
 		}
 	},
 	mounted(){
-		this.getOrderList()
+		this.getOrderList();
 	},
 	methods : {
 		changeTab(val){
-			if(val === this.$route.query.type){
+			if(val === this.tabActive){
 				return false;
 			}
 			this.$router.replace({
@@ -87,76 +115,111 @@ export default {
 			
 		},
 		async getOrderList(){
+			this.loading = true;
 			const {error, result} = await ApiGetOrderList({
 				length : this.pageSize,
 				pageIndex : this.pageIndex,
 				orderStatus : this.tabActive > -1 ? this.tabActive : null
 			});
+			this.loading = false;
 			if(error){
 				this.message.warning(error.message);
 				return false;
 			}
 			this.orderList = result.records;
 			this.orderTotal = result.total
-		}
+		},
+		pay(item){
+			this.operationOrder = item;
+			this.payVisible = true;
+		},
+		canvelPay(item){
+			this.operationOrder = item;
+			this.cancelVisible = true;
+		},
+		receive(){
+			this.$confirm('确认已经收到货了吗？', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(async () => {
+				const {error} = await ApiPutOrderReceive({orderId : this.operationOrder.orderId});
+				if(error){
+					uni.$toast(error.message);
+					return false;
+				}
+				this.$message({
+					type: 'success',
+					message: '成功收货!'
+				});
+				this.emitStatus()
+			});
+		},
 	}
 }
 </script>
 <style lang="scss" scoped>
-.tab {
-	height: 42px;
-	line-height: 42px;
-	border-bottom: 1px solid #ddd;
-	li{
-		float: left;
-		margin-right: 54px;
-		font-size: 16px;
-		cursor: pointer;
-		span{
-			color: #FF875B;
-		}
-	}
-	&__active{
-		color: #FF875B;
-		position: relative;
-		&::after{
-			display: block;
-			height: 2px;
-			width: 100%;
-			content: '';
-			background: #FF875B;
-			position: absolute;
-			bottom: 0;
-		}
-	}
+.main{
+	flex: 1;
+}
+.loading{
+	height: 100px;
+	line-height: 100px;
+	text-align: center;
+	color: #666;
 }
 .order{
 	margin: 10px 0;
 	&--head{
 		height: 42px;
+		line-height: 42px;
 		color: #999;
 		background: #F8F8F8;
 		border: 1px solid #ddd;
 		border-bottom: 0;
+		display: flex;
+		justify-content: space-between;
+		padding: 0 20px;
+		span{
+			margin-right: 50px;
+		}
+		a{
+			color: #999;
+		}
 	}
 	&--table{
+		border: 1px solid #ddd;
 		width: 100%;
+		&-head{
+			margin: 30px 0 20px;
+		}
+		th{
+			height: 46px;
+			background: #f8f8f8;
+			font-weight: normal;
+		}
 		td{
 			border: 1px solid #ddd;
 			padding: 20px;
 			text-align: center;
+
+			&.not-border{
+				border-left: 0;
+				border-right: 0;
+			}
 		}
 		tr:first-child td{
 			border-top: 0;
 		}
 	}
-	&--product{
-		display: flex;
-		align-items: center;
-		p{
-			width: 96px;
-			text-align: center;
-		}
-	}
+}
+.link-btn{
+	display: block;
+	margin: 10px 0;
+	color: #999;
+	display: block;
+}
+.pagination{
+	text-align: right;
 }
 </style>
\ No newline at end of file
diff --git a/pages/account/index/order/list/module/Tab.vue b/pages/account/index/order/list/module/Tab.vue
index e69de29..4eeef66 100644
--- a/pages/account/index/order/list/module/Tab.vue
+++ b/pages/account/index/order/list/module/Tab.vue
@@ -0,0 +1,83 @@
+<!--
+ * @Author: ch
+ * @Date: 2019-01-01 08:04:09
+ * @LastEditors: ch
+ * @LastEditTime: 2022-05-11 21:34:49
+ * @Description: file content
+-->
+<template>
+	<ul class="tab">
+		<li v-for="item in tabs" :key="item.value" @click="change(item.value)"
+			:class="active == item.value && 'tab__active'">
+			{{item.label}}
+			<span v-if="item.count">{{item.count}}</span>
+		</li>
+	</ul>
+</template>
+<script>
+import {ApiGetOrderStatistics} from '~/plugins/api/order';
+export default {
+	props:{
+		active : {
+			type : Number | String,
+			default : -1
+		}
+	},
+	data(){
+		return {
+			tabs : [
+				{label : '全部', value : -1, code: 'allCount'},
+				{label : '待付款', value : 1, code: 'unpaidCount'},
+				{label : '待发货', value : 3, code: 'waitDeliveryCount'},
+				{label : '待收货', value : 4, code: 'deliveredCount'},
+			]
+		}
+	},
+	mounted(){
+		this.getOrderStatistics();
+	},
+	methods : {
+		change(val){
+			this.$emit('change', val)
+		},
+		async getOrderStatistics(){
+			const {result} = await ApiGetOrderStatistics();
+			this.tabs = this.tabs.map(i => {
+				i.count = result[i.code];
+				return i;
+			})
+		}
+	}
+}
+</script>
+<style lang="scss" scoped>
+
+.tab {
+	width: 100%;
+	height: 42px;
+	line-height: 42px;
+	border-bottom: 1px solid #ddd;
+	li{
+		float: left;
+		margin-right: 54px;
+		font-size: 16px;
+		cursor: pointer;
+		span{
+			color: #FF875B;
+		}
+	}
+	&__active{
+		color: #FF875B;
+		position: relative;
+		&::after{
+			display: block;
+			height: 2px;
+			width: 100%;
+			content: '';
+			background: #FF875B;
+			position: absolute;
+			bottom: 0;
+		}
+	}
+}
+</style>
\ No newline at end of file
diff --git a/pages/order/submit/index.vue b/pages/order/submit/index.vue
index 97925b1..81c1149 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-10 18:06:21
+ * @LastEditTime: 2022-05-12 09:58:47
  * @Description: file content
 -->
 
@@ -22,8 +22,8 @@
 		<div class="pay">
 			<UiButton radius type="red_panel" @click="submit">立即支付</UiButton>
 		</div>
-		<BsPay :visible.sync="payVisible" :orderId="payOrder.orderId" :timer="payTimerTxt"
-			@cancel="cancelPay" @finish="finishPay" :money="orderInfo.payAmount"/>
+		<BsPay :visible.sync="payVisible" :orderId="payOrder.orderId"
+			@cancel="cancelPay" @finish="finishPay" />
 	</div>
 </template>
 <script>
@@ -116,36 +116,6 @@ export default {
 			}
 			this.payVisible = true;
 			this.payOrder = result;
-			// 待支付 开始倒计时
-			if(this.payTimerStop){
-				clearTimeout(this.payTimerStop);
-			}
-			this.calcTimerStartSecondNum();
-
-		},
-		/**
-		 * 计算倒计时开始秒数
-		 */
-		calcTimerStartSecondNum(){
-			let expireTime = (new Date(this.payOrder.expireTime.replace(/-/g,'/'))).getTime(),
-				curTime = (this.payOrder.serverTime ? new Date(this.payOrder.serverTime.replace(/-/g,'/')) : new Date()).getTime(),
-				second = Math.floor((expireTime - curTime) / 1000);
-			this.payStartSecondNum = second > 0 ? second : 0;
-			this.timer();
-		},
-		/**
-		 * 待付款的倒计时
-		 */
-		timer(){
-			if(this.payStartSecondNum == 0){
-				this.$emit('close');
-				return;
-			}
-			this.payStartSecondNum--;
-			let minute = parseInt(this.payStartSecondNum / 60);
-			let second = parseInt(this.payStartSecondNum % 60);
-			this.payTimerTxt = `剩余${minute > 0 ? `${minute}分` : ''} ${second}秒`;
-			this.payTimerStop = setTimeout(()=>this.timer(),1000);
 		},
 		cancelPay(){
 			this.$router.replace(`/account/order/detail?id=${this.payOrder.orderId}`)