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

app/controller/.dock.js

@@ -4,6 +4,7 @@ module.exports = {
       "title",
       "desc",
       "start_time",
+      "end_time",
       "join_end",
       "user_id",
       "province",
@@ -23,6 +24,7 @@ module.exports = {
       "title",
       "desc",
       "start_time",
+      "end_time",
       "join_end",
       "status",
       "province",
@@ -43,6 +45,7 @@ module.exports = {
         "title",
         "desc",
         "start_time",
+        "end_time",
         "join_end",
         "user_id",
         "is_allowed",
@@ -70,6 +73,7 @@ module.exports = {
       "contact",
       "contact_tel",
       "email",
+      "role",
       "company",
     ],
     service: "apply",

app/model/dock.js

@@ -6,12 +6,13 @@ const apply = new Schema({
   user_id: { type: String, required: true, maxLength: 200 }, // 用户id
   user_name: { type: String, required: true, maxLength: 200 }, // 用户名称
   buyer: { type: String, required: true, maxLength: 1 }, // 买家/卖家 0/1
-  goodsList: [ Object ],
+  goodsList: [Object],
   contact: { type: String, required: true, maxLength: 200 }, // 联系人
   contact_tel: { type: String, required: true, maxLength: 200 }, // 联系人电话
   email: { type: String, maxLength: 200 }, // 邮箱
   company: { type: String, maxLength: 200 }, // 单位名称
   apply_time: { type: String, maxLength: 200 }, // 申请时间
+  role: { type: String, maxLength: 200 }, // 申请人类型
   status: { type: String, default: 0, maxLength: 1 }, // 申请状态 (0未审核;1已通过;2已拒绝)
 });
 apply.index({ id: 1 });
@@ -19,11 +20,12 @@ apply.index({ userid: 1 });
 const Dock = {
   title: { type: String, required: true, maxLength: 200 }, // 对接会标题
   desc: { type: String, maxLength: 1000 }, // 简介
-  status: { type: String, default: '0', maxLength: 1 }, // 状态:0准备中;1已开始;2已结束
+  status: { type: String, default: "0", maxLength: 1 }, // 状态:0准备中;1已开始;2已结束
   start_time: { type: String, required: true, maxLength: 200 }, // 开始时间
+  end_time: { type: String, required: true, maxLength: 200 }, // 结束时间
   join_end: { type: String, required: true, maxLength: 200 }, // 报名截止时间
-  apply: { type: [ apply ], default: [] },
-  is_allowed: { type: String, default: '0', maxLength: 1 }, // 0未审核;1已允许;2已拒绝
+  apply: { type: [apply], default: [] },
+  is_allowed: { type: String, default: "0", maxLength: 1 }, // 0未审核;1已允许;2已拒绝
   reason: { type: String, required: false, maxLength: 200 }, // 拒绝理由
   user_id: { type: String, required: true, maxLength: 200 }, // 申请用户
   province: { type: String, required: false }, // 省