Merge branch 'master' of http://git.cc-lotus.info/live-platform/service-onlive

app/controller/lookuser.js

@@ -14,8 +14,8 @@ class LookuserController extends Controller {
   }
 
   async looknumber() {
-    const data = await this.service.looknumber();
-    return data;
+    const data = await this.service.looknumber(this.ctx.query);
+    this.ctx.ok({ data });
   }
 }
 

app/router.js

@@ -32,9 +32,9 @@ module.exports = app => {
   router.post('roomuser', '/api/onlive/roomuser/update/:id', controller.roomuser.update);
 
   // 观看用户表设置路由
+  router.get('/api/onlive/lookuser/looknumber', controller.lookuser.looknumber);
   router.resources('lookuser', '/api/onlive/lookuser', controller.lookuser); // index、create、show、destroy
   router.post('lookuser', '/api/onlive/lookuser/update/:id', controller.lookuser.update);
-  router.get('lookuser', '/api/onlive/lookuser/looknumber', controller.lookuser.looknumber);
 
   // 用户登录
   router.post('/api/onlive/login', controller.login.login);

app/service/lookuser.js

@@ -27,7 +27,7 @@ class LookuserService extends CrudService {
     const data = [];
     for (const _room of rooms) {
       const room = _.cloneDeep(JSON.parse(JSON.stringify(_room)));
-      const number = await this.model.count({ roomid: room.id });
+      const number = await this.model.count({ roomid: room._id });
       room.number = number;
       data.push(room);
     }