edit-admin-order_list
This commit is contained in:
@@ -210,6 +210,14 @@ class Ordersv2List
|
||||
if(strlen($params['status_pid'])){
|
||||
$where["{$this->t1}.id>="] = Orders_v2_entity::V2_START_ID;
|
||||
}
|
||||
|
||||
if(strlen($params['status_pid']) && !$params['status_pid']){
|
||||
$orderby = "{$this->t1}.order_time desc";
|
||||
}elseif ($params['status_pid']==3){
|
||||
$orderby = "{$this->t1}.bill_time desc";
|
||||
}else{
|
||||
$orderby = "{$this->t1}.c_time desc";
|
||||
}
|
||||
if(strlen($params['status_pid']) && $params['status']){
|
||||
$where["{$this->t2}.pid_status"] = $params['status_pid'];
|
||||
$up_key = $params['status']+1;
|
||||
@@ -219,13 +227,13 @@ class Ordersv2List
|
||||
$having = "total >= 1";
|
||||
}
|
||||
$count = $this->ci->mdOrders->selectOrders($where,'', '', '', 1,'',$having);
|
||||
$rows = $this->ci->mdOrders->selectOrders($where, "c_time desc", $page, $size, '',$fileds,$having);
|
||||
$rows = $this->ci->mdOrders->selectOrders($where, $orderby, $page, $size, '',$fileds,$having);
|
||||
}else{
|
||||
if(strlen($params['status'])){
|
||||
$where["id not in (select o_id from lc_receiver_order_status where pid_status={$params['status_pid']} and status=1)"] = null;
|
||||
}
|
||||
$count = $this->ci->mdOrders->count($where);
|
||||
$rows = $this->ci->mdOrders->select($where, "c_time desc", $page, $size,$fileds);
|
||||
$rows = $this->ci->mdOrders->select($where, $orderby, $page, $size,$fileds);
|
||||
}
|
||||
$lists = [];
|
||||
if ($count) {
|
||||
|
||||
@@ -2,12 +2,6 @@
|
||||
<div class="bs-example bs-example-tabs" data-example-id="togglable-tabs" style="font-size:15px;">
|
||||
<div id="recom-stat"></div>
|
||||
<ul class="nav nav-tabs" role="tablist">
|
||||
<li role="presentation" class="<?= !strlen($params['status_pid']) ? 'active' : '' ?>">
|
||||
<a href="javascript:void (0);" data-open="/receiver/orderv2/orders">
|
||||
全部
|
||||
<?= $params['count_all'] > 0 ? '<span style="background-color:#ff6600" class="am-badge am-round">' . $params['count_all'] . '</span>' : '' ?>
|
||||
</a>
|
||||
</li>
|
||||
<? foreach ($status_arr as $v) { ?>
|
||||
<li role="presentation"
|
||||
class="<? if (strlen($params['status_pid']) && $params['status_pid'] == $v['id']) { ?>active<? } ?>">
|
||||
@@ -45,6 +39,12 @@
|
||||
<? } ?>
|
||||
</li>
|
||||
<? } ?>
|
||||
<li role="presentation" class="<?= !strlen($params['status_pid']) ? 'active' : '' ?>">
|
||||
<a href="javascript:void (0);" data-open="/receiver/orderv2/orders">
|
||||
全部
|
||||
<?= $params['count_all'] > 0 ? '<span style="background-color:#ff6600" class="am-badge am-round">' . $params['count_all'] . '</span>' : '' ?>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user