wesmiler hai 5 meses
pai
achega
e75f161bf1

+ 2 - 1
app/Services/Api/ExamService.php

@@ -392,6 +392,7 @@ class ExamService extends BaseService
         $this->model->where(['id' => $id, 'mark' => 1])->update($updateData);
         ExamAnswerTopicModel::where(['answer_log_id' => $id, 'mark' => 1])->update(['status' => 2, 'update_time' => time()]);
         RedisService::keyDel("caches:exams:{$userId}*");
+        RedisService::keyDel("caches:paper:info_{$userId}:p*");
         return true;
     }
 
@@ -479,7 +480,7 @@ class ExamService extends BaseService
         // 每日一练
         if ($sceneType == 1 && $rid <= 0) {
             // 今日记录
-            $answerInfo = ExamAnswerModel::where(['paper_id' => $paperId, 'status' => 1, 'mark' => 1])->where('create_time', '>=', strtotime(date('Y-m-d')))->first();
+            $answerInfo = ExamAnswerModel::where(['paper_id' => $paperId,'user_id'=>$userId, 'status' => 1, 'mark' => 1])->where('create_time', '>=', strtotime(date('Y-m-d')))->first();
             $rid = isset($answerInfo['id']) ? $answerInfo['id'] : 0;
             $submit = isset($answerInfo['is_submit']) ? $answerInfo['is_submit'] : 0;
             $answerCount = isset($answerInfo['answer_count']) ? $answerInfo['answer_count'] : 0;

+ 1 - 1
app/Services/Common/ArticleService.php

@@ -77,7 +77,7 @@ class ArticleService extends BaseService
                 }
             })
             ->where(function ($query) use ($cateId,$articleCateType) {
-                if ($articleCateType!=1) {
+                if ($articleCateType && $articleCateType!=1) {
                     if($cateId>0){
                         $query->where('a.cate_id', $cateId);
                     }else{

+ 8 - 0
config/platform.php

@@ -5,24 +5,28 @@ return [
             "id" => 1,
             "name" => '每日一练',
             "code" => 'day-practice',
+            "icon" => get_image_url('/images/icons/menu/icon-day-practice.png'),
             'page' => '/pages/exam/practice?st=1'
         ],
         [
             "id" => 2,
             "name" => '历年真题',
             "code" => 'past-paper',
+            "icon" => get_image_url('/images/icons/menu/icon-past-paper.png'),
             'page' => '/pages/exam/index?st=2'
         ],
         [
             "id" => 3,
             "name" => '模拟试题',
             "code" => 'mock-paper',
+            "icon" => get_image_url('/images/icons/menu/icon-mock-paper.png'),
             'page' => '/pages/exam/index?st=3',
             'page1' => '/pages/exam/subject?st=3',
         ],
         [
             "id" => 98,
             "name" => '智能问答',
+            "icon" => get_image_url('/images/icons/menu/icon-intelligent-answer.png'),
             "code" => 'intelligent-answer',
             'page' => '/pages/custom/index'
         ],
@@ -30,6 +34,7 @@ return [
             "id" => 5,
             "name" => '复习资料',
             "code" => 'review-materials',
+            "icon" => get_image_url('/images/icons/menu/icon-review-materials.png'),
             'page' => '/pagesArticle/pages/article/material?st=5',
             'page1' => '/pagesArticle/pages/article/materialCate?st=5'
         ],
@@ -37,6 +42,7 @@ return [
             "id" => 4,
             "name" => '模拟考试',
             "code" => 'mock-exam',
+            "icon" => get_image_url('/images/icons/menu/icon-mock-exam.png'),
             'page' => '/pages/exam/index?st=4',
             'page1' => '/pages/exam/subject?st=4'
         ],
@@ -44,12 +50,14 @@ return [
             "id" => 6,
             "name" => '考前冲刺',
             "code" => 'exam-sprint',
+            "icon" => get_image_url('/images/icons/menu/icon-exam-sprint.png'),
             'page' => '/pages/exam/index?st=6',
             'page1' => '/pages/exam/subject?st=6',
         ],
         [
             "id" => 99,
             "name" => '院校直达',
+            "icon" => get_image_url('/images/icons/menu/icon-institution-entry.png'),
             "code" => 'institution-entry',
             'page' => '/pages/index/institution'
         ],

BIN=BIN
public/uploads/images/icons/menu/icon-day-practice.png


BIN=BIN
public/uploads/images/icons/menu/icon-exam-sprint.png


BIN=BIN
public/uploads/images/icons/menu/icon-institution-entry.png


BIN=BIN
public/uploads/images/icons/menu/icon-intelligent-answer.png


BIN=BIN
public/uploads/images/icons/menu/icon-mock-exam.png


BIN=BIN
public/uploads/images/icons/menu/icon-mock-paper.png


BIN=BIN
public/uploads/images/icons/menu/icon-past-paper.png


BIN=BIN
public/uploads/images/icons/menu/icon-review-materials.png