diff --git a/src/pages/confirmOrder/confirmOrder.vue b/src/pages/confirmOrder/confirmOrder.vue
index 3d33064..c8317c2 100644
--- a/src/pages/confirmOrder/confirmOrder.vue
+++ b/src/pages/confirmOrder/confirmOrder.vue
@@ -71,117 +71,116 @@
>
非常戴镜
-
-
-
-
-
- {{item.p_name}}
-
-
- ¥{{Number(item.nowPrice) }}
- ¥{{item.oldPrice}}
-
-
- -
- {{checkedCartLst[index].num}}
- +
+
+
+
+
+
+ {{item.p_name}}
+
+
+ ¥{{Number(item.nowPrice) }}
+ ¥{{item.oldPrice}}
+
+
+ -
+ {{checkedCartLst[index].num}}
+ +
+
-
-
- 规格
-
- {{item.sku_name}}/
-
-
- 使用人
- {{item.peopleName}}
-
- 配送方式 快递
- 买家留言
-
+
+ 规格
+
+ {{item.sku_name}}/
+
+
+ 使用人
+ {{item.peopleName}}
+
+ 配送方式 快递
+ 买家留言
+
+
-
-
-
-
-
-
- {{goodInfo.p_name}}
-
-
- ¥{{buyItem.real_price}}
- ¥{{buyItem.out_price}}
-
-
- -
- {{count}}
- +
+
+
+
+
+
+
+ {{goodInfo.p_name}}
+
+
+ ¥{{buyItem.real_price}}
+ ¥{{buyItem.out_price}}
+
+
+ -
+ {{count}}
+ +
+
-
-
- 规格
-
- {{attrList[index].attr[item].name}}/
-
-
- 使用人
- {{name}}
-
- 配送方式 快递
- 买家留言
-
+
+ 规格
+
+ {{attrList[index].attr[item].name}}/
+
+
+ 使用人
+ {{name}}
+
+ 配送方式 快递
+ 买家留言
+
+
-
+
+
diff --git a/src/pages/myOrderPaying/myOrderPaying.vue b/src/pages/myOrderPaying/myOrderPaying.vue
index 22dc83b..015e587 100644
--- a/src/pages/myOrderPaying/myOrderPaying.vue
+++ b/src/pages/myOrderPaying/myOrderPaying.vue
@@ -218,7 +218,10 @@ export default {
},
// 订单付款时间
getLeftTime () {
- return this.orderInfo.order_info ? this.orderInfo.order_info.lefttime : 1800
+ const orderTime = new Date(this.orderInfo.pay_time.replace(/-/g, '/')).getTime()
+ const nowTime = new Date().getTime()
+ console.log('getLeftTime', 1800 - (nowTime - orderTime))
+ return 1800 - (nowTime - orderTime) / 1000
},
// 计算总优惠额
totalDiscount() {