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

js/common.js

@@ -1217,24 +1217,32 @@ function getNowFormatDate(num) {
}
function wlog(dt, id, src) {
	var src = src || "1";
	$.ajax({
		url: "http://www.ekexiu.com:8082/log/jsonp/log",
		data: {
			"id": id,
			"src": src,
			"__lt": dt,
		},
		success:function(data) {
		},
		dataType: "jsonp"
	});
	
    var $img=$("<img src='http://www.ekexiu.com:8082/log/img?__lt="+dt+"&src="+src+"&id="+id+"&_t="+(new Date().getTime())+"' style='display:none;' ></img>");
    $img.appendTo($("body"));
    
    setTimeout(function(){
    	$img.remove();
    },5000);
    	
//	$.ajax({
//		url: "http://www.ekexiu.com:8082/log/jsonp/log",
//		data: {
//			"id": id,
//			"src": src,
//			"__lt": dt,
//		},
//		success:function(data) {
//		},
//		dataType: "jsonp"
//	});
}
//广告相关操作
function addscript(that){
	var script=document.createElement("script");  
	script.setAttribute("type", "text/javascript");  
	var srclink= "http://www.ekexiu.com/data/inc/ad/"+ that +".js?r=" + new Date().getTime();
	var srclink= "https://www.ekexiu.com/data/inc/ad/"+ that +".js?r=" + new Date().getTime();
	script.setAttribute("src", srclink);  
	var heads = document.getElementsByTagName("head");  
	if(heads.length){  

js/public/shareCom.js

@@ -198,24 +198,30 @@ function shareWays(shareTitle,descContent,lineLink,imgUrl){
function wlog(dt, id, src) {
	var src = src || "1";
	$.ajax({
		url: "http://www.ekexiu.com:8082/log/jsonp/log",
		data: {
			"id": id,
			"src": src,
			"__lt": dt,
		},
		success:function(data) {
		},
		dataType: "jsonp"
	});
	var $img=$("<img src='http://www.ekexiu.com:8082/log/img?__lt="+dt+"&src="+src+"&id="+id+"&_t="+(new Date().getTime())+"' style='display:none;' ></img>");
    $img.appendTo($("body"));
    
    setTimeout(function(){
    	$img.remove();
    },5000);
//	$.ajax({
//		url: "http://www.ekexiu.com:8082/log/jsonp/log",
//		data: {
//			"id": id,
//			"src": src,
//			"__lt": dt,
//		},
//		success:function(data) {
//		},
//		dataType: "jsonp"
//	});
}
//广告相关操作
function addscript(that){
	var script=document.createElement("script");  
	script.setAttribute("type", "text/javascript");  
	var srclink= "http://www.ekexiu.com/data/inc/ad/"+ that +".js?r=" + new Date().getTime();
	var srclink= "https://www.ekexiu.com/data/inc/ad/"+ that +".js?r=" + new Date().getTime();
	script.setAttribute("src", srclink);  
	var heads = document.getElementsByTagName("head");  
	if(heads.length){