add front page

README.md

@@ -11,7 +11,7 @@
 
 >  或者您可以 "follow" 一下，我会不断开源更多的有趣的项目
 
->  开发环境 macOS 10.12.4  nodejs 6.10.0
+>  开发环境 macOS 10.12.4  nodejs 6.10.0  Mongodb 3.4.2
 
 >  部署环境 阿里云 CentOS 7.2 64位
 
@@ -46,7 +46,7 @@ npm run dev (需先开启mongodb)
 
 ## 目标功能
 
-- [x] 定位功能 -- 完成
+- [x] IP定位 -- 完成
 - [x] 城市列表 -- 完成
 - [x] 搜索地址 -- 完成
 - [x] 上传图片 -- 完成
@@ -54,7 +54,7 @@ npm run dev (需先开启mongodb)
 - [x] 添加食品 -- 完成
 - [x] 测量距离 -- 完成
 - [x] 搜索美食，餐馆 -- 完成
-- [x] 餐馆排序 -- 完成
+- [x] 根据距离、销量、评分、特色菜、配送方式等进行排序和筛选 -- 完成
 - [x] 评价列表 -- 完成
 - [x] 食品详情 -- 完成
 - [x] 商家详情 -- 完成
@@ -63,19 +63,21 @@ npm run dev (需先开启mongodb)
 - [x] 修改密码 -- 完成
 - [x] 用户信息 -- 完成
 - [x] 添加、删除、修改收货地址 -- 完成
-- [x] 下单功能  -- 完成
+- [x] 下单  -- 完成 ✨✨
 - [x] 订单信息 -- 完成
-- [x] 服务中心 -- 完成
 - [x] 红包 -- 完成
 - [x] 商铺管理 -- 完成
 - [x] 食品管理 -- 完成
-- [x] 会员管理 -- 完成
+- [x] 管理员权限验证 -- 完成
+- [x] 超级管理员 -- 完成
 - [x] 订单管理 -- 完成
 - [x] 流量统计 -- 完成
-- [x] 超级管理员 -- 完成
 - [x] 美化路由(history模式) -- 完成
 - [ ] 部署上线
 
+## 遗留问题
+
+- [ ] 付款 -- 待完成
 
 # API接口文档
 

app.js

@@ -9,6 +9,7 @@ import winston from 'winston';
 import expressWinston from 'express-winston';
 import path from 'path';
 import history from 'connect-history-api-fallback';
+// import history from './middlewares/history';
 import Statistic from './middlewares/statistic'
 
 const app = express();

controller/admin/admin.js

@@ -11,7 +11,8 @@ class Admin extends BaseComponent {
 		super()
 		this.login = this.login.bind(this)
 		this.register = this.register.bind(this)
-		this.encryption = this.encryption.bind(this);
+		this.encryption = this.encryption.bind(this)
+		this.updateAvatar = this.updateAvatar.bind(this)
 	}
 	async login(req, res, next){
 		const form = new formidable.IncomingForm();
@@ -217,7 +218,7 @@ class Admin extends BaseComponent {
 			return 
 		}
 		try{
-			const info = await AdminModel.findOne({id: admin_id});
+			const info = await AdminModel.findOne({id: admin_id}, '-_id -__v -password');
 			if (!info) {
 				throw new Error('未找到当前管理员')
 			}else{
@@ -235,6 +236,34 @@ class Admin extends BaseComponent {
 			})
 		}
 	}
+	async updateAvatar(req, res, next){
+		const admin_id = req.params.admin_id;
+		if (!admin_id || !Number(admin_id)) {
+			console.log('admin_id参数错误', admin_id)
+			res.send({
+				status: 0,
+				type: 'ERROR_ADMINID',
+				message: 'admin_id参数错误',
+			})
+			return 
+		}
+
+		try{
+			const image_path = await this.qiniu(req);
+			await AdminModel.findOneAndUpdate({id: admin_id}, {$set: {avatar: image_path}});
+			res.send({
+				status: 1,
+				image_path,
+			})
+		}catch(err){
+			console.log('上传图片失败', err);
+			res.send({
+				status: 0,
+				type: 'ERROR_UPLOAD_IMG',
+				message: '上传图片失败'
+			})
+		}
+	}
 }
 
 export default new Admin()

