fe / yohobuy-mobile · Commits

Conflicts:
	vip-bill/public/css/index.css
	vip-bill/public/css/index.css.map
	vip-bill/public/js/bill.js
	vip-bill/public/sass/partial/_bill.scss
	vip-bill/views/pages/bill.html

合并homepage kids代码
Conflicts:
	home-page/public/js/data/kids.js