222
Merge pull request #3 from liangji101/master

	update shop vm
222
update shop view