controller/statis/statis.js

@@ -38,6 +38,7 @@ class Statis {
 	async apiAllCount(req, res, next){
 		try{
 			const count = await StatisModel.count()
+			console.log(count.toString())
 			res.send({
 				status: 1,
 				count,

controller/v2/user.js

@@ -290,6 +290,33 @@ class User extends AddressComponent {
 			})
 		}
 	}
+	async getUserCity(req, res, next){
+		const cityArr = ['北京', '上海', '深圳', '杭州'];
+		const filterArr = [];
+		cityArr.forEach(item => {
+			filterArr.push(UserInfoModel.find({city: item}).count())
+		})
+		filterArr.push(UserInfoModel.$where('!["北京", "上海", "深圳", "杭州"].includes(this.city)').count())
+		Promise.all(filterArr).then(result => {
+			res.send({
+				status: 1,
+				user_city: {
+					beijing: result[0],
+					shanghai: result[1],
+					shenzhen: result[2],
+					hangzhou: result[3],
+					qita: result[4],
+				}
+			})
+		}).catch(err => {
+			console.log('获取用户分布城市数据失败', err);
+			res.send({
+				status: 0,
+				type: 'ERROR_GET_USER_CITY',
+				message: '获取用户分布城市数据失败'
+			})
+		})
+	}
 } 
 
 export default new User()

middlewares/history.js

@@ -0,0 +1,9 @@
+// 'use strict'
+
+// export default (req, res, next) => {
+// 	if ((/manage/gi).test(req.url)) {
+// 		res.sendFile(__dirname + '/public/manage/index.html')
+// 	}else{
+// 		res.sendFile(__dirname + '/public/elm/index.html')
+// 	}
+// }

models/admin/admin.js

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

public/manage/index.html

@@ -0,0 +1 @@
+<!DOCTYPE html><html><head><meta charset=utf-8><title>back-manage</title><link href=/manage/static/css/app.478e37eb977615da6f2cffb0abbb4bc9.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/manage/static/js/manifest.74f3257cbf0144145c36.js></script><script type=text/javascript src=/manage/static/js/vendor.bdebe48639b924078feb.js></script><script type=text/javascript src=/manage/static/js/app.d7cd78be417405a43fed.js></script></body></html>

public/manage/static/js/13.3b0d173582caf4548547.js

@@ -0,0 +1,2 @@
+webpackJsonp([13],{192:function(t,n,o){o(695);var e=o(77)(o(642),o(720),null,null);t.exports=e.exports},642:function(t,n,o){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default={}},672:function(t,n,o){n=t.exports=o(177)(!0),n.push([t.i,".allcover{position:absolute;top:0;right:0}.ctt{left:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.ctt,.tb{position:absolute;top:50%}.tb{-webkit-transform:translateY(-50%);transform:translateY(-50%)}.lr{position:absolute;left:50%;-webkit-transform:translateX(-50%);transform:translateX(-50%)}","",{version:3,sources:["/mygit/manage/src/page/uploadImg.vue"],names:[],mappings:"AACA,UACE,kBAAmB,AACnB,MAAO,AACP,OAAS,CACV,AACD,KAGE,SAAU,AACV,uCAAyC,AACjC,8BAAiC,CAC1C,AACD,SANE,kBAAmB,AACnB,OAAS,CAUV,AALD,IAGE,mCAAoC,AAC5B,0BAA4B,CACrC,AACD,IACE,kBAAmB,AACnB,SAAU,AACV,mCAAoC,AAC5B,0BAA4B,CACrC",file:"uploadImg.vue",sourcesContent:["\n.allcover {\n  position: absolute;\n  top: 0;\n  right: 0;\n}\n.ctt {\n  position: absolute;\n  top: 50%;\n  left: 50%;\n  -webkit-transform: translate(-50%, -50%);\n          transform: translate(-50%, -50%);\n}\n.tb {\n  position: absolute;\n  top: 50%;\n  -webkit-transform: translateY(-50%);\n          transform: translateY(-50%);\n}\n.lr {\n  position: absolute;\n  left: 50%;\n  -webkit-transform: translateX(-50%);\n          transform: translateX(-50%);\n}\n"],sourceRoot:""}])},695:function(t,n,o){var e=o(672);"string"==typeof e&&(e=[[t.i,e,""]]),e.locals&&(t.exports=e.locals);o(178)("6e618b64",e,!0)},720:function(t,n){t.exports={render:function(){var t=this,n=t.$createElement;return(t._self._c||n)("div",{staticClass:"fillcontain"},[t._v("\n    uploadImg\n")])},staticRenderFns:[]}}});
+//# sourceMappingURL=13.3b0d173582caf4548547.js.map

public/manage/static/js/14.38d04c5f68c9f0edb171.js

@@ -0,0 +1,2 @@
+webpackJsonp([14],{190:function(t,n,e){e(683);var s=e(77)(e(640),e(708),null,null);t.exports=s.exports},640:function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default={}},660:function(t,n,e){n=t.exports=e(177)(!0),n.push([t.i,".allcover{position:absolute;top:0;right:0}.ctt{left:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.ctt,.tb{position:absolute;top:50%}.tb{-webkit-transform:translateY(-50%);transform:translateY(-50%)}.lr{position:absolute;left:50%;-webkit-transform:translateX(-50%);transform:translateX(-50%)}","",{version:3,sources:["/mygit/manage/src/page/sendMessage.vue"],names:[],mappings:"AACA,UACE,kBAAmB,AACnB,MAAO,AACP,OAAS,CACV,AACD,KAGE,SAAU,AACV,uCAAyC,AACjC,8BAAiC,CAC1C,AACD,SANE,kBAAmB,AACnB,OAAS,CAUV,AALD,IAGE,mCAAoC,AAC5B,0BAA4B,CACrC,AACD,IACE,kBAAmB,AACnB,SAAU,AACV,mCAAoC,AAC5B,0BAA4B,CACrC",file:"sendMessage.vue",sourcesContent:["\n.allcover {\n  position: absolute;\n  top: 0;\n  right: 0;\n}\n.ctt {\n  position: absolute;\n  top: 50%;\n  left: 50%;\n  -webkit-transform: translate(-50%, -50%);\n          transform: translate(-50%, -50%);\n}\n.tb {\n  position: absolute;\n  top: 50%;\n  -webkit-transform: translateY(-50%);\n          transform: translateY(-50%);\n}\n.lr {\n  position: absolute;\n  left: 50%;\n  -webkit-transform: translateX(-50%);\n          transform: translateX(-50%);\n}\n"],sourceRoot:""}])},683:function(t,n,e){var s=e(660);"string"==typeof s&&(s=[[t.i,s,""]]),s.locals&&(t.exports=s.locals);e(178)("0fa23764",s,!0)},708:function(t,n){t.exports={render:function(){var t=this,n=t.$createElement;return(t._self._c||n)("div",{staticClass:"fillcontain"},[t._v("\n    sendMessage\n")])},staticRenderFns:[]}}});
+//# sourceMappingURL=14.38d04c5f68c9f0edb171.js.map

