sport

nova-werun/pages/home/sport/sport-home/index.js

@@ -54,7 +54,7 @@ Page({
         }
         //地图
         this.Getlocation()
-        this.getwalk(0)
+        this.getwalk()
     },
 
     /**
@@ -190,31 +190,29 @@ Page({
 
     },
     //切换
-    switchTab (e) {
-        const index = e.currentTarget.dataset.index;
-        this.setData({
-          currentTab: index
-        });
-        this.getwalk(index)
-        console.log(this.data.currentTab);
-      },
+    // switchTab (e) {
+    //     const index = e.currentTarget.dataset.index;
+    //     this.setData({
+    //       currentTab: index
+    //     });
+    //     this.getwalk(index)
+    //     console.log(this.data.currentTab);
+    //   },
       //获取行走公里
-     async getwalk(index){
+     async getwalk(){
         const currentUser = Parse.User.current();
         let ActivityDataquery = new Parse.Query('ActivityData');
         ActivityDataquery.equalTo('user', currentUser.id);
         ActivityDataquery.equalTo('company', company);
-        if(index==0){
-            ActivityDataquery.equalTo('type', 'walk');
-        }else{
-            ActivityDataquery.equalTo('type', 'run');
-        }
         ActivityDataquery.notEqualTo('isDeleted', true);
+        ActivityDataquery.notEqualTo('type', 'activity');
         let r = await ActivityDataquery.find();
         let List = r.map(item => item.toJSON());
         let distance = 0
         List.forEach(item=>{
-            distance =  Number(item.distance)+distance
+            if(item.distance){
+                distance =  Number(item.distance)+distance
+            }
         })
         this.setData({
             distance,