Merge branch 'master' of https://git.yidian-inc.com:8021/bp/op-web-service

app.js

@@ -20,7 +20,6 @@ app.use(router.routes(), router.allowedMethods());
 app.use(serve(path.join(__dirname, './public')));
 
 
-
 app.listen(config.port, () => {
   console.info(
     'Listening on port %s in %s mode, Open up http://127.0.0.1:%s/ in your browser.',

server/controllers/enterprise.js

@@ -11,7 +11,7 @@ exports.auditList = async ctx => {
     json: true,
     body: ctx.request.body
   };
-  ctx.body = await req(ctx, opts);
+  ctx.body = JSON.stringify(await req(ctx, opts));
 };
 
 // 企业认证获取验证码
@@ -67,7 +67,7 @@ exports.getRecordInfo = async ctx => {
   } else {
     request.result.record.sensitiveWord = true; // 是否有查看敏感词权限
   }
-  ctx.body = request;
+  ctx.body = JSON.stringify(request);
 };
 
 // 历史提交审核日志详情页

server/controllers/life-no.js

@@ -11,7 +11,7 @@ exports.get_life_list = async (ctx, next) => {
     qs: ctx.request.query
   }
 
-  ctx.body = await req(ctx, opts)
+  ctx.body = JSON.stringify(await req(ctx, opts))
 }
 //生活号详情
 exports.get_life_info = async (ctx, next) => {
@@ -23,5 +23,5 @@ exports.get_life_info = async (ctx, next) => {
     timeout: 8000,
     body: ctx.request.body
   }
-  ctx.body = await req(ctx, opts)
+  ctx.body = JSON.stringify(await req(ctx, opts))
 }

server/controllers/role.js

@@ -15,7 +15,7 @@ exports.getRole_list = async (ctx, next) => {
     json: true,
     body: ctx.request.body
   }
-  ctx.body = await req(ctx, opts)
+  ctx.body = JSON.stringify(await req(ctx, opts))
 }
 exports.getAdd_role = async (ctx, next) => {
   var url = `${API_INTERNAL_URI}/merchant/authority/add_role`;

server/controllers/user.js

@@ -46,7 +46,7 @@ exports.user_list = async (ctx, next) => {
     method: "GET",
     qs: ctx.request.query,
   };
-  ctx.body = await req(ctx, opts);
+  ctx.body = JSON.stringify(await req(ctx, opts));
 };
 
 exports.user_detail = async (ctx, next) => {
@@ -56,7 +56,7 @@ exports.user_detail = async (ctx, next) => {
     method: "GET",
     qs: ctx.request.query,
   };
-  ctx.body = await req(ctx, opts);
+  ctx.body = JSON.stringify(await req(ctx, opts));
 };
 
 exports.user_edit = async (ctx, next) => {
@@ -67,7 +67,7 @@ exports.user_edit = async (ctx, next) => {
     json: true,
     body: ctx.request.body,
   };
-  ctx.body = await req(ctx, opts);
+  ctx.body = JSON.stringify(await req(ctx, opts));
 };
 
 exports.user_new = async (ctx, next) => {
@@ -78,6 +78,6 @@ exports.user_new = async (ctx, next) => {
     json: true,
     body: ctx.request.body,
   };
-  ctx.body = await req(ctx, opts);
+  ctx.body = JSON.stringify(await req(ctx, opts));
 };
 

server/utils/request.js

@@ -20,7 +20,7 @@ exports.httpReq = (ctx, opts) => {
       console.info(`[Api] httpReq (${ctx.request.url}, user:[${opts.qs.op_cur_user}]) spent: ${+new Date() - time_start}ms`)
 
       if (!err) {
-        resolve(JSON.stringify(body))
+        resolve(body)
       } else {
         reject(err)
         console.error(opts.url, err)