Merge branch 'release_yh' into 'master'

http域名修复

See merge request !20

new_admincp/source/zsb/js/v1.0/wechatUploadImage.js

@@ -196,7 +196,8 @@ var get_wechat_info = function()
 	}
 
 	//微信数据请求URL
-	var url = 'http://weixinupload.house365.com/wechat_cache_image_new.php?callback=?';
+	var http_= window.location.protocol;
+	var url = http_+'//weixinupload.house365.com/wechat_cache_image_new.php?callback=?';
 
 	//获取已传图片，防止重复加载图片
 	var image_arr = getUploadImageData();