Merge branch 'dev' of http://rungit.jxdsy.cn:10000/sugar/land_army into dev

application/admin/controller/article/announcement/Announcement.php

@@ -142,6 +142,7 @@ class Announcement  extends Backend
                         $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate;
                         $row->validateFailException(true)->validate($validate);
                     }
+                    $params['updatetime']=time();
                     if($params['class_id']==2){
                         $this->error(__('请选择子级分类', ''));
                     }

application/admin/controller/article/courseresource/Courseresource.php

@@ -142,6 +142,7 @@ class Courseresource  extends Backend
                         $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate;
                         $row->validateFailException(true)->validate($validate);
                     }
+                    $params['updatetime']=time();
                     if($params['class_id']==4){
                         $this->error(__('请选择子级分类', ''));
                     }

application/admin/controller/article/dynamic/Dynamic.php

@@ -142,6 +142,7 @@ class Dynamic extends Backend
                         $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate;
                         $row->validateFailException(true)->validate($validate);
                     }
+                    $params['updatetime']=time();
                     if($params['class_id']==1){
                         $this->error(__('请选择子级分类', ''));
                     }

application/admin/controller/article/interactiveplatform/Interactiveplatform.php

@@ -142,6 +142,7 @@ class Interactiveplatform  extends Backend
                         $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate;
                         $row->validateFailException(true)->validate($validate);
                     }
+                    $params['updatetime']=time();
                     if($params['class_id']==6){
                         $this->error(__('请选择子级分类', ''));
                     }

application/admin/controller/article/scientificpayoffs/Scientificpayoffs.php

@@ -141,6 +141,7 @@ class Scientificpayoffs extends Backend
                         $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate;
                         $row->validateFailException(true)->validate($validate);
                     }
+                    $params['updatetime']=time();
                     if($params['class_id']==5){
                         $this->error(__('请选择子级分类', ''));
                     }

application/admin/controller/article/specials/Specials.php

@@ -141,6 +141,7 @@ class Specials  extends Backend
                         $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate;
                         $row->validateFailException(true)->validate($validate);
                     }
+                    $params['updatetime']=time();
                     if($params['class_id']==7){
                         $this->error(__('请选择子级分类', ''));
                     }

application/admin/controller/article/sportsclub/Sportsclub.php

@@ -140,6 +140,7 @@ class Sportsclub  extends Backend
                         $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate;
                         $row->validateFailException(true)->validate($validate);
                     }
+                    $params['updatetime']=time();
                     if($params['class_id']==8){
                         $this->error(__('请选择子级分类', ''));
                     }

application/admin/controller/article/teachingoperation/Teachingoperation.php

@@ -140,6 +140,7 @@ class Teachingoperation  extends Backend
                         $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate;
                         $row->validateFailException(true)->validate($validate);
                     }
+                    $params['updatetime']=time();
                     if($params['class_id']==3){
                         $this->error(__('请选择子级分类', ''));
                     }

application/admin/controller/article/teachingteam/Teachingteam.php

@@ -137,6 +137,7 @@ class Teachingteam  extends Backend
                         $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate;
                         $row->validateFailException(true)->validate($validate);
                     }
