modify pic view logical
modify pic view logical
Merge remote-tracking branch 'origin/master'

Conflicts:
	node_modules/util/upyunws.js