| 
					
				 | 
			
			
				@@ -66,7 +66,8 @@ Component({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 url: '../../pages/home/integral/index' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         ], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        target: 0 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        target: 0, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        sharList:[], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     lifetimes: { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -96,6 +97,7 @@ Component({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             console.log('123', contentpadding); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             this.gettarget() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            this.order() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -131,7 +133,7 @@ Component({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 this.setData({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     target: num[0].num 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                console.log('当前步数',this.data.target); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                console.log('当前步数', this.data.target); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 const currentUser2 = Parse.User.current(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 let userquery2 = new Parse.Query('_User'); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -152,5 +154,33 @@ Component({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        //获取当天运动数据 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        async order() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            const currentUser = Parse.User.current(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            let ActivityDataquery = new Parse.Query('ActivityData'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            ActivityDataquery.equalTo('user', currentUser.id); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            ActivityDataquery.equalTo('company', company); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            ActivityDataquery.equalTo('type', 'today'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            ActivityDataquery.notEqualTo('isDeleted', true); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            // 获取今天的日期 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            const today = new Date(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            const todayStart = new Date(today.getFullYear(), today.getMonth(), today.getDate()); // 今天的开始时间 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            const todayEnd = new Date(todayStart); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            todayEnd.setHours(23, 59, 59, 999); // 今天的结束时间 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            // 在查询条件中添加对 createdAt 的限制 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            ActivityDataquery.greaterThanOrEqualTo('createdAt', todayStart); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            ActivityDataquery.lessThanOrEqualTo('createdAt', todayEnd); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            ActivityDataquery.include('user'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            let r = await ActivityDataquery.find(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            let sharList = r.map(item => item.toJSON()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            this.setData({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                sharList 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            console.log(this.data.sharList); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 }) 
			 |