Authored by Lixiaodi

bug修改

... ... @@ -2811,6 +2811,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon
resp.setColorName(sellerGoodsMap.get(skup).getColorName());
resp.setSizeName(sellerGoodsMap.get(skup).getSizeName());
resp.setAttributesStr(OrderConfigConstant.getOrderAttributeStr(item.getAttributes(), sellerGoodsMap.get(skup).getRegion()));
resp.setRegion(sellerGoodsMap.get(skup).getRegion());
}
resp.setSkup(skup);
... ...
... ... @@ -352,7 +352,7 @@ function getOrderList(){
}
}
if(rowData.status == 4 && (rowData.attributesStr=="海外直邮" || rowData.attributesStr=="海外预售" )){
if(rowData.status == 4 && (rowData.region== 1 )){
buttons += "<a role='settleFail' dataId='"+ rowData.orderCode +"' style='margin-left:10px;color:white;background-color: #D31225 !important;'>清关失败</a>";
}
return buttons;
... ...