Authored by 石坚

修改订单详情中备货中文案,修改物流信息中的一行提示

... ... @@ -376,7 +376,7 @@ class OrderModel
}
}
//把最初的处理放最后
$result['logistics'][] = $logisticsTmp;
//$result['logistics'][] = $logisticsTmp;
}
}
}
... ... @@ -528,12 +528,12 @@ class OrderModel
//'订单已付款,等待备货中'
elseif ($payType != 2 && $payStatus == 'Y') {
$ret['keyName'] = 'paid';
$ret['statusStr'] = '备货中';
$ret['statusStr'] = '待发货';//'备货中';
}
//'订单已成功,等待备货中'-货到付款
elseif ($payType == 2 && $payStatus == 'N') {
$ret['keyName'] = 'complete';
$ret['statusStr'] = '备货中';
$ret['statusStr'] = '待发货';//'备货中';
}
break;
case 1:
... ... @@ -541,7 +541,7 @@ class OrderModel
case 3:
//'订单已付款,等待备货中'
$ret['keyName'] = 'paid';
$ret['statusStr'] = '备货中';
$ret['statusStr'] = '待发货';//'备货中';
break;
case 4:
case 5:
... ...