Commit 3a52f9cf by 冷斌

Merge remote-tracking branch 'origin/master'

parents 048049c4 db7728ef
......@@ -125,7 +125,7 @@ class IndexAction extends Action
$this->assign('module_id', $module_id);
$this->assign('exams_subject_id', $cateId);
if (isAjax() && $_GET['api']) {
echo json_encode(['status' => 1, 'data' => $list]);exit;
echo json_encode(['status' => 1, 'data' => $list, 'cate' => $cateData]);exit;
}
if (isAjax()) {
$html = $this->fetch('paper_list_ajax');
......
......@@ -201,6 +201,9 @@
myCollect: []
}
},
created:function() {
},
mounted:function(){
$("#preloader").hide();
this.onTopTab(0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment