|  | @@ -392,6 +392,7 @@
 | 
	
		
			
				|  |  |  		onLoad(opt) {
 | 
	
		
			
				|  |  |  			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
 | 
	
		
			
				|  |  |  		   console.log(opt)
 | 
	
		
			
				|  |  | +		   this.collectingID=opt.id;
 | 
	
		
			
				|  |  |  		   if(opt.shareId){
 | 
	
		
			
				|  |  |  			   this.shareId=opt.shareId
 | 
	
		
			
				|  |  |  		   }
 | 
	
	
		
			
				|  | @@ -407,7 +408,7 @@
 | 
	
		
			
				|  |  |  				this.scene=opt.scene;
 | 
	
		
			
				|  |  |  				this.getShareParams()
 | 
	
		
			
				|  |  |  			}else{
 | 
	
		
			
				|  |  | -				this.collectingID=opt.id;
 | 
	
		
			
				|  |  | +				
 | 
	
		
			
				|  |  |  				//this.getInfo();
 | 
	
		
			
				|  |  |  				this.queryActivityInfo();
 | 
	
		
			
				|  |  |  				this.queryGoodsLook()
 | 
	
	
		
			
				|  | @@ -422,7 +423,7 @@
 | 
	
		
			
				|  |  |  		   			this.scene=opt.scene;
 | 
	
		
			
				|  |  |  		   			this.getShareParams()
 | 
	
		
			
				|  |  |  		   		}else{
 | 
	
		
			
				|  |  | -		   			this.collectingID=opt.id;
 | 
	
		
			
				|  |  | +		   			
 | 
	
		
			
				|  |  |  		   			//this.getInfo();
 | 
	
		
			
				|  |  |  		   			this.queryActivityInfo();
 | 
	
		
			
				|  |  |  		   			this.queryGoodsLook()
 | 
	
	
		
			
				|  | @@ -1076,7 +1077,7 @@
 | 
	
		
			
				|  |  |  		  that = this;
 | 
	
		
			
				|  |  |  		},
 | 
	
		
			
				|  |  |  		onShareAppMessage(res) {
 | 
	
		
			
				|  |  | -			console.log(this.userInfo)
 | 
	
		
			
				|  |  | +			console.log(res)
 | 
	
		
			
				|  |  |  			var img='';
 | 
	
		
			
				|  |  |  			/* if(this.info.ImgList.length>0){
 | 
	
		
			
				|  |  |  				img=this.info.ImgList[0].url
 | 
	
	
		
			
				|  | @@ -1109,12 +1110,13 @@
 | 
	
		
			
				|  |  |  			}
 | 
	
		
			
				|  |  |  		},
 | 
	
		
			
				|  |  |  		
 | 
	
		
			
				|  |  | -		onShareTimeline() {
 | 
	
		
			
				|  |  | +		onShareTimeline(res) {
 | 
	
		
			
				|  |  | +			
 | 
	
		
			
				|  |  |  			if(this.info.groupType){
 | 
	
		
			
				|  |  |  				//console.log(res.target.dataset.obj.ID)
 | 
	
		
			
				|  |  | -				var url= 'pages/subPack/jkDetail?id=' + this.collectingID+'&shareId='+this.userInfo.openId+'&shareName='+this.userInfo.nickName+'&groupID='+res.target.dataset.obj.ID
 | 
	
		
			
				|  |  | +				var url= 'id=' + this.collectingID+'&shareId='+this.userInfo.openId+'&shareName='+this.userInfo.nickName//+'&groupID='+res.target.dataset.obj.ID
 | 
	
		
			
				|  |  |  			}else{
 | 
	
		
			
				|  |  | -				var url= 'pages/activity/jkDetail?id=' + this.collectingID+'&shareId='+this.userInfo.openId
 | 
	
		
			
				|  |  | +				var url= 'id=' + this.collectingID+'&shareId='+this.userInfo.openId
 | 
	
		
			
				|  |  |  			}
 | 
	
		
			
				|  |  |  		    return {
 | 
	
		
			
				|  |  |  		      title: this.info.activityName,
 |