u

app.json

@@ -1,89 +1,88 @@
 {
-    "pages": [
-        "index"
-    ],
-    "requiredPrivateInfos": [
-        "onLocationChange",
-        "startLocationUpdateBackground",
-        "getLocation"
-    ],
-    "requiredBackgroundModes" : ["location"],
-    "subpackages": [
-        {
-            "root": "nova-werun",
-            "name": "werun",
-            "pages": [
-                "pages/index/index",
-                "pages/circle/circle-detail/index",
-                "pages/circle/my-circle/index",
-                "pages/circle/send-circle/index",
-                "pages/home/signin/index",
-                "pages/home/ranking/index",
-                "pages/home/share/index",
-                "pages/home/medal/index",
-                "pages/home/sport/sport-home/index",
-                "pages/home/sport/sport-start/index",
-                "pages/home/statistics/index",
-                "pages/home/integral/index",
-                "pages/my/my-profile/index",
-                "pages/home/step/index",
-                "pages/my/feedback/index",
-                "pages/activity/index",
-                "pages/activity/detail-activity/index"
-            ]
-        },
-        {
-            "root": "nova-diypage",
-            "name": "DIYPAGE",
-            "pages": [
-                "pages/index/index"
-            ]
-        }
-    ],
-    "window": {
-        "navigationStyle": "custom",
-        "navigationBarTitleText": "",
-        "navigationBarTextStyle": "black",
-        "navigationBarBackgroundColor": "#f6f5fa",
-        "backgroundColor": "#f6f5fa",
-        "enablePullDownRefresh": false
+  "pages": [
+    "index"
+  ],
+  "requiredPrivateInfos": [
+    "onLocationChange",
+    "startLocationUpdateBackground",
+    "getLocation"
+  ],
+  "requiredBackgroundModes": ["location"],
+  "subpackages": [{
+      "root": "nova-werun",
+      "name": "werun",
+      "pages": [
+        "pages/index/index",
+        "pages/circle/circle-detail/index",
+        "pages/circle/my-circle/index",
+        "pages/circle/send-circle/index",
+        "pages/home/signin/index",
+        "pages/home/ranking/index",
+        "pages/home/share/index",
+        "pages/home/medal/index",
+        "pages/home/sport/sport-home/index",
+        "pages/home/sport/sport-start/index",
+        "pages/home/statistics/index",
+        "pages/home/integral/index",
+        "pages/my/my-profile/index",
+        "pages/home/step/index",
+        "pages/my/feedback/index",
+        "pages/activity/index",
+        "pages/activity/detail-activity/index"
+      ]
+    },
+    {
+      "root": "nova-diypage",
+      "name": "DIYPAGE",
+      "pages": [
+        "pages/index/index"
+      ]
+    }
+  ],
+  "window": {
+    "navigationStyle": "custom",
+    "navigationBarTitleText": "",
+    "navigationBarTextStyle": "black",
+    "navigationBarBackgroundColor": "#f6f5fa",
+    "backgroundColor": "#f6f5fa",
+    "enablePullDownRefresh": false
+  },
+  "permission": {
+    "scope.werun": {
+      "desc": "获取运动数据"
     },
-    "permission": {
-        "scope.werun": {
-            "desc": "获取运动数据"
-          },
-          "scope.userLocationBackground": {
-            "desc": "获取后台定位权限"
-          },
-          "scope.userLocation": {
-            "desc": "获取用户位置"
-          }
-      },
-    "usingComponents": {
-        "nav": "plugin://fm-plugin/fm-nav",
-        "get-phone-number-btn": "components/getPhone/index",
-        "search": "/components/search/search",
-        "payment": "/components/nova-payment/payment",
-        "address": "/components/address/index",
-        "upload": "/components/upload/index",
-        "van-icon": "@vant/weapp/icon/index",
-        "van-button": "@vant/weapp/button/index",
-        "van-tabbar": "@vant/weapp/tabbar/index",
-        "van-tabbar-item": "@vant/weapp/tabbar-item/index",
-        "van-empty": "@vant/weapp/empty/index",
-        "van-loading": "@vant/weapp/loading/index"
+    "scope.userLocationBackground": {
+      "desc": "获取后台定位权限"
     },
-    "sitemapLocation": "sitemap.json",
-    "plugins": {
-        "fm-plugin": {
-            "version": "0.1.1",
-            "provider": "wx56d559d35ae6e502",
-            "export": "exportToPlugin.js",
-            "genericsImplementation": {
-                "fm-auth": {
-                    "get-phone-number-btn": "components/getPhone/index"
-                }
-            }
+    "scope.userLocation": {
+      "desc": "获取用户位置"
+    }
+  },
+  "usingComponents": {
+    "nav": "plugin://fm-plugin/fm-nav",
+    "get-phone-number-btn": "components/getPhone/index",
+    "search": "/components/search/search",
+    "payment": "/components/nova-payment/payment",
+    "address": "/components/address/index",
+    "upload": "/components/upload/index",
+    "van-icon": "@vant/weapp/icon/index",
+    "van-button": "@vant/weapp/button/index",
+    "van-tabbar": "@vant/weapp/tabbar/index",
+    "van-tabbar-item": "@vant/weapp/tabbar-item/index",
+    "van-empty": "@vant/weapp/empty/index",
+    "van-loading": "@vant/weapp/loading/index"
+  },
+  "sitemapLocation": "sitemap.json",
+  "plugins": {
+    "fm-plugin": {
+      "version": "0.1.1",
+      "provider": "wx56d559d35ae6e502",
+      "export": "exportToPlugin.js",
+      "genericsImplementation": {
+        "fm-auth": {
+          "get-phone-number-btn": "components/getPhone/index"
         }
+      }
     }
+  }
 }

nova-werun/components/circle-card/index.less

@@ -84,11 +84,11 @@
         width: 100%;
         display: flex;
         flex-wrap: wrap;
-        justify-content: center;
+        justify-content: start;
         margin-top: 30rpx;
         .image{
-            width: 240rpx;
-            height: 240rpx;
+            width: 310rpx;
+            height: 310rpx;
             margin-right: 20rpx;
             margin-bottom: 10rpx;
             border-radius: 15rpx;
@@ -99,7 +99,7 @@
         display: flex;
         flex-wrap: wrap;
         margin-top: 30rpx;
-        justify-content: center;
+        justify-content: start;
         .image{
             width: 230rpx;
             height: 230rpx;
@@ -115,7 +115,7 @@
     .picture3{
         width: 100%;
         display: flex;
-        justify-content: center;
+        justify-content: start;
         flex-wrap: wrap;
         margin-top: 30rpx;
         .image{
@@ -130,7 +130,7 @@
     
         .image-landscape {
             width: 442rpx; /* 横屏图片的宽度 */
-            height: 300rpx;
+            height: 310rpx;
             border-radius: 15rpx;
         }
     }
@@ -511,11 +511,11 @@
         width: 100%;
         display: flex;
         flex-wrap: wrap;
-        justify-content: center;
+        justify-content: start;
         margin-top: 30rpx;
         .image{
-            width: 240rpx;
-            height: 240rpx;
+            width: 310rpx;
+            height: 310rpx;
             margin-right: 20rpx;
             margin-bottom: 10rpx;
             border-radius: 15rpx;
@@ -526,10 +526,10 @@
         display: flex;
         flex-wrap: wrap;
         margin-top: 30rpx;
-        justify-content: center;
+        justify-content: start;
         .image{
-            width: 230rpx;
-            height: 230rpx;
+            width: 310rpx;
+            height: 310rpx;
             margin-right: 20rpx;
             margin-bottom: 20rpx;
             object-fit: cover;
@@ -540,9 +540,9 @@
         }
     }
     .picture3{
-        width: 100%;
+        width: 100vw;
         display: flex;
-        justify-content: center;
+        justify-content: start;
         flex-wrap: wrap;
         margin-top: 30rpx;
         .image{
@@ -557,7 +557,7 @@
     
         .image-landscape {
             width: 442rpx; /* 横屏图片的宽度 */
-            height: 300rpx;
+            height: 310rpx;
             border-radius: 15rpx;
         }
     }

nova-werun/components/circle-card/index.wxml

@@ -9,23 +9,23 @@
     <!-- 图片 -->
     <!-- 4张图片 -->
     <view class="picture4" wx:if="{{images.length==4}}">
-        <image mode="scaleToFill" bindtap="openpreviewImg" data-index="{{index}}" class="image" wx:for="{{images}}" src="{{item}}"> </image>
+        <image mode="scaleToFill" bindtap="openpreviewImg" data-index="{{index}}" class="image" wx:for="{{images}}" src="{{item}}" wx:key="index"> </image>
     </view>
     <!-- 3张和4-9张图片 -->
 
     <block wx:if="{{ type=='detail'}}">
         <view class="picture" wx:if="{{images.length>4   || images.length==3 }}">
-            <image mode="scaleToFill" bindtap="openpreviewImg" data-index="{{index}}" class="image" wx:for="{{images}}" src="{{item}}"> </image>
+            <image mode="scaleToFill" bindtap="openpreviewImg" data-index="{{index}}" class="image" wx:for="{{images}}" wx:key="index" src="{{item}}"> </image>
         </view>
     </block>
 
     <!-- 2张图片 -->
     <view class="picture2" wx:if="{{images.length==2}}">
-        <image mode="scaleToFill" bindtap="openpreviewImg" data-index="{{index}}" class="image" wx:for="{{images}}" src="{{item}}"> </image>
+        <image mode="scaleToFill" bindtap="openpreviewImg" data-index="{{index}}" class="image" wx:for="{{images}}" wx:key="index" src="{{item}}"> </image>
     </view>
     <!-- 1张图片 -->
     <view class="picture3" wx:if="{{images.length==1}}">
-        <image mode="scaleToFill" bindtap="openpreviewImg" data-index="{{index}}" class="{{imageclass}}" wx:for="{{images}}" src="{{item}}" bindload="onImageLoad"> </image>
+        <image mode="scaleToFill" bindtap="openpreviewImg" data-index="{{index}}" class="{{imageclass}}" wx:for="{{images}}" wx:key="index" src="{{item}}" bindload="onImageLoad"> </image>
     </view>
     <!-- 预览组件 -->
     <previewImg id="previewComponent" previewImgList="{{imgList}}" previewImg="{{currentImg}}" />
@@ -105,7 +105,7 @@
     </view> -->
     <!-- 评论 -->
     <view class="{{chickList.length !=0? 'commentbox' :'commentbox2' }}" wx:if="{{commentList.length!=0}}">
-        <block wx:for="{{commentList}}">
+        <block wx:for="{{commentList}}" wx:key="index">
             <view class="{{item.showdeletid?'comment2':'comment'}}" wx:if="{{!item.comment}}" bindtap="showpop" data-id="{{item.objectId}}">
                 <span style="color: #4896FB;margin-right:10rpx">{{item.user.nickname}}:</span>
                 <span>{{item.content}}</span>
@@ -153,18 +153,18 @@
     <!-- 图片 -->
     <!-- 4张图片 -->
     <view class="picture4" wx:if="{{images.length==4}}">
-        <image mode="scaleToFill" bindtap="openpreviewImg" data-index="{{index}}" class="image" wx:for="{{images}}" src="{{item}}"> </image>
+        <image mode="scaleToFill" bindtap="openpreviewImg" data-index="{{index}}" class="image" wx:for="{{images}}" wx:key="index" src="{{item}}"> </image>
     </view>
     <!-- 3张和5-9张图片 -->
     <block wx:if="{{ type=='surface'}}">
         <view class="picture" wx:if="{{images.length>4  && images.length<=9 || images.length==3 }}">
-            <image mode="scaleToFill" bindtap="openpreviewImg" data-index="{{index}}" class="image" wx:for="{{images}}" src="{{item}}"> </image>
+            <image mode="scaleToFill" bindtap="openpreviewImg" data-index="{{index}}" class="image" wx:for="{{images}}" wx:key="index" src="{{item}}"> </image>
         </view>
     </block>
 
     <!-- 9张以上图片 -->
     <view class="picture5" wx:if="{{images.length > 9 && type=='surface'}}">
-        <view wx:for="{{images}}" wx:if="{{index < 9}}">
+        <view wx:for="{{images}}" wx:key="index" wx:if="{{index < 9}}">
             <view class="image-wrapper">
                 <image mode="scaleToFill" bindtap="openpreviewImg" data-index="{{index}}" class="image" src="{{item}}"></image>
                 <view class="more-images" wx:if="{{index==8}}" bindtap="gourl" data-url="../../pages/circle/circle-detail/index" data-id="{{cicleList[0].objectId}}">+{{images.length - 9}}</view>
@@ -254,7 +254,7 @@
     </view> -->
     <!-- 评论 -->
     <view class="{{chickList.length !=0? 'commentbox' :'commentbox2' }}" wx:if="{{commentList.length!=0}}">
-        <block wx:for="{{commentList}}">
+        <block wx:for="{{commentList}}" wx:key="index">
             <view class="{{item.showdeletid?'comment2':'comment'}}" wx:if="{{!item.comment}}" bindtap="showpop" data-id="{{item.objectId}}">
                 <span style="color: #4896FB;margin-right:10rpx">{{item.user.nickname}}:</span>
                 <span>{{item.content}}</span>

nova-werun/components/circle/index.wxml

@@ -17,7 +17,7 @@
                 </view>
             </view>
             <view class="acbox">
-                <view class="ac-picbox" wx:for="{{ActivityList}}" bindtap="goactivity" data-url="../../pages/activity/detail-activity/index" data-acid="{{item.objectId}}">
+                <view class="ac-picbox" wx:for="{{ActivityList}}" wx:key="index" bindtap="goactivity" data-url="../../pages/activity/detail-activity/index" data-acid="{{item.objectId}}">
                     <image src="{{item.cover[0]}}"></image>
                     <view class="picbox">
                         <view class="pic-tex">立即报名</view>
@@ -27,7 +27,7 @@
             </view>
         </view>
         <view style="width: 100%;padding-left: 32rpx;padding-right: 32rpx;">
-            <block wx:for="{{cardList}}" wx:key="{{item.objectId}}">
+            <block wx:for="{{cardList}}" wx:key="index">
                 <circle-card objectId='{{item.objectId}}' type='surface'></circle-card>
             </block>
         </view>

nova-werun/components/home/index.js

@@ -1,409 +1,294 @@
 // nova-werun/components/home/index.js
 const Parse = getApp().Parse;
 const company = getApp().globalData.company;
+let getSportData = require('../../service/getSportData')
+
+
 Component({
-    /**
-     * 组件的属性列表
-     */
-    properties: {
+  /**
+   * 组件的属性列表
+   */
+  properties: {
 
-    },
+  },
 
-    /**
-     * 组件的初始数据
-     */
-    data: {
-        //屏幕高度
-        statusBarHeight: 0, // 状态栏高度
-        screenHeight: 0, // 屏幕高度
-        customHeight: 0, // 自定义导航栏高度（如小程序右上角胶囊按钮）
-        bottomNavHeight: 0, // 底部导航栏高度
-        contentHeight: 0, // 可用内容高度
-        contentpadding: 0, //顶部padding高度
-        navheight: 0,
-        percentage: 0,
-        //选择
-        rows: [{
-                image: 'https://file-cloud.fmode.cn/qpFbRRSZrO/20241225/r5j1uc041211788.png',
-                text: '签到打卡',
-                url: '../../pages/home/signin/index'
-            },
-            {
-                image: 'https://file-cloud.fmode.cn/qpFbRRSZrO/20241225/n1pin1040819673.png',
-                text: '实时步行',
-                url: '../../pages/home/sport/sport-home/index',
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    //屏幕高度
+    statusBarHeight: 0, // 状态栏高度
+    screenHeight: 0, // 屏幕高度
+    customHeight: 0, // 自定义导航栏高度（如小程序右上角胶囊按钮）
+    bottomNavHeight: 0, // 底部导航栏高度
+    contentHeight: 0, // 可用内容高度
+    contentpadding: 0, //顶部padding高度
+    navheight: 0,
+    percentage: 0,
+    //选择
+    rows: [{
+        image: 'https://file-cloud.fmode.cn/qpFbRRSZrO/20241225/r5j1uc041211788.png',
+        text: '签到打卡',
+        url: '../../pages/home/signin/index'
+      },
+      {
+        image: 'https://file-cloud.fmode.cn/qpFbRRSZrO/20241225/n1pin1040819673.png',
+        text: '实时步行',
+        url: '../../pages/home/sport/sport-home/index',
 
-            },
-            {
-                image: 'https://file-cloud.fmode.cn/qpFbRRSZrO/20241225/9vfr1l040831635.png',
-                text: '转发分享',
-                url: '../../pages/home/share/index'
+      },
+      {
+        image: 'https://file-cloud.fmode.cn/qpFbRRSZrO/20241225/9vfr1l040831635.png',
+        text: '转发分享',
+        url: '../../pages/home/share/index'
 
-            },
-            {
-                image: 'https://file-cloud.fmode.cn/qpFbRRSZrO/20241225/it1rna040843179.png',
-                text: '我的勋章',
-                url: '../../pages/home/medal/index'
-            },
-            {
-                image: 'https://file-cloud.fmode.cn/qpFbRRSZrO/20241225/r5193r040853498.png',
-                text: '我的统计',
-                url: '../../pages/home/statistics/index'
-            },
-            // {
-            //     image: 'https://file-cloud.fmode.cn/qpFbRRSZrO/20241102/v6p4fm041343296.png?imageView2/1/w/200/h/200',
-            //     text: '排行榜',
-            //     url: '../../pages/home/ranking/index'
-            // },
+      },
+      {
+        image: 'https://file-cloud.fmode.cn/qpFbRRSZrO/20241225/it1rna040843179.png',
+        text: '我的勋章',
+        url: '../../pages/home/medal/index'
+      },
+      {
+        image: 'https://file-cloud.fmode.cn/qpFbRRSZrO/20241225/r5193r040853498.png',
+        text: '我的统计',
+        url: '../../pages/home/statistics/index'
+      },
+      // {
+      //     image: 'https://file-cloud.fmode.cn/qpFbRRSZrO/20241102/v6p4fm041343296.png?imageView2/1/w/200/h/200',
+      //     text: '排行榜',
+      //     url: '../../pages/home/ranking/index'
+      // },
 
 
-            // {
-            //     image: 'https://file-cloud.fmode.cn/qpFbRRSZrO/20241102/71svpg041343669.png?imageView2/1/w/200/h/200',
-            //     text: '跑步',
-            //     url: '../../pages/home/sport/sport-home/index',
-            //     active: 1
-            // },
+      // {
+      //     image: 'https://file-cloud.fmode.cn/qpFbRRSZrO/20241102/71svpg041343669.png?imageView2/1/w/200/h/200',
+      //     text: '跑步',
+      //     url: '../../pages/home/sport/sport-home/index',
+      //     active: 1
+      // },
 
-            // {
-            //     image: 'https://file-cloud.fmode.cn/qpFbRRSZrO/20241104/k1q4no034958681.png?imageView2/1/w/200/h/200',
-            //     text: '积分',
-            //     url: '../../pages/home/integral/index'
-            // },
-        ],
-        target: 0,
-        sharList: [],
+      // {
+      //     image: 'https://file-cloud.fmode.cn/qpFbRRSZrO/20241104/k1q4no034958681.png?imageView2/1/w/200/h/200',
+      //     text: '积分',
+      //     url: '../../pages/home/integral/index'
+      // },
+    ],
+    target: 0,
+    sharList: [],
 
-        address: "",
-        //排行榜
-        todayList: [],
-        changetitle: 'today',
-        steps:0,
-        //正序
-        rank: 'up'
-    },
-    lifetimes: {
+    address: "",
+    //排行榜
+    todayList: [],
+    changetitle: 0,
+    changetitleMap: {
+      0:'历史',
+      'today': '本日',
+      'toweek': '本周',
+      'tomonth': '本月',
 
-        detached: function () {
-            // 在组件实例被从页面节点树移除时执行
-        },
-        attached: async function () {
-            // 在组件实例进入页面节点树时执行
-            // 计算
-            const systemInfo = wx.getSystemInfoSync();
-            const statusBarHeight = systemInfo.statusBarHeight || 0;
-            const screenHeight = systemInfo.screenHeight || 0;
-            const custom = wx.getMenuButtonBoundingClientRect();
-            const customHeight = custom.height + 10 + 2 || 0;
-            const bottomNavHeight = systemInfo.screenHeight - systemInfo.safeArea.bottom || 0;
+    },
+    steps: 0,
+    //正序
+    rank: 'DESC'
+  },
+  lifetimes: {
 
-            const contentpadding = (statusBarHeight + customHeight) * 750 / systemInfo.windowWidth;
-            const contentHeight = (screenHeight - bottomNavHeight - 50 - statusBarHeight - customHeight) * 750 / systemInfo.windowWidth;
-            const navheight = (statusBarHeight + customHeight) * 750 / systemInfo.windowWidth;
-            this.setData({
-                statusBarHeight,
-                screenHeight: (screenHeight - 50 - bottomNavHeight) * 750 / systemInfo.windowWidth,
-                customHeight,
-                bottomNavHeight,
-                contentHeight,
-                contentpadding,
-                navheight,
-            });
-            this.gettarget()
-            this.order()
-            this.Getlocation()
-            this.gettoday()
-        },
+    detached: function () {
+      // 在组件实例被从页面节点树移除时执行
     },
+    attached: async function () {
+      // getSportData.setEndSport("NwzxcVxCV1")
+      // 在组件实例进入页面节点树时执行
+      // 计算
+      const systemInfo = wx.getSystemInfoSync();
+      const statusBarHeight = systemInfo.statusBarHeight || 0;
+      const screenHeight = systemInfo.screenHeight || 0;
+      const custom = wx.getMenuButtonBoundingClientRect();
+      const customHeight = custom.height + 10 + 2 || 0;
+      const bottomNavHeight = systemInfo.screenHeight - systemInfo.safeArea.bottom || 0;
 
-    /**
-     * 组件的方法列表
-     */
-    methods: {
-        //跳转
-        gourl(e) {
-            const url = e.currentTarget.dataset.url
-            const active = e.currentTarget.dataset.active
-            if (active) {
-                wx.navigateTo({
-                    url: `${url}?id=` + active // 目标页面的路径
-                });
-                console.log(active);
-            } else {
-                wx.navigateTo({
-                    url: `${url}` // 目标页面的路径
-                });
-            }
+      const contentpadding = (statusBarHeight + customHeight) * 750 / systemInfo.windowWidth;
+      const contentHeight = (screenHeight - bottomNavHeight - 50 - statusBarHeight - customHeight) * 750 / systemInfo.windowWidth;
+      const navheight = (statusBarHeight + customHeight) * 750 / systemInfo.windowWidth;
+      this.setData({
+        statusBarHeight,
+        screenHeight: (screenHeight - 50 - bottomNavHeight) * 750 / systemInfo.windowWidth,
+        customHeight,
+        bottomNavHeight,
+        contentHeight,
+        contentpadding,
+        navheight,
+      });
+      this.gettarget()
+      this.Getlocation()
+      this.refersh()
+    },
+  },
 
-        },
-        //获取目标步数
-        async gettarget() {
-            const currentUser = Parse.User.current();
-            let userquery = new Parse.Query('_User');
-            userquery.equalTo('company', company);
-            userquery.equalTo('objectId', currentUser.id);
-            userquery.notEqualTo('isDeleted', true)
-            let user = await userquery.find();
-            let num = user.map(item => item.toJSON());
-            if (num[0].num) {
-                this.setData({
-                    target: num[0].num
-                })
-                console.log('当前步数', this.data.target);
-            } else {
-                const currentUser2 = Parse.User.current();
-                let userquery2 = new Parse.Query('_User');
-                userquery2.equalTo('company', company);
-                userquery2.equalTo('objectId', currentUser2.id);
-                userquery2.notEqualTo('isDeleted', true)
-                let user2 = await userquery2.first();
-                user2.set('num', 5000)
-                try {
-                    let saveDate2 = await user2.save();
-                    console.log(saveDate2);
-                    this.setData({
-                        target: 5000
-                    })
-                    console.log("目标步数更改成功");
-                } catch (error) {
-                    console.error("保存数据时出现错误:", error);
-                }
-            }
-        },
-        //获取当天运动数据
-        async order() {
-            const currentUser = Parse.User.current();
-            let ActivityDataquery = new Parse.Query('ActivityData');
-            ActivityDataquery.equalTo('user', currentUser.id);
-            ActivityDataquery.equalTo('company', company);
-            ActivityDataquery.notEqualTo('isDeleted', true);
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    async refersh(){
+      this.order()
+      this.gettoday()
+    },
 
-            // 获取今天的日期
-            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); // 今天的结束时间
+    //跳转
+    gourl(e) {
+      const url = e.currentTarget.dataset.url
+      const active = e.currentTarget.dataset.active
+      if (active) {
+        wx.navigateTo({
+          url: `${url}?id=` + active // 目标页面的路径
+        });
+        console.log(active);
+      } else {
+        wx.navigateTo({
+          url: `${url}` // 目标页面的路径
+        });
+      }
 
-            // 在查询条件中添加对 createdAt 的限制
-            ActivityDataquery.greaterThanOrEqualTo('createdAt', todayStart);
-            ActivityDataquery.lessThanOrEqualTo('createdAt', todayEnd);
-            ActivityDataquery.include('user');
+    },
+    //获取目标步数
+    async gettarget() {
+      const currentUser = Parse.User.current();
+      let userquery = new Parse.Query('_User');
+      userquery.equalTo('company', company);
+      userquery.equalTo('objectId', currentUser.id);
+      userquery.notEqualTo('isDeleted', true)
+      let user = await userquery.first();
+      let num = user?.toJSON()
+      if (num.num) {
+        this.setData({
+          target: num.num
+        })
+        console.log('当前步数', this.data.target);
+      } else {
+        const currentUser2 = Parse.User.current();
+        let userquery2 = new Parse.Query('_User');
+        userquery2.equalTo('company', company);
+        userquery2.equalTo('objectId', currentUser2.id);
+        userquery2.notEqualTo('isDeleted', true)
+        let user2 = await userquery2.first();
+        user2.set('num', 5000)
+        try {
+          let saveDate2 = await user2.save();
+          console.log(saveDate2);
+          this.setData({
+            target: 5000
+          })
+          console.log("目标步数更改成功");
+        } catch (error) {
+          console.error("保存数据时出现错误:", error);
+        }
+      }
+    },
 
-            let r = await ActivityDataquery.find();
-            let sharList = r.map(item => item.toJSON());
-            let steps = 0
-            sharList.forEach((item)=>{
-                if(item.steps){
-                    steps = steps+item.steps
-                }
-            })
-            this.setData({
-                steps,
-            })
-            this.getBackgroundColor()
-            console.log('sharList',steps);
-        },
-        //获取当前位置信息
-        Getlocation() {
-            // 获取当前位置信息
-            wx.getLocation({
-                type: 'wgs84',
-                success: (res) => {
-                    const {
-                        latitude,
-                        longitude
-                    } = res;
-                    //调用api解析地址
-                    wx.request({
-                        url: 'https://api.map.baidu.com/reverse_geocoding/v3/?ak=sHZTomd7grslfP7sPKB8tRgT49FK9TEu&output=json&coordtype=gcj02&location=' + latitude + ',' + longitude,
-                        data: {},
-                        header: {
-                            'Content-Type': 'application/json'
-                        },
-                        success: (ops) => { // 使用箭头函数
-                            console.log(ops);
-                            // const address = ops.data.result.formatted_address;//详细地址
-                            const address = ops.data.result.addressComponent.city; //市
-                            this.setData({
-                                address: address,
-                            });
-                            console.log(this.data.address);
-                        },
-                        fail: function (resq) {
-                            wx.showModal({
-                                title: '信息提示',
-                                content: '请求失败',
-                                showCancel: false,
-                                confirmColor: '#f37938'
-                            });
-                        },
-                        complete: function () {}
-                    })
+    /** 获取当天运动数据*/
+    async order() {
+      let steps = await getSportData.getwalk('steps')
+      this.setData({
+        steps,
+      })
+      this.getBackgroundColor()
+      // console.log('sharList', steps);
+    },
+     /** 修改进度条*/
+    getBackgroundColor() {
+      let percentage = (this.data.steps / this.data.target) * 100;
+      if (percentage > 100) {
+        percentage = 100;
+      }
+      this.setData({
+        percentage: `conic-gradient(from 0deg, #015EEA ${percentage}%, white 0%)`,
+      })
+      console.log('百分比', this.data.percentage);
+    },
+    /** 获取当前位置信息*/
+    Getlocation() {
+      // 获取当前位置信息
+      wx.getLocation({
+        type: 'wgs84',
+        success: (res) => {
+          const {
+            latitude,
+            longitude
+          } = res;
+          //调用api解析地址
+          wx.request({
+            url: 'https://api.map.baidu.com/reverse_geocoding/v3/?ak=sHZTomd7grslfP7sPKB8tRgT49FK9TEu&output=json&coordtype=gcj02&location=' + latitude + ',' + longitude,
+            data: {},
+            header: {
+              'Content-Type': 'application/json'
+            },
+            success: (ops) => { // 使用箭头函数
+              console.log(ops);
+              // const address = ops.data.result.formatted_address;//详细地址
+              const address = ops.data.result.addressComponent.city; //市
+              this.setData({
+                address: address,
+              });
+              console.log(this.data.address);
+            },
+            fail: function (resq) {
+              wx.showModal({
+                title: '信息提示',
+                content: '请求失败',
+                showCancel: false,
+                confirmColor: '#f37938'
+              });
+            },
+            complete: function () {}
+          })
 
-                },
-                fail: (err) => {
-                    console.error(err);
-                    wx.showToast({
-                        title: '获取位置失败',
-                        icon: 'none'
-                    });
-                }
-            });
-        },
-        // 判断日期是否是今天
-        isToday(item) {
-            const today = new Date();
-            const date = new Date(item.timestamp * 1000); // 假设时间戳是以秒为单位
-            // 比较年、月、日
-            return date.getFullYear() === today.getFullYear() &&
-                date.getMonth() === today.getMonth() &&
-                date.getDate() === today.getDate();
         },
-        //切换
-        change() {
-            // 使用数组来简化切换逻辑
-            const titles = ['today', 'weekdday', 'month'];
-            const currentIndex = titles.indexOf(this.data.changetitle); //获取index
-            const nextIndex = (currentIndex + 1) % titles.length; // 循环切换
-            this.setData({
-                changetitle: titles[nextIndex]
-            });
-            if (this.data.changetitle == 'today') {
-                this.setData({
-                    rank: 'up'
-                })
-                this.gettoday()
-            }
-            if (this.data.changetitle == 'weekdday') {
-                this.setData({
-                    rank: 'up'
-                })
-                console.log('weekdday');
-            }
-            if (this.data.changetitle == 'month') {
-                this.setData({
-                    rank: 'up'
-                })
-                console.log('month');
-            }
-        },
-        // 获取本日排行
-        async gettoday() {
-            const currentUser = Parse.User.current();
-            let ActivityDataquery = new Parse.Query('ActivityData');
-            ActivityDataquery.equalTo('company', company);
-            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); // 今天的结束时间
-            console.log(todayStart, todayEnd);
-            
-            // 在查询条件中添加对 createdAt 的限制
-            ActivityDataquery.greaterThanOrEqualTo('createdAt', todayStart);
-            ActivityDataquery.lessThanOrEqualTo('createdAt', todayEnd);
-        
-            // 根据 steps 字段进行降序排序
-            ActivityDataquery.include('user');
-        
-            try {
-                let P = await ActivityDataquery.find();
-                let todayList = P.map(item => item.toJSON());
-        
-                // 创建一个对象来存储用户的总步数
-                const userStepsMap = {};
-        
-                // 遍历数据，累加相同用户的步数
-                todayList.forEach(item => {
-                    const userId = item.user.objectId;
-                    const steps = item.steps;
-                    if (steps) {
-                        if (!userStepsMap[userId]) {
-                            userStepsMap[userId] = {
-                                ...item.user, // 包含用户信息
-                                totalSteps: 0 // 初始化总步数
-                            };
-                        }
-                        userStepsMap[userId].totalSteps += steps; // 累加步数
-                    }
-                });
-        
-                // 将对象转换为数组
-                const aggregatedList = Object.values(userStepsMap);
-        
-                // 按总步数降序排序
-                aggregatedList.sort((a, b) => b.totalSteps - a.totalSteps);
-        
-                // 添加排名
-                let currentRank = 1; // 当前排名
-                for (let i = 0; i < aggregatedList.length; i++) {
-                    if (i > 0 && aggregatedList[i].totalSteps === aggregatedList[i - 1].totalSteps) {
-                        // 如果步数相同，排名相同
-                        aggregatedList[i].rank = aggregatedList[i - 1].rank;
-                    } else {
-                        // 否则，更新当前排名
-                        aggregatedList[i].rank = currentRank;
-                    }
-                    currentRank++;
-                }
-        
-                // 更新页面数据
-                this.setData({
-                    todayList: aggregatedList,
-                });
-        
-                console.log(this.data.todayList);
-            } catch (error) {
-                console.error('Error fetching today\'s data:', error);
-            }
-        },
-        //正序逆序
-        changeup() {
-            if (this.data.rank == 'up') {
-                this.setData({
-                    rank: 'down'
-                })
-                if (this.data.changetitle == 'today') {
-                    this.setData({
-                        todayList: this.data.todayList.reverse(),
-                    })
-                    console.log('逆序');
-                }
-                if (this.data.changetitle == 'weekdday') {
-                    console.log('weekdday逆序');
-                }
-                if (this.data.changetitle == 'month') {
-                    console.log('month逆序');
-                }
-            } else {
-                this.setData({
-                    rank: 'up'
-                })
-                if (this.data.changetitle == 'today') {
-                    this.setData({
-                        todayList: this.data.todayList.reverse(),
-                    })
-                    console.log('顺序');
-                }
-                if (this.data.changetitle == 'weekdday') {
-                    console.log('weekdday顺序');
-                }
-                if (this.data.changetitle == 'month') {
-                    console.log('month顺序');
-                }
-            }
-        },
-        //修改进度条
-        getBackgroundColor() {
-            let percentage = (this.data.steps / this.data.target) * 100;
-            if (percentage > 100) {
-                percentage = 100;
-            }
-            this.setData({
-                percentage: `conic-gradient(from 0deg, #015EEA ${percentage}%, white 0%)`,
-            })
-            console.log('百分比', this.data.percentage);
-        },
-    }
+        fail: (err) => {
+          console.error(err);
+          wx.showToast({
+            title: '获取位置失败',
+            icon: 'none'
+          });
+        }
+      });
+    },
+ 
+    /** 切换 历史/本日/本周/本月*/
+    change() {
+      // 使用数组来简化切换逻辑
+      const titles = [0, 'today', 'toweek', 'tomonth'];
+      const currentIndex = titles.indexOf(this.data.changetitle); //获取index
+      const nextIndex = (currentIndex + 1) % titles.length; // 循环切换
+      this.setData({
+        changetitle: titles[nextIndex]
+      });
+      this.gettoday()
+    },
+    /**获取排行榜 */
+    async gettoday() {
+      let {
+        rank,
+        changetitle
+      } = this.data
+      let data = await getSportData.getRanking('', changetitle, '', '', rank)
+      console.log(data)
+      this.setData({
+        todayList: data,
+      });
+    },
+    /** 正序逆序*/
+    async changeup() {
+      if (this.data.rank == 'DESC') {
+        await this.setData({
+          rank: 'ASC'
+        })
+      } else {
+        await this.setData({
+          rank: 'DESC'
+        })
+      }
+      this.gettoday()
+    },
+   
+  }
 })

nova-werun/components/home/index.json

@@ -2,6 +2,7 @@
     "component": true,
     "usingComponents": {
         "van-icon": "@vant/weapp/icon/index",
-        "van-notice-bar": "@vant/weapp/notice-bar/index"
+        "van-notice-bar": "@vant/weapp/notice-bar/index",
+        "van-empty": "@vant/weapp/empty/index"
     }
 }

nova-werun/components/home/index.wxml

@@ -1,104 +1,101 @@
 <!--nova-werun/components/home/index.wxml-->
 <view class="all" style="height: {{screenHeight}}rpx;">
-    <view class="navbox" style="height: {{navheight}}rpx;">
-        <view class="nav">
-            <view class="nav-title">首页</view>
-            <view class="nav-addbox">
-                <van-icon name="location-o" size='28rpx' color='white' />
-                <view class="nav-add">{{address}}</view>
-            </view>
-        </view>
+  <view class="navbox" style="height: {{navheight}}rpx;">
+    <view class="nav">
+      <view class="nav-title">首页</view>
+      <view class="nav-addbox">
+        <van-icon name="location-o" size='28rpx' color='white' />
+        <view class="nav-add">{{address}}</view>
+      </view>
     </view>
-    <view class="sco" style="height: {{contentHeight}}rpx;">
-        <!-- 顶部 -->
-        <view class="topbox">
-            <view class="top-tex">
-                健康运动 go
-            </view>
-            <view class="top-tex2">
-                积累运动
-                <view class="top-tex2-tex">225</view>
-                天
-            </view>
+  </view>
+  <view class="sco" style="height: {{contentHeight}}rpx;">
+    <!-- 顶部 -->
+    <view class="topbox">
+      <view class="top-tex">
+        健康运动 go
+      </view>
+      <view class="top-tex2">
+        积累运动
+        <view class="top-tex2-tex">225</view>
+        天
+      </view>
+    </view>
+    <view class="clockinbox">
+      <view class="clockinbox2">
+        <view class="runbox" style="background:{{percentage}}">
+          <view class="run">
+            <view class="step-num">{{steps||0}}</view>
+            <view class="tody-steps">今日步数</view>
+          </view>
         </view>
-        <view class="clockinbox">
-            <view class="clockinbox2">
-                <view class="runbox" style="background:{{percentage}}">
-                    <view class="run">
-                        <view class="step-num">{{steps||0}}</view>
-                        <view class="tody-steps">今日步数</view>
-                    </view>
-                </view>
-                <!--    目标 -->
-                <view class="objbox">
-                    <view class="obj1" bindtap="gourl" data-url="../../pages/home/step/index">
-                        <view class="boj1-ti">目标步数</view>
-                        <view class="obj1-numbox">
-                            <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241225/s519td033232206.png"></image>
-                            <view class="obj1-numbox-tex">{{target}}步</view>
-                        </view>
-                    </view>
-
-                    <view class="obj1" style="margin-top: 32rpx;">
-                        <view class="boj1-ti">连续打卡</view>
-                        <view class="obj1-numbox">
-                            <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20250102/tii6p6035434602.png"></image>
-                            <view class="obj1-numbox-tex">7天</view>
-                        </view>
-                    </view>
-                    <view class="obj2">积累打卡7天，超过20%人</view>
-                </view>
+        <!--    目标 -->
+        <view class="objbox">
+          <view class="obj1" bindtap="gourl" data-url="../../pages/home/step/index">
+            <view class="boj1-ti">目标步数</view>
+            <view class="obj1-numbox">
+              <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241225/s519td033232206.png"></image>
+              <view class="obj1-numbox-tex">{{target}}步</view>
             </view>
-            <view class="today-check" bindtap="gourl" data-url="../../pages/home/sport/sport-home/index">今日打卡</view>
+          </view>
 
-
-        </view>
-
-        <van-notice-bar color="#1989fa" color='#000' background="#ecf9ff" background="#fff" left-icon="volume-o" custom-class='a' text="在微信开发者工具中进行测试，确保定位和轨迹绘制的准确性。完成测试后，提交审核并发布小程序。通过以上步骤，您就可以在微信小程序中使用高德地图实现实时运动轨迹的功能。" />
-        <!-- 类型 -->
-        <view class="typebox">
-            <view class="column" wx:for="{{rows}}" wx:key="index" data-url="{{item.url}}" bindtap="gourl" data-active="{{item.active}}">
-                <image src="{{item.image}}"></image>
-                <text class="item-text">{{item.text}}</text>
+          <view class="obj1" style="margin-top: 32rpx;">
+            <view class="boj1-ti">连续打卡</view>
+            <view class="obj1-numbox">
+              <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20250102/tii6p6035434602.png"></image>
+              <view class="obj1-numbox-tex">7天</view>
             </view>
+          </view>
+          <view class="obj2">积累打卡7天，超过20%人</view>
         </view>
+      </view>
+      <view class="today-check" bindtap="gourl" data-url="../../pages/home/sport/sport-home/index">今日打卡</view>
+    </view>
 
-        <view class="rankbox">
-            <view class="ran-top">
-                <view class="top-til" wx:if="{{changetitle=='today'}}">本日排行榜</view>
-                <view class="top-til" wx:if="{{changetitle=='weekdday'}}">本周排行榜</view>
-                <view class="top-til" wx:if="{{changetitle=='month'}}">本月排行榜</view>
-                <view class="top-box" bindtap="change">
-                    切换
-                    <image style="width: 22rpx;height: 22rpx;" src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241226/fejv43122812199.png"></image>
-                </view>
-                <view class="top-box" style="margin-left: 20rpx;" wx:if="{{rank=='up'}}" bindtap="changeup">
-                    正序
-                    <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241226/8lu1od115228414.png"></image>
-                </view>
-                <view class="top-box" style="margin-left: 20rpx;" wx:if="{{rank=='down'}}" bindtap="changeup">
-                    逆序
-                    <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241226/8lu1od115228414.png"></image>
-                </view>
-            </view>
-            <block wx:for="{{todayList}}" wx:key="index">
-                <view class="cardbox">
-                    <view class="image1" wx:if="{{index==0}}">1</view>
-                    <view class="image2" wx:if="{{index==1}}">2</view>
-                    <view class="image3" wx:if="{{index==2}}">3</view>
-                    <view class="paiming" wx:if="{{index>=3}}">{{index+1}}</view>
-                    <image class="avarter" src="{{item.avatar}}"></image>
-                    <view class="name">
-                    {{item.nickname}}
-                    <view class="name2">已打卡12天</view>
-                    </view>
-                    <view class="num">{{item.totalSteps}}</view>
-                </view>
-            </block>
+    <van-notice-bar color="#1989fa" color='#000' background="#ecf9ff" background="#fff" left-icon="volume-o" custom-class='a' text="在微信开发者工具中进行测试，确保定位和轨迹绘制的准确性。完成测试后，提交审核并发布小程序。通过以上步骤，您就可以在微信小程序中使用高德地图实现实时运动轨迹的功能。" />
+    <!-- 类型 -->
+    <view class="typebox">
+      <view class="column" wx:for="{{rows}}" wx:key="index" data-url="{{item.url}}" bindtap="gourl" data-active="{{item.active}}">
+        <image src="{{item.image}}"></image>
+        <text class="item-text">{{item.text}}</text>
+      </view>
+    </view>
 
+    <view class="rankbox">
+      <view class="ran-top">
+        <view class="top-til">{{changetitleMap[changetitle]}}排行榜</view>
+        <view class="top-box" bindtap="change">
+          切换
+          <image style="width: 22rpx;height: 22rpx;" src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241226/fejv43122812199.png"></image>
         </view>
+        <view class="top-box" style="margin-left: 20rpx;" bindtap="changeup">
+          {{rank=='ASC'?'逆序':'正序'}}
+          <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241226/8lu1od115228414.png"></image>
+        </view>
+      </view>
 
+      <block wx:for="{{todayList}}" wx:key="index">
+        <view class="cardbox">
+          <view class="image1" wx:if="{{index==0}}">1</view>
+          <view class="image2" wx:if="{{index==1}}">2</view>
+          <view class="image3" wx:if="{{index==2}}">3</view>
+          <view class="paiming" wx:if="{{index>=3}}">{{index+1}}</view>
+          <image class="avarter" src="{{item.avatar}}"></image>
+          <view class="name">
+            {{item.nickname}}
+            <view class="name2">已打卡12天</view>
+          </view>
+          <view class="num">{{item.totalSteps}}</view>
+        </view>
+      </block>
+      <block wx:if="{{todayList.length<=0}}">
+        <van-empty description="{{changetitleMap[changetitle]}}榜单静悄悄，快来运动一下吧~">
+          <van-button bindtap="gourl" data-url="../../pages/home/sport/sport-home/index"   color="#4F9AF7" size="small">前往运动</van-button>
+        </van-empty>
+      </block>
     </view>
 
+  </view>
+
 
 </view>

nova-werun/pages/activity/detail-activity/index.js

@@ -1,138 +1,944 @@
-// nova-werun/pages/activity/detail-activity/index.js
+const dateF = require("../../../../utils/date")
 const Parse = getApp().Parse;
 const company = getApp().globalData.company;
+const uid = Parse.User.current()?.id
+const login = require("../../../../utils/login");
 Page({
 
-    /**
-     * 页面的初始数据
-     */
-    data: {
-        statusBarHeight: 0, // 状态栏高度
-        screenHeight: 0, // 屏幕高度
-        customHeight: 0, // 自定义导航栏高度（如小程序右上角胶囊按钮）
-        bottomNavHeight: 0, // 底部导航栏高度
-        contentHeight: 0, // 可用内容高度
-        contentHeight2: 0,
-        contentpadding: 0, //顶部padding高度
-
-        objectId: "",
-        activity:{},
-        active:0,
-        showpopup:false,
-    },
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    attachment: null,
+    isAttachment: null,
 
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad: function (options) {
-        // 计算
-        const systemInfo = wx.getSystemInfoSync();
-        const statusBarHeight = systemInfo.statusBarHeight || 0;
-        const screenHeight = systemInfo.screenHeight || 0;
-        const custom = wx.getMenuButtonBoundingClientRect();
-        const customHeight = custom.height + 10 + 2 || 0;
-        const bottomNavHeight = systemInfo.screenHeight - systemInfo.safeArea.bottom || 0;
-
-        const contentpadding = (statusBarHeight + customHeight) * 750 / systemInfo.windowWidth;
-        const contentHeight = (screenHeight - bottomNavHeight - statusBarHeight - customHeight) * 750 / systemInfo.windowWidth;
-        this.setData({
-            statusBarHeight,
-            screenHeight,
-            customHeight,
-            bottomNavHeight,
-            contentpadding,
-            contentHeight
-        });
+    showpopup: false,
+    name: null,
+    mobile: null,
 
-        this.setData({
-            objectId: options.id
-        })
-        console.log(this.data.objectId);
+    sex: null,
+    idcard: null,
+    birthdate: null,
+    address: null,
+    classType: null,
+    centerDesc: null,
+    teacher: null,
+    tel: null,
 
-        this.getactivity()
+    date: '',
+    showDate: false,
+    storeVal: null,
+    active: 0,
+    comList: [],
+    comCount: 0,
+    comVal: null,
+    replyObj: {
+      placeholder: '你猜我的评论区在等谁？'
     },
+    autosize: {
+      maxHeight: 100,
+      minHeight: 50
+    },
+    idcard: null,
+    teacher: null,
+    teacherAdd: null,
+    remark: null,
+    optionKeyList: [],
+    isAttend:false,//当前活动是否可参与（报名时间结束即可参与运动）
+  },
 
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady: function () {
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    let userInfo = wx.getStorageSync("userLogin");
+    console.log(userInfo)
+    let {
+      id
+    } = options
+    this.setData({
+      aid: id,
+      userInfo
+    })
+    this.refersh()
+  },
 
-    },
 
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow: function () {
+  login() {
+    let userInfo = wx.getStorageSync("userLogin");
+    if (!userInfo || userInfo == '') {
+      login.loginNow()
+    } else {
+      this.setData({
+        userInfo
+      })
+      this.refersh()
+    }
+  },
+  async refersh() {
+    await this.getActivity()
+    this.getActStatus()
+    this.getActRegister()
+    this.getArticle()
+  },
+  /**获取当前活动 */
+  async getActivity() {
+    let {
+      aid
+    } = this.data
+    let query = new Parse.Query('Activity')
+    let data = await query.get(aid)
+    let activity = data.toJSON()
+    console.log(activity)
+    let now = new Date()
+    if(activity.signFromTo?.to?.iso){//当前时间大于可签到结束时间-可参与
+      let signTo = new Date(activity.signFromTo?.to?.iso)
+      if(now > signTo){
+        this.setData({isAttend:true})
+      }
+    }
+    if(activity.endDate){//当前时间大于活动结束时间-不可参与
+      let end = new Date(activity.endDate)
+      if(now > end){
+        this.setData({isAttend:false})
+      }
+    }
+    let optionKeyList = Object.keys(activity.limitOptions || {}) || []
+    activity.start = dateF.formatTime("YYYY.mm.dd HH:MM", activity.startDate?.iso)
+    activity.end = dateF.formatTime("mm.dd HH:MM", activity.endDate?.iso)
+    activity.startDate = new Date(activity.startDate?.iso)
+    activity.endDate = new Date(activity.endDate?.iso)
+    
+    if (activity.signFromTo?.from && activity.signFromTo?.to) {
+      activity.signFromTo.fromDate = new Date(activity.signFromTo?.from?.iso) || null
+      activity.signFromTo.toDate = new Date(activity.signFromTo?.to?.iso) || null
+      activity.signFromTo.from = dateF.formatTime("YYYY.mm.dd HH:MM", activity.signFromTo?.from?.iso)
+      activity.signFromTo.to = dateF.formatTime("mm.dd HH:MM", activity.signFromTo?.to?.iso)
+    }
+ 
+   
+    this.setData({
+      activity,
+      optionKeyList,
+    })
+  },
+  /**预览图片 */
+  imagePreview(e) {
+    let {
+      activity
+    } = this.data
+    let {
+      img
+    } = e.currentTarget.dataset
+    wx.previewImage({
+      current: img, // 当前显示图片的http链接
+      urls: activity.cover // 需要预览的图片http链接列表
+    })
+  },
+  /**切换 活动详情/排行榜 */
+  async changeTab(e) {
+    if (e.detail.name == 1 && !this.data?.comList?.length) {
+      // this.getHomeCom()
+    }
+    this.setData({
+      active: e.detail.name
+    })
+  },
+  /**获取报名记录 */
+  async getActRegister() {
+    let {
+      activity
+    } = this.data
+    let query = new Parse.Query('ActivityRegister')
+    query.notEqualTo('isDeleted', true)
+    query.equalTo('activity', activity.objectId)
+    query.equalTo('isPay', true)
+    query.equalTo('isChecked', true)
+    query.equalTo('user', uid)
+    query.descending('createdAt') //大到小
+    query.include('shopStore')
+    let req = await query.find()
+    let registerList = []
+    if (req?.length > 0) {
+      registerList = req.map(item => {
+        let results = item?.toJSON()
+        results.createdAt = dateF.formatTime("YYYY.mm.dd HH:MM", item.get('createdAt'))
+        results.booking = dateF.formatTime("YYYY.mm.dd HH:MM", item.get('startDate'))
+        results.bookObj = {}
+        results.bookObj.from = dateF.formatTime("YYYY.mm.dd HH:MM", item.get('booking')?.from)
+        results.bookObj.to = dateF.formatTime("mm.dd HH:MM", item.get('booking')?.to)
+        results.shop = results?.shopStore
+        return results
+      })
+    }
+    this.setData({
+      registerList,
+      registerPaseList: req
+    })
+  },
+  /**查看报名记录 */
+  lookLog(e) {
+    this.setData({
+      checkDate: null
+    })
+    let {
+      registerList,
+      registerPaseList
+    } = this.data
+    let {
+      index
+    } = e.currentTarget.dataset
+    console.log(registerList[index])
+    this.setData({
+      bookObj: registerList[index].bookObj,
+      shop: registerList[index].shop,
+      aRegister: registerPaseList[index],
+    })
 
-    },
+    this.onOpen()
+  },
+  /**判断用户参与活动状态 */
+  async getActStatus() {
+    let {
+      activity
+    } = this.data
+    let query = new Parse.Query('ActivityRegister')
+    query.notEqualTo('isDeleted', true)
+    query.equalTo('activity', activity.objectId)
+    query.equalTo('isPay', true)
+    query.equalTo('isChecked', true)
+    let count = await query.count()
+    let tips = {
+      title: '可报名',
+      isCanSign: true,
+      isEdit: true, //是否可编辑
+    }
+    let now = new Date()
+    this.setData({
+      tips,
+      count,
+      toYear: now.getFullYear(),
+      toMonth: now.getMonth() + 1,
+      toDate: now.getDate()
+    })
 
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide: function () {
+    if (now > activity.endDate) {
+      tips = {
+        title: '活动已结束',
+        isCanSign: false,
+        isEdit: false,
+      }
+      this.setData({
+        tips
+      })
+      return
+    }
+    if (!activity.isEnabled) {
+      tips = {
+        title: '活动未开启',
+        isCanSign: false,
+        isEdit: false,
+      }
+      this.setData({
+        tips
+      })
+      return
+    }
+    if (activity.signFromTo?.fromDate && now < activity.signFromTo.fromDate) {
+      tips = {
+        title: '未到报名时间',
+        isCanSign: false,
+        isEdit: false,
+      }
+      this.setData({
+        tips
+      })
+      return
+    }
+    if (activity.signFromTo?.toDate && now >= activity.signFromTo.toDate) {
+      tips = {
+        title: '报名时间已过',
+        isCanSign: false,
+        isEdit: false,
+      }
+      this.setData({
+        tips
+      })
+      return
+    }
+    query.equalTo('user', uid)
+    query.descending('createdAt') //大到小
+    query.include('shopStore')
 
-    },
+    let userCount = await query.count()
+    if (userCount >= activity?.everyCount) {
+      tips = {
+        title: '已报名本活动',
+        isCanSign: false,
+        isCanRevise: false,
+        // isEdit: false,
+        isEdit: true,
+      }
+      this.setData({
+        tips
+      })
+      return
+    }
+    let aRegister = await query.first()
+    let aregisterJson = aRegister?.toJSON()
+    if (aRegister?.id) {
+      tips = {
+        title: '已报名本活动',
+        isCanSign: true,
+        isCanRevise: true,
+        // isEdit: false,
+        isEdit: true,
+      }
+      let booking = dateF.formatTime("YYYY.mm.dd HH:MM", aRegister.get('startDate'))
+      let bookObj = {}
+      bookObj.from = dateF.formatTime("YYYY.mm.dd HH:MM", aRegister.get('booking')?.from)
+      bookObj.to = dateF.formatTime("mm.dd HH:MM", aRegister.get('booking')?.to)
+      this.setData({
+        tips,
+        booking,
+        bookObj,
+        aRegister,
+        shop: aregisterJson.shopStore
+      })
+      return
+    }
 
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload: function () {
+    if (activity.merber >= 0 && count >= activity.merber) {
+      tips = {
+        title: '活动人数已满',
+        isCanSign: false,
+        isEdit: false,
+      }
+      this.setData({
+        tips
+      })
+      return
+    }
 
-    },
 
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh: function () {
+  },
+  /**前往报名 */
+  application() {
+    this.setData({
+      aRegister: null,
+      bookObj: null,
+      shop: null
+    })
+    this.onOpen()
+  },
+  onOpen() {
+    let {
+      activity
+    } = this.data
+    let minDate = Infinity
+    let maxDate = 0
+    let checkDateList = []
+    if (Array.isArray(activity.bookingList) && activity.bookingList.length > 0) {
+      activity.bookingList.forEach(item => {
+        let from = new Date(item.from.iso)
+        let to = new Date(item.to.iso)
+        if (minDate > from) minDate = from.getTime()
+        if (maxDate < to) maxDate = to.getTime()
+        let fromMonth = from.getMonth()
+        let fromDate = from.getDate()
 
-    },
+        checkDateList.push({
+          fromDate: dateF.formatTime("YYYY-mm-dd HH:MM", from),
+          toDate: dateF.formatTime("YYYY-mm-dd HH:MM", to),
+          month: fromMonth,
+          date: fromDate,
+          from: dateF.formatTime("HH:MM", from),
+          to: dateF.formatTime("mm月dd日 HH:MM", to),
+        })
+      });
+    }
+    let formatter = (day) => {
+      let month = day.date.getMonth()
+      let date = day.date.getDate()
+      checkDateList.forEach(item => {
+        if (item.month == month && item.date == date) day.bottomInfo = '可预约'
+      });
+      return day
+    }
+    this.setData({
+      minDate,
+      maxDate,
+      formatter,
+      checkDateList,
+      showpopup: true
+    })
+    let now = new Date()
+    let tradeNo = "C" +
+      String(now.getFullYear()) +
+      (now.getMonth() + 1) +
+      now.getDate() +
+      now.getHours() +
+      now.getMinutes() +
+      now.getSeconds() +
+      Math.random().toString().slice(-6); //生成六位随机数
+    this.setData({
+      tradeNo
+    })
+    this.getUserProfile()
+  },
+  onClose() {
+    this.setData({
+      showpopup: false
+    })
+  },
 
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom: function () {
+  /**打开选择位置 */
+  openStore() {
+    this.getShop()
+    this.setData({
+      showStorePopup: true
+    })
+  },
+  /**关闭位置选择 */
+  closeStore() {
+    this.setData({
+      showStorePopup: false
+    })
+  },
+  /**获取可选位置 */
+  async getShop() {
+    let {
+      activity
+    } = this.data
+    let shopList = this.data.shopList || []
+    if (shopList?.length > 0) return
+    for (let i in activity?.shopStore) {
+      let query = new Parse.Query('ShopStore')
+      query.equalTo('company', company)
+      query.notEqualTo('isDeleted', true)
+      query.equalTo('isVerified', true)
+      query.equalTo('objectId', activity?.shopStore[i].objectId)
+      let req = await query.first()
+      shopList.push(req.toJSON())
+    }
+    this.setData({
+      shopList
+    })
+  },
+  /**选择位置 */
+  chooseShop(e) {
+    let {
+      shopList,tips
+    } = this.data
+    if(!tips.isEdit){
+      wx.showToast({
+        title:`${tips.title},无法修改`,
+        icon:'none'
+      })
+      this.setData({
+        showStorePopup: false
+      })
+      return
+    }
+    let {
+      index
+    } = e.currentTarget.dataset
+    this.setData({
+      shop: shopList[index],
+      showStorePopup: false
+    })
+  },
+  /**获取当前用户和身份 */
+  async getUserProfile() {
+    let profile
+    let query = new Parse.Query('Profile')
+    query.notEqualTo("isDeleted", true)
+    query.equalTo('user', uid)
+    profile = await query.first()
+    if (!profile?.id) {
+      let Pro = Parse.Object.extend('Profile')
+      profile = new Pro()
+    } else {
+      this.setData({
+        name: profile.get('name') || '',
+        college: profile.get('college') || '',
+        mobile: profile.get('mobile') || '',
+        sex: profile.get('sex') || '',
+        idcard: profile.get('idcard') || '',
+        birthdate: profile.get('birthdate') || '',
+        address: profile.get('address') || '',
+        classType: profile.get('classType') || '',
+        centerDesc: profile.get('centerDesc') || '',
+        teacher: profile.get('teacher') || '',
+        tel: profile.get('tel') || '',
+      })
+    }
+    this.setData({
+      profile
+    })
+  },
+  onChangeSexIsAttachment(event) {
+    this.setData({
+      isAttachment: event.detail == '同意',
+    });
+  },
+  onChangeSex(event) {
+    this.setData({
+      sex: event.detail,
+    });
+  },
+  onChangecenterDesc(event) {
+    this.setData({
+      centerDesc: event.detail,
+    });
+  },
+  /** 立即预约*/
+  async enlists(e) {
+    let date
+    let {
+      name,
+      isAttachment,
+      mobile,
+      sex,
+      idcard,
+      birthdate,
+      address,
+      classType,
+      centerDesc,
+      teacher,
+      tel,
+      aRegister
+    } = this.data
+    // if (!name || !college || !mobile) {
+    console.log(name, isAttachment,
+      mobile,
+      sex,
+      idcard,
+      birthdate,
+      address,
+      classType,
+      centerDesc,
+      teacher,
+      tel, )
+    if (!name ||
+      !sex || !idcard ||
+      !birthdate || !address || !classType || !centerDesc || !teacher
+    ) {
+      wx.showToast({
+        title: '存在未填项',
+        icon: 'none',
+        duration: 5000
+      })
+      return
+    }
 
-    },
+    if (mobile.length != 11 || tel.length != 11) {
+      wx.showToast({
+        title: '请输入11位手机号',
+        icon: 'none',
+        duration: 5000
+      })
+      return
+    }
+    let {
+      shop
+    } = this.data
+    if (!shop?.objectId) {
+      wx.showToast({
+        title: '请选择位置',
+        icon: 'none',
+        duration: 5000
+      })
+      return
+    }
+    if (!isAttachment) {
+      wx.showToast({
+        title: '请阅读并同意《参赛选手免责声明》',
+        icon: 'none',
+        duration: 5000
+      })
+      return
+    }
 
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage: function () {
+    let {
+      profile,
+      activity
+    } = this.data
+    profile.set('name', name || '')
+    profile.set('mobile', mobile || '')
+    profile.set('sex', sex || '')
+    profile.set('idcard', idcard || '')
+    profile.set('birthdate', birthdate || '')
+    profile.set('address', address || '')
+    profile.set('classType', classType || '')
+    profile.set('centerDesc', centerDesc || '')
+    profile.set('teacher', teacher || '')
+    profile.set('tel', tel || '')
 
-    },
-    //获取活动详细信息
-    async getactivity() {
-        let Activityquery = new Parse.Query('Activity');
-        Activityquery.equalTo('company', company);
-        Activityquery.equalTo('objectId', this.data.objectId);
-        Activityquery.notEqualTo('isDeleted', true);
-        Activityquery.equalTo('isEnabled', true);
-
-        let P = await Activityquery.find();
-        let activity = P.map(item => item.toJSON());
+    profile.set('company', {
+      className: 'Company',
+      __type: 'Pointer',
+      objectId: company
+    })
+    profile.set('user', {
+      className: '_User',
+      __type: 'Pointer',
+      objectId: uid
+    })
+    let proSave = await profile.save()
+    if (aRegister?.id) {
+      this.successPay()
+      return
+    }
+    let {
+      from,
+      to
+    } = e.currentTarget.dataset
+    let booking = {}
+    if (from && to) {
+      booking = {
+        from: new Date(from),
+        to: new Date(to),
+      }
+    }
+    this.setData({
+      showPay: true,
+      profileId: proSave?.id,
+      date,
+      booking
+    })
+    if (activity.price <= 0) {
+      this.successPay()
+    }
+  },
+  /**支付回调 */
+  async acceptResult(e) {
+    let {
+      params,
+      no,
+      type
+    } = e.detail;
+    let {
+      tradeNo,
+      activity,
+      aRegister
+    } = this.data
+    if (aRegister?.id) {
+      this.successPay()
+      return
+    }
+    try {
+      if (params == 'ok') {
+        await this.successPay()
         this.setData({
-            activity:activity[0]
+          showpopup: false
         })
-        console.log(this.data.activity);
-    },
-    //切换
-    async changeTab(e) {
-        if (e.detail.name == 1) {
-            this.getactivity()
-        }
+      } else {
+        wx.showToast({
+          title: "取消支付",
+          icon: "error",
+          duration: 1500,
+        });
+      }
+    } catch (error) {
+      wx.showToast({
+        title: "支付失败",
+        icon: "error",
+        duration: 1500,
+      });
+      wx.hideLoading()
+    }
+  },
+
+  async successPay() {
+    let {
+      profileId,
+      activity,
+      tradeNo,
+      booking,
+      shop,
+      aRegister
+    } = this.data
+
+    wx.showLoading({
+      title: "处理中",
+      mask: true
+    });
+    /**当前操作是否编辑  新增报名记录/编辑报名记录 */
+    let isEdit = true
+    if (!aRegister?.id) {
+      isEdit = false
+      let query = new Parse.Query('ActivityRegister')
+      query.notEqualTo('isDeleted', true)
+      query.equalTo('activity', activity.objectId)
+      query.notEqualTo('isPay', true)
+      query.equalTo('user', uid)
+      query.notEqualTo('isChecked', true)
+      aRegister = await query.first()
+      if (!aRegister?.id) {
+        let ActivityRegister = Parse.Object.extend('ActivityRegister')
+        aRegister = new ActivityRegister()
+        aRegister.set('orderNum', tradeNo)
+        aRegister.set('company', {
+          className: 'Company',
+          __type: 'Pointer',
+          objectId: company
+        })
+        aRegister.set('user', {
+          className: '_User',
+          __type: 'Pointer',
+          objectId: uid
+        })
+        aRegister.set('activity', {
+          className: 'Activity',
+          __type: 'Pointer',
+          objectId: activity.objectId
+        })
+        aRegister.set('isPayTpye', 'wx')
+        aRegister.set('type', 'daily')
+        aRegister.set('price', activity.price)
+        aRegister.set('isPay', true)
+        aRegister.set('profile', {
+          className: 'Profile',
+          __type: 'Pointer',
+          objectId: profileId
+        })
+        aRegister.set('isChecked', true)
+      }
+    }
+    if (shop.objectId) {
+      aRegister.set('shopStore', {
+        className: 'ShopStore',
+        __type: 'Pointer',
+        objectId: shop.objectId
+      })
+    }
+    if (booking?.from && booking?.to) {
+      aRegister.set('startDate', booking.from)
+      aRegister.set('booking', booking)
+    }
+    await aRegister.save()
+    await this.getActStatus()
+    await this.getActRegister()
+    this.setData({
+      checkDate: null
+    })
+    wx.hideLoading()
+    wx.showToast({
+      title: "报名成功",
+      icon: "success",
+      duration: 1000,
+    });
+    this.onClose()
+    // if (!isEdit) {
+    //   setTimeout(() => {
+    //     wx.navigateTo({
+    //       url: activity.url,
+    //     })
+    //   }, 1000);
+
+    // }
+
+  },
+
+  /**打开时间选择 */
+  onDisplay() {
+    this.setData({
+      showDate: true
+    });
+  },
+  /**关闭时间选择框 */
+  onCloseDate() {
+    this.setData({
+      showDate: false
+    });
+  },
+
+  /** 日历选中*/
+  onConfirm(event) {
+    let {
+      checkDateList
+    } = this.data
+    let checkDate = event.detail
+    let checkTimeList = checkDateList.filter(item => item.month == checkDate.getMonth() && item.date == checkDate.getDate())
+    this.setData({
+      checkTimeList,
+      checkDate: dateF.formatTime("YYYY年mm月dd日", checkDate),
+      showDate: false,
+    });
+  },
+
+  /**参与活动 */
+  involved(){
+
+  },
+
+  async goUrl() {
+    let {isAttachment,aRegister}=this.data
+    let actQuery = new Parse.Query('ActivityData')
+    actQuery.equalTo('company', company)
+    actQuery.equalTo('user', uid)
+    actQuery.notEqualTo('isDeleted', true)
+    actQuery.equalTo('actRegister', aRegister?.id)
+    let actDate = await actQuery.first()
+    if(actDate?.get('status')=='end'){
+      wx.showToast({
+        title: '成绩已结算，查看其他预约或参与其他活动吧',
+        icon:'none'
+      })
+      return
+    }
+    if (!isAttachment) {
+      wx.showToast({
+        title: '请阅读并同意《参赛选手免责声明》',
+        icon: 'none',
+        duration: 5000
+      })
+      return
+    }
+   let url = `${aRegister?.get('activity')?.get('url')}&a_reg=${aRegister?.id}`
+    wx.navigateTo({
+      url: url,
+    })
+  },
+
+
+  /**隐私协议 */
+  async getArticle() {
+    let query = new Parse.Query("Article")
+    query.equalTo("company", company)
+    query.equalTo("type", 'activity')
+    query.equalTo("isEnabled", true)
+    query.select("title", "attachment")
+    let res = await query.first()
+    if (res && res.id) {
+      let r = res.toJSON()
+      if (r.attachment && r.attachment.length > 0) {
         this.setData({
-          active: e.detail.name
+          attachment: r
         })
-        console.log(this.data.active);
-      },
-      open(){
-          this.setData({
-            showpopup:true,
+      }
+    }
+  },
+  //附件下载
+  async openFile() {
+    await this.getArticle()
+    let {
+      attachment
+    } = this.data
+    let url = attachment.attachment[0].url,
+      name = attachment.title
+    const _this = this
+    let rep = this.getFileType(url)
+    wx.showLoading({
+      title: '加载中',
+    })
+    wx.downloadFile({
+      url: url, //要预览的PDF的地址
+      filePath: wx.env.USER_DATA_PATH + `/${name}.${rep}`,
+      success: function (res) {
+        if (res.statusCode === 200) { //成功
+          var Path = res.filePath //返回的文件临时地址，用于后面打开本地预览所用
+          wx.openDocument({
+            filePath: Path, //要打开的文件路径
+            showMenu: true,
+            success: function (res) {
+              wx.hideLoading()
+            },
+            fail: function (res) {
+              wx.hideLoading()
+            }
           })
+        }
       },
-      onClose(){
-        this.setData({
-            showpopup:false,
-          })
-      }
+      fail: function (res) {
+        wx.hideLoading()
+      },
+    })
+  },
+  //解析文件类型
+  getFileType(url) {
+    let pdfReg = /^.+(\.pdf)$/
+    let txtReg = /^.+(\.txt)$/
+    let wordReg = /^.+(\.doc|\.docx)$/
+    let excelReg = /^.+(\.xls|\.xlsx)$/
+    let jpgPng = /^.+(\.png)$/
+    let jpgJpg = /^.+(\.jpg)$/
+    let jpgJpeg = /^.+(\.jpeg)$/
+    if (pdfReg.test(url)) {
+      return 'pdf'
+    }
+    if (txtReg.test(url)) {
+      return 'txt'
+    }
+    if (wordReg.test(url)) {
+      return 'doc'
+    }
+    if (excelReg.test(url)) {
+      return 'xls'
+    }
+    if (jpgPng.test(url)) {
+      return 'png'
+    }
+    if (jpgJpg.test(url)) {
+      return 'jpg'
+    }
+    if (jpgJpeg.test(url)) {
+      return 'jpeg'
+    }
+  },
+
+
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    let userInfo = wx.getStorageSync("userLogin");
+    this.setData({
+      userInfo
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
 })

nova-werun/pages/activity/detail-activity/index.json

@@ -7,6 +7,10 @@
     "van-calendar": "@vant/weapp/calendar/index",
     "van-picker": "@vant/weapp/picker/index",
     "van-tab": "@vant/weapp/tab/index",
-    "van-tabs": "@vant/weapp/tabs/index"
+    "van-tabs": "@vant/weapp/tabs/index",
+    "van-radio": "@vant/weapp/radio/index",
+    "van-radio-group": "@vant/weapp/radio-group/index",
+    "van-cell": "@vant/weapp/cell/index",
+    "van-cell-group": "@vant/weapp/cell-group/index"
   }
 }

nova-werun/pages/activity/detail-activity/index.less

@@ -1,119 +1,344 @@
-/* nova-werun/pages/activity/detail-activity/index.wxss */
-.all{
-    width: 100vw;
-    .box {
+.box {
 
-        // position: relative;
-        .swiper {
-          height: 500rpx;
-        }
-      
-        .detail {
-          position: absolute;
-          background: white;
-          width: 100%;
-          // top: 400rpx;
-          border-radius: 30rpx 30rpx 0 0;
-          padding: 20rpx;
-      
-          .name {
-            margin: 20rpx 0;
-      
-            .title {
-              font-size: 40rpx;
+  // position: relative;
+  .swiper {
+    height: 500rpx;
+  }
+
+  .detail {
+    position: absolute;
+    background: white;
+    width: 100%;
+    // top: 400rpx;
+    border-radius: 30rpx 30rpx 0 0;
+    padding: 20rpx;
+
+    .name {
+      margin: 20rpx 0;
+
+      .title {
+        font-size: 55rpx;
+        font-weight: bold;
+        font-family: "华文琥珀";
+      }
+
+      .desc {
+        margin: 20rpx;
+        font-size: 25rpx;
+        // white-space: nowrap;
+        // text-overflow: ellipsis;
+        // overflow: hidden;
+      }
+    }
+
+
+
+    .comments {
+      .ul {
+        .li {
+          padding: 10rpx 0;
+          border-bottom: whitesmoke 1rpx solid;
+
+          .user {
+            display: flex;
+
+            .name {
+              font-size: 28rpx;
+              margin-left: 10rpx;
               font-weight: bold;
-              font-family: "华文琥珀";
-            }
-      
-            .desc {
-              margin: 20rpx;
-              font-size: 25rpx;
-              // white-space: nowrap;
-              // text-overflow: ellipsis;
-              // overflow: hidden;
             }
           }
-          .detailbox{
-            width: 100%;
-            height: auto;
-            // position: relative;
-            .item {
-                display: flex;
-                align-items: center;
-                padding: 30rpx 0 20rpx 0rpx;
-                margin: 0 30rpx;
-                border-bottom: 1rpx solid rgb(224, 224, 224);
-          
-                .title {
-                  font-size: 30rpx;
-                  margin-right: 20rpx;
-                  align-items: center;
-                  font-weight: bold;
-          
-                  van-icon {
-                    font-size: 30rpx;
-                  }
+
+          .content {
+            margin-top: 10rpx;
+            margin-left: 50rpx;
+
+            .text {
+              font-size: 26rpx;
+            }
+
+            .icon {
+              display: flex;
+              align-items: center;
+              margin: 10rpx 0;
+
+              .love {
+                margin-right: 35rpx;
+
+                van-icon {
+                  font-size: 35rpx;
+                  margin-right: 5rpx;
                 }
-          
-                .common {
-                  font-size: 28rpx;
-          
-                  van-icon {
-                    margin-right: 10rpx;
-                  }
-          
-                  .arLog {
-                    display: flex;
-                    align-items: center;
-                    padding: 10rpx 0;
-                    color: #7F56B2;
-                    font-weight: bold;
-                  }
+
+                text {
+                  font-size: 25rpx;
                 }
               }
-              .item2{
-                display: flex;
-                padding: 30rpx 0 20rpx 0rpx;
-                margin: 0 30rpx;
-                border-bottom: 1rpx solid rgb(224, 224, 224);
-                .title {
-                    font-size: 30rpx;
-                    margin-right: 20rpx;
-                    align-items: center;
-                    font-weight: bold;
-                  }
-                  .common{
-                    width: 510rpx;
-                    font-size: 28rpx;
+
+              .reply {
+                font-size: 38rpx;
+              }
+            }
+
+            .replyComment {
+              background: whitesmoke;
+              padding: 20rpx;
+              border-radius: 10rpx;
+              font-size: 28rpx;
+
+              .reItem {
+                padding: 25rpx 0 5rpx 0;
+                border-bottom: rgb(235, 235, 235) solid 1rpx;
+
+                .reName {
+                  color: #4F9AF7;
+                }
+
+                .reText {
+                  margin: 0 10rpx;
+                }
+
+                .reIcon {
+                  width: 100%;
+                  display: flex;
+                  align-items: center;
+                  justify-content: flex-end;
+
+                  >view {
+                    margin-right: 30rpx;
                   }
+                }
               }
-              .btn {
-                // width: 500rpx;
-                // height: 80rpx;
-                margin: 30rpx 0;
-                background: #4F9AF7;
-                font-size: 35rpx;
-                // position: fixed;
+
+              .more {
+                padding-top: 10rpx;
               }
-          }
-          .popup{
-            width: 100%;
-            height: 70vh;
-            .submit{
-                width: 90%;
-                display: flex;
-                justify-content: center;
-                align-items: center;
-                height: 80rpx;
-                font-size: 35rpx;
-                background: #4F9AF7;
-                position: absolute;
-                bottom: 0;
-                left: 5%;
-                border-radius: 15rpx;
             }
           }
         }
       }
 
+
+    }
+
+    .inp {
+      width: 100vw;
+
+      border-top: 1rpx solid #e4d2fa;
+      position: fixed;
+      bottom: 0rpx;
+      right: 0;
+    }
+
+    .date {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin: 20rpx;
+
+      .toDay {
+        font-size: 55rpx;
+        font-weight: bold;
+        color: #4F9AF7;
+        font-family: "华文琥珀";
+
+        .month {
+          font-size: 35rpx;
+        }
+      }
+
+      .tip {
+        font-size: 45rpx;
+        font-weight: bold;
+        font-family: "华文琥珀";
+      }
+    }
+
+    .item {
+      display: flex;
+      align-items: center;
+      padding: 30rpx 0 20rpx 0rpx;
+      margin: 0 30rpx;
+      border-bottom: 1rpx solid rgb(224, 224, 224);
+
+      .title {
+        font-size: 30rpx;
+        margin-right: 20rpx;
+        align-items: center;
+        font-weight: bold;
+
+        van-icon {
+          font-size: 30rpx;
+        }
+      }
+
+      .common {
+        font-size: 28rpx;
+
+        van-icon {
+          margin-right: 10rpx;
+        }
+
+        .arLog {
+          display: flex;
+          align-items: center;
+          padding: 10rpx 0;
+          color: #4F9AF7;
+          font-weight: bold;
+        }
+      }
+    }
+
+    .btn {
+      margin: 30rpx 0;
+      background: #4F9AF7;
+      font-size: 35rpx;
+    }
+  }
+}
+
+.popup {
+  height: 70vh;
+  overflow-y: auto;
+
+  .topTitle {
+    
+    position: fixed;
+    // top: 300rpx;
+    left: 0rpx;
+    z-index: 9;
+  }
+.topBox{
+  border-radius:40rpx 40rpx 0 0;
+  background: white;
+  width: 100vw;
+  padding: 20rpx;
+  border-bottom: 1rpx solid rgb(206, 206, 206);
+  text-align: center;
+  font-weight: bold;
+}
+
+  .registerStartDate {
+    padding: 20rpx;
+    display: flex;
+    align-items: center;
+
+    .title {
+      width: 220rpx;
+      font-size: 28rpx;
+
+      text {
+        color: red;
+      }
+    }
+
+    .date {
+      font-size: 28rpx;
+      font-weight: bold;
+    }
+  }
+
+  .registerStartTime {
+    // height:;
+
+    padding: 20rpx;
+
+    .title {
+      width: 220rpx;
+      font-size: 28rpx;
+
+      text {
+        color: red;
+      }
+    }
+
+    .box {
+      display: flex;
+      margin: 20rpx;
+      align-items: center;
+      justify-content: space-between;
+      padding: 20rpx;
+      box-shadow: 1rpx 1rpx 10rpx rgb(204, 204, 204);
+      border-radius: 20rpx;
+
+      .time {
+        .from {
+          margin: 10rpx 0;
+          font-size: 35rpx;
+
+          van-icon {
+            font-size: 35rpx;
+          }
+
+          font-weight: bold;
+        }
+
+        .to {
+          font-size: 28rpx;
+
+          van-icon {
+            font-size: 35rpx;
+          }
+        }
+      }
+
+      .btn {
+        font-size: 30rpx;
+        background: #4F9AF7;
+        padding: 10rpx 20rpx;
+        border-radius: 100rpx;
+        color: white;
+      }
+    }
+  }
+
+  .btn_btm {
+    width: 100vw;
+    background: white;
+    position: fixed;
+    bottom: 0rpx;
+    z-index: 9;
+    button{
+      color: white;
+      font-size: 30rpx;
+    }
+  }
+
+  .revise {
+    float: right;
+    background: #4F9AF7;
+    margin: 20rpx;
+
+  }
+}
+
+
+
+.audit {
+  font-size: 25rpx;
+  color: #4F9AF7;
+  background: #e4d2fa;
+  width: 95rpx;
+  padding: 5rpx 10rpx;
+  margin-left: 10rpx;
+
+}
+
+.company {
+  margin: 20rpx;
+
+  .name {
+    font-size: 26rpx;
+    margin: 20rpx 40rpx;
+    padding: 20rpx;
+    border-bottom: 1rpx solid rgb(243, 243, 243);
+  }
+}
+
+van-cell {
+  van-radio-group {
+    van-radio {
+      margin: 20rpx 0;
+    }
+  }
 }

nova-werun/pages/activity/detail-activity/index.wxml

@@ -1,111 +1,291 @@
-<!--nova-werun/pages/activity/detail-activity/index.wxml-->
-<nav type="back" title="活动详情" background-color="{{'#4F9AF7'}}" front-color="{{'#ffffff'}}"></nav>
-<view class="all" style="height: {{contentHeight}}rpx;">
-
-    <view class="box" style="height: {{contentHeight}}rpx;">
-        <view class="banner">
-            <swiper class="swiper" indicator-dots="true" autoplay="true" circular="ture">
-                <swiper-item wx:for="{{activity.cover}}" wx:key="index">
-                    <image data-img="{{item}}" bindtap="imagePreview" src="{{item}}" style="width: 100vw;height: 100%;" mode="aspectFill" />
-                </swiper-item>
-            </swiper>
-            <view class="linear"></view>
+<wxs src="../../../../utils//totalprices.wxs" module="total" />
+<nav type="back" background-color="#4F9AF7" frontColor="#000000" title="参与活动" />
+<view class="box">
+  <view class="banner">
+    <swiper class="swiper" indicator-dots="true" autoplay="true" circular="ture">
+      <swiper-item wx:for="{{activity.cover}}" wx:key="index">
+        <image data-img="{{item}}" bindtap="imagePreview" src="{{item}}" style="width: 100vw;height: 100%;" mode="aspectFill" />
+      </swiper-item>
+    </swiper>
+    <view class="linear"></view>
+  </view>
+  <view class="detail">
+    <view class="name">
+      <view class="title" bindtap="getThumbs">
+        {{activity.title}}
+      </view>
+
+      <view class="desc">
+        {{activity.desc}}
+      </view>
+    </view>
+    <block wx:if="{{userInfo}}">
+      <van-tabs active="{{ active }}" bind:change="changeTab" color="#4F9AF7">
+        <van-tab title="活动详情"></van-tab>
+        <van-tab title="排行榜"></van-tab>
+      </van-tabs>
+
+      <block wx:if="{{active==0}}">
+        <view class="date">
+          <view></view>
+          <view class="tip" style="color: {{(tips.isCanSign||tips.isCanRevise)?'#7F56B2':'gray'}};">
+            {{tips.title}}
+          </view>
         </view>
-        <view class="detail">
-            <view class="name">
-                <view class="title" bindtap="getThumbs">
-                    {{activity.title}}
-                </view>
-                <view wx:if="{{userInfo}}" style="float: right;font-size: 25rpx;">
-                    <van-icon bindtap="thumbs" name="{{countObj.uCount?'like':'like-o'}}" size='20' color="#7F56B2" />
-                    <text style="color: #7F56B2;margin: 0 20rpx 0 0;">{{countObj.count||''}}</text>
-                    <van-icon wx:if="{{active==1}}" bindtap="getReply" name="comment-o" size='20' />
-                </view>
-                <view class="desc">
-                    {{activity.desc}}
-                </view>
+        <block wx:for="{{optionKeyList}}" wx:key="index">
+          <view class="item">
+            <view class="title">
+              {{item}}
             </view>
-            <block>
-                <van-tabs active="{{ active }}" bind:change="changeTab" color="#4F9AF7">
-                    <van-tab title="活动详细"></van-tab>
-                    <van-tab title="排行榜"></van-tab>
-                </van-tabs>
-
-                <block wx:if="{{active==0}}">
-                    <view class="detailbox">
-                        <view class="item">
-                            <view class="title">
-                                报名时间
-                            </view>
-                            <view>
-                                <view class="common">2025.01.14 00:00 - 2025.01.14 14:00 </view>
-                            </view>
-
-                        </view>
-                        <block wx:if="{{activity.merber>0}}">
-                            <view class="item">
-                                <view class="title">
-                                    报名人数
-                                </view>
-                                <view class="common">50人 /{{activity.merber}}</view>
-                            </view>
-                        </block>
-                        <block>
-                            <view class="item">
-                                <view class="title">
-                                    活动时间
-                                </view>
-                                <view class="common">2025.01.14 00:00 - 2025.01.14 14:00</view>
-                            </view>
-                        </block>
-                        <block>
-                            <view class="item">
-                                <view class="title">
-                                    活动状态
-                                </view>
-                                <view class="common">报名中</view>
-                            </view>
-                        </block>
-
-                        <block>
-                            <view class="item">
-                                <view class="title">
-                                    联系电话
-                                </view>
-                                <view class="common">15888888888</view>
-                            </view>
-                        </block>
-
-                        <block>
-                            <view class="item2">
-                                <view class="title">
-                                    活动规则
-                                </view>
-                                <view class="common">本次跑步活动全程 [X] 公里，参与者需在规定的 [起始时间] 于指定起点出发，沿既定路线前进，途中设置多个打卡点，参与者务必按顺序在各打卡点完成打卡，最终于 [截止时间] 前抵达终点，以完成全程且打卡完整、用时短者为优胜，活动过程中严禁借助交通工具，须全程保持跑步或步行状态，违反规则将取消参赛资格 。</view>
-                            </view>
-                        </block>
-
-                        <button class="btn" bindtap="open">
-                            报名中
-                        </button>
-                    </view>
-                </block>
-                <!-- 填写报名信息 -->
-                <van-popup style="height: 70vh;" show="{{ showpopup }}" bind:click-overlay='onClose' round position="bottom" bind:close="onClose">
-                    <view class="popup">
-                        <view style="padding: 20rpx;border-bottom: 1rpx solid rgb(206, 206, 206);text-align: center;font-weight: bold;">填写报名信息</view>
-                        <van-cell-group>
-                            <van-field model:value="{{ name }}" required clearable label="姓名" placeholder="请输入姓名" />
-                            <!-- <van-field model:value="{{ college }}" clearable label="学院" placeholder="请输入学院" /> -->
-                            <van-field model:value="{{ mobile }}" type="number" required clearable label="手机号" placeholder="请输入手机号" />
-                        </van-cell-group>
-                        <view class="submit">立即报名</view>
-                    </view>
-                </van-popup>
-                <block wx:if="{{active==1}}">
+            <view class="common">{{activity.limitOptions[item]}}</view>
+          </view>
+        </block>
+
+        <view class="item" wx:if="{{booking}}">
+          <view class="title">
+            预约时间
+          </view>
+          <view>
+            <view class="common" style="font-weight: bold;color: red;">{{registerList[registerList.length-1].bookObj.from}} - {{registerList[registerList.length-1].bookObj.to}}</view>
+          </view>
+
+        </view>
+        <view class="item" wx:if="{{booking}}">
+          <view class="title">
+            预约服务位置
+          </view>
+          <view class="common" style="font-weight: bold;color: red;">{{registerList[registerList.length-1].shop.storeName||'未知'}}</view>
+        </view>
+        <block wx:if="{{activity.signFromTo.from&&activity.signFromTo.to}}">
+          <view class="item">
+            <view class="title">
+              报名时间
+            </view>
+            <view class="common">{{activity.signFromTo.from}} - {{activity.signFromTo.to}}</view>
+          </view>
+        </block>
+        <block wx:if="{{activity.merber>0}}">
+          <view class="item">
+            <view class="title">
+              报名人数
+            </view>
+            <view class="common">{{count}}人 /{{activity.merber}}</view>
+          </view>
+        </block>
+
+
+        <block wx:if="{{activity.start&&activity.end}}">
+          <view class="item">
+            <view class="title">
+              活动时间
+            </view>
+            <view class="common">{{activity.start}} - {{activity.end}}</view>
+          </view>
+        </block>
+
+        <block wx:if="{{activity.isEnabled}}">
+          <view class="item">
+            <view class="title">
+              活动状态
+            </view>
+            <view class="common">{{activity.isEnabled?'已开启':'未开启'}}</view>
+          </view>
+        </block>
 
+        <block wx:if="{{activity.mobile}}">
+          <view class="item">
+            <view class="title">
+              联系电话
+            </view>
+            <view class="common">{{activity.mobile}}</view>
+          </view>
+        </block>
+        <block wx:if="{{registerList.length>0}}">
+          <view class="item">
+            <view class="title">
+              报名记录
+            </view>
+            <block wx:if="{{registerList.length==1}}">
+              <view class="common">
+                <block wx:for="{{registerList}}" wx:key="index">
+                  <view data-index="{{index}}" bind:tap="lookLog" class="arLog">
+                    <text>{{item.shopStore.storeName}} {{item.booking}}</text>
+                    <van-icon name="{{tips.isEdit?'edit':'medal' }}" size="40rpx" />
+                  </view>
                 </block>
+              </view>
             </block>
-        </view>
+          </view>
+          <view class="item" wx:if="{{registerList.length>1}}">
+            <view class="title">
+              <text decode="{{true}}">&emsp;&emsp;&emsp;&emsp;</text>
+            </view>
+            <view class="common">
+              <block wx:for="{{registerList}}" wx:key="index">
+                <view data-index="{{index}}" bind:tap="lookLog" class="arLog">
+                  <text>{{item.shopStore.storeName}} {{item.booking}}</text>
+                  <van-icon name="{{tips.isEdit?'edit':'medal-o' }}" size="40rpx" />
+                </view>
+              </block>
+            </view>
+          </view>
+        </block>
+
+
+
+        <button bindtap="application" wx:if="{{activity.shopStore.length>0&&tips.isCanSign}}" class="btn">
+          <text wx:if="{{activity.price}}" style="color: red;font-weight: bold;margin-right: 10rpx;font-size: 28rpx;margin: 10rpx 0;">￥{{activity.price}}</text>
+          前 往 报 名
+        </button>
+
+      </block>
+      <block wx:if="{{active==1}}">
+
+      </block>
+    </block>
+    <block wx:else>
+      <button bind:tap="login">登录后可报名</button>
+    </block>
+  </view>
+</view>
+
+
+<van-popup style="height: 70vh;" show="{{ showpopup }}" bind:click-overlay='onClose' round position="bottom" bind:close="onClose">
+  <view class="popup">
+    <view class="topTitle topBox">报名信息</view>
+    <view class="topBox">报名信息</view>
+    <van-cell-group>
+      <van-field model:value="{{ name }}" required clearable label="姓名" placeholder="请输入姓名" />
+    </van-cell-group>
+    <view class="registerStartDate">
+      <view class="title">
+        <text>*</text>
+        姓别
+      </view>
+      <view class="date">
+        <van-radio-group direction='horizontal' model:value="{{ sex }}" bind:change="onChangeSex">
+          <van-radio icon-size="35rpx" name="男">男</van-radio>
+          <van-radio icon-size="35rpx" name="女">女</van-radio>
+        </van-radio-group>
+      </view>
+    </view>
+    <van-cell-group>
+      <van-field model:value="{{ idcard }}" type="number" required clearable label="身份证号" />
+      <van-field model:value="{{ birthdate }}" required clearable label="出生日期" />
+      <van-field model:value="{{ address }}" required clearable label="现居住地" />
+      <van-field model:value="{{ mobile }}" type="number" required clearable label="联系电话" placeholder="请输入联系电话" />
+      <van-field model:value="{{ classType }}" required clearable label="血型" />
+      <van-field model:value="{{ teacher }}" required clearable label="紧急联系人" />
+      <van-field model:value="{{ tel }}" type="number" required clearable label="联系人电话" placeholder="紧急联系人电话" />
+    </van-cell-group>
+    <view class="registerStartDate">
+      <view class="title">
+        <text>*</text>
+        服装尺码
+      </view>
+    </view>
+    <view class="registerStartDate">
+      <view class="title"></view>
+      <view class="date">
+        <van-radio-group model:value="{{ centerDesc }}" bind:change="onChangecenterDesc">
+          <van-radio icon-size="35rpx" name="S码(90斤以下)">S码(90斤以下) </van-radio>
+          <van-radio icon-size="35rpx" name="M码(90斤-105斤)">M码(90斤-105斤)</van-radio>
+          <van-radio icon-size="35rpx" name="L码(105斤-120斤)">L码(105斤-120斤)</van-radio>
+          <van-radio icon-size="35rpx" name="XL码(120斤-135斤)">XL码(120斤-135斤)</van-radio>
+          <van-radio icon-size="35rpx" name="2XL码(135斤-150斤)">2XL码(135斤-150斤)</van-radio>
+          <van-radio icon-size="35rpx" name="3XL码(150斤-165斤)">3XL码(150斤-165斤)</van-radio>
+          <van-radio icon-size="35rpx" name="4XL码(165斤-190斤)">4XL码(165斤-190斤)</van-radio>
+          <van-radio icon-size="35rpx" name="5XL码(190斤-220斤)">5XL码(190斤-220斤)</van-radio>
+        </van-radio-group>
+      </view>
     </view>
-</view>
+    <view class="registerStartDate" bindtap="openStore">
+      <view class="title">
+        <text>*</text>
+        位置
+      </view>
+      <view class="date">{{shop.storeName||'选择位置'}}</view>
+    </view>
+    <view class="registerStartDate" bindtap="onDisplay">
+      <view class="title">
+        <text>*</text>
+        预约日期
+      </view>
+      <view class="date" wx:if="{{(!checkDate)&&aRegister.id}}">{{bookObj.from+' - '+bookObj.to}}</view>
+      <view class="date" wx:else>{{checkDate?checkDate:'选择日期'}}</view>
+    </view>
+
+
+    <view class="registerStartTime" wx:if="{{checkDate}}">
+      <view class="title">
+        <text>*</text>
+        选择时间
+      </view>
+      <block wx:if="{{checkTimeList&&checkTimeList.length>0}}">
+        <block wx:for="{{checkTimeList}}" wx:key="index">
+          <view class="box">
+            <view class="time">
+              <view class="from">
+                <van-icon name="underway-o" />
+                {{item.from}}
+              </view>
+              <view class="to">
+                <van-icon name="stop-circle-o" />
+                {{item.to}}
+              </view>
+            </view>
+            <view>
+              <view wx:if="{{activity.price}}" style="display: flex;flex-direction: column;align-items: center;">
+                <text style="color: red;font-weight: bold;margin-right: 10rpx;font-size: 28rpx;margin: 10rpx 0;">￥{{activity.price}}</text>
+              </view>
+              <block wx:if="{{tips.isEdit}}">
+                <view class="btn" data-from="{{item.fromDate}}" data-to="{{item.toDate}}" bindtap="enlists">
+                  {{aRegister.id?'更改为本时间':'立即预约'}}
+                </view>
+              </block>
+            </view>
+          </view>
+        </block>
+      </block>
+      <van-empty wx:else description="当天无可预约时间" />
+    </view>
+    <view class="registerStartDate">
+      <view style="font-size: 30rpx;">
+        <van-radio-group value="{{ isAttachment }}" bind:change="onChangeSexIsAttachment">
+          <van-radio icon-size="35rpx" label-disabled name="同意">
+            我已阅读并同意
+            <text bind:tap="openFile" style="color: red;">《参赛选手免责声明》</text>
+          </van-radio>
+        </van-radio-group>
+      </view>
+    </view>
+    <van-calendar color="#4F9AF7" formatter="{{ formatter }}" min-date="{{minDate}}" max-date="{{maxDate}}" show="{{ showDate }}" bind:close="onCloseDate" bind:confirm="onConfirm" />
+    <view class="btn_btm">
+      <button wx:if="{{tips.isEdit&&aRegister.id&&!checkDate}}" class="revise" bindtap="enlists">确认修改</button>
+      <button wx:if="{{aRegister.id&&isAttend}}" class="revise" bind:tap="goUrl">前往参与</button>
+    </view>
+    <view style="height: 200rpx;"></view>
+  </view>
+</van-popup>
+
+
+<van-popup show="{{ showStorePopup }}" bind:click-overlay='closeStore' round position="bottom" bind:close="closeStore">
+  <view style="height: 70vh;">
+    <view style="padding: 20rpx;border-bottom: 1rpx solid rgb(206, 206, 206);text-align: center;font-weight: bold;">选择位置</view>
+
+    <van-empty wx:if="{{!shopList.length}}" description="暂无可选地址" />
+    <scroll-view style="height:calc(70vh - 200rpx) ;" scroll-y="{{true}}">
+      <view class="company">
+        <block wx:for="{{shopList}}" wx:key="index">
+          <view data-index="{{index}}" bindtap="chooseShop" class="name" style="color: {{shop.objectId==item.objectId?'#4F9AF7':'gray'}};">{{item.storeName}}
+            <van-icon wx:if="{{shop.objectId==item.objectId}}" name="success" />
+          </view>
+        </block>
+      </view>
+    </scroll-view>
+  </view>
+</van-popup>
+
+<block wx:if="{{activity.price}}">
+  <payment style="z-index: 99999;" id='payMent' show="{{showPay}}" showType="wxpay" tradeNo="{{tradeNo}}" bind:payResult='acceptResult' price="{{activity.price}}" />
+</block>

nova-werun/pages/activity/detail-activity/index.wxss

@@ -1 +1,258 @@
-.all{width:100vw}.all .box .swiper{height:500rpx}.all .box .detail{position:absolute;background:white;width:100%;border-radius:30rpx 30rpx 0 0;padding:20rpx}.all .box .detail .name{margin:20rpx 0}.all .box .detail .name .title{font-size:40rpx;font-weight:bold;font-family:"华文琥珀"}.all .box .detail .name .desc{margin:20rpx;font-size:25rpx}.all .box .detail .detailbox{width:100%;height:auto}.all .box .detail .detailbox .item{display:flex;align-items:center;padding:30rpx 0 20rpx 0rpx;margin:0 30rpx;border-bottom:1rpx solid #e0e0e0}.all .box .detail .detailbox .item .title{font-size:30rpx;margin-right:20rpx;align-items:center;font-weight:bold}.all .box .detail .detailbox .item .title van-icon{font-size:30rpx}.all .box .detail .detailbox .item .common{font-size:28rpx}.all .box .detail .detailbox .item .common van-icon{margin-right:10rpx}.all .box .detail .detailbox .item .common .arLog{display:flex;align-items:center;padding:10rpx 0;color:#7F56B2;font-weight:bold}.all .box .detail .detailbox .item2{display:flex;padding:30rpx 0 20rpx 0rpx;margin:0 30rpx;border-bottom:1rpx solid #e0e0e0}.all .box .detail .detailbox .item2 .title{font-size:30rpx;margin-right:20rpx;align-items:center;font-weight:bold}.all .box .detail .detailbox .item2 .common{width:510rpx;font-size:28rpx}.all .box .detail .detailbox .btn{margin:30rpx 0;background:#4F9AF7;font-size:35rpx}.all .box .detail .popup{width:100%;height:70vh}.all .box .detail .popup .submit{width:90%;display:flex;justify-content:center;align-items:center;height:80rpx;font-size:35rpx;background:#4F9AF7;position:absolute;bottom:0;left:5%;border-radius:15rpx}
+.box .swiper {
+  height: 500rpx;
+}
+.box .detail {
+  position: absolute;
+  background: white;
+  width: 100%;
+  border-radius: 30rpx 30rpx 0 0;
+  padding: 20rpx;
+}
+.box .detail .name {
+  margin: 20rpx 0;
+}
+.box .detail .name .title {
+  font-size: 55rpx;
+  font-weight: bold;
+  font-family: "华文琥珀";
+}
+.box .detail .name .desc {
+  margin: 20rpx;
+  font-size: 25rpx;
+}
+.box .detail .comments .ul .li {
+  padding: 10rpx 0;
+  border-bottom: whitesmoke 1rpx solid;
+}
+.box .detail .comments .ul .li .user {
+  display: flex;
+}
+.box .detail .comments .ul .li .user .name {
+  font-size: 28rpx;
+  margin-left: 10rpx;
+  font-weight: bold;
+}
+.box .detail .comments .ul .li .content {
+  margin-top: 10rpx;
+  margin-left: 50rpx;
+}
+.box .detail .comments .ul .li .content .text {
+  font-size: 26rpx;
+}
+.box .detail .comments .ul .li .content .icon {
+  display: flex;
+  align-items: center;
+  margin: 10rpx 0;
+}
+.box .detail .comments .ul .li .content .icon .love {
+  margin-right: 35rpx;
+}
+.box .detail .comments .ul .li .content .icon .love van-icon {
+  font-size: 35rpx;
+  margin-right: 5rpx;
+}
+.box .detail .comments .ul .li .content .icon .love text {
+  font-size: 25rpx;
+}
+.box .detail .comments .ul .li .content .icon .reply {
+  font-size: 38rpx;
+}
+.box .detail .comments .ul .li .content .replyComment {
+  background: whitesmoke;
+  padding: 20rpx;
+  border-radius: 10rpx;
+  font-size: 28rpx;
+}
+.box .detail .comments .ul .li .content .replyComment .reItem {
+  padding: 25rpx 0 5rpx 0;
+  border-bottom: #ebebeb solid 1rpx;
+}
+.box .detail .comments .ul .li .content .replyComment .reItem .reName {
+  color: #4F9AF7;
+}
+.box .detail .comments .ul .li .content .replyComment .reItem .reText {
+  margin: 0 10rpx;
+}
+.box .detail .comments .ul .li .content .replyComment .reItem .reIcon {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+}
+.box .detail .comments .ul .li .content .replyComment .reItem .reIcon > view {
+  margin-right: 30rpx;
+}
+.box .detail .comments .ul .li .content .replyComment .more {
+  padding-top: 10rpx;
+}
+.box .detail .inp {
+  width: 100vw;
+  border-top: 1rpx solid #e4d2fa;
+  position: fixed;
+  bottom: 0rpx;
+  right: 0;
+}
+.box .detail .date {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin: 20rpx;
+}
+.box .detail .date .toDay {
+  font-size: 55rpx;
+  font-weight: bold;
+  color: #4F9AF7;
+  font-family: "华文琥珀";
+}
+.box .detail .date .toDay .month {
+  font-size: 35rpx;
+}
+.box .detail .date .tip {
+  font-size: 45rpx;
+  font-weight: bold;
+  font-family: "华文琥珀";
+}
+.box .detail .item {
+  display: flex;
+  align-items: center;
+  padding: 30rpx 0 20rpx 0rpx;
+  margin: 0 30rpx;
+  border-bottom: 1rpx solid #e0e0e0;
+}
+.box .detail .item .title {
+  font-size: 30rpx;
+  margin-right: 20rpx;
+  align-items: center;
+  font-weight: bold;
+}
+.box .detail .item .title van-icon {
+  font-size: 30rpx;
+}
+.box .detail .item .common {
+  font-size: 28rpx;
+}
+.box .detail .item .common van-icon {
+  margin-right: 10rpx;
+}
+.box .detail .item .common .arLog {
+  display: flex;
+  align-items: center;
+  padding: 10rpx 0;
+  color: #4F9AF7;
+  font-weight: bold;
+}
+.box .detail .btn {
+  margin: 30rpx 0;
+  background: #4F9AF7;
+  font-size: 35rpx;
+}
+.popup {
+  height: 70vh;
+  overflow-y: auto;
+}
+.popup .topTitle {
+  position: fixed;
+  left: 0rpx;
+  z-index: 9;
+}
+.popup .topBox {
+  border-radius: 40rpx 40rpx 0 0;
+  background: white;
+  width: 100vw;
+  padding: 20rpx;
+  border-bottom: 1rpx solid #cecece;
+  text-align: center;
+  font-weight: bold;
+}
+.popup .registerStartDate {
+  padding: 20rpx;
+  display: flex;
+  align-items: center;
+}
+.popup .registerStartDate .title {
+  width: 220rpx;
+  font-size: 28rpx;
+}
+.popup .registerStartDate .title text {
+  color: red;
+}
+.popup .registerStartDate .date {
+  font-size: 28rpx;
+  font-weight: bold;
+}
+.popup .registerStartTime {
+  padding: 20rpx;
+}
+.popup .registerStartTime .title {
+  width: 220rpx;
+  font-size: 28rpx;
+}
+.popup .registerStartTime .title text {
+  color: red;
+}
+.popup .registerStartTime .box {
+  display: flex;
+  margin: 20rpx;
+  align-items: center;
+  justify-content: space-between;
+  padding: 20rpx;
+  box-shadow: 1rpx 1rpx 10rpx #cccccc;
+  border-radius: 20rpx;
+}
+.popup .registerStartTime .box .time .from {
+  margin: 10rpx 0;
+  font-size: 35rpx;
+  font-weight: bold;
+}
+.popup .registerStartTime .box .time .from van-icon {
+  font-size: 35rpx;
+}
+.popup .registerStartTime .box .time .to {
+  font-size: 28rpx;
+}
+.popup .registerStartTime .box .time .to van-icon {
+  font-size: 35rpx;
+}
+.popup .registerStartTime .box .btn {
+  font-size: 30rpx;
+  background: #4F9AF7;
+  padding: 10rpx 20rpx;
+  border-radius: 100rpx;
+  color: white;
+}
+.popup .btn_btm {
+  width: 100vw;
+  background: white;
+  position: fixed;
+  bottom: 0rpx;
+  z-index: 9;
+}
+.popup .btn_btm button {
+  color: white;
+  font-size: 30rpx;
+}
+.popup .revise {
+  float: right;
+  background: #4F9AF7;
+  margin: 20rpx;
+}
+.audit {
+  font-size: 25rpx;
+  color: #4F9AF7;
+  background: #e4d2fa;
+  width: 95rpx;
+  padding: 5rpx 10rpx;
+  margin-left: 10rpx;
+}
+.company {
+  margin: 20rpx;
+}
+.company .name {
+  font-size: 26rpx;
+  margin: 20rpx 40rpx;
+  padding: 20rpx;
+  border-bottom: 1rpx solid #f3f3f3;
+}
+van-cell van-radio-group van-radio {
+  margin: 20rpx 0;
+}

nova-werun/pages/activity/index.css

@@ -0,0 +1,10 @@
+.cardbox {
+  display: flex;
+}
+.cardbox .card {
+  width: 300rpx;
+}
+.cardbox .card image {
+  width: 300rpx;
+  height: 100rpx;
+}

nova-werun/pages/activity/index.js

@@ -1,119 +1,179 @@
 // nova-werun/pages/activity/index.js
 const Parse = getApp().Parse;
 const company = getApp().globalData.company;
+const uid = Parse.User.current()?.id
+const dateF = require("../../../utils/date")
+
 Page({
 
-    /**
-     * 页面的初始数据
-     */
-    data: {
-        statusBarHeight: 0, // 状态栏高度
-        screenHeight: 0, // 屏幕高度
-        customHeight: 0, // 自定义导航栏高度（如小程序右上角胶囊按钮）
-        bottomNavHeight: 0, // 底部导航栏高度
-        contentHeight: 0, // 可用内容高度
-        contentHeight2: 0,
-        contentpadding: 0, //顶部padding高度
-
-        ActivityList:[],
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad: function (options) {
-        // 计算
-        const systemInfo = wx.getSystemInfoSync();
-        const statusBarHeight = systemInfo.statusBarHeight || 0;
-        const screenHeight = systemInfo.screenHeight || 0;
-        const custom = wx.getMenuButtonBoundingClientRect();
-        const customHeight = custom.height + 10 + 2 || 0;
-        const bottomNavHeight = systemInfo.screenHeight - systemInfo.safeArea.bottom || 0;
-
-        const contentpadding = (statusBarHeight + customHeight) * 750 / systemInfo.windowWidth;
-        const contentHeight = (screenHeight - bottomNavHeight - statusBarHeight - customHeight) * 750 / systemInfo.windowWidth;
-        this.setData({
-            statusBarHeight,
-            screenHeight,
-            customHeight,
-            bottomNavHeight,
-            contentpadding,
-            contentHeight
-        });
-
-        this.getact()
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload: function () {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh: function () {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom: function () {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage: function () {
-
-    },
-    //活动列表
-    async getact() {
-        let Activityquery = new Parse.Query('Activity');
-        Activityquery.equalTo('company', company);
-        Activityquery.notEqualTo('isDeleted', true);
-        Activityquery.equalTo('isEnabled', true);
-        Activityquery.ascending('index'); // 按index升序排序
-    
-        let P = await Activityquery.find();
-        let ActivityList = P.map(item => item.toJSON());
-    
-        this.setData({
-            ActivityList,
-        });
-
-        console.log(ActivityList);
-    },
-    gourl(e) {
-        const url = e.currentTarget.dataset.url
-        const id = e.currentTarget.dataset.id
-            wx.navigateTo({
-                url: `${url}?id=` + id // 目标页面的路径
-            });
-    },
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    activtList: [],
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    this.getActivity()
+  },
+
+   /**判断用户参与活动状态 */
+   async getActStatus(activity, query, count) {
+    let now = new Date()
+    if (now > activity.get('endDate')) {
+      return {
+        title: '已结束',
+        isCanSign: false
+      }
+    }
+    if (!activity.get('isEnabled')) {
+      return {
+        title: '未开启',
+        isCanSign: false
+      }
+    }
+    if (activity.get('signFromTo')?.fromDate && now < activity.get('signFromTo').fromDate) {
+      return {
+        title: '未到报名时间',
+        isCanSign: false
+      }
+    }
+    if (activity.get('signFromTo')?.toDate && now >= activity.get('signFromTo').toDate) {
+      return {
+        title: '报名时间已过',
+        isCanSign: false,
+      }
+    }
+    query.equalTo('user', uid)
+    let aRegister = await query.first()
+    if (aRegister?.id) {
+      return {
+        title: '已报名',
+        isCanSign: false,
+        isCanRevise: true
+      }
+    }
+    if (activity.get('merber') >= 0 && count >= activity.get('merber')) {
+      return {
+        title: '人数已满',
+        isCanSign: false
+      }
+    }
+    return {
+      title: '可报名',
+      isCanSign: true
+    }
+  },
+  /** 获取前五个活动*/
+  async getActivity() {
+    let {
+      activtList,
+      count
+    } = this.data
+    if (count && activtList.length >= count) {
+      wx.showToast({
+        title: '已加载全部',
+        icon: 'none',
+        duration: 500
+      })
+      return
+    }
+    let query = new Parse.Query('Activity')
+    query.equalTo('company', company)
+    query.notEqualTo('isDeleted', true)
+    query.notEqualTo('isHidden', true)
+    query.ascending('index')
+    count = await query.count()
+    query.limit(20)
+    query.skip(activtList?.length)
+    let list = await query.find()
+    let aList = []
+    if (Array.isArray(list)) {
+      for (let i in list) {
+        let query = new Parse.Query('ActivityRegister')
+        query.notEqualTo('isDeleted', true)
+        query.equalTo('activity', list[i].id)
+        query.equalTo('isPay', true)
+        query.equalTo('isChecked', true)
+        let count = await query.count()
+        let tip = await this.getActStatus(list[i], query, count)
+        let obj = list[i].toJSON()
+        obj.tip = tip
+        obj['resgisterCount'] = count
+        obj.startDate = dateF.formatTime("YYYY.mm.dd HH:MM", obj.startDate?.iso)
+        obj.endDate = dateF.formatTime("YYYY.mm.dd HH:MM", obj.endDate?.iso)
+        if (obj.signFromTo?.from && obj.signFromTo?.to) {
+          obj.signFromTo.from = dateF.formatTime("YYYY.mm.dd HH:MM", obj.signFromTo?.from?.iso)
+          obj.signFromTo.to = dateF.formatTime("mm.dd HH:MM", obj.signFromTo?.to?.iso)
+        }
+        activtList.push(obj)
+      }
+    }
+    this.setData({
+      activtList,
+      count
+    })
+  },
+
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+    this.getActivity()
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+   
+  gourl(e) {
+    const url = e.currentTarget.dataset.url
+    const id = e.currentTarget.dataset.id
+    wx.navigateTo({
+      url: `${url}?id=` + id // 目标页面的路径
+    });
+  },
 })

nova-werun/pages/activity/index.less

@@ -1,55 +1,103 @@
-/* nova-werun/pages/activity/index.wxss */
-.all{
-    width: 100vw;
-    .cardbox{
-        border-radius: 15rpx;
-        margin: 20rpx;
-        padding: 30rpx;
-        box-shadow: 0rpx 0rpx 10rpx #b8b7b7;
-        position: relative;
-        .card{
-            width: 100%;
-            display: flex;
-            image{
-                width: 310rpx;
-                height: 177rpx;
-                border-radius: 20rpx;
-            }
-            .infobox{
-                margin-left: 20rpx;
-                width: 405rpx;
-                .title{
-                    width: 100%;
-                    height: 160rpx;
-                    font-size: 28rpx;
-                    overflow: hidden;
-                    text-overflow: ellipsis;
-                    display: -webkit-box;
-                    -webkit-line-clamp: 4;
-                    -webkit-box-orient: vertical;
-                }
-    
-            }
+// .cardbox{
+//     border-radius: 15rpx;
+//     margin: 20rpx;
+//     padding: 30rpx;
+//     box-shadow: 0rpx 0rpx 10rpx #b8b7b7;
+//     .card{
+//         width: 100%;
+//         display: flex;
+//         image{
+//             width: 310rpx;
+//             height: 177rpx;
+//             border-radius: 20rpx;
+//         }
+//         .infobox{
+//             margin-left: 20rpx;
+//             width: 405rpx;
+//             .title{
+//                 width: 100%;
+//                 height: 160rpx;
+//                 font-size: 28rpx;
+//                 overflow: hidden;
+//                 text-overflow: ellipsis;
+//                 display: -webkit-box;
+//                 -webkit-line-clamp: 4;
+//                 -webkit-box-orient: vertical;
+//             }
 
-        }
+//         }
+
+//     }
+
+//     .time{
+//         width: 100%;
+//         font-size: 26rpx;
+//         color: gray;
+//         margin-top: 10rpx;
+//     }
+//     .submit{
+//         position: absolute;
+//         right: 0;
+//         bottom: 0;
+//         border-radius: 15rpx;
+//         display: flex;
+//         justify-content: center;
+//         align-items: center;
+//         background-color: aqua;
+//         font-size: 25rpx;
+//         padding: 10rpx 20rpx;
+//     }
+// }
+
+
+
+
+
+.cardbox {
+    position: relative;
+    display: flex;
+    justify-content: space-between;
+    padding: 20rpx;
+    margin: 20rpx;
+    box-shadow: 0rpx 0rpx 10rpx rgb(218, 218, 218);
+    border-radius: 10rpx;
 
-        .time{
+    .card {
+        width: 260rpx;
+        height: 180rpx;
+
+        image {
             width: 100%;
-            font-size: 26rpx;
-            color: gray;
-            margin-top: 10rpx;
+            height: 100%;
+        }
+    }
+
+    .infobox {
+        width: 400rpx;
+        height: 200rpx;
+
+        .title {
+            font-size: 32rpx;
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 3;
+            overflow: hidden;
         }
-        .submit{
-            position: absolute;
-            right: 0;
-            bottom: 0;
-            border-radius: 15rpx;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            background-color: aqua;
-            font-size: 25rpx;
-            padding: 10rpx 20rpx;
+       
+        .time {
+            font-size: 28rpx;
         }
+
+    }
+
+    .status {
+        position: absolute;
+        bottom: 0rpx;
+        right: 0rpx;
+        font-size: 25rpx;
+        border-radius: 10rpx;
+        background: #4F9AF7;
+        padding: 10rpx 20rpx;
+        color: white;
     }
 }

nova-werun/pages/activity/index.wxml

@@ -1,17 +1,17 @@
 <!--nova-werun/pages/activity/index.wxml-->
-<nav type="back" title="全部活动" background-color="{{'#4F9AF7'}}" front-color="{{'#ffffff'}}"></nav>
-<view class="all" style="height: {{contentHeight}}rpx;">
-    <block wx:for="{{ActivityList}}">
-        <view class="cardbox" bindtap="gourl" data-url="../activity/detail-activity/index" data-id="{{item.objectId}}">
-            <view class="card">
-                <image src="{{item.cover[0]}}" mode="aspectFit"></image>
-                <view class="infobox">
-                    <view class="title">{{item.desc}}{{item.desc}}</view>
-                </view>
-            </view>
-            <view class="time">活动时间：2025-01-14T06:58:57.476Z</view>
-            <view class="submit">报名中</view>
-        </view>
-    </block>
+<nav type="back" title="全部活动" background-color="#4F9AF7" front-color="#ffffff"></nav>
 
-</view>
+<block wx:for="{{activtList}}" wx:key="index">
+  <view class="cardbox" bindtap="gourl" data-url="../activity/detail-activity/index" data-id="{{item.objectId}}">
+    <view class="card">
+      <image src="{{item.logo}}" mode="aspectFill"></image>
+    </view>
+    <view class="infobox">
+      <view class="title">{{item.title}}</view>
+      <view class="time">活动时间：{{item.startDate}} — {{item.endDate}}</view>
+    </view>
+    <view class="status" style="background:{{(item.tip.isCanRevise||item.tip.isCanSign)?'#4F9AF7':'gray'}} ;">{{item.tip.title}}</view>
+
+  </view>
+
+</block>

nova-werun/pages/activity/index.wxss

@@ -1 +1,41 @@
-.all{width:100vw}.all .cardbox{border-radius:15rpx;margin:20rpx;padding:30rpx;box-shadow:0rpx 0rpx 10rpx #b8b7b7;position:relative}.all .cardbox .card{width:100%;display:flex}.all .cardbox .card image{width:310rpx;height:177rpx;border-radius:20rpx}.all .cardbox .card .infobox{margin-left:20rpx;width:405rpx}.all .cardbox .card .infobox .title{width:100%;height:160rpx;font-size:28rpx;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:4;-webkit-box-orient:vertical}.all .cardbox .time{width:100%;font-size:26rpx;color:gray;margin-top:10rpx}.all .cardbox .submit{position:absolute;right:0;bottom:0;border-radius:15rpx;display:flex;justify-content:center;align-items:center;background-color:aqua;font-size:25rpx;padding:10rpx 20rpx}
+.cardbox {
+  position: relative;
+  display: flex;
+  justify-content: space-between;
+  padding: 20rpx;
+  margin: 20rpx;
+  box-shadow: 0rpx 0rpx 10rpx #dadada;
+  border-radius: 10rpx;
+}
+.cardbox .card {
+  width: 260rpx;
+  height: 180rpx;
+}
+.cardbox .card image {
+  width: 100%;
+  height: 100%;
+}
+.cardbox .infobox {
+  width: 400rpx;
+  height: 200rpx;
+}
+.cardbox .infobox .title {
+  font-size: 32rpx;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 3;
+  overflow: hidden;
+}
+.cardbox .infobox .time {
+  font-size: 28rpx;
+}
+.cardbox .status {
+  position: absolute;
+  bottom: 0rpx;
+  right: 0rpx;
+  font-size: 25rpx;
+  border-radius: 10rpx;
+  background: #4F9AF7;
+  padding: 10rpx 20rpx;
+  color: white;
+}

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

@@ -1,222 +1,210 @@
 // nova-werun/pages/home/sport/sport-home/index.js
 const Parse = getApp().Parse;
 const company = getApp().globalData.company;
+const uid = Parse.User.current()?.id
+let request = require('../../../../../utils/request')
+let getSportData = require('../../../../service/getSportData')
+
 Page({
 
-    /**
-     * 页面的初始数据
-     */
-    data: {
-        //屏幕高度
-        statusBarHeight: 0, // 状态栏高度
-        screenHeight: 0, // 屏幕高度
-        customHeight: 0, // 自定义导航栏高度（如小程序右上角胶囊按钮）
-        bottomNavHeight: 0, // 底部导航栏高度
-        contentHeight: 0, // 可用内容高度
-        contentHeight2: 0,
-        contentpadding: 0, //顶部padding高度
-        //
-        currentTab: 0,
-        //地图
-        longitude: 0,
-        latitude: 0,
-        markers: [],
-        //
-        distance:0
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad: function (options) {
-        // 计算
-        const systemInfo = wx.getSystemInfoSync();
-        const statusBarHeight = systemInfo.statusBarHeight || 0;
-        const screenHeight = systemInfo.screenHeight || 0;
-        const custom = wx.getMenuButtonBoundingClientRect();
-        const customHeight = custom.height + 10 + 2 || 0;
-        const bottomNavHeight = systemInfo.screenHeight - systemInfo.safeArea.bottom || 0;
-
-        const contentpadding = (statusBarHeight + customHeight) * 750 / systemInfo.windowWidth;
-        const contentHeight = (screenHeight - bottomNavHeight - statusBarHeight - customHeight) * 750 / systemInfo.windowWidth;
-        this.setData({
-            statusBarHeight,
-            screenHeight,
-            customHeight,
-            bottomNavHeight,
-            contentpadding,
-            contentHeight,
-        });
-        if(Number(options.id)){
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    //屏幕高度
+    statusBarHeight: 0, // 状态栏高度
+    screenHeight: 0, // 屏幕高度
+    customHeight: 0, // 自定义导航栏高度（如小程序右上角胶囊按钮）
+    bottomNavHeight: 0, // 底部导航栏高度
+    contentHeight: 0, // 可用内容高度
+    contentHeight2: 0,
+    contentpadding: 0, //顶部padding高度
+    //
+    currentTab: 0,
+    //地图
+    longitude: 0,
+    latitude: 0,
+    markers: [],
+    //
+    distance: 0,
+    type: 'walk',
+    show: false,
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    // 计算
+    const systemInfo = wx.getSystemInfoSync();
+    const statusBarHeight = systemInfo.statusBarHeight || 0;
+    const screenHeight = systemInfo.screenHeight || 0;
+    const custom = wx.getMenuButtonBoundingClientRect();
+    const customHeight = custom.height + 10 + 2 || 0;
+    const bottomNavHeight = systemInfo.screenHeight - systemInfo.safeArea.bottom || 0;
+
+    const contentpadding = (statusBarHeight + customHeight) * 750 / systemInfo.windowWidth;
+    const contentHeight = (screenHeight - bottomNavHeight - statusBarHeight - customHeight) * 750 / systemInfo.windowWidth;
+    this.setData({
+      statusBarHeight,
+      screenHeight,
+      customHeight,
+      bottomNavHeight,
+      contentpadding,
+      contentHeight,
+    });
+    if (Number(options.id)) {
+      this.setData({
+        active: Number(options.id)
+      })
+    }
+    //地图
+    this.Getlocation()
+    this.getwalk()
+  },
+  /** 获取行走公里*/
+  async getwalk() {
+    let distance = await getSportData.getwalk('distance')
+    this.setData({
+      distance: distance.toFixed(2),
+    })
+    console.log('距离', this.data.distance);
+  },
+  showPopup() {
+    this.setData({
+      show: true
+    });
+  },
+
+  onClose() {
+    this.setData({
+      show: false
+    });
+  },
+  /** 跳转*/
+  gourl(e) {
+    this.onClose()
+    const url = e.currentTarget.dataset.url
+    wx.navigateTo({
+      url: `${url}` // 目标页面的路径
+    });
+  },
+
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+  //获取当前位置信息
+  Getlocation() {
+    // 获取当前位置信息
+    wx.getLocation({
+      type: 'gcj02',
+      success: (res) => {
+        const {
+          latitude,
+          longitude
+        } = res;
+        // console.log('获取到的经纬度:', latitude, longitude); // 添加日志
+        //调用api解析地址
+        wx.request({
+          url: 'https://api.map.baidu.com/reverse_geocoding/v3/?ak=sHZTomd7grslfP7sPKB8tRgT49FK9TEu&output=json&coordtype=gcj02&location=' + latitude + ',' + longitude,
+          data: {},
+          header: {
+            'Content-Type': 'application/json'
+          },
+          success: (ops) => { // 使用箭头函数
+            console.log(ops);
+            const address = ops.data.result.formatted_address;
             this.setData({
-                active:Number(options.id)
-            })
-        }
-        //地图
-        this.Getlocation()
-        this.getwalk()
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload: function () {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh: function () {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom: function () {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage: function () {
-
-    },
-    //获取当前位置信息
-    Getlocation() {
-        // 获取当前位置信息
-        wx.getLocation({
-            type: 'gcj-02',
-            success: (res) => {
-                const {
-                    latitude,
-                    longitude
-                } = res;
-                console.log('获取到的经纬度:', latitude, longitude); // 添加日志
-                //调用api解析地址
-                wx.request({
-                    url: 'https://api.map.baidu.com/reverse_geocoding/v3/?ak=sHZTomd7grslfP7sPKB8tRgT49FK9TEu&output=json&coordtype=gcj02&location=' + latitude + ',' + longitude,
-                    data: {},
-                    header: {
-                        'Content-Type': 'application/json'
-                    },
-                    success: (ops) => { // 使用箭头函数
-                        console.log(ops);
-                        const address = ops.data.result.formatted_address;
-                        this.setData({
-                            address: address,
-                            latitude: latitude, // 保证 latitude 被设置
-                            longitude: longitude, // 保证 longitude 被设置
-                            markers: [{ // 设置 markers
-                                id: 1,
-                                latitude: latitude,
-                                longitude: longitude,
-                                iconPath: 'https://file-cloud.fmode.cn/13WZ0W7u3l/20240724/7ebg0k104325941.png?imageView2/1/w/200/h/200', // 自定义标记图标
-                                width: 40,
-                                height: 40,
-                                // callout: {
-                                //     content: address, // 可以显示解析出的地址
-                                //     color: '#ffffff',
-                                //     bgColor: '#7F56B2',
-                                //     padding: 10,
-                                //     borderRadius: 5,
-                                //     display: 'ALWAYS'
-                                // }
-                            }]
-                        });
-                        console.log(this.data.address);
-                    },
-                    fail: function (resq) {
-                        wx.showModal({
-                            title: '信息提示',
-                            content: '请求失败',
-                            showCancel: false,
-                            confirmColor: '#f37938'
-                        });
-                    },
-                    complete: function () {}
-                })
-
-            },
-            fail: (err) => {
-                console.error(err);
-                wx.showToast({
-                    title: '获取位置失败',
-                    icon: 'none'
-                });
-            }
-        });
-    },
-    //跳转
-    gourl(e) {
-        const url = e.currentTarget.dataset.url
-        // if(this.data.currentTab==0){
-        //     const title='步行'
-        //     wx.navigateTo({
-        //         url: `${url}?id=`+title // 目标页面的路径
-        //     });
-        // }else{
-        //     const title='跑步'
-        //     wx.navigateTo({
-        //         url: `${url}?id=`+title // 目标页面的路径
-        //     });
-        // }
-        wx.navigateTo({
-            url: `${url}` // 目标页面的路径
-        });
-
-    },
-    //切换
-    // switchTab (e) {
-    //     const index = e.currentTarget.dataset.index;
-    //     this.setData({
-    //       currentTab: index
-    //     });
-    //     this.getwalk(index)
-    //     console.log(this.data.currentTab);
-    //   },
-      //获取行走公里
-     async getwalk(){
-        const currentUser = Parse.User.current();
-        let ActivityDataquery = new Parse.Query('ActivityData');
-        ActivityDataquery.equalTo('user', currentUser.id);
-        ActivityDataquery.equalTo('company', company);
-        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=>{
-            if(item.distance){
-                distance =  Number(item.distance)+distance
-            }
-        })
-        this.setData({
-            distance,
+              address: address,
+              latitude: latitude, // 保证 latitude 被设置
+              longitude: longitude, // 保证 longitude 被设置
+              markers: [{ // 设置 markers
+                id: 1,
+                latitude: latitude,
+                longitude: longitude,
+                iconPath: 'https://file-cloud.fmode.cn/13WZ0W7u3l/20240724/7ebg0k104325941.png?imageView2/1/w/200/h/200', // 自定义标记图标
+                width: 40,
+                height: 40,
+                // callout: {
+                //     content: address, // 可以显示解析出的地址
+                //     color: '#ffffff',
+                //     bgColor: '#7F56B2',
+                //     padding: 10,
+                //     borderRadius: 5,
+                //     display: 'ALWAYS'
+                // }
+              }]
+            });
+            // console.log(this.data.address);
+          },
+          fail: function (resq) {
+            wx.showModal({
+              title: '信息提示',
+              content: '请求失败',
+              showCancel: false,
+              confirmColor: '#f37938'
+            });
+          },
+          complete: function () {}
         })
-        console.log('距离',this.data.distance);
+
+      },
+      fail: (err) => {
+        console.error(err);
+        wx.showToast({
+          title: '获取位置失败',
+          icon: 'none'
+        });
       }
+    });
+  },
+
+
+
 })

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

@@ -1,7 +1,8 @@
 {
   "usingComponents": {
     "van-tab": "@vant/weapp/tab/index",
-    "van-tabs": "@vant/weapp/tabs/index"
+    "van-tabs": "@vant/weapp/tabs/index",
+    "van-popup": "@vant/weapp/popup/index"
   },
   "permission": {
     "scope": {

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

@@ -57,7 +57,7 @@
     }
     .mapbox{
         width: 100%;
-        height: 1100rpx;
+        height: 60vh;
         border-radius: 15rpx;
         position: relative;
         margin-top: 30rpx;
@@ -83,4 +83,47 @@
             bottom: 100rpx;
         }
     }
+}
+
+.model {
+  width: 80vw;
+  height: 300rpx;
+  .content {
+    width: 100%;
+    padding: 40rpx;
+    background-size: cover;
+
+    .close {
+      height: 50rpx;
+      width: 100%;
+      display: flex;
+      .h2 {
+        margin: auto;
+        text-align: center;
+        font-size: 40rpx;
+        font-weight: bold;
+      }
+      van-icon {
+        color: rgb(128, 125, 125);
+        float: right;
+      }
+    }
+
+   
+    .btnBox{
+      margin-top: 50rpx;
+      display: flex;
+      .btn{
+        font-size: 35rpx;
+        width: 40%;
+        background: #4F9AF7;
+        margin: auto;
+        color:white;
+        padding: 20rpx;
+        text-align: center;
+        border-radius: 100rpx;
+      }
+    }
+ 
+  }
 }

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

@@ -1,50 +1,36 @@
 <!--nova-werun/pages/home/sport/sport-home/index.wxml-->
 <nav type="back" title="运动" background-color="{{'#4F9AF7'}}" front-color="{{'#333333'}}"></nav>
 <view class="all" style="height: {{contentHeight}}rpx;">
-    <!-- <view class="tab-bar">
-        <view style="margin-left: 66rpx;" class="tab-item {{currentTab == 0? 'active' : ''}}" bindtap="switchTab" data-index="0">
-            步行
+  <view>
+    <view class="textbox">
+      <view class="text">今日积累运动</view>
+      <view class="number" data-url="../../statistics/index" bindtap="gourl">{{distance}}米 ></view>
+    </view>
+    <view class="mapbox">
+      <view class="map">
+        <map class="map" enable-zoom="ture" enable-scroll="ture" id="map" longitude="{{longitude}}" latitude="{{latitude}}" scale="18" markers="{{markers}}"></map>
+      </view>
+      <!-- <view class="button" data-url="/nova-werun/pages/home/sport/sport-start/index?type={{type}}" bindtap="go">GO</view> -->
+      <view class="button" data-url="/nova-werun/pages/home/sport/sport-start/index?type={{type}}" bindtap="showPopup">GO</view>
+    </view>
+  </view>
+</view>
+
+<van-popup round show="{{show}}" >
+  <view class="model">
+    <view class="content">
+      <view class="close">
+        <view class="h2">选择运动类型</view>
+        <van-icon name="cross" size="50rpx" bind:tap="onClose" />
+      </view>
+      <view class="btnBox">
+        <view class="btn" data-url="/nova-werun/pages/home/sport/sport-start/index?type=walk" bind:tap="gourl">
+          步行
         </view>
-        <view style="margin-left: 44rpx;" class="tab-item {{currentTab == 1? 'active' : ''}}" bindtap="switchTab" data-index="1">
-            跑步
+        <view class="btn" data-url="/nova-werun/pages/home/sport/sport-start/index?type=run" bind:tap="gourl">
+          跑步
         </view>
-    </view> -->
-    <!-- 走路 -->
-    <!-- <view wx:if="{{currentTab == 0}}">
-            <view class="textbox">
-                <view class="text">今日积累行走</view>
-                <view class="number" data-url="../../statistics/index"  bindtap="gourl">{{distance}}公里 ></view>
-            </view>
-            <view class="mapbox">
-                <view class="map">
-                    <map class="map" enable-zoom="ture" enable-scroll="ture" id="map" longitude="{{longitude}}" latitude="{{latitude}}" scale="18" markers="{{markers}}"></map>
-                </view>
-                <view class="button" data-url="../sport-start/index"  bindtap="gourl">GO</view>
-            </view>
-    </view> -->
-    <!-- 跑步 -->
-    <!-- <view wx:if="{{currentTab == 1}}">
-            <view class="textbox">
-                <view class="text">今日积累跑步</view>
-                <view class="number" data-url="../../statistics/index"  bindtap="gourl">{{distance}}公里 ></view>
-            </view>
-            <view class="mapbox">
-                <view class="map">
-                    <map class="map" enable-zoom="ture" enable-scroll="ture" id="map" longitude="{{longitude}}" latitude="{{latitude}}" scale="18" markers="{{markers}}"></map>
-                </view>
-                <view class="button" data-url="../sport-start/index"  bindtap="gourl">GO</view>
-            </view>
-    </view> -->
-    <view>
-            <view class="textbox">
-                <view class="text">今日积累运动</view>
-                <view class="number" data-url="../../statistics/index"  bindtap="gourl">{{distance}}公里 ></view>
-            </view>
-            <view class="mapbox">
-                <view class="map">
-                    <map class="map" enable-zoom="ture" enable-scroll="ture" id="map" longitude="{{longitude}}" latitude="{{latitude}}" scale="18" markers="{{markers}}"></map>
-                </view>
-                <view class="button" data-url="../sport-start/index"  bindtap="gourl">GO</view>
-            </view>
+      </view>
     </view>
-</view>
+  </view>
+</van-popup>

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

@@ -1 +1,121 @@
-.all{width:100vw;padding-left:40rpx;padding-right:40rpx;padding-top:20rpx;background:linear-gradient(to bottom, #4F9AF7, #FFFFFF)}.all .tab-bar{display:flex;justify-content:space-around}.all .tab-item{padding:10rpx 0;text-align:center;position:relative;color:black;font-size:32rpx}.all .tab-item.active{position:relative;color:#0178EE;font-size:32rpx;font-family:'NotoSans-Bold-5',sans-serif}.all .tab-item.active::after{content:"";width:64rpx;position:absolute;left:calc(50% - 32rpx);right:calc(50% - 32rpx);bottom:0;height:2rpx;background-color:#0178EE;border-radius:4rpx}.all .textbox{width:100%;height:80rpx;border-radius:40rpx;display:flex;align-items:center;margin-top:40rpx;background-color:white}.all .textbox .text{font-size:30rpx;margin-left:20rpx}.all .textbox .number{font-size:32rpx;margin-left:auto;margin-right:20rpx}.all .mapbox{width:100%;height:1100rpx;border-radius:15rpx;position:relative;margin-top:30rpx;margin-bottom:40rpx}.all .mapbox .map{width:100%;height:100%;border-radius:15rpx;overflow:hidden}.all .mapbox .button{width:150rpx;height:150rpx;border-radius:50%;display:flex;justify-content:center;align-items:center;font-size:40rpx;background-color:#4F9AF7;color:white;position:absolute;left:38%;bottom:100rpx}
+/* nova-werun/pages/home/sport/sport-home/index.wxss */
+.all {
+  width: 100vw;
+  padding-left: 40rpx;
+  padding-right: 40rpx;
+  padding-top: 20rpx;
+  background: linear-gradient(to bottom, #4F9AF7, #FFFFFF);
+  /* 竖直渐变 */
+}
+.all .tab-bar {
+  display: flex;
+  justify-content: space-around;
+}
+.all .tab-item {
+  padding: 10rpx 0;
+  text-align: center;
+  position: relative;
+  color: black;
+  font-size: 32rpx;
+}
+.all .tab-item.active {
+  position: relative;
+  color: #0178EE;
+  font-size: 32rpx;
+  font-family: 'NotoSans-Bold-5', sans-serif;
+}
+.all .tab-item.active::after {
+  content: "";
+  width: 64rpx;
+  position: absolute;
+  left: calc(50% - 32rpx);
+  right: calc(50% - 32rpx);
+  bottom: 0;
+  height: 2rpx;
+  background-color: #0178EE;
+  border-radius: 4rpx;
+}
+.all .textbox {
+  width: 100%;
+  height: 80rpx;
+  border-radius: 40rpx;
+  display: flex;
+  align-items: center;
+  margin-top: 40rpx;
+  background-color: white;
+}
+.all .textbox .text {
+  font-size: 30rpx;
+  margin-left: 20rpx;
+}
+.all .textbox .number {
+  font-size: 32rpx;
+  margin-left: auto;
+  margin-right: 20rpx;
+}
+.all .mapbox {
+  width: 100%;
+  height: 60vh;
+  border-radius: 15rpx;
+  position: relative;
+  margin-top: 30rpx;
+  margin-bottom: 40rpx;
+}
+.all .mapbox .map {
+  width: 100%;
+  height: 100%;
+  border-radius: 15rpx;
+  overflow: hidden;
+}
+.all .mapbox .button {
+  width: 150rpx;
+  height: 150rpx;
+  border-radius: 50%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 40rpx;
+  background-color: #4F9AF7;
+  color: white;
+  position: absolute;
+  left: 38%;
+  bottom: 100rpx;
+}
+.model {
+  width: 80vw;
+  height: 300rpx;
+}
+.model .content {
+  width: 100%;
+  padding: 40rpx;
+  background-size: cover;
+}
+.model .content .close {
+  height: 50rpx;
+  width: 100%;
+  display: flex;
+}
+.model .content .close .h2 {
+  margin: auto;
+  text-align: center;
+  font-size: 40rpx;
+  font-weight: bold;
+}
+.model .content .close van-icon {
+  color: #807d7d;
+  float: right;
+}
+.model .content .btnBox {
+  margin-top: 50rpx;
+  display: flex;
+}
+.model .content .btnBox .btn {
+  font-size: 35rpx;
+  width: 40%;
+  background: #4F9AF7;
+  margin: auto;
+  color: white;
+  padding: 20rpx;
+  text-align: center;
+  border-radius: 100rpx;
+}

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

@@ -1,927 +1,862 @@
 // nova-werun/pages/home/sport/sport-start/index.js
 const Parse = getApp().Parse;
 const company = getApp().globalData.company;
-Page({
-
-    /**
-     * 页面的初始数据
-     */
-    data: {
-        //屏幕高度
-        statusBarHeight: 0, // 状态栏高度
-        screenHeight: 0, // 屏幕高度
-        customHeight: 0, // 自定义导航栏高度（如小程序右上角胶囊按钮）
-        bottomNavHeight: 0, // 底部导航栏高度
-        contentHeight: 0, // 可用内容高度
-        contentHeight2: 0,
-        contentpadding: 0, //顶部padding高度
-        navheight: 0,
-        //地图
-        longitude: 0,
-        latitude: 0,
-        markers: [],
-        //是否暂停
-        isstop: false,
-        //标题
-        title: '',
+const uid = Parse.User.current()?.id
+let request = require('../../../../../utils/request')
+const dateF = require("../../../../../utils/date")
 
-        percentage: '',
-        timer: null,
-        startTime: 0,
-
-        show: false,
-
-        //
-        timer2: null,
-        totalSeconds: 0, // 用于存储总秒数
-        formattedTime: '00:00:00', // 用于存储格式化后的时间
-        isRunning: false, // 计时器是否在运行
-        steps: 0, //运动步数
-        defferentstep: 0,
-        distance: 0,
-        calorie: 0,
-        pace: 0,
-
-        //
-        activitdateid: '', //ActivityData的id
-        show2: false, //继续上次运动
-        runlogList: [],
-
-        iscontinue: false
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad: async function (options) {
-        // 计算
-        const systemInfo = wx.getSystemInfoSync();
-        const statusBarHeight = systemInfo.statusBarHeight || 0;
-        const screenHeight = systemInfo.screenHeight || 0;
-        const custom = wx.getMenuButtonBoundingClientRect();
-        const customHeight = custom.height + 10 + 2 || 0;
-        const bottomNavHeight = systemInfo.screenHeight - systemInfo.safeArea.bottom || 0;
-        const navheight = (statusBarHeight + customHeight) * 750 / systemInfo.windowWidth;
-        const contentHeight = (screenHeight - bottomNavHeight) * 750 / systemInfo.windowWidth;
-        this.setData({
-            statusBarHeight,
-            screenHeight,
-            customHeight,
-            bottomNavHeight,
-            contentHeight,
-            navheight,
-        });
-        if (options.id) {
-            this.setData({
-                title: options.id
-            })
-        }
-        // 地图
-        this.Getlocation();
-        this.getWeRunData2(); // 获取初始步数
-        //判断是否继续运动
-        this.searchrulog()
-    },
-
-    //查询是否有为完成的记录
-    async searchrulog() {
-        const currentUser = Parse.User.current();
-        const {
-            startOfDay,
-            endOfDay
-        } = this.getTodayRange(); // 获取今天的日期范围
-
-        let query = new Parse.Query('ActivityRunLog');
-        query.equalTo('company', company);
-        query.equalTo('user', currentUser.id);
-        query.notEqualTo('isDeleted', true);
-        query.greaterThanOrEqualTo('createdAt', startOfDay);
-        query.lessThanOrEqualTo('createdAt', endOfDay);
-        query.descending('createdAt');
-
-        let P = await query.find();
-        let runlogList = P.map(item => item.toJSON());
-
-        if (runlogList.length == 0) {
-            console.log('今日无数据');
-            // 今日无数据
-            this.startdate(); // 创建开始数据
-            this.getWeRunData2(); // 获取初始步数
-            this.startbackgroumd(); // 开启后台定位
-            return
 
-        } else {
-            console.log('今日有数据');
-            console.log(runlogList);
-
-            if (runlogList[0].stage == 'end') {
-                console.log('可以开始');
-                this.startdate(); // 创建开始数据
-                this.getWeRunData2(); // 获取初始步数
-                this.startbackgroumd(); // 开启后台定位
-
-                return
-            } else {
-                console.log('是否继续运动');
-                this.setData({
-                    runlogList,
-                    show2: true,
-                })
-                this.stop()
-                return
-            }
-        }
-    },
+let {
+  statusBarHeight
+} = wx.getSystemInfoSync()
+let custom = wx.getMenuButtonBoundingClientRect()
+let customHeight = custom.height
 
-    // 继续上次运动
-    async continueLastActivity(lastRunlog) {
-        console.log(lastRunlog);
-        const id = await this.getActivityDataid(); // 获取 ActivityData ID
-        console.log('id', id);
-        this.setData({
-            distance: lastRunlog.distance,
-            totalSeconds: lastRunlog.sportDate,
-            defferentstep: lastRunlog.steps,
-            calorie: lastRunlog.burnCalories,
-            activitdateid: id,
+Page({
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    navheight: 0, //导航高度px
+    isStop: false, //计时是否暂停
+    longitude: 0, //经度
+    latitude: 0, //纬度
+    markers: [], //地图标记点
+    showPermissions: true, //权限弹框-开
+    journey: 0, //运动的路程-米
+    calorie: 0, //卡路里-千卡
+    pace: 0, //配速-min/km
+    timer: 0, //已记的时长-秒
+    status: 'noStart', //运动状态 'noStart'未开始,'inSports'运动中,'paused'暂停
+    percentage: '', //长按结束运动百分比
+    endHaloInterval: null, //光环计时器
+    endHaloStartDate: null, //光环开始时间戳
+    endHaloEndDate: null, //光环结束时间戳
+    isRefershLaLo: true, //是否刷新经纬度
+    stage: 'start', //运动过程 start,progress,end
+    actData: null, //运动数据
+    formattedTime: '00:00:00', // 用于存储格式化后的时间
+    step: 0, //运动步数
+    type: 'walk', //运动类型-步行
+    actDataList: [], //未运动结束数据
+    isShowActDataList: false, //是否展示未运动结束的数据
+    checkActDataId: null, //点击的未结束运动
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: async function (options) {
+    wx.offLocationChange()
+    this.setData({
+      navheight: customHeight + statusBarHeight + 5,
+      type: options.type || 'walk', //运动方式 run/walk
+      a_reg: options.a_reg || '', //所属报名记录 ActivityRegister.id
+    })
+
+    console.log(options)
+    this.getActivityData()
+    this.beforeUnload()
+  },
+
+
+  /**获取运动数据 */
+  async getActivityData() {
+    let {
+      a_reg,
+      type
+    } = this.data
+
+    let query = new Parse.Query('ActivityData')
+    query.equalTo('company', company)
+    query.equalTo('user', uid)
+    query.equalTo('type', type)
+    query.notEqualTo('isDeleted', true)
+    query.descending('createdAt')
+    if (a_reg) { //如果传递了报名记录-直接进行这个运动
+      console.log('如果传递了报名记录-直接进行这个运动')
+      let actData
+      query.equalTo('actRegister', a_reg)
+      actData = await query.first()
+      if (actData?.get('status') == 'end') {
+        wx.showToast({
+          title: '已结算成绩',
+          icon: 'none'
         })
-        this.startbackgroumd(); // 开启后台定位
-    },
-
-    // 开启新运动
-    async startNewActivity() {
-        await this.getWeRunData2(); // 获取初始步数
-        this.startbackgroumd(); // 开启后台定位
-        await this.startdate(); // 创建开始数据
-    },
-    //今天时间范围
-    getTodayRange() {
-        const now = new Date();
-        const startOfDay = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 0, 0, 0, 0); // 今天的开始时间
-        const endOfDay = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 23, 59, 59, 999); // 今天的结束时间
-        return {
-            startOfDay,
-            endOfDay
-        };
-    },
-    //查找继续运动的ActivityData的id
-    async getActivityDataid() {
-        try {
-            const currentUser = Parse.User.current();
-            const {
-                startOfDay,
-                endOfDay
-            } = this.getTodayRange(); // 获取今天的日期范围
-
-            // 查询最近一条 stage 为 "start" 的 ActivityRunLog
-            const runlogQuery = new Parse.Query('ActivityRunLog');
-            runlogQuery.equalTo('company', company);
-            runlogQuery.equalTo('user', currentUser.id);
-            runlogQuery.notEqualTo('isDeleted', true);
-            runlogQuery.equalTo('stage', 'start');
-            runlogQuery.greaterThanOrEqualTo('createdAt', startOfDay);
-            runlogQuery.lessThanOrEqualTo('createdAt', endOfDay);
-            runlogQuery.descending('createdAt');
-            runlogQuery.limit(1);
-
-            const latestRunlog = await runlogQuery.first();
-            if (!latestRunlog) {
-                throw new Error('未找到符合条件的 ActivityRunLog 记录');
-            }
-            // 查询对应的 ActivityData
-            const activityDataQuery = new Parse.Query('ActivityData');
-            activityDataQuery.equalTo('company', company);
-            activityDataQuery.equalTo('user', currentUser.id);
-            activityDataQuery.notEqualTo('isDeleted', true);
-            activityDataQuery.equalTo('runlog', latestRunlog.id); // 使用 latestRunlog.id
-
-            const activityData = await activityDataQuery.first();
-            if (!activityData) {
-                throw new Error('未找到对应的 ActivityData 记录');
-            }
-
-            return activityData.id; // 返回 ActivityData 的 objectId
-        } catch (error) {
-            console.error('获取 ActivityData ID 失败:', error);
-            throw error;
-        }
-    },
-    //取消弹窗
-    onClose2() {
-        this.setData({
-            show2: false,
-        });
-        this.getWeRunData2(); // 获取初始步数
-        this.continue()
-        this.startNewActivity()
-    },
-    //确认返回
-    onConfirm2() {
-        this.setData({
-            show2: false,
-            iscontinue: true
-        });
-        this.getWeRunData2(); // 获取初始步数
-        this.continue()
-        this.continueLastActivity(this.data.runlogList[0]);
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow: function () {
-        if (!this.data.isstop) {
-            this.startTimer();
-        }
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide: function () {
-        if (this.data.isRunning) {
-            this.stopTimer();
-        }
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload: function () {
-        this.stopTimer();
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh: function () {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom: function () {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage: function () {
-
-    },
-    //获取当前位置信息
-    Getlocation() {
-        // 获取当前位置信息
-        wx.getLocation({
-            type: 'gcj02',
-            success: (res) => {
-                const {
-                    latitude,
-                    longitude
-                } = res;
-                console.log('获取到的经纬度:', latitude, longitude); // 添加日志
-                //调用api解析地址
-                wx.request({
-                    url: 'https://api.map.baidu.com/reverse_geocoding/v3/?ak=sHZTomd7grslfP7sPKB8tRgT49FK9TEu&output=json&coordtype=gcj02&location=' + latitude + ',' + longitude,
-                    data: {},
-                    header: {
-                        'Content-Type': 'application/json'
-                    },
-                    success: (ops) => { // 使用箭头函数
-                        const address = ops.data.result.formatted_address;
-                        this.setData({
-                            address: address,
-                            latitude: latitude, // 保证 latitude 被设置
-                            longitude: longitude, // 保证 longitude 被设置
-                            markers: [{ // 设置 markers
-                                id: 1,
-                                latitude: latitude,
-                                longitude: longitude,
-                                iconPath: 'https://file-cloud.fmode.cn/13WZ0W7u3l/20240724/7ebg0k104325941.png?imageView2/1/w/200/h/200', // 自定义标记图标
-                                width: 40,
-                                height: 40,
-                                // callout: {
-                                //     content: address, // 可以显示解析出的地址
-                                //     color: '#ffffff',
-                                //     bgColor: '#7F56B2',
-                                //     padding: 10,
-                                //     borderRadius: 5,
-                                //     display: 'ALWAYS'
-                                // }
-                            }]
-                        });
-                    },
-                    fail: function (resq) {
-                        wx.showModal({
-                            title: '信息提示',
-                            content: '请求失败',
-                            showCancel: false,
-                            confirmColor: '#f37938'
-                        });
-                    },
-                    complete: function () {}
-                })
-
-            },
-            fail: (err) => {
-                console.error(err);
-                wx.showToast({
-                    title: '获取位置失败',
-                    icon: 'none'
-                });
-            }
-        });
-    },
-    //继续计时
-    continue () {
-        this.setData({
-            isstop: false
+        wx.navigateBack({
+          delta: 1
         })
-        this.startTimer()
-    },
-    //停止计时
-    stop() {
-
-        this.setData({
-            isstop: true,
+        return
+      }
+      if (!actData?.id) {
+        console.log('未查询出运动数据')
+        let regQuery = new Parse.Query('ActivityRegister')
+        let act_reg = await regQuery.get(a_reg)
+        await this.creatActDateFun(act_reg)
+        return
+      } else {
+        console.log('运动未结束')
+        wx.showToast({
+          title: '运动未结束',
+          icon: 'none'
         })
-        this.stopTimer()
-
-        console.log(this.data.isstop);
-    },
-    //结束光环展示
-    startIncrease() {
-        // 记录开始时间
-        this.setData({
-            startTime: Date.now(),
-        });
-
-        // 清除之前的定时器
-        if (this.data.timer) {
-            clearInterval(this.data.timer);
-        }
-
-        // 设置定时器，每隔 40 毫秒更新一次 percentage
-        this.setData({
-            timer: setInterval(() => {
-                const currentTime = Date.now();
-                const elapsedTime = currentTime - this.data.startTime;
-                const percentage = Math.min((elapsedTime / 4000) * 100, 100);
-
-                this.setData({
-                    percentage: `conic-gradient(from 0deg, #015EEA ${percentage}%, white 0%)`,
-                });
-
-                if (percentage >= 100) {
-                    wx.showToast({
-                        title: '运动已结束',
-                        icon: 'success',
-                        duration: 500
-                    });
-                    this.enddate() //结束数据
-                    this.endActivitydate()
-                    setTimeout(() => {
-                        this.onConfirm()
-                    }, 500)
-
-                }
-
-                // 如果达到 100%，清除定时器
-                if (percentage >= 100) {
-                    clearInterval(this.data.timer);
-                    this.setData({
-                        timer: null,
-                    });
-                }
-            }, 40),
-        });
-    },
-
-    stopIncrease() {
-        // 清除定时器
-        if (this.data.timer) {
-            clearInterval(this.data.timer);
-            this.setData({
-                timer: null,
-            });
-
-            // 如果未达到 100%，清零 percentage
-            const elapsedTime = Date.now() - this.data.startTime;
-            if (elapsedTime < 4000) {
-                this.setData({
-                    percentage: '',
-                });
-            }
-        }
-    },
-    //点击返回按钮
-    goback() {
+        await this.assignmentFun(actData?.id)
         this.setData({
-            show: true,
-            isstop: true,
+          actData
         })
-    },
-    //取消弹窗
-    onClose() {
-        this.setData({
-            show: false
-        });
-    },
-    //确认返回
-    onConfirm() {
-        wx.navigateBack({
-            delta: 1 // 返回的页面层数，1 表示返回上一页
-        });
-        this.stopBackgroundLocation() // 停止后台定位和位置监听
-    },
-    //开始计时或继续计时
-    startTimer: function () {
-        if (this.data.isRunning) return; // 如果已经在运行，则不再启动
-
-        const that = this;
-        this.data.timer2 = setInterval(function () {
-            that.data.totalSeconds += 1; // 增加总秒数
-            that.setData({
-                formattedTime: that.formatTime(that.data.totalSeconds) // 更新格式化后的时间
-            });
-
-            // 每30秒调用一次getWeRunData
-            if (that.data.totalSeconds % 4 === 0) {
-                that.getWeRunData(); // 调用获取微信步数的函数
-            }
-
-            that.onLocationChange((res) => {
-                // 这里可以处理位置变化的逻辑
-                console.log('位置已更新:', res);
-            });
-
-        }, 1000);
-
-        this.setData({
-            isRunning: true // 设置为运行状态
-        });
-    },
-    //暂停
-    stopTimer: function () {
-        clearInterval(this.data.timer2);
-        this.setData({
-            isRunning: false // 设置为未运行状态
-        });
-        wx.offLocationChange();
-    },
-    formatTime: function (seconds) {
-        const hours = Math.floor(seconds / 3600);
-        const minutes = Math.floor((seconds % 3600) / 60);
-        const secs = seconds % 60;
-
-        // 格式化为两位数
-        const formattedHours = String(hours).padStart(2, '0');
-        const formattedMinutes = String(minutes).padStart(2, '0');
-        const formattedSeconds = String(secs).padStart(2, '0');
-
-        return `${formattedHours}:${formattedMinutes}:${formattedSeconds}`;
-    },
-    //获取初始步数
-    async getWeRunData2() {
-        wx.getWeRunData({
-            success: (res) => {
-                // 获取到的加密数据
-                const encryptedData = res.encryptedData;
-                const iv = res.iv;
-                const userInfo = wx.getStorageSync('userInfo');
-                const session_key = userInfo.session_key
-                // 这里需要调用你的后端接口进行解密
-                // 假设你有一个解密函数 decryptData
-                this.decryptData(encryptedData, iv, session_key).then(async steps => {
-                    console.log('再次赋值');
-                    await this.setData({
-                        steps: steps,
-                    });
-                    console.log('用户步数:', this.data.steps);
-                }).catch(err => {
-                    console.error('解密失败:', err);
-                });
-            },
-            fail: (err) => {
-                console.error('获取运动数据失败:', err);
-            }
-        });
-    },
-    //获取微信步数
-    async getWeRunData() {
-        wx.getWeRunData({
-            success: (res) => {
-                // 获取到的加密数据
-                const encryptedData = res.encryptedData;
-                const iv = res.iv;
-                const userInfo = wx.getStorageSync('userInfo');
-                const session_key = userInfo.session_key
-                // 这里需要调用你的后端接口进行解密
-                // 假设你有一个解密函数 decryptData
-                this.decryptData(encryptedData, iv, session_key).then(async steps => {
-                    console.log('再次赋值');
-                    const defferentstep = steps - this.data.steps + this.data.defferentstep
-                    await this.setData({
-                        // defferentstep: steps - this.data.startsteps
-                        defferentstep,
-                        steps,
-                    });
-                    console.log('用户步数:', this.data.steps);
-                }).catch(err => {
-                    console.error('解密失败:', err);
-                });
-            },
-            fail: (err) => {
-                console.error('获取运动数据失败:', err);
-            }
-        });
-    },
-    //  解密
-    decryptData(encryptedData, iv, session_key) {
-        return new Promise((resolve, reject) => {
-            // 发送请求到后端进行解密
-            wx.request({
-                url: 'https://server.fmode.cn/api/wxapp/decrypt_phone', // 替换为你的后端解密接口
-                method: 'get',
-                data: {
-                    encryptedData: encryptedData,
-                    iv: iv,
-                    appId: 'wxe6ecc0193c09696c',
-                    sessionKey: session_key
-                },
-                success: (res) => {
-                    if (res.data.data) {
-                        const stepInfoList = res.data.data.stepInfoList
-                        const todaylist = stepInfoList.filter(item => {
-                            console.log(this.isToday(item));
-                            return this.isToday(item); // 使用 isToday 函数判断是否是今天
-                        });
-                        const steps = todaylist[0].step;
-                        resolve(steps);
-                    } else {
-                        reject('解密返回数据格式错误');
-                    }
-
-                },
-                fail: (err) => {
-                    reject(err);
-                }
-            });
-        });
-    },
-    // 判断日期是否是今天
-    isToday(item) {
-        const today = new Date();
-        const date = new Date(item.timestamp * 1000); // 假设时间戳是以秒为单位
-        // 比较年、月、日
-        return date.getFullYear() === today.getFullYear() &&
-            date.getMonth() === today.getMonth() &&
-            date.getDate() === today.getDate();
-    },
-    // 开启后台定位
-    startbackgroumd() {
-        console.log('后台定位函数执行');
-        wx.startLocationUpdateBackground({
-            success: (res) => {
-                // 开始监听GPS数据
-                this.onLocationChange((res) => {
-                    // 在这里处理位置变化的逻辑
-                    console.log('位置已更新:', res);
-                });
-                console.log('后台定位打开');
-            },
-            fail: (res) => {
-                console.log(res);
-                // 授权失败后引导用户打开定位信息
-                // 可以添加提示或引导用户操作的代码
-            }
-        });
-    },
-    // 监听位置变化
-    onLocationChange(callback) {
-        console.log('运行了');
-        // 监听位置变化
-        // this.Getlocation2()
-        wx.onLocationChange((res) => {
-            // 计算距离
-            let distance = this.haversineDistance(this.data.longitude, this.data.latitude, res.longitude, res.latitude);
-
-            // 更新总距离
-            const totalDistance = parseFloat((Number(this.data.distance) + Number(distance)).toFixed(3));
-
-            if (totalDistance != this.data.distance) {
-                this.progressdate()
-                this.progressActivitydate()
-            }
-            // 计算卡路里
-            const calorie = this.getCalorie(60, totalDistance); // 假设体重为60kg
-            let pace = 0
-            // if (this.data.title == '步行') {
-            //     pace = (totalDistance / (this.data.totalSeconds / 3600)) || 0;
-            //     pace = parseFloat(pace.toFixed(2));
-            // }else{
-
-            // }
-            if(this.data.totalSeconds&&totalDistance){
-                pace = ((this.data.totalSeconds / 60)/totalDistance) || 0;
-                pace = parseFloat(pace.toFixed(2));
-            }
-            // if (res.speed > 0) {
-            //     pace = parseFloat(Number((res.speed * 3.6).toFixed(2))); // 配速（km/h）
-            //     console.log(pace);
-            // }
-            console.log('总距离', totalDistance, '段距离', distance, '总卡路里', calorie, '配速', pace);
-            // 更新状态
-            this.setData({
-                pace,
-                distance: totalDistance,
-                calorie: calorie,
-                latitude: res.latitude,
-                longitude: res.longitude
-            });
-
-            // 打印更新后的经纬度（可选）
-            console.log('更新后的经纬度:', this.data.latitude, this.data.longitude);
-
-            // 调用回调函数（如果有提供的话）
-            if (callback) {
-                callback(res);
-            }
-        });
-
-    },
-    //位置变化
-    Getlocation2() {
-        // 获取当前位置信息
-        wx.getLocation({
-            type: 'gcj02',
-            success: (res) => {
-                const {
-                    latitude,
-                    longitude
-                } = res;
-                if (this.data.longitude == res.longitude && this.data.latitude == res.latitude) {
-                    console.log('位置没变');
-                } else {
-                    // 计算距离
-                    let distance = this.haversineDistance(this.data.longitude, this.data.latitude, res.longitude, res.latitude);
-
-                    // 更新总距离
-                    const totalDistance = parseFloat((Number(this.data.distance) + Number(distance)).toFixed(3));
-
-                    // 计算卡路里
-                    const calorie = this.getCalorie(60, totalDistance); // 假设体重为60kg
-
-                    const pace = parseFloat(Number((totalDistance / (this.data.totalSeconds / 3600)).toFixed(2))); // 配速（km/h）
-
-                    console.log('总距离', totalDistance, '段距离', distance, '总卡路里', calorie, '配速', pace);
-                    // 更新状态
-                    this.setData({
-                        pace,
-                        distance: totalDistance,
-                        calorie: calorie,
-                        latitude: res.latitude,
-                        longitude: res.longitude
-                    });
-                    console.log('更新经纬度:', latitude, longitude); // 添加日志
-                }
-
-            },
-            fail: (err) => {
-                console.error(err);
-                wx.showToast({
-                    title: '获取位置失败',
-                    icon: 'none'
-                });
+      }
+    } else { //未传递-显示当前类型（run/walk）所有未结束的运动
+      console.log('/未传递-显示当前类型所有未结束的运动')
+      let actDataCount
+      actDataCount = await query.count()
+      if (actDataCount <= 0 || !actDataCount) {
+        await this.creatActDateFun()
+        return
+      } else {
+        let sql = `SELECT act_d."objectId",act_d."startDate",act_d."createdAt",act."title",act_r."booking",act."endDate" AS act_end
+        FROM "ActivityData" act_d
+        LEFT JOIN "Activity" act ON act."objectId" = act_d."activity"
+        LEFT JOIN "ActivityRegister" act_r ON act_r."objectId" = act_d."actRegister" AND act_r."isDeleted" IS NOT TRUE
+        WHERE act_d."company"='${company}'
+        AND act_d."user"='${uid}'
+        AND act_d."status" NOT IN ('end')
+        AND act_d."type"='${type}'
+        AND act_d."isDeleted" IS NOT TRUE
+        ORDER BY act_d."startDate" DESC
+        LIMIT 20`
+        let actDataList = await request.customSQL(sql) || []
+        if (actDataList?.length <= 0 || !actDataList) {
+          await this.creatActDateFun()
+          return
+        } else {
+          console.log(actDataList)
+          let actDataList2 = actDataList?.map(item => {
+            let obj = item
+            if (item.startDate || item.createdAt) obj.sport_startDate = dateF.formatTime("YYYY.mm.dd HH:MM", item.startDate || item.createdAt)
+            if (item.booking?.from?.iso) obj.booking.fromDate = dateF.formatTime("YYYY.mm.dd HH:MM", item.booking.from.iso)
+            /**该运动是否可继续 */
+            let isAttend = false
+            let now = new Date()
+            if (item.act_end) {
+              let end = new Date(item.act_end)
+              isAttend = now < end
+              obj.actEndDate = dateF.formatTime("YYYY.mm.dd HH:MM", item.act_end)
+              console.log('end', end, isAttend)
             }
-        });
-    },
-    //计算两点距离
-    haversineDistance(longitude1, latitude1, longitude2, latitude2) {
-        let lat1 = latitude1
-        let lon1 = longitude1
-        let lat2 = latitude2
-        let lon2 = longitude2
-
-        function toRad(degree) {
-            return degree * Math.PI / 180;
-        }
-        const R = 6371e3; // 地球半径，单位为米
-        const φ1 = toRad(lat1);
-        const φ2 = toRad(lat2);
-        const Δφ = toRad(lat2 - lat1);
-        const Δλ = toRad(lon2 - lon1);
-
-        const a = Math.sin(Δφ / 2) * Math.sin(Δφ / 2) +
-            Math.cos(φ1) * Math.cos(φ2) *
-            Math.sin(Δλ / 2) * Math.sin(Δλ / 2);
-        const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
-
-        const distance = (R * c) / 1000; // 距离，单位为公里
-        console.log('计算出距离', distance);
-        return parseFloat(distance.toFixed(3));
-    },
-    //计算卡路里
-    getCalorie(weight, distance) {
-        weight = weight || 60 // 国人平均体重 60kg
-        const Calorie = weight * distance * 0.75
-        console.log('卡路里为', Calorie);
-        return parseFloat(Calorie.toFixed(2)); // 保留两位小数并转换为数字
-
-    },
-    //创建开始数据
-    async startdate() {
-        if (!this.data.iscontinue) {
-            const currentUser = Parse.User.current();
-            let Userquery = new Parse.Query('_User');
-            Userquery.equalTo('company', company);
-            Userquery.equalTo('objectId', currentUser.id);
-            Userquery.notEqualTo('isDeleted', true)
-            let user = await Userquery.first();
-
-            let companyPointer = Parse.Object.extend('Company').createWithoutData(company);
-            let query = new Parse.Object('ActivityRunLog');
-            query.set('user', user.toPointer())
-            query.set('company', companyPointer)
-            query.set('stage', 'start')
-            query.set('steps', 0) //步数
-            query.set('distance', 0) //距离
-            query.set('matchSpeed', 0) //配速
-            query.set('sportDate', 0) //运动时间
-            query.set('burnCalories', 0) //卡路里
-            try {
-                let saveDate2 = await query.save();
-                console.log(saveDate2);
-                const id = saveDate2.id
-                await this.startActivitdate(id)
-                console.log("创建开始数据");
-            } catch (error) {
-                console.error("保存数据时出现错误:", error);
+            if (item.booking?.to?.iso) {
+              let to = new Date(item.booking?.to?.iso)
+              isAttend = now < to
+              obj.booking.toDate = dateF.formatTime("YYYY.mm.dd HH:MM", item.booking.to.iso)
+              console.log('to', to, isAttend)
             }
+            obj.isAttend = isAttend
+            return obj
+          })
+          this.setData({
+            actDataList:actDataList2,
+            isShowActDataList:true,
+          })
+          console.log(actDataList2)
         }
-    },
-    //创建ActivityData数据
-    async startActivitdate(objectId) {
-        const currentUser = Parse.User.current();
-        let Userquery = new Parse.Query('_User');
-        Userquery.equalTo('company', company);
-        Userquery.equalTo('objectId', currentUser.id);
-        Userquery.notEqualTo('isDeleted', true)
-        let user = await Userquery.first();
-
-        let Activitdate = new Parse.Query('ActivityRunLog');
-        Activitdate.equalTo('objectId', objectId);
-        Activitdate.notEqualTo('isDeleted', true)
-        let Activit = await Activitdate.first();
-
-        let companyPointer = Parse.Object.extend('Company').createWithoutData(company);
-        let query = new Parse.Object('ActivityData');
-        query.set('user', user.toPointer())
-        query.set('company', companyPointer)
-        query.set('runlog', Activit.toPointer())
-        // if (this.data.title == '步行') {
-        //     query.set('type', 'walk')
-        // } else if (this.data.title == '跑步') {
-        //     query.set('type', 'run')
-        // } else {
-        //     query.set('type', 'activity')
-        // }
-        if (this.data.title) {
-            query.set('type', 'activity')
-        }
-        try {
-            let saveDate2 = await query.save();
-            this.setData({
-                activitdateid: saveDate2.id
+      }
+    }
+  },
+  /**关闭未结束运动弹框 */
+  closeActDataList() {
+    this.creatActDateFun()
+    this.setData({
+      isShowActDataList: false
+    })
+  },
+  /**点击未结束运动 */
+  async checkActEndDate(e) {
+    let {
+      actDataList,
+      type
+    } = this.data
+    console.log(e)
+    let {
+      index
+    } = e.currentTarget.dataset
+    let act_end_data_id = actDataList[index].objectId
+    let log_query = new Parse.Query('ActivityRunLog')
+    log_query.equalTo('company', company)
+    log_query.equalTo('user', uid)
+    log_query.equalTo('actData', act_end_data_id)
+    log_query.equalTo('type', type)
+    log_query.notEqualTo('isDeleted', true)
+    log_query.descending('createdAt')
+    let log = await log_query.first()
+    let that = this
+    console.log(actDataList[index])
+    if(actDataList[index].isAttend||!actDataList[index].title){
+      wx.showModal({
+        title: `${actDataList[index].title||'日常运动'}`,
+        content: `${actDataList[index].sport_startDate||'未知时间'}开始运动，已运动 ${log?.get('distance')||0} m, ${log?.get('steps')||0} 步，消耗 ${log?.get('burnCalories')||0} 千卡,是否继续进行？`,
+        success:async(res)=> {
+          if (res.confirm) {
+            console.log('用户点击确定')
+  
+            await that.assignmentFun(act_end_data_id)
+            that.setData({
+              isShowActDataList: false
             })
-            console.log("ActivityData数据", this.data.activitdate);
-        } catch (error) {
-            console.error("保存数据时出现错误:", error);
-        }
-    },
-    //创建过程数据
-    async progressdate() {
-        if (this.data.totalSeconds % 4 != 0) {
-            return
-        }
-        const currentUser = Parse.User.current();
-        let Userquery = new Parse.Query('_User');
-        Userquery.equalTo('company', company);
-        Userquery.equalTo('objectId', currentUser.id);
-        Userquery.notEqualTo('isDeleted', true)
-        let user = await Userquery.first();
-
-        let companyPointer = Parse.Object.extend('Company').createWithoutData(company);
-        let query = new Parse.Object('ActivityRunLog');
-        query.set('user', user.toPointer())
-        query.set('company', companyPointer)
-        query.set('stage', 'progress')
-        query.set('steps', this.data.defferentstep) //步数
-        query.set('distance', this.data.distance) //距离
-        query.set('matchSpeed', this.data.pace) //配速
-        query.set('sportDate', this.data.totalSeconds) //运动时间
-        query.set('burnCalories', this.data.calorie) //卡路里
-        try {
-            console.log('上传成功', this.data.defferentstep, this.data.distance, this.data.pace, this.data.totalSeconds, this.data.calorie);
-            let saveDate2 = await query.save();
-            console.log("新数据保存成功");
-        } catch (error) {
-            console.error("保存数据时出现错误:", error);
+          } else if (res.cancel) {
+            console.log('用户点击取消')
+          }
         }
-    },
-    //上传ActivityData过程数据
-    async progressActivitydate() {
-        if (this.data.totalSeconds % 4 != 0) {
-            return
-        }
-        let query = new Parse.Query('ActivityData');
-        query.equalTo('objectId', this.data.activitdateid);
-        query.notEqualTo('isDeleted', true)
-        let Activit = await query.first();
-        console.log('Activit', Activit);
-        if (Activit) {
-            Activit.set('steps', this.data.defferentstep) //步数
-            Activit.set('distance', this.data.distance) //距离
-            Activit.set('matchSpeed', this.data.pace) //配速
-            Activit.set('sportDate', this.data.totalSeconds) //运动时间
-            Activit.set('burnCalories', this.data.calorie) //卡路里
-            try {
-                let saveDate2 = await Activit.save();
-                console.log("ActivityData过程数据数据");
-            } catch (error) {
-                console.error("保存数据时出现错误:", error);
-            }
+      })
+    }else if(!actDataList[index].isAttend){
+      wx.showModal({
+        title: `${actDataList[index].title||'日常运动'}`,
+        content: `${actDataList[index].sport_startDate||'未知时间'}开始运动，已运动 ${log?.get('distance')||0} m, ${log?.get('steps')||0} 步，消耗 ${log?.get('burnCalories')||0} 千卡。当前报名记录已过期，可查看其他报名或其他活动。`,
+        showCancel:false,
+        confirmText:'结束运动',
+        success:async(res)=> {
+          if (res.confirm) {
+            await that.setEndActDateFun(act_end_data_id)
+            actDataList.splice(index,1)
+            that.setData({actDataList})
+            wx.showToast({
+              title: '已结束',
+              icon:'none'
+            })
+          }
         }
-
-    },
-    //创建结束数据
-    async enddate() {
-        const currentUser = Parse.User.current();
-        let Userquery = new Parse.Query('_User');
-        Userquery.equalTo('company', company);
-        Userquery.equalTo('objectId', currentUser.id);
-        Userquery.notEqualTo('isDeleted', true)
-        let user = await Userquery.first();
-
-        let companyPointer = Parse.Object.extend('Company').createWithoutData(company);
-        let query = new Parse.Object('ActivityRunLog');
-        query.set('user', user.toPointer())
-        query.set('company', companyPointer)
-        query.set('stage', 'end')
-        query.set('steps', this.data.defferentstep) //步数
-        query.set('distance', this.data.distance) //距离
-        query.set('matchSpeed', this.data.pace) //配速
-        query.set('sportDate', this.data.totalSeconds) //运动时间
-        query.set('burnCalories', this.data.calorie) //卡路里
-        try {
-            console.log('上传成功', this.data.defferentstep, this.data.distance, this.data.pace, this.data.totalSeconds, this.data.calorie);
-            let saveDate2 = await query.save();
-            console.log("新数据保存成功");
-        } catch (error) {
-            console.error("保存数据时出现错误:", error);
+      })
+    }
+ 
+  },
+  /**继续未结束运动 */
+  async goOnactEndDate() {
+    let {
+      checkActDataId
+    } = this.data
+    await this.assignmentFun(checkActDataId)
+    this.setData({
+      isShowActDataList: false
+    })
+  },
+
+
+  /**
+   * 新建运动数据
+   * @param {*} act_reg 活动报名记录 Parse.Object
+   */
+  async creatActDateFun(act_reg) {
+    let {
+      type
+    } = this.data
+    let ActivityData = Parse.Object.extend('ActivityData')
+    let actData = new ActivityData()
+    if (act_reg?.id && act_reg?.get('activity')?.id) {
+      actData.set('activity', {
+        __type: 'Pointer',
+        className: 'Activity',
+        objectId: act_reg?.get('activity')?.id
+      })
+      actData.set('actRegister', {
+        __type: 'Pointer',
+        className: 'ActivityRegister',
+        objectId: act_reg?.id
+      })
+    }
+    actData.set('company', {
+      __type: 'Pointer',
+      className: 'Company',
+      objectId: company
+    })
+    actData.set('user', {
+      __type: 'Pointer',
+      className: '_User',
+      objectId: uid
+    })
+    actData.set('type', type)
+    actData.set('startDate', new Date())
+    console.log('未查询出显示这个', actData)
+    await this.setData({
+      actData
+    })
+  },
+  /**
+   * 运动数据赋值操作
+   * @param {*} actDataId 运动数据id
+   */
+  async assignmentFun(actDataId) {
+    let {
+      type
+    } = this.data
+    let log_query = new Parse.Query('ActivityRunLog')
+    log_query.equalTo('company', company)
+    log_query.equalTo('user', uid)
+    log_query.equalTo('actData', actDataId)
+    log_query.equalTo('type', type)
+    log_query.notEqualTo('isDeleted', true)
+    log_query.descending('createdAt')
+    let log = await log_query.first()
+    let data_query = new Parse.Query('ActivityData')
+    let actData = await data_query.get(actDataId)
+    this.setData({actData})
+    this.setData({
+      stage: 'progress',
+      status: 'paused',
+      isRefershLaLo: true,
+      timer: log?.get('sportDate') || 0,
+      pace: log?.get('matchSpeed') || 0,
+      calorie: log?.get('burnCalories') || 0,
+      journey: log?.get('distance') || 0,
+      step: log?.get('steps' || 0),
+      formattedTime: this.formatTime(log?.get('sportDate') || 0),
+      
+    })
+  },
+  /**
+   * 结束运动
+   * @param {*} actDataId 运动数据id
+   */
+  async setEndActDateFun(actDataId) {
+    let {
+      type
+    } = this.data
+    let log_query = new Parse.Query('ActivityRunLog')
+    log_query.equalTo('company', company)
+    log_query.equalTo('user', uid)
+    log_query.equalTo('actData', actDataId)
+    log_query.equalTo('type', type)
+    log_query.notEqualTo('isDeleted', true)
+    log_query.descending('createdAt')
+    let log = await log_query.first()
+    let data_query = new Parse.Query('ActivityData')
+    let data = await data_query.get(actDataId)
+    log?.get('steps') && data.set('steps', log?.get('steps') || 0)
+    log?.get('distance') && data.set('distance', log?.get('distance') || 0)
+    log?.get('matchSpeed') && data.set('matchSpeed', log?.get('matchSpeed') || 0)
+    log?.get('sportDate') && data.set('sportDate', log?.get('sportDate') || 0)
+    log?.get('burnCalories') && data.set('burnCalories', log?.get('burnCalories') || 0)
+    data.set('endDate', log?.get('createdAt') || new Date())
+    data.set('status', 'end')
+    await data.save()
+    if (log?.id) {
+      log.set('stage', 'end')
+      await log.save()
+    }
+  },
+
+  /**监听页面退出事件 */
+  beforeUnload() {
+    wx.enableAlertBeforeUnload({ //获取不到"确认/取消"按钮事件
+      message: '未开始运动、暂停运动中以及运动结束请忽略本提示。若当前正在运动，退出本页面将在微信后台记录。关闭小程序、关闭小程序运行权限、长时间未进入小程序、手机退出微信等操作都将暂停记录。',
+    })
+  },
+
+  /**检查用户授权状况 */
+  examineAuthorization() {
+    let that = this
+    wx.getSetting({
+      success(res) {
+        console.log(res)
+        if (!res.authSetting['scope.userLocation'] || !res.authSetting['scope.userLocationBackground']) {
+          that.openPermissions()
+        } else {
+          that.closePermissions()
         }
-    },
-    //上传ActivityData结束数据
-    async endActivitydate() {
-        let query = new Parse.Query('ActivityData');
-        query.equalTo('objectId', this.data.activitdateid);
-        query.notEqualTo('isDeleted', true)
-        let Activit = await query.first();
-        if (Activit) {
-            Activit.set('steps', this.data.defferentstep) //步数
-            Activit.set('distance', this.data.distance) //距离
-            Activit.set('matchSpeed', this.data.pace) //配速
-            Activit.set('sportDate', this.data.totalSeconds) //运动时间
-            Activit.set('burnCalories', this.data.calorie) //卡路里
-            try {
-                let saveDate2 = await Activit.save();
-                console.log("ActivityData结束数据数据");
-            } catch (error) {
-                console.error("保存数据时出现错误:", error);
-            }
+      }
+    })
+  },
+  /**权限弹框-开 */
+  openPermissions() {
+    this.setData({
+      showPermissions: true
+    })
+  },
+  /**权限弹框-关 */
+  async closePermissions() {
+    await this.setData({
+      showPermissions: false
+    })
+    let {
+      type
+    } = this.data
+    let tip = '运动'
+    switch (type) {
+      case 'run':
+        tip = '跑步'
+        break;
+      case 'walk':
+        tip = '步行'
+        break;
+      default:
+        break;
+    }
+    wx.showToast({
+      title: `开启${tip}之旅吧~`,
+      icon: 'none'
+    })
+    this.refersh()
+  },
+  /**打开微信权限设置页面 */
+  openWxSetting() {
+    wx.openSetting({
+      success(res) {
+        console.log(res.authSetting)
+      },
+      fail(err) {
+        console.log(err)
+      }
+    })
+  },
+
+
+  async refersh() {
+    this.startSports()
+  },
+  /**刷新初始位置 */
+  startSports() {
+    let that = this
+    wx.getLocation({
+      type: 'gcj02',
+      success: async (res) => {
+        console.log(res)
+        let {
+          longitude,
+          latitude,
+        } = res
+        let markers = [{
+          iconPath: "https://file-cloud.fmode.cn/13WZ0W7u3l/20240724/7ebg0k104325941.png",
+          width: 20,
+          height: 20,
+          longitude: longitude,
+          latitude: latitude,
+          id: 0,
+        }]
+        await that.setData({
+          longitude,
+          latitude,
+          markers
+        })
+      },
+      fail: (err) => {
+        console.error(err);
+        wx.showToast({
+          title: '获取位置失败',
+          icon: 'none'
+        });
+      }
+    });
+  },
+
+  /**
+   * 位置监听开启
+   */
+  async setTime() {
+    await this.setData({
+      status: 'inSports',
+      isRefershLaLo: true,
+    })
+    let that = this
+    wx.offLocationChange()
+    setTimeout(() => {
+      that.monitorLocationChange()
+      console.log('执行经纬度获取')
+    }, 1000);
+  },
+  /**开始运动 */
+  async startInterval() {
+    await this.setData({
+      longitude: 0, //经度
+      latitude: 0, //纬度
+      markers: [], //地图标记点
+      journey: 0, //运动的路程-米
+      step: 0,
+      calorie: 0, //卡路里-千卡
+      pace: 0, //配速-min/km
+      interval: null, //计时器
+      timer: 0, //已记的时长-秒
+      formattedTime: '00:00:00', // 用于存储格式化后的时间
+      status: 'inSports', //运动中
+      stage: 'start',
+    })
+    //===================这里在getActivityData方法设置=====================
+    // let {
+    //   type,actData
+    // } = this.data
+    // if(!actData){
+    //   let ActivityData = Parse.Object.extend('ActivityData')
+    //   actData = new ActivityData()
+    //   actData.set('company', {
+    //     __type: 'Pointer',
+    //     className: 'Company',
+    //     objectId: company
+    //   })
+    //   actData.set('user', {
+    //     __type: 'Pointer',
+    //     className: '_User',
+    //     objectId: uid
+    //   })
+    //   actData.set('startDate', new Date())
+    //   actData.set('type', type)
+    // }
+    // this.setData({
+    //   actData
+    // })
+    setTimeout(() => {
+      this.setTime()
+    }, 1000);
+  },
+
+  /** 暂停运动*/
+  async pausedInterval() {
+    wx.offLocationChange()
+    this.setData({
+      status: 'paused',
+    })
+    let {
+      actData,
+      timer,
+      pace,
+      calorie,
+      journey,
+      step
+    } = this.data
+    console.log(actData)
+    actData.set('status', 'paused')
+    actData.set('distance', parseFloat(journey))
+    actData.set('steps', parseInt(step))
+    actData.set('sportDate', parseInt(timer))
+    actData.set('matchSpeed', parseFloat(pace))
+    actData.set('burnCalories', parseFloat(calorie))
+    await actData.save()
+    console.log('暂停')
+  },
+  /**继续运动 */
+  goOn() {
+    this.setTime()
+  },
+  /**长按结束-起 */
+  onStart() {
+    let endHaloStartDate = new Date()
+    this.setData({
+      endHaloStartDate
+    })
+    let {
+      endHaloInterval
+    } = this.data
+    endHaloInterval = setInterval(() => {
+      let now = new Date()
+      let elapsedTime = now - endHaloStartDate
+      let percentage = Math.min((elapsedTime / 4000) * 100, 100);
+      this.setData({
+        percentage: `conic-gradient(from 0deg, #015EEA ${percentage}%, white 0%)`,
+      });
+    }, 40);
+    this.setData({
+      endHaloInterval
+    })
+  },
+  /**长按结束-终 */
+  async onEnd() {
+    let {
+      endHaloStartDate,
+      endHaloInterval,
+      actData,
+    } = this.data
+    let endHaloEndDate = new Date()
+    let a = endHaloEndDate - endHaloStartDate
+    if (a >= 4000) { //长按4秒
+      clearInterval(endHaloInterval)
+      wx.offLocationChange()
+      wx.stopLocationUpdate({
+        success: (res) => {
+          console.log('后台定位已停止');
+        },
+        fail: (res) => {
+          console.error('停止后台定位失败', res);
         }
+      });
 
-    },
-    // 停止后台定位和位置监听
-    stopBackgroundLocation() {
-        wx.stopLocationUpdate({
-            success: (res) => {
-                console.log('后台定位已停止');
-            },
-            fail: (res) => {
-                console.error('停止后台定位失败', res);
-            }
+      await this.setData({
+        status: 'noStart',
+        endHaloStartDate: null,
+        endHaloStartDate: null,
+        percentage: '',
+        endHaloInterval: null,
+        stage: 'end'
+      })
+      await this.setActivityRunLog()
+      let {
+        actData,
+        timer,
+        pace,
+        calorie,
+        journey,
+        step
+      } = this.data
+      console.log(actData)
+      actData.set('status', 'end')
+      actData.set('endDate', new Date())
+      actData.set('distance', parseFloat(journey))
+      actData.set('sportDate', parseInt(timer))
+      actData.set('steps', parseInt(step))
+      actData.set('matchSpeed', parseFloat(pace))
+      actData.set('burnCalories', parseFloat(calorie))
+      await actData.save()
+      wx.showToast({
+        title: '已结束本次运动',
+        icon: 'none'
+      })
+    } else {
+      clearInterval(endHaloInterval)
+      this.setData({
+        endHaloStartDate: null,
+        endHaloStartDate: null,
+        percentage: '',
+        endHaloInterval: null,
+      })
+    }
+  },
+  /**监听位置变化 */
+  monitorLocationChange() {
+    let that = this
+    wx.startLocationUpdateBackground({
+      success: (res) => {
+        wx.onLocationChange(async (change_res) => {
+          console.log(change_res.longitude, change_res.latitude)
+          let {
+            longitude, //经度
+            latitude, //纬度
+            journey, //路程-m
+            calorie, //卡路里-千卡
+            pace, //配速-min/km
+            timer, //计时
+            isRefershLaLo,
+          } = that.data
+          timer = timer + 1 || 1
+          let formattedTime = that.formatTime(parseInt(timer))
+          if (isRefershLaLo) {
+            longitude = change_res.longitude
+            latitude = change_res.latitude
+            let {
+              actData
+            } = that.data
+            console.log(actData)
+            actData.set('status', 'inSports')
+            await actData.save()
+            that.setData({
+              isRefershLaLo: false,
+              actData
+            })
+          }
+          let distance = that.haversine(latitude, longitude, change_res.latitude, change_res.longitude)?.toFixed(2)
+          journey = (parseFloat(journey || 0) + parseFloat(distance || 0))?.toFixed(2)
+          calorie = that.getCalorie(50, journey) //体重50kg
+          pace = distance ? (distance * 6) / 100 : 0
+          let step = parseInt(parseInt(journey) / 0.6)
+          await that.setData({
+            formattedTime,
+            step,
+            timer,
+            journey,
+            longitude: change_res.longitude,
+            latitude: change_res.latitude,
+            calorie,
+            pace: parseFloat(pace)?.toFixed(2),
+          })
+          let time = timer % 5
+          if (time === 0) {
+            await that.setActivityRunLog()
+            that.setData({
+              stage: 'progress'
+            })
+            // console.log('执行保存数据')
+          }
         });
-        wx.offLocationChange(); // 停止监听位置变化
-    },
-
+      },
+      fail: (res) => {
+        this.openPermissions()
+      }
+    });
+  },
+
+  /**微信步数获取-弃用-使用0.6米/步 */
+  async getWeRun() {
+    wx.login({
+      success: (res) => {
+        console.log(res)
+        wx.request({
+          url: `https://api.weixin.qq.com/sns/jscode2session?appid=wxe6ecc0193c09696c&secret=0ee1172c8729c547d33f0ab45715d7ec&js_code=${res.code}&grant_type=authorization_code`,
+          method: 'GET',
+          success(res) {
+            console.log(res)
+            let session_key = res.data.session_key
+            wx.getWeRunData({
+              success: async (res) => {
+                console.log(res)
+                console.log(res.encryptedData)
+                console.log(res.iv)
+                wx.request({
+                  url: 'http://localhost:7337/api/o2o/wxrun',
+                  data: {
+                    app_id: 'wxe6ecc0193c09696c',
+                    session_key: session_key,
+                    encrypted_data: res.encryptedData,
+                    iv: res.iv
+                  },
+                  method: 'POST',
+                  success(res) {
+                    console.log(res)
+                  },
+                })
+              },
+              fail: (err) => {
+                console.log(err)
+              }
+            })
+          },
+        })
+      },
+    })
+
+  },
+
+
+  toRadians(degrees) {
+    return degrees * (Math.PI / 180);
+  },
+  /**
+   * 两点距离-米
+   * @param {*} lat1 纬1
+   * @param {*} lon1 经1
+   * @param {*} lat2 纬2
+   * @param {*} lon2 经2
+   */
+  haversine(lat1, lon1, lat2, lon2) {
+    const R = 6371000;
+    const φ1 = this.toRadians(parseFloat(lat1));
+    const φ2 = this.toRadians(parseFloat(lat2));
+    const Δφ = this.toRadians(parseFloat(lat2) - parseFloat(lat1));
+    const Δλ = this.toRadians(parseFloat(lon2) - parseFloat(lon1));
+    const a = Math.sin(Δφ / 2) * Math.sin(Δφ / 2) +
+      Math.cos(φ1) * Math.cos(φ2) *
+      Math.sin(Δλ / 2) * Math.sin(Δλ / 2);
+    const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+    const distance = R * c;
+    return distance;
+  },
+  /**
+   * 计算卡路里-千卡
+   * @param {*} weight 体重kg
+   * @param {*} distance 距离m
+   */
+  getCalorie(weight, distance) {
+    const caloriesBurned = weight * distance * 0.75;
+    return (caloriesBurned / 1000).toFixed(2);
+  },
+
+  /**记录运动过程-每5秒保存一次 */
+  async setActivityRunLog() {
+    let {
+      actData,
+      stage,
+      longitude, //经度
+      latitude, //纬度
+      journey, //运动的路程-米
+      step,
+      calorie, //卡路里-千卡
+      pace, //配速-min/km
+      timer, //已记的时长-秒
+      type, //步行/跑步
+    } = this.data
+    let ActivityRunLog = Parse.Object.extend('ActivityRunLog')
+    let log = new ActivityRunLog()
+
+    log.set('company', {
+      __type: 'Pointer',
+      className: 'Company',
+      objectId: company
+    })
+    log.set('user', {
+      __type: 'Pointer',
+      className: '_User',
+      objectId: uid
+    })
+    log.set('actData', {
+      __type: 'Pointer',
+      className: 'ActivityData',
+      objectId: actData?.id
+    })
+    log.set('stage', stage)
+    log.set('type', type)
+    log.set('sportDate', parseInt(timer) || 0)
+    log.set('burnCalories', parseFloat(calorie || '0'))
+    log.set('matchSpeed', parseFloat(pace || '0'))
+    log.set('distance', parseFloat(journey || '0'))
+    log.set('steps', step)
+    let location = new Parse.GeoPoint({
+      latitude: latitude,
+      longitude: longitude
+    });
+    log.set('location', location)
+    await log.save()
+  },
+
+  /**时间格式显示 */
+  formatTime: function (seconds) {
+    const hours = Math.floor(seconds / 3600);
+    const minutes = Math.floor((seconds % 3600) / 60);
+    const secs = seconds % 60;
+
+    // 格式化为两位数
+    const formattedHours = String(hours).padStart(2, '0');
+    const formattedMinutes = String(minutes).padStart(2, '0');
+    const formattedSeconds = String(secs).padStart(2, '0');
+
+    return `${formattedHours}:${formattedMinutes}:${formattedSeconds}`;
+  },
+
+
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    this.examineAuthorization()
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {},
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {},
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
 })

nova-werun/pages/home/sport/sport-start/index.json

@@ -1,6 +1,8 @@
 {
   "usingComponents": {
-    "van-dialog": "@vant/weapp/dialog/index"
+    "van-dialog": "@vant/weapp/dialog/index",
+    "van-popup": "@vant/weapp/popup/index",
+    "van-tag": "@vant/weapp/tag/index"
   },
   "requiredBackgroundModes": ["location"]
 }

nova-werun/pages/home/sport/sport-start/index.less

@@ -1,92 +1,102 @@
 /* nova-werun/pages/home/sport/sport-start/index.wxss */
-.all{
+.navbox {
     width: 100vw;
-    background: linear-gradient(to bottom, #4F9AF7, #FFFFFF); 
-    color: #015EEA;
-    .navbox{
-        width: 100vw;
+    display: flex;
+    align-items: flex-end;
+    background: #4F9AF7;
+
+    .nav {
+        width: 100%;
         display: flex;
-        align-items: flex-end;
-            .nav{
-                width: 100%;
-                display: flex;
-                justify-content: center;
-                position: relative;
-                margin-bottom: 30rpx;
-                height: 40rpx;
-                .nav-addbox{
-                    position: absolute;
-                    left: 0rpx;
-                    top: 8rpx;
-                    font-size: 28rpx;
-                    height: 40rpx;
-                    color: white;
-                    display: flex;
-                    .nav-add{
-                        margin-left: 4rpx;
-    
-                    }
-                }
-                .nav-title{
-                    height: 36rpx;
-                    font-family: MicrosoftYaHei;
-                    font-size: 36rpx;
-                    color: #333333;
-                    line-height: 40rpx;
-                    text-align: center;
-                    font-weight: 600;
-                }
+        justify-content: center;
+        position: relative;
+        margin-bottom: 30rpx;
+        height: 40rpx;
+
+        .nav-addbox {
+            position: absolute;
+            left: 0rpx;
+            top: 8rpx;
+            font-size: 28rpx;
+            height: 40rpx;
+            color: white;
+            display: flex;
+
+            .nav-add {
+                margin-left: 4rpx;
+
             }
         }
-    .map{
-        width: 100%;
-        height: 600rpx;
+
+        .nav-title {
+            height: 36rpx;
+            font-family: MicrosoftYaHei;
+            font-size: 36rpx;
+            color: #333333;
+            line-height: 40rpx;
+            text-align: center;
+            font-weight: 600;
+        }
+    }
+}
+
+
+.all {
+    width: 100vw;
+    background: linear-gradient(to bottom, #4F9AF7, #FFFFFF);
+    color: #015EEA;
+
+    .map {
+        width: 100vw;
+        height: 50vh;
     }
-    .numberbox{
+
+    .numberbox {
         width: 100%;
-        height: 780rpx;
         display: flex;
         align-items: center;
         flex-direction: column;
-        .distance{
+
+        .distance {
             display: flex;
             align-items: flex-end;
-            margin-top: 20rpx;
-            
-            .dis-num{
-                height: 132rpx;
-                font-size: 100rpx;
+
+            .dis-num {
+                font-size: 80rpx;
                 display: flex;
                 align-items: flex-end;
             }
-            .dis-text{
-                height: 132rpx;
-                font-size: 35rpx;
+
+            .dis-text {
+                font-size: 28rpx;
                 display: flex;
                 align-items: flex-end;
                 padding-bottom: 18rpx;
                 margin-left: 10rpx;
             }
         }
-        .number{
+
+        .number {
             width: 100%;
             height: 200rpx;
             display: flex;
             justify-content: space-between;
             margin-top: 30rpx;
-            .num{
+
+            .num {
                 height: 100%;
                 width: 255rpx;
                 display: flex;
                 flex-direction: column;
                 justify-content: center;
                 align-items: center;
-                
-                .num-num{
-                    font-size: 50rpx;
+
+                .num-num {
+                    font-size: 40rpx;
                     margin-bottom: 18rpx;
                 }
-                .num-text{
+
+                .num-text {
                     width: 100%;
                     display: flex;
                     justify-content: center;
@@ -96,70 +106,142 @@
             }
         }
     }
-    .btn{
-        width: 350rpx;
-        height: 320rpx;
+
+
+
+    .btnBox {
+        width: 90vw;
         display: flex;
-        justify-content: center;
-        align-items: center;
-        flex-direction: column;
-        .pause{
-            width: 200rpx;
-            height: 200rpx;
-            margin-top: 25rpx;
-        }
-        .btn-text{
-            font-size: 30rpx;
-            margin-top: 20rpx;
-        }
-        .btn-stop{
-            width: 200rpx;
-            height: 200rpx;
-            border-radius: 50%;
+        justify-content: space-around;
+
+        .btn {
             display: flex;
             justify-content: center;
             align-items: center;
-            .btn-stop1{
-                height: 180rpx;
-                width: 180rpx;
+            flex-direction: column;
+            margin: 0 20rpx;
+
+            .pause {
+                width: 130rpx;
+                height: 130rpx;
+                margin-top: 25rpx;
+            }
+
+            .btn-stop {
+                width: 130rpx;
+                height: 130rpx;
                 border-radius: 50%;
                 display: flex;
                 justify-content: center;
                 align-items: center;
-                border: #015EEA solid 2rpx;
-                z-index: 10;
-                background-color: white;
-                .btn-stop2{
-                    width: 60rpx;
-                    height: 60rpx;
-                    border-radius: 10rpx;
-                    background-color: #015EEA;
-                }   
+
+                .btn-stop1 {
+                    height: 120rpx;
+                    width: 120rpx;
+                    border-radius: 50%;
+                    display: flex;
+                    justify-content: center;
+                    align-items: center;
+                    border: #015EEA solid 2rpx;
+                    z-index: 10;
+                    background-color: white;
+
+                    .btn-stop2 {
+                        width: 50rpx;
+                        height: 50rpx;
+                        border-radius: 10rpx;
+                        background-color: #015EEA;
+                    }
+                }
+            }
+
+            .btn-text {
+                font-size: 30rpx;
+                margin-top: 15rpx;
             }
         }
+
+
     }
-    .stop{
-        width: 100%;
-        height: 320rpx;
+
+
+}
+
+
+.permissions {
+    width: 70vw;
+    height: 280rpx;
+    margin: 40rpx;
+    font-size: 30rpx;
+
+    button {
+        margin-top: 40rpx;
+        background: #4F9AF7;
+        color: white;
+        font-size: 30rpx;
+    }
+}
+
+.actData {
+    width: 80vw;
+    margin: 40rpx;
+
+    .title {
         display: flex;
-        justify-content: center;
-        .btn{
-            width: 300rpx;
-            height: 320rpx;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            flex-direction: column;
-            .pause{
-                width: 200rpx;
-                height: 200rpx;
-                margin-top: 25rpx;
+        justify-content: space-between;
+        padding-bottom: 10rpx;
+        border-bottom: rgb(194, 192, 192) solid 1rpx;
+
+        van-icon {
+            font-size: 50rpx;
+            color: gray;
+        }
+    }
+
+    .subtit {
+        color: rgb(194, 192, 192);
+        font-size: 25rpx;
+        // text-align: end;
+        margin-bottom: 10rpx;
+    }
+
+    .listBox {
+        max-height: 50vh;
+        overflow-y: auto;
+        padding: 20rpx;
+
+        .actDataItem {
+            font-size: 32rpx;
+            padding: 40rpx 20rpx 10rpx 20rpx;
+            border-bottom: 1rpx solid whitesmoke;
+
+            .startDate {
+                margin-top: 10rpx;
+                font-size: 28rpx;
+                color: rgb(201, 200, 200);
             }
-            .btn-text{
-                font-size: 30rpx;
-                margin-top: 20rpx;
+
+            .title2 {
+                display: flex;
+                justify-content: space-between;
+
+                .text {
+                    width: 80%;
+                }
+
+                .tag {
+                    height: 40rpx;
+                    font-size: 25rpx;
+                    padding: 3rpx 10rpx;
+                    border-radius: 5rpx;
+                }
             }
         }
     }
 
+    button {
+        background: #4F9AF7;
+        color: white;
+        font-size: 30rpx;
+    }
 }

nova-werun/pages/home/sport/sport-start/index.wxml

@@ -1,63 +1,119 @@
 <!--nova-werun/pages/home/sport/sport-start/index.wxml-->
-<view class="all" style="height: {{contentHeight}}rpx;">
-    <view class="navbox" style="height: {{navheight}}rpx;">
-        <view class="nav">
-            <!-- <view class="nav-title">{{title}}</view> -->
-            <view class="nav-title">运动开始</view>
-            <view class="nav-addbox" bindtap="goback">
-                <van-icon name="arrow-left" size='44rpx' color='white' />
-            </view>
-        </view>
+<!-- <view class="navbox" style="height: {{navheight}}px;">
+  <view class="nav">
+    <view class="nav-title">运动开始</view>
+    <view class="nav-addbox" bindtap="goback">
+      <van-icon name="arrow-left" size='44rpx' color='white' />
     </view>
-    <!-- 确认退出运动 -->
-    <van-dialog title="取消运动" message="确定要退出运动吗？" show="{{ show }}" show-cancel-button bind:close="onClose" bind:confirm='onConfirm'></van-dialog>
-    <!-- 是否继续运动 -->
-    <van-dialog title="继续运动" message="是否继续上次运动" show="{{ show2 }}" show-cancel-button bind:close="onClose2" bind:confirm='onConfirm2'></van-dialog>
-    <view class="map">
-        <map class="map" enable-zoom="ture" enable-scroll="ture" id="map" longitude="{{longitude}}" latitude="{{latitude}}" scale="18" markers="{{markers}}"></map>
+  </view>
+</view> -->
+<nav type="back" title="运动开始" background-color="{{'#4F9AF7'}}" front-color="{{'#333333'}}"></nav>
+
+<view class="all">
+  <view class="map">
+    <map style="width: 100% ;height: 100%;" enable-zoom="ture" enable-scroll="ture" id="map" longitude="{{longitude}}" latitude="{{latitude}}" scale="15" markers="{{markers}}"></map>
+  </view>
+  <view class="numberbox" style="height:calc( 40vh - {{navheight+'px'}} - 10px );">
+    <view class="distance">
+      <!-- <view class="dis-num">{{distance}}</view>
+      <view class="dis-text">公里</view> -->
+      <view class="dis-text">{{type=='run'?'跑步':'步行'}}：</view>
+      <view class="dis-num">{{journey||0}}</view>
+      <view class="dis-text">米</view>
+      <view class="dis-num">{{step}}</view>
+      <view class="dis-text">步</view>
     </view>
-    <view class="numberbox">
-        <view class="distance">
-            <view class="dis-num">{{distance}}</view>
-            <view class="dis-text">公里</view>
+    <view class="number">
+      <view class="num">
+        <view class="num-num">{{pace}}</view>
+        <view class="num-text">配速（min/km）</view>
+      </view>
+      <view class="num">
+        <view class="num-num">{{formattedTime}}</view>
+        <view class="num-text">时间</view>
+      </view>
+      <view class="num">
+        <view class="num-num">{{calorie}}</view>
+        <view class="num-text">千卡</view>
+      </view>
+    </view>
+
 
-            <view class="dis-num">{{defferentstep}}</view>
-            <view class="dis-text">步</view>
+
+    <view class="btnBox">
+      <!-- 未开始 -->
+      <block wx:if="{{status=='noStart'}}">
+        <view class="btn">
+          <image class="pause" src="https://file-cloud.fmode.cn/qpFbRRSZrO/20250103/gu1592024214365.png?imageView2/1/w/200/h/200" bindtap="startInterval"></image>
+          <view class="btn-text">开始</view>
         </view>
-        <view class="number">
-            <view class="num">
-                <view class="num-num">{{pace}}</view>
-                <!-- <view class="num-text" wx:if="{{title =='步行'}}">配速（h/km）</view> -->
-                <view class="num-text">配速（min/km）</view>
-            </view>
-            <view class="num">
-                <view class="num-num">{{formattedTime}}</view>
-                <view class="num-text">时间</view>
-            </view>
-            <view class="num">
-                <view class="num-num">{{calorie}}</view>
-                <view class="num-text">千卡</view>
-            </view>
+      </block>
+      <!-- 运动中 -->
+      <block wx:if="{{status=='inSports'}}">
+        <view class="btn">
+          <image class="pause" src="https://file-cloud.fmode.cn/qpFbRRSZrO/20250103/ot1nko024129224.png?imageView2/1/w/200/h/200" bindtap="pausedInterval"></image>
+          <view class="btn-text">暂停</view>
         </view>
-        <view class="btn" wx:if="{{!isstop}}">
-            <image class="pause" src="https://file-cloud.fmode.cn/qpFbRRSZrO/20250103/ot1nko024129224.png?imageView2/1/w/200/h/200" bindtap="stop"></image>
-            <view class="btn-text">暂停</view>
+      </block>
+      <!-- 暂停中 -->
+      <block wx:if="{{status=='paused'}}">
+        <view class="btn">
+          <image class="pause" src="https://file-cloud.fmode.cn/qpFbRRSZrO/20250103/gu1592024214365.png?imageView2/1/w/200/h/200" bindtap="goOn"></image>
+          <view class="btn-text">继续</view>
         </view>
-        <view class="stop" wx:if="{{isstop}}">
-            <view class="btn">
-                <image class="pause" src="https://file-cloud.fmode.cn/qpFbRRSZrO/20250103/gu1592024214365.png?imageView2/1/w/200/h/200" bindtap="continue"></image>
-                <view class="btn-text">继续</view>
-            </view>
-            <view class="btn">
-                <view class="btn-stop" style="background:{{percentage}}" bindlongpress="startIncrease" bindtouchend="stopIncrease">
-                    <view class="btn-stop1">
-                        <view class="btn-stop2"></view>
-                    </view>
-                </view>
-                <view class="btn-text">长按结束</view>
+        <view class="btn">
+          <view class="btn-stop" style="background:{{percentage}}" bindtouchstart="onStart" bindtouchend="onEnd">
+            <view class="btn-stop1">
+              <view class="btn-stop2"></view>
             </view>
+          </view>
+          <view class="btn-text">长按结束</view>
         </view>
+      </block>
+    </view>
+  </view>
+</view>
+
 
+<van-popup round show="{{ showPermissions }}">
+  <view class="permissions">
+    为正常记录运动状态，请授予本小程序位置、后台运行权限。 设置 -> 位置消息 -> 使用小程序期间和离开小程序后。
+    <button bind:tap="openWxSetting">前往设置</button>
+  </view>
+</van-popup>
 
+<van-popup round show="{{ isShowActDataList }}">
+  <view class="actData">
+    <view class="title">
+      <text>未结束运动</text>
+      <van-icon bind:tap="closeActDataList" name="cross" />
     </view>
-</view>
+    <!-- <view class="subtit">显示前20条未结束运动</view> -->
+    <view class="listBox">
+      <block wx:for="{{actDataList}}" wx:key="index">
+        <view class="actDataItem" data-index="{{index}}" bind:tap="checkActEndDate">
+          <view class="title2">
+            <view class="text">
+              {{item.title||'日常运动'}}
+              <van-icon wx:if="{{item.title}}" color="#4F9AF7" name="medal-o" />
+              <text class="startDate" style="color: gray;">{{item.sport_startDate}}</text>
+            </view>
+            <block wx:if="{{item.isAttend||!item.title}}">
+              <view class="tag" style="background:#4F9AF7;color: white;">暂停中</view>
+            </block>
+            <block wx:else>
+              <view class="tag" style="background:rgb(201, 200, 200);color: white;">已结束</view>
+            </block>
+          </view>
+          <block wx:if="{{item.title}}">
+            <view class="startDate">到期时间：{{item.booking.toDate}}</view>
+          </block>
+
+        </view>
+
+      </block>
+    </view>
+
+    <button>全部结束</button>
+  </view>
+</van-popup>

nova-werun/pages/index/index.js

@@ -110,24 +110,16 @@ Page({
     }
     switch (active) {
       case 0:
-        // componentPage.refresh()
+        componentPage.refersh()
         break;
       case 1:
-        // componentPage.setData({
-        //   scate: []
-        // })
-        // componentPage.getcircle()
+   
         break;
       case 2:
-        componentPage.setData({
-          allCheck: false,
-          cartList: [],
-          totalPrice: 0.00,
-        })
-        componentPage.getShopcart()
+       
         break;
       case 3:
-        componentPage.refresh()
+        
         break;
     }
   },

nova-werun/pages/index/index.wxml

@@ -11,7 +11,7 @@
 </view>
 
 <template name="nova-home">
-	<home id="comp{{id}}" />
+	<home id="comp0" />
 </template>
 <template name="nova-circle">
 	<!-- <cart id="comp{{id}}" take="{{takeAddress}}" give="giveAddress" /> -->
@@ -19,7 +19,6 @@
 </template>
 <template name="nova-my">
 	<my id="comp{{id}}" />
-	
 </template>
 <!-- 底部导航 -->
 <van-tabbar

nova-werun/service/getSportData.js

@@ -0,0 +1,182 @@
+const Parse = getApp().Parse;
+const company = getApp().globalData.company;
+const uid = Parse.User.current()?.id
+let request = require('../../utils/request')
+const dateF = require('../../utils/date')
+
+/**
+ * 计算运动累加状况-页面使用
+ * @param {*} column 累加字段
+ */
+async function getwalk(column) {
+  let typeList = ['walk', 'run']
+  let distance = 0
+  for (let i in typeList) {
+    let type = typeList[i]
+    let d = await getData(column, type) || 0
+    console.log(d)
+    distance = distance + d
+  }
+  return distance < 0 ? 0 : distance
+}
+
+
+/**
+ * 计算运动累加状况-getwalk使用
+ * @param {*} column 累加字段 (未知则'distance')
+ * @param {*} type 运动类型 walk/run(未知则不限制)
+ */
+async function getData(column, type) {
+  let todate = new Date(new Date().setHours(0, 0, 0, 0))
+  let tomorrow = new Date(new Date(todate).setDate(todate.getDate() + 1))
+  let todaySql = dateF.formatTime(`YYYY-mm-dd HH:MM:SS`, todate)
+  let yestodaySql = dateF.formatTime(`YYYY-mm-dd HH:MM:SS`, tomorrow)
+
+  let sql = `SELECT SUM(t1."num")- SUM(t1."ago_num") AS "sum"
+  FROM(SELECT MAX(al."${column||'distance'}") AS "num" ,al."actData",(
+   SELECT MAX(al2."${column||'distance'}")
+    FROM "ActivityRunLog" al2
+    WHERE al2."actData"=al."actData"
+    AND al2."isDeleted" IS NOT TRUE
+    ${type?`AND al2."type"='${type}'`:''} 
+    AND al2."createdAt" < '${todaySql}'
+    AND al2."isDeleted" IS NOT TRUE
+  )AS "ago_num"
+  FROM "ActivityRunLog" al
+  LEFT JOIN "ActivityData" ad ON ad."objectId"=al."actData"
+  WHERE al."isDeleted" IS NOT TRUE
+  AND al."createdAt" > '${todaySql}'
+  AND al."createdAt" < '${yestodaySql}'
+  AND al."company"='${company}'
+  AND al."user"='${uid}'
+  ${type?`AND al."type"='${type}'`:''}
+  AND al."isDeleted" IS NOT TRUE
+  AND ad."isDeleted" IS NOT TRUE
+  ${type?`AND ad."type"='${type}'`:''} 
+  GROUP BY al."actData")t1`
+  // console.log(sql)
+  let data = await request.customSQL(sql)
+  // console.log(data)
+  return data[0].sum || 0
+}
+
+
+/**查看活动运动数据（当前活动对应运动是否结束） */
+async function getActSport(actId) {
+  let actQuery = new Parse.Query('Activity')
+  let act = await actQuery.get(actId)
+  if (act?.get('endDate')) {
+
+  }
+}
+/**对于活动超时未结束的运动，设置stage为end */
+async function setEndSport(actId) {
+  let regQuery = new Parse.Query('ActivityRegister')
+  regQuery.equalTo('company', company)
+  regQuery.equalTo('user', uid)
+  regQuery.notEqualTo('isDeleted', true)
+  regQuery.equalTo('activity', actId)
+  regQuery.select('booking')
+  let reg = await regQuery.find()
+  let overtimeReg = reg?.filter(item => {
+    let now = new Date()
+    let endTime = item?.get('booking')?.to
+    if (!endTime) return true
+    return now >= endTime
+  })?.map(item => item?.id)
+  console.log(overtimeReg)
+  if (overtimeReg?.length <= 0) return
+  let actQuery = new Parse.Query('ActivityData')
+  actQuery.equalTo('company', company)
+  actQuery.equalTo('user', uid)
+  actQuery.notEqualTo('isDeleted', true)
+  actQuery.containedIn('activity', overtimeReg)
+  actQuery.select('objectId')
+  let actData = await actQuery.find()
+  for (let i in actData) {
+    let act = actData[i]
+    //获取最后一条运动过程记录
+    let logQuery = new Parse.Query('ActivityRunLog')
+    logQuery.equalTo('company', company)
+    logQuery.equalTo('user', uid)
+    logQuery.notEqualTo('isDeleted', true)
+    logQuery.equalTo('actData', act?.id)
+    logQuery.descending('createdAt')
+    let endLog = await logQuery.first()
+    endLog.set('stage', 'end')
+    await endLog.save()
+    act.set('steps', endLog?.get('steps') || 0)
+    act.set('distance', endLog?.get('distance') || 0)
+    act.set('matchSpeed', endLog?.get('matchSpeed') || 0)
+    act.set('sportDate', endLog?.get('sportDate') || 0)
+    act.set('burnCalories', endLog?.get('burnCalories') || 0)
+    act.set('status', 'end')
+    act.set('endDate', new Date())
+    await act.save()
+  }
+}
+
+/**
+ * 获取排行榜
+ * @param {*} type 运动类型
+ * @param {*} fromto 时间范围 today/toweek/tomonth/空
+ * @param {*} limit 默认20
+ * @param {*} skip 默认0
+ * @param {*} order 默认 DESC
+ */
+async function getRanking(type, fromto, limit, skip,order) {
+  let fromtoSql = ``
+  switch (fromto) {
+    case 'today':
+      let todate = new Date(new Date().setHours(0, 0, 0, 0))
+      let tomorrow = new Date(new Date(todate).setDate(todate.getDate() + 1))
+      let todaySql = dateF.formatTime(`YYYY-mm-dd HH:MM:SS`, todate)
+      let yestodaySql = dateF.formatTime(`YYYY-mm-dd HH:MM:SS`, tomorrow)
+      fromtoSql = `AND ad."endDate" >= '${todaySql}' AND ad."endDate" < '${yestodaySql}'`
+      break;
+    case 'toweek':
+      const today = new Date();
+      const dayOfWeek = today.getDay();
+      const thisSun = new Date(today);
+      thisSun.setDate(today.getDate() + (0 - dayOfWeek));
+      thisSun.setHours(0, 0, 0, 0);
+      const nextSun = new Date(thisSun);
+      nextSun.setDate(thisSun.getDate() + 7);
+      let thisSunSql = dateF.formatTime(`YYYY-mm-dd HH:MM:SS`, thisSun)
+      let nextSunSql = dateF.formatTime(`YYYY-mm-dd HH:MM:SS`, nextSun)
+      fromtoSql = `AND ad."endDate" >= '${thisSunSql}' AND ad."endDate" < '${nextSunSql}'`
+      break;
+    case 'tomonth':
+      const now = new Date();
+      const toMon = new Date(now.getFullYear(), now.getMonth(), 1, 0, 0, 0);
+      const nextMon = new Date(now.getFullYear(), now.getMonth() + 1, 1, 0, 0, 0);
+      let toMonSql = dateF.formatTime(`YYYY-mm-dd HH:MM:SS`, toMon)
+      let nextMonSql = dateF.formatTime(`YYYY-mm-dd HH:MM:SS`, nextMon)
+      fromtoSql = `AND ad."endDate" >= '${toMonSql}' AND ad."endDate" < '${nextMonSql}'`
+      break;
+    default:
+      break;
+  }
+  let sql = `SELECT SUM(ad."steps") AS "totalSteps",SUM(ad."distance") AS "distance",SUM(ad."burnCalories") AS "burnCalories",SUM(ad."sportDate") AS "sportDate",ad."user",u."nickname",u."avatar"
+  FROM "ActivityData" ad
+  LEFT JOIN "_User" u ON u."objectId"=ad."user"
+  WHERE ad."company"='${company}'
+  AND ad."isDeleted" IS NOT TRUE
+  AND ad."status" = 'end'
+  ${type?`AND ad."type" = '${type}'`:''}
+  ${fromtoSql}
+  GROUP BY ad."user",u."nickname",u."avatar"
+  ORDER BY SUM(ad."steps") ${order||'DESC'}
+  LIMIT ${limit||20} OFFSET ${skip||0}`
+  // console.log(sql)
+  let data = await request.customSQL(sql)
+  // console.log(data)
+  return data
+}
+
+
+module.exports = {
+  getwalk,
+  setEndSport,
+  getRanking
+};

project.config.json

@@ -1,60 +1,60 @@
 {
-    "description": "项目配置文件",
-    "packOptions": {
-        "ignore": [
-            {
-                "value": "package-lock.json",
-                "type": "file"
-            }
-        ],
-        "include": []
+  "description": "项目配置文件",
+  "packOptions": {
+    "ignore": [
+      {
+        "value": "package-lock.json",
+        "type": "file"
+      }
+    ],
+    "include": []
+  },
+  "setting": {
+    "urlCheck": true,
+    "es6": true,
+    "enhance": true,
+    "postcss": true,
+    "preloadBackgroundData": false,
+    "minified": true,
+    "newFeature": false,
+    "coverView": true,
+    "nodeModules": false,
+    "autoAudits": false,
+    "showShadowRootInWxmlPanel": true,
+    "scopeDataCheck": false,
+    "uglifyFileName": false,
+    "checkInvalidKey": true,
+    "checkSiteMap": true,
+    "uploadWithSourceMap": true,
+    "compileHotReLoad": false,
+    "lazyloadPlaceholderEnable": false,
+    "useMultiFrameRuntime": true,
+    "useApiHook": true,
+    "useApiHostProcess": false,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
     },
-    "setting": {
-        "urlCheck": true,
-        "es6": true,
-        "enhance": true,
-        "postcss": true,
-        "preloadBackgroundData": false,
-        "minified": true,
-        "newFeature": false,
-        "coverView": true,
-        "nodeModules": false,
-        "autoAudits": false,
-        "showShadowRootInWxmlPanel": true,
-        "scopeDataCheck": false,
-        "uglifyFileName": false,
-        "checkInvalidKey": true,
-        "checkSiteMap": true,
-        "uploadWithSourceMap": true,
-        "compileHotReLoad": false,
-        "lazyloadPlaceholderEnable": false,
-        "useMultiFrameRuntime": true,
-        "useApiHook": true,
-        "useApiHostProcess": false,
-        "babelSetting": {
-            "ignore": [],
-            "disablePlugins": [],
-            "outputPath": ""
-        },
-        "enableEngineNative": false,
-        "useIsolateContext": false,
-        "userConfirmedBundleSwitch": false,
-        "packNpmManually": false,
-        "packNpmRelationList": [],
-        "minifyWXSS": true,
-        "disableUseStrict": false,
-        "minifyWXML": true,
-        "showES6CompileOption": false,
-        "useCompilerPlugins": false
-    },
-    "compileType": "miniprogram",
-    "libVersion": "2.27.3",
-    "appid": "wxe6ecc0193c09696c",
-    "projectname": "nova-wapp",
-    "cloudfunctionTemplateRoot": "",
-    "editorSetting": {
-        "tabIndent": "insertSpaces",
-        "tabSize": 2
-    },
-    "condition": {}
+    "enableEngineNative": false,
+    "useIsolateContext": false,
+    "userConfirmedBundleSwitch": false,
+    "packNpmManually": false,
+    "packNpmRelationList": [],
+    "minifyWXSS": true,
+    "disableUseStrict": false,
+    "minifyWXML": true,
+    "showES6CompileOption": false,
+    "useCompilerPlugins": false
+  },
+  "compileType": "miniprogram",
+  "libVersion": "2.27.3",
+  "appid": "wxe6ecc0193c09696c",
+  "projectname": "nova-wapp",
+  "cloudfunctionTemplateRoot": "",
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
+  },
+  "condition": {}
 }

project.private.config.json

@@ -1,100 +1,32 @@
 {
-    "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-    "setting": {
-        "compileHotReLoad": false,
-        "urlCheck": true,
-        "preloadBackgroundData": false
-    },
-    "game": {
-        "list": []
-    },
-    "gamePlugin": {
-        "list": []
-    },
+  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "setting": {
+    "compileHotReLoad": false,
+    "urlCheck": false,
+    "preloadBackgroundData": false
+  },
+  "game": {
+    "list": []
+  },
+  "gamePlugin": {
+    "list": []
+  },
+  "miniprogram": {
+    "list": []
+  },
+  "libVersion": "2.27.3",
+  "projectname": "nova-wapp",
+  "condition": {
     "miniprogram": {
-        "list": []
-    },
-    "libVersion": "2.27.3",
-    "projectname": "nova-wapp",
-    "condition": {
-        "plugin": {
-            "list": []
-        },
-        "game": {
-            "list": []
-        },
-        "gamePlugin": {
-            "list": []
-        },
-        "miniprogram": {
-            "list": [
-                {
-                    "name": "发送朋友圈",
-                    "pathName": "nova-werun/pages/circle/send-circle/index",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "打卡签到",
-                    "pathName": "nova-werun/pages/home/signin/index",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "排行榜",
-                    "pathName": "nova-werun/pages/home/ranking/index",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "分享",
-                    "pathName": "nova-werun/pages/home/share/index",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "我的勋章",
-                    "pathName": "nova-werun/pages/home/medal/index",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "运动",
-                    "pathName": "nova-werun/pages/home/sport/sport-home/index",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "运动开始",
-                    "pathName": "nova-werun/pages/home/sport/sport-start/index",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "我的统计",
-                    "pathName": "nova-werun/pages/home/statistics/index",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "完善资料",
-                    "pathName": "nova-werun/pages/my/my-profile/index",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "目标步数",
-                    "pathName": "nova-werun/pages/home/step/index",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "全部活动",
-                    "pathName": "nova-werun/pages/activity/index",
-                    "query": "",
-                    "scene": null
-                }
-            ]
+      "list": [
+        {
+          "name": "nova-werun/pages/home/statistics/index",
+          "pathName": "nova-werun/pages/home/statistics/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
         }
+      ]
     }
+  }
 }