Merge remote-tracking branch 'origin/master'

apps/exams/Lib/Action/IndexAction.class.php

@@ -125,7 +125,7 @@ class IndexAction extends Action
         $this->assign('module_id', $module_id);
         $this->assign('module_id', $module_id);
         $this->assign('exams_subject_id', $cateId);
         $this->assign('exams_subject_id', $cateId);
 		if (isAjax() && $_GET['api']) {
 		if (isAjax() && $_GET['api']) {
-			echo json_encode(['status' => 1, 'data' => $list]);exit;
+			echo json_encode(['status' => 1, 'data' => $list, 'cate' => $cateData]);exit;
 		}
 		}
         if (isAjax()) {
         if (isAjax()) {
             $html = $this->fetch('paper_list_ajax');
             $html = $this->fetch('paper_list_ajax');

apps/home/Tpl/default/Home/exams_w3g.html

@@ -201,6 +201,9 @@
 				myCollect: []
 				myCollect: []
 			}
 			}
 		},
 		},
+		created:function() {
+			
+		},
 		mounted:function(){
 		mounted:function(){
 			$("#preloader").hide();
 			$("#preloader").hide();
 			this.onTopTab(0)
 			this.onTopTab(0)