fe / yohoblk-wap · Commits

Go to a project

Authored by 沈志敏
Commit 6ba26572525cdbadb8fb4924b472fdae952abbc3 1 parent 68bc78c6

fix bug

Inline Side-by-side
Showing 4 changed files with 21 additions and 47 deletions
... ... @@ -268,6 +268,12 @@ body {
outline: none;
}
}
.count-down {
display: inline-block;
width: 110px;
text-align: left;
}
}
}
... ...
... ... @@ -201,6 +201,12 @@ $white: #fff;
outline: none;
}
}
.count-down {
display: inline-block;
width: 110px;
text-align: left;
}
}
}
}
... ...
... ... @@ -50,7 +50,7 @@
<button v-if="order.isCancel === 'Y'" @click="deleteOrder(order.orderCode)" class="normal">删除订单</button>
<template v-else>
<button v-if="order.status == 0" @click="cancelOrder(order.orderCode)">取消订单</button>
<button v-if="order.status == 0 " class="countdown" @click="goBuy(order)">去支付 <span v-count-down :left-time="order.payLefttime" :callback="autoCancel(order.orderCode)"></span></button>
<button v-if="order.status == 0 " class="countdown" @click="goBuy(order)">去支付 <span class="count-down" v-count-down :left-time="order.payLefttime" :callback="autoCancel()"></span></button>
<a v-if="order.status == 4 || order.status == 5 || order.status == 6" href="/me/logistic?order_code={{order.orderCode}}">查看物流</a>
<button v-if="order.status == 4 || order.status == 5 " class="black" @click="confirmGoods(order.orderCode)">确认收货</button>
<button v-if="order.isSupportRefund == 'Y' || order.isSupportExchange == 'Y'" class="normal" @click="applyRefund()">申请售后</button>
... ... @@ -213,29 +213,10 @@
}
};
},
autoCancel(code) {
autoCancel() {
return () => {
let reasonId;
let reason;
if (yoho.isiOS && this.options.length > 1) {
reasonId = this.options[1].id;
reason = this.options[1].reason;
} else if (this.options.length) {
reasonId = this.options[0].id;
reason = this.options[0].reason;
}
this.orderDetail().cancel({
orderCode: code,
reasonId: reasonId,
reason: reason
}, (result) => {
if (result.code === 200) {
this.reload();
yoho.store.set('orderReload', true);
}
});
this.order.isCancel = 'Y';
yoho.store.set('orderReload', true);
};
},
cancelOrder() {
... ...
... ... @@ -32,16 +32,16 @@
<div class="order-option">
<div class="goods-total">合计 <b>&yen;{{order.amount}}</b></div>
<div class="options">
<button v-if="order.isCancel === 'Y'" @click="deleteOrder(order,index)" class="normal">删除订单</button>
<button v-if="order.isCancel === 'Y'" @click="deleteOrder(order, index)" class="normal">删除订单</button>
<template v-else>
<button v-if="order.status == 0" @click="cancelOrder(order.orderCode)" class="leftpad">取消订单</button>
<button v-if="order.status == 0 " class="countdown" @click="goBuy(order)">去支付
<span v-count-down :left-time="order.payLefttime" :callback="autoCancel(order.orderCode)"></span>
<span class="count-down" v-count-down :left-time="order.payLefttime" :callback="autoCancel(order)"></span>
</button>
<a v-if="order.status == 4 || order.status == 5 " class="leftpad"
href="/me/logistic?order_code={{order.orderCode}}">查看物流</a>
<button v-if="order.status == 4 || order.status == 5 " class="black" @click="confirmGoods(order.orderCode)">确认收货</button>
<button v-if="order.status == 6" @click="deleteOrder(order,index)" class="normal">删除订单</button>
<button v-if="order.status == 6" @click="deleteOrder(order, index)" class="normal">删除订单</button>
</template>
</div>
</div>
... ... @@ -177,28 +177,9 @@
tip('操作失败');
});
},
autoCancel(code) {
autoCancel(order) {
return () => {
let reasonId;
let reason;
if (yoho.isiOS && this.options.length > 1) {
reasonId = this.options[1].id;
reason = this.options[1].reason;
} else if (this.options.length) {
reasonId = this.options[0].id;
reason = this.options[0].reason;
}
this.order().cancel({
orderCode: code,
reasonId: reasonId,
reason: reason
}, (result) => {
if (result.code === 200) {
this.reload();
}
});
order.isCancel = 'Y';
};
},
order() {
... ...