Merge branch 'dev'

app/controller/system/config/.config.js

@@ -1,6 +1,6 @@
 module.exports = {
   create: {
-    requestBody: ['reward_day', 'title', 'config', 'agree', 'bottom_title', 'bottom_menu'],
+    requestBody: ['reward_day', 'title', 'config', 'agree', 'bottom_title', 'bottom_menu','leader'],
   },
   destroy: {
     params: ['!id'],
@@ -8,7 +8,7 @@ module.exports = {
   },
   update: {
     params: ['!id'],
-    requestBody: ['reward_day', 'title', 'config', 'agree', 'bottom_title', 'bottom_menu'],
+    requestBody: ['reward_day', 'title', 'config', 'agree', 'bottom_title', 'bottom_menu','leader'],
   },
   show: {
     parameters: {

app/controller/system/config/.userleader.js

@@ -0,0 +1,59 @@
+module.exports = {
+  create: {
+    requestBody: [
+      "user_id",
+      "openid",
+      "name",
+      "card",
+      "phone",
+      "status",
+      "cause",
+    ],
+  },
+  destroy: {
+    params: ["!id"],
+    service: "delete",
+  },
+  update: {
+    params: ["!id"],
+    requestBody: [
+      "user_id",
+      "openid",
+      "name",
+      "card",
+      "phone",
+      "status",
+      "cause",
+    ],
+  },
+  show: {
+    parameters: {
+      params: ["!id"],
+    },
+    service: "fetch",
+  },
+  index: {
+    parameters: {
+      query: {
+        "meta.createdAt@start": "meta.createdAt@start",
+        "meta.createdAt@end": "meta.createdAt@end",
+        user_id: "user_id",
+        openid: "openid",
+        name: "name",
+        card: "card",
+        phone: "phone",
+        status: "status",
+      },
+      // options: {
+      //   "meta.state": 0 // 默认条件
+      // },
+    },
+    service: "query",
+    options: {
+      query: ["skip", "limit"],
+      sort: ["meta.createdAt"],
+      desc: true,
+      count: true,
+    },
+  },
+};

app/controller/system/userleader.js

@@ -0,0 +1,13 @@
+'use strict';
+const meta = require("./config/.userleader.js");
+const Controller = require('egg').Controller;
+const { CrudController } = require('naf-framework-mongoose-free/lib/controller');
+
+// 
+class UserleaderController extends Controller {
+  constructor(ctx) {
+    super(ctx);
+    this.service = this.ctx.service.system.userleader;
+  }
+}
+module.exports = CrudController(UserleaderController, meta);

app/model/system/config.js

@@ -20,6 +20,7 @@ const config = {
   bottom_title: { type: String, required: false, zh: '底部加载数据结束的文字提示' }, //
   bottom_menu: { type: Object, zh: '底部菜单' },
   reward_day: { type: Number, zh: '提现日期', default: 14 },
+  leader: { type: Object, required: false  , zh: '团长规则' }, // explain,rule 
 };
 const schema = new Schema(config, { toJSON: { getters: true, virtuals: true } });
 schema.index({ id: 1 });

app/model/system/userleader.js

@@ -0,0 +1,32 @@
+"use strict";
+const Schema = require("mongoose").Schema;
+const metaPlugin = require("naf-framework-mongoose-free/lib/model/meta-plugin");
+
+// 团长申请表
+const userleader = {
+  user_id: { type: String, required: false, zh: "用户id" }, //
+  openid: { type: String, required: false, zh: "openid" }, //
+  name: { type: String, required: false, zh: "姓名" }, //
+  card: { type: String, required: false, zh: "身份证号" }, //
+  phone: { type: String, required: false, zh: "手机号" }, //
+  status: { type: String, required: false, default: "0", zh: "状态" }, // 字典表：exam_status
+  cause: { type: String, required: false, zh: "审核结果" }, //
+};
+const schema = new Schema(userleader, {
+  toJSON: { getters: true, virtuals: true },
+});
+schema.index({ id: 1 });
+schema.index({ "meta.createdAt": 1 });
+schema.index({ user_id: 1 });
+schema.index({ openid: 1 });
+schema.index({ name: 1 });
+schema.index({ card: 1 });
+schema.index({ phone: 1 });
+schema.index({ status: 1 });
+
+schema.plugin(metaPlugin);
+
+module.exports = (app) => {
+  const { mongoose } = app;
+  return mongoose.model("Userleader", schema, "userleader");
+};

app/service/system/userleader.js

@@ -0,0 +1,15 @@
+'use strict';
+const { CrudService } = require('naf-framework-mongoose-free/lib/service');
+const { BusinessError, ErrorCode } = require('naf-core').Error;
+const _ = require('lodash');
+const assert = require('assert');
+
+//
+class UserleaderService extends CrudService {
+  constructor(ctx) {
+    super(ctx, "userleader");
+    this.model = this.ctx.model.System.Userleader;
+  }
+}
+
+module.exports = UserleaderService;

app/z_router/system/index.js

@@ -2,11 +2,12 @@
  * @param {Egg.Application} app - egg application
  */
 module.exports = app => {
-  require('./banner')(app); // 广告图
-  require('./indexModule')(app); // 图标菜单
-  require('./serviceContact')(app); // 客服信息
-  require('./goodsTags')(app); // 商品标签
-  require('./actTags')(app); // 活动标签
-  require('./config')(app); // 系统设置
-  require('./platformAct')(app); // 平台活动
+  require("./banner")(app); // 广告图
+  require("./indexModule")(app); // 图标菜单
+  require("./serviceContact")(app); // 客服信息
+  require("./goodsTags")(app); // 商品标签
+  require("./actTags")(app); // 活动标签
+  require("./config")(app); // 系统设置
+  require("./platformAct")(app); // 平台活动
+  require("./userleader")(app); // 团长管理
 };

app/z_router/system/userleader.js

@@ -0,0 +1,19 @@
+'use strict';
+// 路由配置
+const path = require('path');
+const regPath = path.resolve('app', 'public', 'routerRegister');
+const routerRegister = require(regPath);
+const rkey = "userleader";
+const ckey = "system.userleader";
+const keyZh = "团长申请表";
+const routes = [
+  { method: 'get', path: `${rkey}`, controller: `${ckey}.index`, name: `${ckey}Query`, zh: `${keyZh}列表查询` },
+  { method: 'get', path: `${rkey}/:id`, controller: `${ckey}.show`, name: `${ckey}Show`, zh: `${keyZh}查询` },
+  { method: 'post', path: `${rkey}`, controller: `${ckey}.create`, name: `${ckey}Create`, zh: `创建${keyZh}` },
+  { method: 'post', path: `${rkey}/:id`, controller: `${ckey}.update`, name: `${ckey}Update`, zh: `修改${keyZh}` },
+  { method: 'delete', path: `${rkey}/:id`, controller: `${ckey}.destroy`, name: `${ckey}Delete`, zh: `删除${keyZh}` },
+];
+
+module.exports = app => {
+  routerRegister(app, routes, keyZh, rkey, ckey);
+};