diff --git a/app/api/controller/Enrol/Classes.php b/app/api/controller/Enrol/Classes.php new file mode 100644 index 0000000..f24a9eb --- /dev/null +++ b/app/api/controller/Enrol/Classes.php @@ -0,0 +1,62 @@ +param(); + $con = []; + + $query = ModelClasses::where($con) + ->field([ + 'classes_id', + 'classes_name', + 'classes_desc', + 'classes_sort' + ]) + ->order('classes_sort', 'asc'); + + + return msg("获取班型列表成功!", $query); + } + + /** + * 获取班型详情 + */ + public function getClassesInfo(Request $request): array + { + $params = $request->param(); + + $this->validate($params, ['classes_id' => 'require']); + + $find = ModelClasses::field([ + 'classes_id', + 'classes_name', + 'classes_desc', + 'classes_content', + 'classes_sort' + ]) + ->where('classes_id', $params['classes_id']) + ->find(); + + return msg(0, '获取班型详情成功!', ['data' => $find]); + } +} diff --git a/app/api/controller/Enrol/EnrolAq.php b/app/api/controller/Enrol/EnrolAq.php index f00168b..9406b3a 100644 --- a/app/api/controller/Enrol/EnrolAq.php +++ b/app/api/controller/Enrol/EnrolAq.php @@ -25,25 +25,24 @@ class EnrolAq extends BaseController $params = $request->param(); $con = []; - $con = Tool::getOptionalQuery(['enrol_aq_question', 'LIKE'], ['enrol_aq_status', '='], ['enrol_aq_answer_status', '='],); + $con = Tool::getOptionalQuery(['enrol_aq_question', 'LIKE']); $query = ModelEnrolAq::where($con) ->field([ 'enrol_aq_id', - 'enrol_aq_guid', 'enrol_aq_question', 'enrol_aq_answer', 'enrol_aq_sort', - 'enrol_aq_status', - 'enrol_aq_answer_status' ]) - ->where('enrol_aq_status',2) - ->where('enrol_aq_answer_status',2) - ->order('enrol_aq_sort', 'asc'); + ->where('enrol_aq_status', 2) + ->where('enrol_aq_answer_status', 2) + ->order('enrol_aq_sort', 'asc') + ->select(); - - - return msg("获取招生问答列表成功!", $query); + return msg(0, "获取招生问答列表成功!", [ + 'data' => $query, + 'count' => count($query) + ]); } @@ -68,5 +67,4 @@ class EnrolAq extends BaseController ]); return msg('添加成功!'); } - } diff --git a/app/api/controller/Enrol/EnrolIntro.php b/app/api/controller/Enrol/EnrolIntro.php new file mode 100644 index 0000000..00bc28c --- /dev/null +++ b/app/api/controller/Enrol/EnrolIntro.php @@ -0,0 +1,59 @@ +param(); + $con = []; + + $query = ModelEnrolIntro::where($con) + ->field([ + 'enrol_intro_id', + 'enrol_intro_title', + 'enrol_intro_sort', + ]) + ->order('enrol_intro_sort', 'asc'); + + return msg("获取招生简介列表成功!", $query); + } + + /** + * 获取招生简介详情 + */ + public function getEnrolIntroInfo(Request $request): array + { + $params = $request->param(); + + $this->validate($params, ['enrol_intro_id' => 'require']); + + $find = ModelEnrolIntro::field([ + 'enrol_intro_id', + 'enrol_intro_title', + 'enrol_intro_content', + 'enrol_intro_sort', + ]) + ->where('enrol_intro_id', $params['enrol_intro_id']) + ->find(); + + return msg(0, '获取招生简介详情成功!', ['data' => $find]); + } +} diff --git a/app/api/controller/Enrol/EnterSchoolProcess.php b/app/api/controller/Enrol/EnterSchoolProcess.php new file mode 100644 index 0000000..6802689 --- /dev/null +++ b/app/api/controller/Enrol/EnterSchoolProcess.php @@ -0,0 +1,46 @@ +param(); + $con = []; + + $query = ModelEnterSchoolProcess::where($con) + ->field([ + 'enter_school_process_id', + 'enter_school_process_title', + 'enter_school_process_intro', + 'enter_school_process_sort' + ]) + ->order('enter_school_process_sort', 'desc') + ->select(); + + + + return msg(0, "获取入学流程列表成功!", [ + 'data' => $query, + 'count' => count($query) + ]); + } + +} diff --git a/app/api/controller/Enrol/SignUpProcess.php b/app/api/controller/Enrol/SignUpProcess.php new file mode 100644 index 0000000..f1599de --- /dev/null +++ b/app/api/controller/Enrol/SignUpProcess.php @@ -0,0 +1,47 @@ +param(); + $con = []; + + $query = ModelSignUpProcess::where($con) + ->field([ + 'sign_up_process_id', + 'sign_up_process_title', + 'sign_up_process_icon', + 'sign_up_process_intro', + 'sign_up_process_sort' + ]) + ->order('sign_up_process_sort', 'desc') + ->select(); + + + + return msg(0, "获取报名流程列表成功!", [ + 'data' => $query, + 'count' => count($query) + ]); + } + +} diff --git a/app/common/model/Flow/Flow.php b/app/common/model/Flow/Flow.php index b393b71..4b990ee 100644 --- a/app/common/model/Flow/Flow.php +++ b/app/common/model/Flow/Flow.php @@ -113,13 +113,14 @@ class Flow extends BaseModel // $res_url = explode('/',$url)[1]; $match_res_pool = [ 'index'=>'首页', - 'product'=>'产品页', - 'product-details-id'=>'产品详情页', - 'news'=>'新闻页', - 'news-details-id'=>'新闻详情页', - 'serviceSupport'=>'服务支持页', - 'contactUs'=>'联系我们页', - 'aboutUs'=>'关于我们页' + 'about-intro'=>'关于我们-厚德简介', + 'about-env'=>'关于我们-教学环境', + 'about-history'=>'关于我们-发展历程', + 'teachers'=>'师资力量', + 'teachers-details-id'=>'师资力量-详情页', + 'achievement-school_achievement'=>'荣誉成绩-录取院校', + 'achievement-joint_achievement-page'=>'荣誉成绩-联考成绩', + 'achievement-joint_achievement-details-id'=>'荣誉成绩-联考成绩-详情页', ]; if(!isset($match_res_pool[$url])){ return '未知页面'; diff --git a/app/resources/view/api/controller.tpl b/app/resources/view/api/controller.tpl index 3820252..7db4d94 100644 --- a/app/resources/view/api/controller.tpl +++ b/app/resources/view/api/controller.tpl @@ -29,11 +29,15 @@ class {$className} extends BaseController $query = Model{$className}::where($con) ->field({$queryFields}) - ->order({$orderField}, {$orderMode}); + ->order({$orderField}, {$orderMode}) + ->select(); {$imgUrlPrefixPadding} - return msg("获取{$functionName}列表成功!",$query); + return msg(0, "获取{$functionName}列表成功!", [ + 'data' => $query, + 'count' => count($query) + ]); } /**