Merge remote-tracking branch 'origin/dev' into test

js/common.js

@@ -1,5 +1,5 @@
var wlogurl="http://192.168.3.233:8080"
//var wlogurl="http://www.ekexiu.com:8082";
//var wlogurl="http://192.168.3.233:8080"
var wlogurl="http://www.ekexiu.com:8082";
$(document).ready(function() {
	$(".unlogin").show();

js/public/shareCom.js

@@ -1,5 +1,5 @@
var wlogurl="http://192.168.3.233:8080"
//var wlogurl="http://www.ekexiu.com:8082";
//var wlogurl="http://192.168.3.233:8080"
var wlogurl="http://www.ekexiu.com:8082";
function GetQueryString(name) {
	var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");