diff --git a/application/api/model/UserGiftPack.php b/application/api/model/UserGiftPack.php index 42206b06..8971af45 100644 --- a/application/api/model/UserGiftPack.php +++ b/application/api/model/UserGiftPack.php @@ -108,15 +108,18 @@ class UserGiftPack extends Model //背包收入 public function income_user_gift_pack($uid,$page=1,$page_limit=10) { - $type = [ - self::SYSTEM_ADJUSTMENT, - self::GIFT_PACK_GET, -// self::GIFT_SEND, - self::FIRST_CHARGE, - self::DRAW_GIFT, - self::XLH_DRAW_GIFT_GET - ,self::HOUR_RANK_GET - ,self::NEW_CHARGE_GIFT + $type = [ + self::SYSTEM_ADJUSTMENT + , self::GIFT_PACK_GET +// , self::GIFT_SEND + , self::FIRST_CHARGE + , self::DRAW_GIFT + , self::XLH_DRAW_GIFT_GET + , self::HOUR_RANK_GET + , self::NEW_CHARGE_GIFT + , self::TASK_REWARD + , self::DAILY_SIGN + , self::BLANK_BOX_DRAW_GIFT_GET ]; //获取背包日志列表 $log_model = Db::name('vs_user_gift_pack_log')->where(['user_id'=>$uid])->whereIn('type', $type)