|
@@ -409,10 +409,10 @@ Class Manage
|
|
|
}
|
|
|
$active = Dever::db('active/info')->find($v['active_id']);
|
|
|
$m = '';
|
|
|
- if ($v['status'] == 1 && time()<$active['act_start'] && $active['refund_type'] == 2) {
|
|
|
+ // if ($v['status'] == 1 && time()<$active['act_start'] && $active['refund_type'] == 2) {
|
|
|
$url = Dever::url('lib/manage.setOrder&order_id=' . $v['order_id'].'&code_id='.$v['id'], 'active');
|
|
|
$m = '<a href="javascript:;" onclick="load( \''.$url.'\')" class="layui-btn">退款</a>';
|
|
|
- }
|
|
|
+ // }
|
|
|
$d = array
|
|
|
(
|
|
|
$join_name,
|
|
@@ -514,7 +514,7 @@ Class Manage
|
|
|
$where['refund_num'] = $refund_num + $data['refund_num'];
|
|
|
|
|
|
if ($type == 1 || ($price == $data['price']) || ($data['num'] == $where['refund_num'])) {
|
|
|
- Dever::db('active/order')->update($where);
|
|
|
+ $ids = Dever::db('active/order')->update($where);
|
|
|
} else {
|
|
|
$where['status'] = 2;
|
|
|
$ids = Dever::db('active/order')->update($where);
|