bulti router

README.md

@@ -73,7 +73,7 @@ npm run dev (需开启本地mongodb，如果没有安装mongodb，可以运行 n
 - [x] 订单管理
 - [ ] 流量统计
 - [ ] 超级管理员
-- [ ] 前后台同构，美化路由
+- [x] 美化路由(history模式)
 - [ ] 部署上线
 
 

app.js

@@ -8,10 +8,9 @@ import connectMongo from 'connect-mongo';
 import winston from 'winston';
 import expressWinston from 'express-winston';
 import path from 'path';
-
+import history from 'connect-history-api-fallback';
 
 const app = express();
-app.use(express.static('./public'));
 
 app.all('*', (req, res, next) => {
 	res.header("Access-Control-Allow-Origin", req.headers.origin);
@@ -65,6 +64,9 @@ router(app);
 //     ]
 // }));
 
+
+app.use(history());
+app.use(express.static('./public'));
 app.use((err, req, res, next) => {
 	res.status(404).send('未找到当前路由');
 });

controller/v1/carts.js

@@ -65,9 +65,10 @@ class Carts extends AddressComponent{
 				})
 				return 
 			}
-			let deliver_amount = 0; //食品价格
+			const deliver_amount = 4;
+			let price = 0; //食品价格
 			entities[0].map(item => {
-				deliver_amount += item.price * item.quantity;
+				price += item.price * item.quantity;
 				if (item.packing_fee) {
 					this.extra[0].price += item.packing_fee*item.quantity;
 				}
@@ -76,7 +77,7 @@ class Carts extends AddressComponent{
 				}
 			})
 			//食品总价格
-			const total = deliver_amount + this.extra[0].price * this.extra[0].quantity;
+			const total = price + this.extra[0].price * this.extra[0].quantity + deliver_amount;
 			//是否支持发票
 			let invoice = {
 				is_available: false,

controller/v1/order.js

@@ -4,7 +4,7 @@ import BaseComponent from '../../prototype/baseComponent'
 import formidable from 'formidable'
 import OrderModel from '../../models/bos/order'
 import CartModel from '../../models/v1/cart'
-import timestamp from 'time-stamp'
+import dtime from 'time-formater'
 import AddressModel from '../../models/v1/address'
 
 class Order extends BaseComponent{
@@ -62,6 +62,7 @@ class Order extends BaseComponent{
 				})
 				return 
 			}
+			const deliver_fee = {price: cartDetail.cart.deliver_amount};
 			const orderObj = {
 				basket: {
 					group: entities,
@@ -69,12 +70,13 @@ class Order extends BaseComponent{
 						name: cartDetail.cart.extra[0].name,
 						price: cartDetail.cart.extra[0].price,
 						quantity: cartDetail.cart.extra[0].quantity,
-					}
+					},
+					deliver_fee,
 				},
 				restaurant_id: cartDetail.cart.restaurant_id,
 				restaurant_image_url: cartDetail.cart.restaurant_info.image_path,
 				restaurant_name:  cartDetail.cart.restaurant_info.name,
-				formatted_created_at: timestamp('YYYY-MM-DD mm:ss'),
+				formatted_created_at: dtime().format('YYYY-MM-DD HH:mm'),
 				order_time: new Date().getTime(),
 				time_pass: 900,
 				status_bar: {

controller/v2/user.js

@@ -5,7 +5,7 @@ import formidable from 'formidable'
 import UserInfoModel from '../../models/v2/userInfo'
 import UserModel from '../../models/v2/user'
 import crypto from 'crypto'
-import timestamp from 'time-stamp'
+import dtime from 'time-formater'
 
 class User extends AddressComponent {
 	constructor(){
@@ -13,6 +13,7 @@ class User extends AddressComponent {
 		this.login = this.login.bind(this);
 		this.encryption = this.encryption.bind(this);
 		this.chanegPassword = this.chanegPassword.bind(this);
+		this.updateAvatar = this.updateAvatar.bind(this);
 	}
 	async login(req, res, next){
 		const cap = req.cookies.cap;
@@ -59,7 +60,7 @@ class User extends AddressComponent {
 				if (!user) {
 					const user_id = await this.getId('user_id');
 					const cityInfo = await this.guessPosition(req);
-					const registe_time = timestamp('YYYY-MM-DD mm:ss');
+					const registe_time = dtime().format('YYYY-MM-DD HH:mm');
 					const newUser = {username, password: newpassword, user_id};
 					const newUserInfo = {username, user_id, id: user_id, city: cityInfo.city, registe_time, };
 					UserModel.create(newUser);
@@ -134,7 +135,7 @@ class User extends AddressComponent {
 		}
 	}
 	async signout(req, res, next){
-		req.session.user_id = null;
+		delete req.session.user_id
 		res.send({
 			status: 1,
 			message: '退出成功'
@@ -255,6 +256,40 @@ class User extends AddressComponent {
 			})
 		}
 	}
+	async updateAvatar(req, res, next){
+		const sid = req.session.user_id;
+		const user_id = req.params.user_id;
+		if (!user_id || !Number(user_id)) {
+			res.send({
+				status: 0,
+				type: 'ERROR_USERID',
+				message: 'user_id参数错误',
+			})
+			return 
+		}else if(Number(sid) !== Number(user_id)){
+			res.send({
+				status: 0,
+				type: 'NEED_LOGIN_IN',
+				message: '登录后才可修改头像',
+			})
+			return 
+		}
+		try{
+			const image_path = await this.qiniu(req);
+			await UserInfoModel.findOneAndUpdate({user_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 User()

models/v2/userInfo.js

@@ -5,7 +5,7 @@ import mongoose from 'mongoose'
 const Schema = mongoose.Schema;
 
 const userInfoSchema = new Schema({
-	avatar: {type: String, default: '/default.jpg'},
+	avatar: {type: String, default: 'default.jpg'},
 	balance: {type: Number, default: 0},
 	brand_member_new: {type: Number, default: 0},
 	current_address_id: {type: Number, default: 0},

package.json

@@ -28,6 +28,7 @@
     "captchapng": "0.0.1",
     "config-lite": "^1.5.0",
     "connect-flash": "^0.1.1",
+    "connect-history-api-fallback": "^1.3.0",
     "connect-mongo": "^1.3.2",
     "cookie-parser": "^1.4.3",
     "cross-env": "^5.0.0",
@@ -46,6 +47,7 @@
     "qiniu": "^6.1.13",
     "sha1": "^1.1.1",
     "supervisor": "^0.12.0",
+    "time-formater": "^1.0.1",
     "time-stamp": "^2.0.0",
     "winston": "^2.3.1"
   },

prototype/baseComponent.js

@@ -14,7 +14,7 @@ export default class BaseComponent {
 		this.idList = ['restaurant_id', 'food_id', 'order_id', 'user_id', 'address_id', 'cart_id', 'img_id', 'category_id', 'item_id', 'sku_id'];
 		this.imgTypeList = ['shop', 'food', 'avatar','default'];
 		this.uploadImg = this.uploadImg.bind(this)
-
+		this.qiniu = this.qiniu.bind(this)
 	}
 	async fetch(url = '', data = {}, type = 'GET', resType = 'JSON'){
 		type = type.toUpperCase();
@@ -78,74 +78,53 @@ export default class BaseComponent {
 
 	async uploadImg(req, res, next){
 		const type = req.params.type;
-		if (!this.imgTypeList.includes(type)) {
-			console.log('前台传入参数错误');
+		try{
+			const image_path = await this.qiniu(req, type);
+			res.send({
+				status: 1,
+				image_path,
+			})
+		}catch(err){
+			console.log('上传图片失败', err);
 			res.send({
 				status: 0,
-				type: 'ERROR_PARAMS',
-				message: '参数错误',
+				type: 'ERROR_UPLOAD_IMG',
+				message: '上传图片失败'
 			})
-			return
 		}
-		const form = formidable.IncomingForm();
-		form.uploadDir = './public/img/' + type;
 		
-		form.parse(req, async (err, fields, files) => {
-			let img_id;
-			try{
-				img_id = await this.getId('img_id');
-			}catch(err){
-				console.log('获取图片id失败');
-				fs.unlink(files.file.path)
-				res.send({
-					status: 0,
-					type: 'ERROR_GET_ID',
-					message: '获取图片id失败',
-				})
-				return 
-			}
-			const imgName = (new Date().getTime() + Math.ceil(Math.random()*10000)).toString(16) + img_id;
-			const extname = path.extname(files.file.name);
-			const repath = './public/img/' + type + '/' + imgName + extname;
-			try{
-				const key = imgName + extname;
-				await fs.rename(files.file.path, repath);
-				const token = this.uptoken('node-elm', key);
-				const qiniuImg = await this.uploadFile(token.toString(), key, repath);
-				fs.unlink(repath);
-				res.send({
-					status: 1,
-					image_path: qiniuImg
-				})
-				// gm(repath)
-				// .resize(400, 400, '!')
-				// .write(repath, async (err) => {
-				// 	if(err){
-				// 		console.log('改写图片尺寸失败');
-				// 		fs.unlink(repath);
-				// 		res.send({
-				// 			status: 0,
-				// 			type: 'ERROR_GET_SIZE',
-				// 			message: '改写图片尺寸失败',
-				// 		})
-				// 	}else{
-				// 		const path = repath.replace(/^\.\/public/, '');
-				// 		res.send({
-				// 			status: 1,
-				// 			image_path: path
-				// 		})
-				// 	} 
-				// })
-			}catch(err){
-				console.log('改写图片路径失败', err);
-				fs.unlink(files.file.path)
-				res.send({
-					status: 0,
-					type: 'ERROR_USE_GM',
-					message: '切图失败',
-				})
-			}
-		});
+	}
+	async qiniu(req, type = 'default'){
+		return new Promise((resolve, reject) => {
+			const form = formidable.IncomingForm();
+			form.uploadDir = './public/img/' + type;
+			form.parse(req, async (err, fields, files) => {
+				let img_id;
+				try{
+					img_id = await this.getId('img_id');
+				}catch(err){
+					console.log('获取图片id失败');
+					fs.unlink(files.file.path);
+					reject('获取图片id失败')
+				}
+				const imgName = (new Date().getTime() + Math.ceil(Math.random()*10000)).toString(16) + img_id;
+				const extname = path.extname(files.file.name);
+				const repath = './public/img/' + type + '/' + imgName + extname;
+				try{
+					const key = imgName + extname;
+					await fs.rename(files.file.path, repath);
+					const token = this.uptoken('node-elm', key);
+					const qiniuImg = await this.uploadFile(token.toString(), key, repath);
+					fs.unlink(repath);
+					resolve(qiniuImg)
+				}catch(err){
+					console.log('保存至七牛失败', err);
+					fs.unlink(files.file.path)
+					reject('保存至七牛失败')
+				}
+			});
+
+		})
 	}
 	uptoken(bucket, key){
 		var putPolicy = new qiniu.rs.PutPolicy(bucket+":"+key);

public/elm/static/css/app.css

@@ -1 +0,0 @@
-a,article,aside,b,body,button,dd,div,dl,dt,figcaption,figure,footer,h1,h2,h3,h4,h5,h6,header,i,input,li,nav,p,section,select,span,textarea,ul{padding:0;margin:0;list-style:none;font-style:normal;text-decoration:none;border:none;color:#333;box-sizing:border-box;font-family:Microsoft Yahei,sans-serif;-webkit-tap-highlight-color:transparent;-webkit-font-smoothing:antialiased}a:focus,article:focus,aside:focus,b:focus,body:focus,button:focus,dd:focus,div:focus,dl:focus,dt:focus,figcaption:focus,figure:focus,footer:focus,h1:focus,h2:focus,h3:focus,h4:focus,h5:focus,h6:focus,header:focus,i:focus,input:focus,li:focus,nav:focus,p:focus,section:focus,select:focus,span:focus,textarea:focus,ul:focus{outline:none}::-webkit-scrollbar{width:0;height:0;background-color:#f5f5f5}::-webkit-scrollbar-track{-webkit-box-shadow:inset 0 0 1px transparent;border-radius:10px;background-color:#f5f5f5}::-webkit-scrollbar-thumb{border-radius:10px;-webkit-box-shadow:inset 0 0 6px rgba(0,0,0,.3);background-color:#555}input[type=button],input[type=reset],input[type=search],input[type=submit],textarea{-webkit-appearance:none}body,html{height:100%;width:100%;background-color:#f5f5f5}.clear:after{content:'';display:block;clear:both}.clear{zoom:1}.back_img{background-repeat:no-repeat;background-size:100% 100%}.margin{margin:0 auto}.left{float:left}.right{float:right}.hide{display:none}.show{display:block}.ellipsis{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.paddingTop{padding-top:1.95rem}.router-fade-enter-active,.router-fade-leave-active{-webkit-transition:opacity .3s;transition:opacity .3s}.router-fade-enter,.router-fade-leave-active{opacity:0}

public/static/css/app.css

@@ -0,0 +1 @@
+a,article,aside,b,body,button,dd,div,dl,dt,figcaption,figure,footer,h1,h2,h3,h4,h5,h6,header,i,input,li,nav,p,section,select,span,textarea,ul{padding:0;margin:0;list-style:none;font-style:normal;text-decoration:none;border:none;color:#333;font-weight:400;font-family:Microsoft Yahei;box-sizing:border-box;-webkit-tap-highlight-color:transparent;-webkit-font-smoothing:antialiased}a:hover,article:hover,aside:hover,b:hover,body:hover,button:hover,dd:hover,div:hover,dl:hover,dt:hover,figcaption:hover,figure:hover,footer:hover,h1:hover,h2:hover,h3:hover,h4:hover,h5:hover,h6:hover,header:hover,i:hover,input:hover,li:hover,nav:hover,p:hover,section:hover,select:hover,span:hover,textarea:hover,ul:hover{outline:none}::-webkit-scrollbar{width:0;height:0;background-color:#f5f5f5}::-webkit-scrollbar-track{-webkit-box-shadow:inset 0 0 1px transparent;border-radius:10px;background-color:#f5f5f5}::-webkit-scrollbar-thumb{border-radius:10px;-webkit-box-shadow:inset 0 0 6px rgba(0,0,0,.3);background-color:#555}input[type=button],input[type=reset],input[type=search],input[type=submit],textarea{-webkit-appearance:none}body,html{height:100%;width:100%;background-color:#f5f5f5}.clear:after{content:'';display:block;clear:both}.clear{zoom:1}.back_img{background-repeat:no-repeat;background-size:100% 100%}.margin{margin:0 auto}.left{float:left}.right{float:right}.hide{display:none}.show{display:block}.ellipsis{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.paddingTop{padding-top:1.95rem}.router-fade-enter-active,.router-fade-leave-active{-webkit-transition:opacity .3s;transition:opacity .3s}.router-fade-enter,.router-fade-leave-active{opacity:0}