功能更新

app/controller/admin/Base.php

@@ -9,9 +9,12 @@
 namespace app\controller\admin;
 
 use app\model\Menu;
+use app\model\Model;
+use app\model\AuthGroup;
 use think\facade\View;
 use \app\model\Form;
 use \app\controller\Base as BaseC;
+use think\facade\Route;
 
 class Base extends BaseC {
 
@@ -190,28 +193,26 @@ class Base extends BaseC {
 	}
 
 	protected function getContentMenu() {
-		$model = \think\facade\Loader::model('Model');
-		$list = array();
-		$map = array(
-			'status' => array('gt', 0),
-		);
-		$list = $model::where($map)->field("name,id,title,icon,'' as 'style'")->select();
+		$list = [];
+		$menu = [];
+		$map[] = ['status', '>', 0];
+		$list = Model::where($map)->field("name,id,title,icon,'' as 'style'")->select();
 
 		//判断是否有模型权限
-		$models = AuthGroup::getAuthModels(session('user_auth.uid'));
+		$models = AuthGroup::getAuthModels(session('userInfo.uid'));
 		foreach ($list as $key => $value) {
 			if (IS_ROOT || in_array($value['id'], $models)) {
-				if ('/admin/content/index' == $this->request->path() && input('model_id') == $value['id']) {
+				if ('/admin/content/index' == $this->request->url() && input('model_id') == $value['id']) {
 					$value['style'] = "active";
 				}
-				$value['url'] = "/admin/content/index?model_id=" . $value['id'];
+				$value['url'] = "/admin/".$value['name']."/index";
 				$value['title'] = $value['title'] . "管理";
 				$value['icon'] = $value['icon'] ? $value['icon'] : 'file';
 				$menu[] = $value;
 			}
 		}
 		if (!empty($menu)) {
-			$this->assign('extend_menu', array('内容管理' => $menu));
+			View::assign('extend_menu', array('内容管理' => $menu));
 		}
 	}