Merge branch 'release_yh' into 'master'

JS域名修复

See merge request !19

new_admincp/applications/zsb/views/nj/360pic_inc.php

@@ -171,10 +171,11 @@
 
     function uploads_zsb_360(id,key) {
         console.log(id);
+        var http_= window.location.protocol;
         var uploader = new plupload.Uploader({
             browse_button: id, //触发文件选择对话框的按钮，为那个元素id
             //url: '/pic/house?pic_from_sell='+pic_from_sell, //服务器端的上传页面地址
-            url:'http://newrent.house365.com/ajax-action/upload-file',
+            url:http_+'//newrent.house365.com/ajax-action/upload-file',
             flash_swf_url: '/source/common/js/plupload-2.3.6/js/Moxie.swf', //swf文件，当需要使用swf方式进行上传时需要配置该参数
             silverlight_xap_url: '/source/common/js/plupload-2.3.6/js/Moxie.xap', //silverlight文件，当需要使用silverlight方式进行上传时需要配置该参数
             multi_selection: true,

new_admincp/applications/zsb/views/nj/pic_inc.php

@@ -250,10 +250,11 @@ foreach($arr_sort as $key=>$sort) { ?>
     mycars[1]=5;
     mycars[0]=3;
     function uploads_zsb(id,key) {
+        var http_= window.location.protocol;
         var uploader = new plupload.Uploader({
             browse_button: id, //触发文件选择对话框的按钮，为那个元素id
             //url: '/pic/house?pic_from_sell='+pic_from_sell, //服务器端的上传页面地址
-            url:'http://newrent.house365.com/ajax-action/upload-file',
+            url:http_+'//newrent.house365.com/ajax-action/upload-file',
             flash_swf_url: '/source/common/js/plupload-2.3.6/js/Moxie.swf', //swf文件，当需要使用swf方式进行上传时需要配置该参数
             silverlight_xap_url: '/source/common/js/plupload-2.3.6/js/Moxie.xap', //silverlight文件，当需要使用silverlight方式进行上传时需要配置该参数
             multi_selection: true,

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

@@ -107,8 +107,9 @@ $(function(){
 	//二维码过期，重新生成
 	//$(".JsweicodeRefresh").click(function(){
 	$("#panoramaWeicodeRefresh,#doorinWeicodeRefresh,#dooroutWeicodeRefresh,#layoutWeicodeRefresh").click(function(){
+		var http_= window.location.protocol;
 		//重新加载二维码URL
-		var url = 'http://'+$("#GB_CITY").val()+'.zsb.house365.com/sell/get_ajax_wechat_image';
+		var url = http_+'//'+$("#GB_CITY").val()+'.zsb.house365.com/sell/get_ajax_wechat_image';
 
 		$.getJSON(url,{random:Math.random},function(data){
 			if(data['status'] == 200)