1.修改默认layout为空

modules/bills_lib/routes/bills_lib_routes.js

@@ -8,14 +8,9 @@ let billsRouter =express.Router();
 module.exports =function (app) {
 
     app.get("/stdBillsmain", function(req, res){
-        if(!req.session.userAccount){
-            res.redirect('/login');
-        }
-        else {
-            res.render("maintain/bills_lib/html/main.html",
-                {userAccount: req.session.userAccount,
-                    userID: req.session.userID});
-        }
+        res.render("maintain/bills_lib/html/main.html",
+            {userAccount: req.session.managerData.username,
+                userID: req.session.managerData.userID});
     });
     app.get("/stdBills", function(req, res){
         res.render("maintain/bills_lib/html/qingdan.html");

modules/users/controllers/dashboard_controller.js

@@ -35,6 +35,7 @@ class DashboardController extends BaseController {
         let renderData = {
             parentTitle: DashboardController.parentTitle,
             parentIndex: DashboardController.parentIndex,
+            layout: 'users/views/layout/layout'
         };
         response.render('users/views/dashboard/index', renderData);
     }

modules/users/controllers/login_controller.js

@@ -16,12 +16,16 @@ class LoginController extends BaseController {
      *
      * @param {object} request
      * @param {object} response
-     * @return {void}
+     * @return {void|Mixed}
      */
     index(request, response) {
         let renderData = {
             layout: false,
         };
+        let managerSessionData = request.session.managerData;
+        if (managerSessionData !== undefined) {
+            return response.redirect("/dashboard");
+        }
         response.render('users/views/login/index', renderData);
     }
 
@@ -64,6 +68,7 @@ class LoginController extends BaseController {
                 username: managerData.username,
                 loginTime: currentTime,
                 sessionToken: sessionToken,
+                userID: managerData.id
             };
             request.session.managerData = managerSession;
         } catch (error) {

modules/users/controllers/manager_controller.js

@@ -42,7 +42,8 @@ class ManagerController extends BaseController {
 
         let renderData = {
             managerList: managerList,
-            pages: pageData
+            pages: pageData,
+            layout: 'users/views/layout/layout'
         };
         response.render('users/views/manager/index', renderData);
     }
@@ -107,6 +108,7 @@ class ManagerController extends BaseController {
 
         let renderData = {
             adminData: adminData,
+            layout: 'users/views/layout/layout'
         };
         response.render('users/views/manager/save', renderData);
     }

modules/users/controllers/notify_controller.js

@@ -17,7 +17,10 @@ class NotifyController extends BaseController {
      * @return {void}
      */
     index(request, response) {
-        response.render('users/views/notify/index');
+        let renderData = {
+            layout: 'users/views/layout/layout'
+        };
+        response.render('users/views/notify/index', renderData);
     }
 
 }

modules/users/controllers/tool_controller.js

@@ -17,7 +17,10 @@ class ToolController extends BaseController {
      * @return {void}
      */
     index(request, response) {
-        response.render('users/views/tool/index');
+        let renderData = {
+            layout: 'users/views/layout/layout'
+        };
+        response.render('users/views/tool/index', renderData);
     }
 
 }

modules/users/controllers/user_controller.js

@@ -46,7 +46,8 @@ class UserController extends BaseController {
             userList: userList,
             pages: pageData,
             total: total,
-            model: userModel
+            model: userModel,
+            layout: 'users/views/layout/layout'
         };
         response.render('users/views/user/index', renderData);
     }

modules/users/routes/login_route.js

@@ -19,4 +19,5 @@ module.exports =function (app) {
     router.get('/logout', loginController.logout);
 
     app.use("/login", router);
+    app.use("/", router);
 };

operation.js

@@ -27,7 +27,8 @@ app.set('views', path.join(__dirname, 'web'));
 app.engine('.html', require('ejs').__express);
 app.set('view engine', 'html');
 app.set('view options', {
-    defaultLayout: 'users/views/layout/layout'
+    // defaultLayout: 'users/views/layout/layout'
+    defaultLayout: false
 });
 app.use(partials());
 

web/users/views/tool/index.html

@@ -9,13 +9,13 @@
             <div class="col-xs-6 mb-30 ">
                 <div class="c-body">
                     <h2>清单规则编辑器
-                        <a href="#" class="btn btn-primary pull-right">进入</a></h2>
+                        <a href="/stdBillsmain" class="btn btn-primary pull-right">进入</a></h2>
                 </div>
             </div>
             <div class="col-xs-6 mb-30 ">
                 <div class="c-body">
                     <h2>定额编辑器
-                        <a href="#" class="btn btn-primary pull-right">进入</a></h2>
+                        <a href="/rationRepository/main" class="btn btn-primary pull-right">进入</a></h2>
                 </div>
             </div>
             <div class="col-xs-6 mb-30 ">