删除settings
Merge branch 'develop' of github.com:WangTe/WuJiaDian into develop

Conflicts:
	.gitignore
Merge branch 'develop' of github.com:WangTe/WuJiaDian into develop
添加购物车弹窗JS CSS文件
添加对话窗效果
Merge branch 'develop' of github.com:WangTe/WuJiaDian into develop