ufo / ufo-platform · Commits

Go to a project

Authored by LUOXC
Commit 75f3bef08999194d8578a1b101988c42d9b1d052 2 parents 2791a1f3 705b92e4

Merge branch 'hotfix-2020-2' into test6.9.21

Inline Side-by-side
Showing 2 changed files with 12 additions and 5 deletions
... ... @@ -76,6 +76,7 @@ public enum Constant {
BUYER_ORDER_STATUS_APPRAISE_UNSURE((byte)23,"已取消(无法鉴定)"),
BUYER_ORDER_STATUS_SETTLE_FAIL_PLATFORM((byte)24,"清关失败(平台原因)"),
BUYER_ORDER_STATUS_SETTLE_FAIL_BUYER((byte)25,"清关失败(买家原因)"),
CS_CANCEL_BEFORE_SELLER_SENT_OUT((byte)26, "已取消(卖家无法发货)"),
BUYER_ORDER_STATUS_DECETION_NOT_PASS((byte)91, "商品检测不通过"),
BUYER_CANCEL_BEFORE_DEPOT_RECEIVE_USE_DEPOSIT_GOODS((byte)40, "发货后买家取消"),
... ... @@ -95,7 +96,6 @@ public enum Constant {
BUYER_BID_PAY_TIMEOUT((byte)97, "买家支付超时"),
BUYER_CLICK_FARM_CANCELD((byte)41,"买家刷单客服取消"),
;
private byte byteVal;
... ...
... ... @@ -80,6 +80,7 @@
<option value="23">已取消(商品无法鉴定)</option>
<option value="24">清关失败(平台原因)</option>
<option value="25">清关失败(买家原因)</option>
<option value="26">已取消(卖家无法发货)</option>
<option value="91">商品检测不通过</option>
<option value="40">已取消(寄存转现货)</option>
<option value="41">已取消(刷单取消)</option>
... ... @@ -362,11 +363,11 @@ function getOrderList(){
align: "center",
formatter: function (value, rowData, rowIndex) {
var buttons = '';
var cancelButtons = [];
buttons += "<a role='detail' dataId='"+ rowData.orderCode + "' skup='"+ rowData.skup + "' style='margin-left:10px;background-color: #5cb85c !important;'>详情</a>";
// 卖家已发货
if(rowData.status == 2){
buttons += "<a role='cancelOrder' dataId='"+ rowData.orderCode +"' style='margin-left:10px;color:white;background-color: #D31225 !important;'>取消订单</a>";
cancelButtons.push("<a role='cancelOrder' dataId='"+ rowData.orderCode +"' style='margin-left:10px;color:white;background-color: #D31225 !important;'>取消订单</a>")
if(abnormalDeliveryTab&&(1!=rowData.sellerDeliveryDeal)){
if(12==navStatus){
buttons += "<a role='sellerDeliveryDealOrder' dataId='"+ rowData.orderCode +"' style='margin-left:10px;color:white;background-color: #5bc0de !important;'>处理</a>";
... ... @@ -380,10 +381,16 @@ function getOrderList(){
buttons += "<a role='settleFail' dataId='"+ rowData.orderCode +"' style='margin-left:10px;color:white;background-color: #D31225 !important;'>清关失败</a>";
}
if(rowData.attributes == 1 && rowData.region== 0 && (rowData.status == 1 || rowData.status == 2 ||rowData.status == 31 ||rowData.status == 32)){
buttons += "<a role='cancelBuyerOrderClickFarm' dataId='"+ rowData.orderCode +"' style='margin-left:10px;color:white;background-color:#fadb14 !important;'>取消刷单</a>";
cancelButtons.push("<a role='cancelBuyerOrderClickFarm' dataId='"+ rowData.orderCode +"' style='margin-left:10px;color:white;background-color:#fadb14 !important;'>取消刷单</a>");
}
if(rowData.status == 1){
buttons += "<a role='cancelOrder' dataId='"+ rowData.orderCode +"' cancelType='2' style='margin-left:10px;color:white;background-color: #D31225 !important;'>卖家无法发货</a>";
cancelButtons.push("<a role='cancelOrder' dataId='"+ rowData.orderCode +"' cancelType='2' style='margin-left:10px;color:white;background-color: #D31225 !important;'>卖家无法发货</a>")
}
if(cancelButtons.length > 0){
buttons +='<a href="#" class="easyui-menubutton" data-options="menu:\'#cancelButtons\',iconCls:\'icon-cancel\'">取消</a>';
buttons += '<div id="cancelButtons" style="width:150px;">';
buttons += cancelButtons.join("");
buttons += '</div>';
}
return buttons;
}
... ...