合并分支 'heshupeng' 到 'master'

PC二开考试优化



查看合并请求 !234

@@ -613,7 +613,12 @@ class Exam extends Api
         $data = Db::name('third_exam')
             ->where('id',$id)
             ->find();
-        $info['num'] = 3 - Db::name('third_exam')->where('user_id',$data['user_id'])->where('study_id',$data['study_id'])->count();
+        $exam_times = Db::name('third_exam')
+            ->where('user_id',$data['user_id'])
+            ->where('study_id',$data['study_id'])
+            ->whereTime('createtime','month')
+            ->count();
+        $info['num'] = 3 - $exam_times;
         $info['score'] = $data['score'];
         $this->success('success',$info);
     }