public/manage/static/js/15.dc1ed0c735327d0f5dab.js

@@ -0,0 +1,2 @@
+webpackJsonp([15],{188:function(t,n,e){e(691);var r=e(77)(e(638),e(716),null,null);t.exports=r.exports},638:function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default={}},668:function(t,n,e){n=t.exports=e(177)(!0),n.push([t.i,".allcover{position:absolute;top:0;right:0}.ctt{left:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.ctt,.tb{position:absolute;top:50%}.tb{-webkit-transform:translateY(-50%);transform:translateY(-50%)}.lr{position:absolute;left:50%;-webkit-transform:translateX(-50%);transform:translateX(-50%)}","",{version:3,sources:["/mygit/manage/src/page/newMember.vue"],names:[],mappings:"AACA,UACE,kBAAmB,AACnB,MAAO,AACP,OAAS,CACV,AACD,KAGE,SAAU,AACV,uCAAyC,AACjC,8BAAiC,CAC1C,AACD,SANE,kBAAmB,AACnB,OAAS,CAUV,AALD,IAGE,mCAAoC,AAC5B,0BAA4B,CACrC,AACD,IACE,kBAAmB,AACnB,SAAU,AACV,mCAAoC,AAC5B,0BAA4B,CACrC",file:"newMember.vue",sourcesContent:["\n.allcover {\n  position: absolute;\n  top: 0;\n  right: 0;\n}\n.ctt {\n  position: absolute;\n  top: 50%;\n  left: 50%;\n  -webkit-transform: translate(-50%, -50%);\n          transform: translate(-50%, -50%);\n}\n.tb {\n  position: absolute;\n  top: 50%;\n  -webkit-transform: translateY(-50%);\n          transform: translateY(-50%);\n}\n.lr {\n  position: absolute;\n  left: 50%;\n  -webkit-transform: translateX(-50%);\n          transform: translateX(-50%);\n}\n"],sourceRoot:""}])},691:function(t,n,e){var r=e(668);"string"==typeof r&&(r=[[t.i,r,""]]),r.locals&&(t.exports=r.locals);e(178)("244e3e9f",r,!0)},716:function(t,n){t.exports={render:function(){var t=this,n=t.$createElement;return(t._self._c||n)("div",{staticClass:"fillcontain"},[t._v("\n    newMember\n")])},staticRenderFns:[]}}});
+//# sourceMappingURL=15.dc1ed0c735327d0f5dab.js.map

