Merge branch 'master' of http://10.1.235.20:3000/ipu/android-share

display-server/web/biz/js/plugin/qr.js

@@ -22,7 +22,7 @@ require(["domReady!","wadeMobile","util"], function(doc,WadeMobile) {
		var str=$("#info").html();
		WadeMobile.createQrCode(function(base64){
			$("#img").html("<img src=\"data:image/jpeg;base64,"+base64+"\" >");
			doc.getElementById("resultContent").style.display="";
			doc.getElementById("resultContent").style.display="block";
			iscroll.refresh();
		},str);
	});