new

application/index/view/share_shop/share_detail.html

@@ -263,8 +263,8 @@
 		<!--<script src="/app/js/jquery.js"></script>-->
 		<script src="/app/js/jquery-1122-min.js" charset="UTF-8"></script>
 		<script src="/app/js/swiper.js"></script>
-		<script src="/app/js/app_jump.js"></script>
 		<script src="/app/js/common.js" charset="utf-8"></script>
+		<script src="/app/js/app_jump.js"></script>
 		<script src="/app/js/detaila_tl.js?new1"></script>
 		<script src="/app/js/jquery.cookie.js"></script>
 		<script src="/app/js/Tab_min.js" charset="utf-8"></script>

public/app/js/app_jump.js

@@ -87,22 +87,24 @@ function jumpEvent(){
 	var params = "?" + window.location.href.split('?')[1]
 	
 	$('#jump_link').click(function(e){
-		if ($('#jump_link').attr("data-phone") == 'true' ? true : false ){
+		if (JSON.parse($('#open_id').val()).is_user == 'true'){
 			if(device.isIos()) {
+				console.log(navigator.userAgent.toLowerCase().match(/MicroMessenger/i)!='micromessenger' )
 				if ( navigator.userAgent.toLowerCase().match(/MicroMessenger/i)!='micromessenger' ) {
+					alert('externalCallTLC://AppOpenShopDetail/'+ id);
 					window.location.href = 'externalCallTLC://AppOpenShopDetail/'+ id; 
-					window.setTimeout(function(){
-			           location.href = ServerHostTempC + _clientType==='b'?'/app_broker/download_b':'/app.php/app/download_c'
-				    },10000);
+//					window.setTimeout(function(){
+//			           location.href = ServerHostTempC + _clientType==='b'?'/app_broker/download_b':'/app.php/app/download_c'
+//				    },10000);
 				} else {
 					location.href = "yindaoIos" + params
 				}
-			} else if (device.isAndroid()){
+			} else if (device.isAndroid()) {
 				if ( navigator.userAgent.toLowerCase().match(/MicroMessenger/i)!='micromessenger' ) {
 					window.location.href = 'tlscheme://tlhost/tongtonglian/open' + params; 
-					window.setTimeout(function(){
-			           location.href = ServerHostTempC + _clientType==='b'?'/app_broker/download_b':'/app.php/app/download_c'
-			        },1000);
+//					window.setTimeout(function(){
+//			           location.href = ServerHostTempC + _clientType==='b'?'/app_broker/download_b':'/app.php/app/download_c'
+//			        },1000);
 					
 				} else {
 					location.href = "yindaoAndroid" + params
@@ -110,8 +112,13 @@ function jumpEvent(){
 			} else {
 			};
 		} else {
+			var user_id = JSON.parse($('#open_id').val()).user_id; //从url获取的商铺id
+			var referrer = _clientType==='b'? 20 : 10 ;
+			var union_id = JSON.parse($('#open_id').val()).wx_union_id;
+			var device_id = JSON.parse($('#open_id').val()).device_id;
 //			location.href = ServerHostTempC + "/app/dist/index.html#/inviteRegister?" + "inviteRegister";
-			location.href = ServerHostTempC + _clientType==='b'?'/app_broker/download_b':'/app.php/app/download_c'
+//			location.href = ServerHostTempC + _clientType==='b'?'/app_broker/download_b':'/app.php/app/download_c'
+			location.href =ServerHostTempC + '/app/dist/index.html#/inviteRegister?referrer_id='+user_id+'&referrer_source='+referrer+'&device_id='+device_id+'&wx_union_id='+union_id;
 		}
 		e.preventDefault();
 		e.stopPropagation();

public/app/js/detaila_tl.js

@@ -333,13 +333,13 @@
 				location.href = ServerHost + '/app/dist/#/shopList';
 			});
 		};
-
+		$('#jump_link').attr("data-phone" , JSON.parse($('#open_id').val()).is_user)
 		jumpEvent(); //添加跳转app页面事件
 	}
 })();
 
 
-//$(document).ready(function(){
+$(document).ready(function(){
 //	console.log("12312321321312321132")
 //		//window.location.href = 'https://www.baidu.com';
 //		
@@ -361,5 +361,5 @@
 //	console.log($('#open_id').val())
 //	console.log(JSON.parse($('#open_id').val()));
 //	console.log(JSON.parse($('#open_id').val()).id)
-//	$('#jump_link').attr("data-phone" , JSON.parse($('#open_id').val()).is_user)
-//})
\ No newline at end of file
+	$('#jump_link').attr("data-phone" , JSON.parse($('#open_id').val()).is_user)
+})
\ No newline at end of file

public/resource/js/performance_ranking.js

@@ -241,7 +241,7 @@ define (['doT', 'ckfinder','ckfinderStart', 'css!style/home.css',"datetimepicker
 		loadTableData : function(){
 			var that = performanceRanking ; 
 			var date = new Date();
-			var time = "(" + date.getFullYear() + "." + ( date.getMonth() + 1 ) + ".1-" + ( date.getMonth() + 1 ) + date.getDate() + ")";
+			var time = "(" + date.getFullYear() + "." + ( date.getMonth() + 1 ) + ".1-" + ( date.getMonth() + 1 ) + "." + date.getDate() + ")";
 			$('#table-time').text(time);
 			var  user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo')));  //读取缓存
 			var id = user_info_obj.id;