删除多余的php now
i change the top of index.html
修改了首页翻页
视频详细页面bug fix
qq 登陆api 接入
shop 同步登录登出
fix
删除掉首页翻页，，，改了天天锻炼子页面
改变顶部的z-index
删除掉首页翻页，，，改了天天锻炼子页面
改变顶部的z-index
修改头部
i change header of index.html
Merge remote-tracking branch 'refs/remotes/origin/MianBranch'

Conflicts:
	aijianmei_back/apps/index/Tpl/default/Public/css/public.css
	aijianmei_back/apps/index/Tpl/default/Public/js/public.js
index.html nav
Merge remote-tracking branch 'refs/remotes/origin/MianBranch'

Conflicts:
	aijianmei_back/apps/index/Tpl/default/Public/css/public.css
change index.html
鼠标滚动事件兼容ie
Merge remote-tracking branch 'refs/remotes/origin/MianBranch'
fix
fix www同步相关文件
fix