Merge remote-tracking branch 'origin/master' into akun

@@ -435,6 +435,12 @@ class ProjectLogic extends BaseLogic
                 NoticeLog::createLog(NoticeLog::TYPE_INIT_KEYWORD_COMMENT, ['project_id' => $param['id']]);
             }
         }
+        if(isset($param['tag_page_version']) && $param['tag_page_version'] == 1){
+            $project_info = $this->model->read(['id'=>$param['id']],'tag_page_version');
+            if($project_info['tag_page_version'] == 2){
+                $this->fail('新版聚合页开启后不允许关闭，如需关闭，请联系管理员');
+            }
+        }
         if($param['type'] == Project::TYPE_FIVE){
             $param['extend_type'] = Project::TYPE_FIVE;
             unset($param['type']);