Authored by liangxs

Merge branch 'beta/wap' of http://git.dev.yoho.cn/web/yohobuywap into beta/wap

# Conflicts:
#	static/dist/myohobuy/1.3.17/index.css
#	static/dist/myohobuy/1.3.17/index.js
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.