Merge branch 'feature/orderDetail' into 'release/6.5.2'

倒计时位置修改



See merge request !1293

@@ -72,11 +72,11 @@ module.exports = class extends global.yoho.BaseModel {
             if (_.get(order, 'orderDetailInfo.key') === '203') { // 待支付尾款
                 payAmount = _.get(order, 'orderExtInfo.orderTailPayAmount');
                 order.orderDetailInfo.ext.desc = `你的商品已到货，您还需支付尾款<span>¥${payAmount}</span>，
-                请在<i class="hours new-hours hide">${countTime}</i>内完成支付。超时订单自动取消`;
+                请在<i class="hours new-hours hide">${countTime}</i>内完成支付，超时订单自动取消`;
             } else if (_.get(order, 'orderDetailInfo.key') === '201') { // 待支付定金
                 payAmount = _.get(order, 'orderExtInfo.orderDepositAmount');
                 order.orderDetailInfo.ext.desc = `您需支付定金<span>¥${payAmount}</span>，
-                请在<i class="hours new-hours hide">${countTime}</i>内完成支付。超时订单自动取消`;
+                请在<i class="hours new-hours hide">${countTime}</i>内完成支付，超时订单自动取消`;
             }
 
             /* 预售商品，不能进行任何操作 */
@@ -88,9 +88,10 @@ module.exports = class extends global.yoho.BaseModel {
 
         /* 倒计时时间 订单详情页倒计时不在同一级*/
         if (_.get(order, 'orderDetailInfo.ext.payLefttime') && parseInt(order.orderDetailInfo.ext.payLefttime, 10)) {
-            orderBtn.push({
-                leftTimeTop: order.orderDetailInfo.ext.payLefttime * 1000
-            });
+            let countTime = _.get(order, 'orderDetailInfo.ext.payLefttime') * 1000;
+
+            order.orderDetailInfo.ext.desc = `您的订单已提交，
+            请在<i class="hours new-hours hide">${countTime}</i>内完成支付，超时订单自动取消`;
         }
 
         _.each(order.links, (val) => {