public/manage/static/js/manifest.74f3257cbf0144145c36.js

@@ -0,0 +1,2 @@
+!function(e){function r(n){if(t[n])return t[n].exports;var o=t[n]={i:n,l:!1,exports:{}};return e[n].call(o.exports,o,o.exports,r),o.l=!0,o.exports}var n=window.webpackJsonp;window.webpackJsonp=function(t,c,f){for(var a,d,i,u=0,b=[];u<t.length;u++)d=t[u],o[d]&&b.push(o[d][0]),o[d]=0;for(a in c)Object.prototype.hasOwnProperty.call(c,a)&&(e[a]=c[a]);for(n&&n(t,c,f);b.length;)b.shift()();if(f)for(u=0;u<f.length;u++)i=r(r.s=f[u]);return i};var t={},o={19:0};r.e=function(e){function n(){f.onerror=f.onload=null,clearTimeout(a);var r=o[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),o[e]=void 0)}if(0===o[e])return Promise.resolve();if(o[e])return o[e][2];var t=new Promise(function(r,n){o[e]=[r,n]});o[e][2]=t;var c=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,r.nc&&f.setAttribute("nonce",r.nc),f.src=r.p+"static/js/"+e+"."+{0:"c298211367d9d850e00b",1:"ec569487bd98baab40c5",2:"34dc944e6789b941fff8",3:"634f2f2b2e3a631ce1c5",4:"7cff5d0e68231ed42932",5:"1529fea4916cf2a90a64",6:"95266f7cab40f4b8cb3e",7:"b2765d39504818eed102",8:"7d537065f054167abe94",9:"a105a5665dba1115fddc",10:"fc20f767186f1e78775f",11:"667e1248fd7fcffc3208",12:"5a33a047016023b1fb88",13:"3b0d173582caf4548547",14:"38d04c5f68c9f0edb171",15:"dc1ed0c735327d0f5dab",16:"d7cc438e3ed594baff3e",17:"bdebe48639b924078feb",18:"d7cd78be417405a43fed"}[e]+".js";var a=setTimeout(n,12e4);return f.onerror=f.onload=n,c.appendChild(f),t},r.m=e,r.c=t,r.i=function(e){return e},r.d=function(e,n,t){r.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:t})},r.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(n,"a",n),n},r.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},r.p="/manage",r.oe=function(e){throw console.error(e),e}}([]);
+//# sourceMappingURL=manifest.74f3257cbf0144145c36.js.map