update

app/controller/shop/config/.shop.js

@@ -1,6 +1,6 @@
 module.exports = {
   create: {
-    requestBody: ['qrcode', 'goods_score', 'send_score', 'service_score', 'user', 'logo', 'name', 'code', 'person', 'phone', 'address', 'file', 'status'],
+    requestBody: ['qrcode', 'goods_score', 'send_score', 'service_score', 'logo', 'name', 'code', 'person', 'phone', 'address', 'file', 'status'],
   },
   destroy: {
     params: ['!id'],
@@ -8,7 +8,7 @@ module.exports = {
   },
   update: {
     params: ['!id'],
-    requestBody: ['qrcode', 'goods_score', 'send_score', 'service_score', 'user', 'logo', 'name', 'code', 'person', 'phone', 'address', 'file', 'status'],
+    requestBody: ['qrcode', 'goods_score', 'send_score', 'service_score', 'logo', 'name', 'code', 'person', 'phone', 'address', 'file', 'status'],
   },
   show: {
     parameters: {
@@ -21,7 +21,6 @@ module.exports = {
       query: {
         'meta.createdAt@start': 'meta.createdAt@start',
         'meta.createdAt@end': 'meta.createdAt@end',
-        user: 'user',
         name: '%name%',
         code: 'code',
         person: 'person',

app/controller/user/config/.admin.js

@@ -1,6 +1,6 @@
 module.exports = {
   create: {
-    requestBody: ['account', 'password', 'name'],
+    requestBody: ['account', 'password', 'name', 'role'],
   },
   destroy: {
     params: ['!id'],
@@ -8,7 +8,7 @@ module.exports = {
   },
   update: {
     params: ['!id'],
-    requestBody: ['account', 'password', 'name'],
+    requestBody: ['account', 'password', 'name', 'role'],
   },
   show: {
     parameters: {

app/model/shop/shop.js

@@ -4,7 +4,6 @@ const metaPlugin = require('naf-framework-mongoose-free/lib/model/meta-plugin');
 
 // 商店信息
 const shop = {
-  user: { type: String, required: false, zh: '店铺管理用户', ref: 'User.User' }, //
   logo: { type: Array, required: false, zh: '店铺logo' }, //
   name: { type: String, required: false, zh: '商店名称' }, //
   code: { type: String, required: false, zh: '店铺编号' }, // 自增,中间件处理
@@ -21,7 +20,6 @@ const shop = {
 const schema = new Schema(shop, { toJSON: { getters: true, virtuals: true } });
 schema.index({ id: 1 });
 schema.index({ 'meta.createdAt': 1 });
-schema.index({ user: 1 });
 schema.index({ name: 1 });
 schema.index({ code: 1 });
 schema.index({ person: 1 });

app/model/user/admin.js

@@ -8,6 +8,8 @@ const { Secret } = require('naf-framework-mongoose-free/lib/model/schema');
 const admin = {
   account: { type: String, required: false, zh: '账号' }, //
   password: { type: Secret, required: false, select: false, zh: '密码' }, //
+  role: { type: String, zh: '角色', ref: 'Dev.Role' },
+  shop: { type: String, zh: '店铺', ref: 'Shop.Shop' },
   name: { type: String, required: false, zh: '名称' }, //
 };
 const schema = new Schema(admin, { toJSON: { getters: true, virtuals: true } });