|
...
|
...
|
@@ -286,7 +286,6 @@ class Member extends Api |
|
|
|
if ($type == 1) $where['type'] = ['in', '1,2'];
|
|
|
|
else $where['type'] = ['eq', 3];
|
|
|
|
$list = $orderModel->selectPageData($where, $page, $limit);
|
|
|
|
halt($list);
|
|
|
|
$data = [];
|
|
|
|
foreach ($list['list'] as $k => $order) {
|
|
|
|
if ($order['status'] == -1) {
|
|
...
|
...
|
@@ -322,6 +321,7 @@ class Member extends Api |
|
|
|
$tmp['pay_total'] += $orderInfo[$kk]['goods_total'];
|
|
|
|
$tmp['goods_image'][] = $orderInfo[$kk]['goods_image'];
|
|
|
|
}
|
|
|
|
halt($tmp);
|
|
|
|
$data[] = $tmp;
|
|
|
|
}
|
|
|
|
} elseif ($order['status'] == 3) {
|
...
|
...
|
|
