Authored by biao

update for status when payleft is 0

... ... @@ -264,6 +264,7 @@ const _getUserOrder = (uid, type, page) => {
orderList.forEach(item => {
const ot = parseInt(item.orderType, 10);
const st = parseInt(item.status, 10);
const payleftTime = parseInt(item.payLefttime, 10);
let hasRefund = false;
let canRefund = false;
... ... @@ -293,7 +294,7 @@ const _getUserOrder = (uid, type, page) => {
// 没有取消订单并且状态为0的时候显示付款按钮
if (item.isCancel === 'N' &&
st === 0) {
st === 0 && payleftTime !== 0) {
item.showPayButton = true;
}
... ... @@ -315,6 +316,10 @@ const _getUserOrder = (uid, type, page) => {
if (item.isCancel === 'Y') {
item.showBuyBtn = true;
item.statusStr = '已取消';
} else if (payleftTime === 0) {
item.showBuyBtn = true;
item.showPayButton = false;
item.statusStr = '已取消';
} else if (item.isOnlinePaid) {
item.statusStr = statusMap[st].valueStr;
}
... ... @@ -541,6 +546,14 @@ const getOrderDetail = (uid, code) => {
detail.invoice = false;
}
if (detail.payLefttime === '0') {
detail.showLeftTime = false;
detail.statusStr = '已取消';
detail.steps = false;
detail.btns = false;
}
detail.paymentTypeStr = paymentTypeStr[detail.paymentType];
detail.allAddress = detail.area + detail.address;
... ...
... ... @@ -2,7 +2,7 @@
<div class="basic">
<p>订单号:{{orderCode}}</p>
<p>订单状态:{{statusStr}}</p>
<div class="edit-btns">
<div class="edit-btns hide-when-invalid">
<ul>
{{# btns}}
<li>
... ... @@ -22,9 +22,9 @@
{{#if showLeftTime}}
<div class="time">
<span>剩余支付时间:</span>
<span class="iconfont">&#xe606;</span>
<span class="iconfont hide-when-invalid">&#xe606;</span>
<p class="left-time" data-left={{payLefttime}}></p>
<span class="tip">(逾期订单将自动取消)</span>
<span class="tip hide-when-invalid">(逾期订单将自动取消)</span>
</div>
{{/if}}
... ...
... ... @@ -22,12 +22,12 @@
{{#if showPayButton}}
<div class="pay-operation">
{{#if isOnlinePaid}}
<span class="iconfont">&#xe606;</span><p class="left-time" data-left="{{payLefttime}}"></p>
<span class="iconfont hide-when-invalid">&#xe606;</span><p class="left-time" data-left="{{payLefttime}}"></p>
<a href="{{payUrl}}">
<span class="btn red">立即付款</span>
</a>
<span class="btn red hide-when-invalid">立即付款</span>
</a>
{{/if}}
<p class="subtext cancel">取消订单</p>
<p class="subtext cancel hide-when-invalid">取消订单</p>
</div>
{{/if}}
{{#if showEditOption}}
... ...
... ... @@ -31,6 +31,7 @@ module.exports = {
if (src <= 0) {
timeStr = '已失效';
$('.hide-when-invalid').hide();
return timeStr;
}
... ...