add city admin

controller/admin/admin.js

@@ -1,12 +1,12 @@
 'use strict';
 
 import AdminModel from '../../models/admin/admin'
-import BaseComponent from '../../prototype/baseComponent'
+import AddressComponent from '../../prototype/addressComponent'
 import crypto from 'crypto'
 import formidable from 'formidable'
 import dtime from 'time-formater'
 
-class Admin extends BaseComponent {
+class Admin extends AddressComponent {
 	constructor(){
 		super()
 		this.login = this.login.bind(this)
@@ -47,6 +47,7 @@ class Admin extends BaseComponent {
 				if (!admin) {
 					const adminTip = status == 1 ? '普通管理员' : '超级管理员'
 					const admin_id = await this.getId('admin_id');
+					const cityInfo = await this.guessPosition(req);
 					const newAdmin = {
 						user_name, 
 						password: newpassword, 
@@ -54,6 +55,7 @@ class Admin extends BaseComponent {
 						create_time: dtime().format('YYYY-MM-DD'),
 						admin: adminTip,
 						status,
+						city: cityInfo.city
 					}
 					await AdminModel.create(newAdmin)
 					req.session.admin_id = admin_id;
@@ -176,7 +178,7 @@ class Admin extends BaseComponent {
 	async getAllAdmin(req, res, next){
 		const {limit = 20, offset = 0} = req.query;
 		try{
-			const allAdmin = await AdminModel.find({}, '-_id -password').skip(Number(offset)).limit(Number(limit))
+			const allAdmin = await AdminModel.find({}, '-_id -password').sort({id: -1}).skip(Number(offset)).limit(Number(limit))
 			res.send({
 				status: 1,
 				data: allAdmin,

controller/v2/user.js

@@ -233,7 +233,7 @@ class User extends AddressComponent {
 	async getUserList(req, res, next){
 		const {limit = 20, offset = 0} = req.query;
 		try{
-			const users = await UserInfoModel.find({}, '-_id').limit(Number(limit)).skip(Number(offset));
+			const users = await UserInfoModel.find({}, '-_id').sort({user_id: -1}).limit(Number(limit)).skip(Number(offset));
 			res.send(users);
 		}catch(err){
 			console.log('获取用户列表数据失败', err);

models/admin/admin.js

@@ -12,6 +12,7 @@ const adminSchema = new Schema({
 	admin: {type: String, default: '普通管理员'},
 	status: Number,  //1:普通管理、 2:超级管理员
 	avatar: {type: String, default: 'default.jpg'},
+	city: String,
 })
 
 adminSchema.index({id: 1});