+                    $params['updatetime']=time();
                     $result = $row->allowField(true)->save($params);
                     Db::commit();
                 } catch (ValidateException $e) {

application/admin/controller/auth/Group.php

@@ -255,7 +255,7 @@ class Group extends Backend
             $currentGroupModel = $model->get($id);
         }
         if (($pid || $parentGroupModel) && (!$id || $currentGroupModel)) {
-            $id = $id ? $id : null;
+            $id = $id ? $id : null;//->where(['status'=>'normal'])
             $ruleList = collection(model('AuthRule')->order('weigh', 'desc')->order('id', 'asc')->select())->toArray();
             //读取父类角色所有节点列表
             $parentRuleList = [];

application/index/controller/Article.php

@@ -101,8 +101,12 @@ class Article extends Backend
 
     ///搜索关键词
     public function searchSkeyword(){
+        header('Access-Control-Allow-Origin:*');
+        header("Access-Control-Allow-Headers: Origin, X-Requested-With, Content-Type, Accept");
+        header('Access-Control-Allow-Methods:GET, POST, OPTIONS');
         $keywords = $this->request->get('keywords','');
         $page = $this->request->get('page',1);
+        $pageSize = $this->request->get('pageSize',5);
         $where =[];
         if(!empty($keywords)){
             $where['title'] = ['like',"%$keywords%"];
@@ -113,13 +117,14 @@ class Article extends Backend
             ->count();
         $list =CourseArticleModel::where($where)
             ->order('createtime desc')
-            ->limit($this->pagesize)
+            ->limit($pageSize)
             ->page($page)
             ->select();
         //echo CourseArticleModel::getLastSql();
         $list = collection($list)->toArray();
         foreach ($list as $key => $val){
             $list[$key]['title']=mb_substr_content($val['title'],30);
+            $list[$key]['class_name']=CourseClassModel::sourceClassById($val['class_id']);
         }
         $result = array("total" => $total, "rows" => $list);
         return json($result);

application/index/controller/Teachrun.php

@@ -13,6 +13,9 @@ use app\admin\model\CourseVideoModel;
 use app\admin\model\VideoSublessonModel;
 use app\common\controller\Backend;
 use app\common\controller\Frontend;
+use think\Hook;
+use think\Loader;
+use think\Session;
 
 class Teachrun extends Backend
 {
@@ -25,6 +28,9 @@ class Teachrun extends Backend
      * @return string
      */
     public function secondTeachrun(){
+        $controllername = Loader::parseName($this->request->controller());
+        $actionname = strtolower($this->request->action());
+        $path = str_replace('.', '/', $controllername) . '/' . $actionname;
         $teachrun_id = 2;
         $teachrunclass = CourseClassModel::where(['pid' =>$teachrun_id])->field('id,title')->select();
         $this->view->assign("teachrunclass", $teachrunclass);
@@ -32,15 +38,19 @@ class Teachrun extends Backend
         $Teachfiles = CourseArticleModel::where(['class_id' =>40])->order('createtime desc')->field('*,FROM_UNIXTIME(createtime,"%Y-%m-%d") as createtime_text')->limit(14)->select();
         $this->view->assign("Teachfiles", $Teachfiles);
         //基本教案
-        $Basiclessonclass = CourseClassModel::where(['pid' =>41])->field('id,title')->select();
-        foreach ($Basiclessonclass as $key => $val){
-            $BasiclessonArticles = CourseArticleModel::where(['class_id' =>$val['id']])->order('createtime desc')->field('*,FROM_UNIXTIME(createtime,"%Y-%m-%d") as createtime_text')->limit(14)->select();
-            foreach ($BasiclessonArticles as $k => $v){
-                $BasiclessonArticles[$k]['title'] = mb_substr_content($v['title'],25);
+        $Basiclessonclass=[];
+        if ($this->auth->check($path)) {
+            Hook::listen('admin_nopermission', $this);
+            $Basiclessonclass = CourseClassModel::where(['pid' =>41])->field('id,title')->select();
+            foreach ($Basiclessonclass as $key => $val){
+                $BasiclessonArticles = CourseArticleModel::where(['class_id' =>$val['id']])->order('createtime desc')->field('*,FROM_UNIXTIME(createtime,"%Y-%m-%d") as createtime_text')->limit(14)->select();
+                foreach ($BasiclessonArticles as $k => $v){
+                    $BasiclessonArticles[$k]['title'] = mb_substr_content($v['title'],25);
+                }
+                $Basiclessonclass[$key]['BasiclessonArticles'] = $BasiclessonArticles;
             }
-            $Basiclessonclass[$key]['BasiclessonArticles'] = $BasiclessonArticles;
-        }
-        $this->view->assign("Basiclessonclass", $Basiclessonclass);
+         }
+        $this->view->assign("Basiclessonclass",$Basiclessonclass);
         //自编教材
         $selfteach = CourseArticleModel::where(['class_id' =>42])->order('createtime desc')->field('*,FROM_UNIXTIME(createtime,"%Y-%m-%d") as createtime_text')->limit(10)->select();
         $this->view->assign("selfteach", $selfteach);
@@ -75,6 +85,7 @@ class Teachrun extends Backend
             ->select();//推荐视频
         $runbanner = get_banner(5,5);
         $this->view->assign("runbanner", $runbanner);
+        $this->view->assign("atu", $runbanner);
         $this->view->assign("Video_class_id", 45);
         $this->view->assign("CourseVideos", $CourseVideos);
         return $this->view->fetch('index/jxyxindex');

application/index/view/index/jxyxindex.html

@@ -77,7 +77,7 @@
 
     
     <!-- 基本教案 -->
-    <div class="jxyx_plate_two" id="jxyx_plate_two">
+    <div class="jxyx_plate_two" id="jxyx_plate_two" style=" display: {if !$Basiclessonclass}none{/if}">
         <div class="container">
             <div class="jxyx_tit">
                 <img class="jxyx_titing" src="/static/images/jxyxindex/LDOxckBJowuV3RdUJQHs.png" alt="">

public/static/css/global.css

@@ -2474,7 +2474,7 @@ a:focus, a:hover {
 
 .jiaoxueyunxinbanner .jiaoxueyunxinindexbanner {
   width: 100%;
-  height: 600px;
+  height: 300px;
 }
 
 .jiaoxueyunxinbanner .jxyxbannertext {

public/static/css/global.scss

@@ -2324,7 +2324,7 @@ $ontnavheight:68px;
     position: relative;
     .jiaoxueyunxinindexbanner{
         width: 100%;
-        height: 600px;
+        height: 300px;
     }
     .jxyxbannertext{
         position: absolute;