app/controller/column.js

@@ -28,6 +28,11 @@ class ColumnController extends Controller {
     const res = await ctx.service.column.usercolumnquery(ctx.query);
     ctx.body = res;
   }
+  async menuquery() {
+    const { ctx } = this;
+    const res = await ctx.service.column.menuquery(ctx.query);
+    ctx.body = res;
+  }
 }
 
 module.exports = ColumnController;

app/controller/page.js

@@ -28,6 +28,11 @@ class PageController extends Controller {
     const res = await ctx.service.page.details(ctx.params);
     ctx.body = res;
   }
+  async detailscode() {
+    const { ctx } = this;
+    const res = await ctx.service.page.detailscode(ctx.query);
+    ctx.body = res;
+  }
 }
 
 module.exports = PageController;

app/router.js

@@ -27,6 +27,7 @@ module.exports = app => {
   router.delete('/api/column/delete/:id', jwt, controller.column.del);
   router.get('/api/column/query', controller.column.query);
   router.get('/api/column/usercolumnquery', controller.column.usercolumnquery);
+  router.get('/api/column/menuquery', controller.column.menuquery);
   // 登录
   router.post('/api/power/login', controller.power.login);
   router.get('/api/power/getUserMenu', controller.power.getUserMenu);
@@ -42,6 +43,7 @@ module.exports = app => {
   router.delete('/api/page/delete/:id', jwt, controller.page.del);
   router.get('/api/page/query', controller.page.query);
   router.get('/api/page/details/:id', controller.page.details);
+  router.get('/api/page/details', controller.page.detailscode);
   // 文件
   router.post('/api/files/create', jwt, controller.files.create);
   router.post('/api/files/update', jwt, controller.files.update);

app/service/column.js

@@ -46,6 +46,16 @@ class ColumnService extends Service {
       throw new Error({ errcode: -2001, errmsg: '删除失败' });
     }
   }
+  async menuquery({ code }) {
+    const { Column: model } = this.ctx.model;
+
+    try {
+      const res = await model.where('menuList').in(code);
+      return { errmsg: '', errcode: 0, data: res };
+    } catch (error) {
+      throw new Error({ errcode: -2001, errmsg: '查询失败' });
+    }
+  }
   async usercolumnquery() {
     const { Column: model } = this.ctx.model;
     const { AdminUser: Usermodel } = this.ctx.model;

app/service/content.js

@@ -49,14 +49,14 @@ class ContentService extends Service {
       throw new Error({ errcode: -2001, errmsg: '删除失败' });
     }
   }
-  async query({ skip, limit, title, menucode }) {
+  async query({ skip, limit, title, code }) {
     const { Content: model } = this.ctx.model;
     const filter = {};
     if (title) filter.title = title;
     const total = await model.find();
     try {
-      if (menucode) {
-        const list = await model.find({ columnList: { $in: [ menucode ] } });
+      if (code) {
+        const list = await model.find({ columnList: { $in: [ code ] } }).skip(Number(skip) * Number(limit)).limit(Number(limit));
         return { errmsg: '', errcode: 0, data: list, total: total.length };
       }
       let res;

app/service/page.js

@@ -49,6 +49,16 @@ class PageService extends Service {
       throw new Error({ errcode: -2001, errmsg: '删除失败' });
     }
   }
+  async detailscode({ code }) {
+    assert(code, 'code不存在');
+    const { Page: model } = this.ctx.model;
+    try {
+      const res = await model.find({ menu: code });
+      return { errmsg: '', errcode: 0, data: res };
+    } catch (error) {
+      throw new Error({ errcode: -2001, errmsg: '删除失败' });
+    }
+  }
   async query({ skip, limit, title }) {
     const { Page: model } = this.ctx.model;
     const filter = {};