update shop cart js
Merge branch 'master' of github.com:allen2/jy

Conflicts:
	src/main/java/com/renren/ntc/sg/util/ReadExcel.java
add order confirm page
use self js
Merge branch 'master' of github.com:allen2/jy
add user vm
add error vm
Merge pull request #2 from liangji101/master

	update shop cart js