|
|
@ -133,7 +133,7 @@ class User extends BaseController |
|
|
|
|
|
|
|
|
$list = Db::name('consumption_records') |
|
|
$list = Db::name('consumption_records') |
|
|
->where(['user_id' => $userData['id']]) |
|
|
->where(['user_id' => $userData['id']]) |
|
|
->field('zone_goods_id,actual_price,residue_amount,create_time') |
|
|
->field('zone_goods_id,actual_price,residue_amount,create_time,actual_type') |
|
|
->order('id' ,'desc') |
|
|
->order('id' ,'desc') |
|
|
->paginate($limit); |
|
|
->paginate($limit); |
|
|
|
|
|
|
|
|
@ -145,6 +145,7 @@ class User extends BaseController |
|
|
$item['zone_title'] = $Zone->title; |
|
|
$item['zone_title'] = $Zone->title; |
|
|
give_symbol($item['actual_price'],'-'); |
|
|
give_symbol($item['actual_price'],'-'); |
|
|
$item['create_time'] = date("m月d日 H:i",strtotime($item['create_time'])); |
|
|
$item['create_time'] = date("m月d日 H:i",strtotime($item['create_time'])); |
|
|
|
|
|
$item['actual_type'] = $item['actual_type'] == 2 ? '可提余额' : '余额'; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
return $this->renderSuccess('数据获取成功',[ |
|
|
return $this->renderSuccess('数据获取成功',[ |
|
|
|