合并分支 'li' 到 'master'

赠送积分和角色管理



查看合并请求 !573

@@ -380,10 +380,13 @@ class CenterController extends HomeBaseController
         $type = request()->param('type');
         $type = request()->param('type');
         if ($type == 1) {
         if ($type == 1) {
             $title = '积分获取记录';
             $title = '积分获取记录';
+            $where['type'] = ['neq', 2];
         } else {
         } else {
             $title = '积分使用记录';
             $title = '积分使用记录';
+            $where['type'] = ['neq', 1];
         }
         }
-        $log = Db::name('zj_integral_log')->where(['uid' => session('user.id'), 'type' => $type])->order('create_time DESC')->select();
+        $where['uid'] = ['eq', session('user.id')];
+        $log = Db::name('zj_integral_log')->where($where)->order('create_time DESC')->select();
         return $this->fetch('integral_log', [
         return $this->fetch('integral_log', [
             'log' => $log,
             'log' => $log,
             'title' => $title
             'title' => $title