...
|
...
|
@@ -76,7 +76,7 @@ const ORDER_OP_ALL = [ |
|
|
type: 'lookQrcode',
|
|
|
name: '查看二维码',
|
|
|
qrcode: true,
|
|
|
hrefFun: it => helpers.urlFormat('/home/orders/detail', {orderCode: it})
|
|
|
hrefFun: it => helpers.urlFormat('/home/qrcode', {orderCode: it})
|
|
|
},
|
|
|
{
|
|
|
type: 'afterService',
|
...
|
...
|
@@ -404,7 +404,8 @@ const getOrders = (uid, page, limit, type, isPage)=> { |
|
|
newGood.refundStatus = refundNum > 0;// 只要发生一件退换,退换过的标记
|
|
|
newGood.goRefundUrl = helpers.urlFormat('/home/returns');
|
|
|
newGood.arrivalDate = good.expect_arrival_time;
|
|
|
let goodsTagName = _getGoodsTag(order.attribute, good.goods_type);
|
|
|
|
|
|
let goodsTagName = _getGoodsTag(+order.attribute, good.goods_type);
|
|
|
|
|
|
if (goodsTagName) {
|
|
|
newGood[goodsTagName] = true;
|
...
|
...
|
@@ -525,7 +526,7 @@ const _getVirtualPro = (isCancel, status, createTime) => { |
|
|
process.middleStatus[1].cur = true;
|
|
|
} else if (status === 6) {
|
|
|
process.percent = '100%';
|
|
|
process.middleStatus[3].cur = true;
|
|
|
process.middleStatus[2].cur = true;
|
|
|
}
|
|
|
}
|
|
|
|
...
|
...
|
@@ -707,7 +708,7 @@ const _getOrderDetail = co(function * (uid, orderId) { |
|
|
|
|
|
detail.progress = statusInfo.cancel ? false : (function() {
|
|
|
// 未取消订单,进度
|
|
|
if (orderDetail.attribute === 3) {
|
|
|
if (+orderDetail.attribute === 3) {
|
|
|
return _getVirtualPro(orderDetail.is_cancel, +orderDetail.status, orderDetail.create_time);
|
|
|
} else {
|
|
|
if (isOfflineBySelf(orderDetail)) {
|
...
|
...
|
@@ -735,7 +736,7 @@ const _getOrderDetail = co(function * (uid, orderId) { |
|
|
detail.traceOrder.courierNumbe = expressInfo.courierNumbe;
|
|
|
|
|
|
// 虚拟商品
|
|
|
if (orderDetail.attribute === 3) {
|
|
|
if (+orderDetail.attribute === 3) {
|
|
|
detail.virtualGoods = true;
|
|
|
detail.virtualPayMode = {
|
|
|
payMode: ChannelConfig.payType[orderDetail.payment_type],
|
...
|
...
|
@@ -797,7 +798,7 @@ const _getOrderDetail = co(function * (uid, orderId) { |
|
|
num: good.buy_number,
|
|
|
sum: good.goods_amount,
|
|
|
sku: good.product_sku,
|
|
|
[_getGoodsTag(good.attribute, good.goods_type)]: true
|
|
|
[_getGoodsTag(+good.attribute, good.goods_type)]: true
|
|
|
};
|
|
|
|
|
|
// 划线的价格
|
...
|
...
|
@@ -847,6 +848,7 @@ const _getOrderDetail = co(function * (uid, orderId) { |
|
|
detail.operation = _getOrderDetailOp(orderDetail.order_code, +orderDetail.payment, +orderDetail.status,
|
|
|
orderDetail.is_cancel, orderDetail.payment_status, orderDetail.payment_type,
|
|
|
+orderDetail.order_type, +orderDetail.attribute, +orderDetail.refund_status);
|
|
|
|
|
|
detail.packageTitle = orderDetail.package_title;
|
|
|
detail.packages = _getPackageInfo(orderDetail);
|
|
|
|
...
|
...
|
|