Merge pull request #1 from wangbailin/master

促销罐投票功能页面
base
js
js
temp