|
@@ -65,7 +65,7 @@ class UserBill extends BaseModel
|
|
|
if ($page) {
|
|
if ($page) {
|
|
|
$list = self::where('uid', $uid)
|
|
$list = self::where('uid', $uid)
|
|
|
->where('category', 'now_money')
|
|
->where('category', 'now_money')
|
|
|
- ->where('type', 'in','brokerage')
|
|
|
|
|
|
|
+ ->where('type', 'in','brokerage,extract')
|
|
|
->field('mark,pm,number,add_time')
|
|
->field('mark,pm,number,add_time')
|
|
|
->where('status', 1)
|
|
->where('status', 1)
|
|
|
->where($where)
|
|
->where($where)
|
|
@@ -75,7 +75,7 @@ class UserBill extends BaseModel
|
|
|
} else {
|
|
} else {
|
|
|
$list = self::where('uid', $uid)
|
|
$list = self::where('uid', $uid)
|
|
|
->where('category', 'now_money')
|
|
->where('category', 'now_money')
|
|
|
- ->where('category', 'in','extract')
|
|
|
|
|
|
|
+ ->where('category', 'in','brokerage,extract')
|
|
|
->field('mark,pm,number,add_time')
|
|
->field('mark,pm,number,add_time')
|
|
|
->where('status', 1)
|
|
->where('status', 1)
|
|
|
->where($where)
|
|
->where($where)
|
