wesmiler 更新第5期更新代码合并

vendor/thinkcmf/cmf-app/src/admin/controller/IndexController.php

@@ -73,9 +73,6 @@ class IndexController extends AdminBaseController
             $menusTmp[$indexTmp] = $item;
         }
         $this->assign("menus_js_var",json_encode($menusTmp));
-
-        //$admin = Db::name("user")->where('id', cmf_get_current_admin_id())->find();
-        //$this->assign('admin', $admin);
         return $this->fetch();
     }
 }

vendor/thinkcmf/cmf-app/src/admin/controller/PublicController.php

@@ -55,7 +55,7 @@ class PublicController extends AdminBaseController
 
         $admin_id = session('ADMIN_ID');
         if (!empty($admin_id)) {//已经登录
-            return redirect(url("admin/Index/sale"));
+            return redirect(url("admin/Index/index"));
         } else {
             session("__SP_ADMIN_LOGIN_PAGE_SHOWED_SUCCESS__", true);
             $result = hook_one('admin_login');
@@ -141,8 +141,7 @@ class PublicController extends AdminBaseController
                 Db::name('user')->update($result);
                 cookie("admin_username", $name, 3600 * 24 * 30);
                 session("__LOGIN_BY_CMF_ADMIN_PW__", null);
-                $url = $result['user_type'] != 3? url("admin/Index/index") : url("admin/Index/sale");
-                $this->success(lang('LOGIN_SUCCESS'), $url);
+                $this->success(lang('LOGIN_SUCCESS'), url("admin/Index/index"));
             } else {
                 $this->error(lang('PASSWORD_NOT_RIGHT'));
             }