u

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

@@ -255,7 +255,7 @@
         }
         .button{
             position: absolute; /* 设置为绝对定位 */
-            bottom: 18rpx; /* 距离底部10rpx */
+            // bottom: 18rpx; /* 距离底部10rpx */
             right: 10rpx; /* 距离右侧10rpx */
             width: 100rpx;
             height: 50rpx;
@@ -271,7 +271,7 @@
         }
         .button2{
             position: absolute; /* 设置为绝对定位 */
-            bottom: 18rpx; /* 距离底部10rpx */
+            // bottom: 18rpx; /* 距离底部10rpx */
             right: 10rpx; /* 距离右侧10rpx */
             width: 100rpx;
             height: 50rpx;
@@ -682,7 +682,7 @@
         }
         .button{
             position: absolute; /* 设置为绝对定位 */
-            bottom: 18rpx; /* 距离底部10rpx */
+            // bottom: 18rpx; /* 距离底部10rpx */
             right: 10rpx; /* 距离右侧10rpx */
             width: 100rpx;
             height: 50rpx;
@@ -698,7 +698,7 @@
         }
         .button2{
             position: absolute; /* 设置为绝对定位 */
-            bottom: 18rpx; /* 距离底部10rpx */
+            // bottom: 18rpx; /* 距离底部10rpx */
             right: 10rpx; /* 距离右侧10rpx */
             width: 100rpx;
             height: 50rpx;

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

@@ -86,7 +86,7 @@
         <!-- <view class="point" bindtap="showgood"> ·· </view> -->
         <van-popup show="{{ show }}" position="bottom" custom-style="height: {{bottomNavHeight+textareaHeight+70}}rpx;" bind:close="onClose" overlay-style='background-color: rgba(255, 255, 255, 0); ' custom-style='background-color: #efefef;'>
 
-            <view class='sending' style="height: {{textareaHeight+40}}rpx;">
+            <view class='sending' style="height: {{textareaHeight+140}}rpx;">
                 <textarea placeholder="{{commenttext}}" class="textarea" style="height: {{textareaHeight}}rpx;" bindinput="onInput" value="{{inputValue}}"></textarea>
                 <view class="button2" wx:if="{{!inputValue}}">发送</view>
                 <view class="button" wx:if="{{inputValue}}" bindtap="sendComment">发送</view>
@@ -234,13 +234,11 @@
         <!-- 输入框 -->
         <!-- <view class="point" bindtap="showgood"> ·· </view> -->
         <van-popup show="{{ show }}" position="bottom" custom-style="height: {{bottomNavHeight+textareaHeight+70}}rpx;" bind:close="onClose" overlay-style='background-color: rgba(255, 255, 255, 0); ' custom-style='background-color: #efefef;'>
-
-            <view class='sending' style="height: {{textareaHeight+40}}rpx;">
+            <view class='sending' style="height: {{textareaHeight+140}}rpx;">
                 <textarea placeholder="{{commenttext}}" class="textarea" style="height: {{textareaHeight}}rpx;" bindinput="onInput" value="{{inputValue}}"></textarea>
                 <view class="button2" wx:if="{{!inputValue}}">发送</view>
                 <view class="button" wx:if="{{inputValue}}" bindtap="sendComment">发送</view>
             </view>
-
         </van-popup>
     </view>
     <!-- 点赞人 -->

nova-werun/components/home/index.js

@@ -92,7 +92,8 @@ Component({
     //正序
     rank: 'DESC',
     meContinuousChick: 0, //当前用户连续打卡数
-    sportTotal:0,//当前用户累计运动
+    sportTotal: 0, //当前用户累计运动
+    notice: '', //公告
   },
   lifetimes: {
 
@@ -132,15 +133,26 @@ Component({
    */
   methods: {
     async refersh() {
-      
+
       await this.gettarget()
       this.order()
       this.gettoday()
       this.getMeChick()
-      let sportTotal =await getSportData.getChickCount(uid,'ActivityData')
-      this.setData({sportTotal})
+      let sportTotal = await getSportData.getChickCount(uid, 'ActivityData')
+      this.setData({
+        sportTotal
+      })
+      this.getNotice()
+    },
+    async getNotice() {
+      let query = new Parse.Query('Notice');
+      query.equalTo('company', company);
+      query.notEqualTo('isDeleted', true)
+      let n = await query.first();
+      this.setData({
+        notice: n?.get('content') || '欢迎加入儒乐湖健身~'
+      })
     },
-
     /**当前用户连续打卡数 */
     async getMeChick() {
       let meContinuousChick = await getSportData.getContinuousCount(uid, 'ActivityData') || 0

nova-werun/components/home/index.wxml

@@ -46,13 +46,13 @@
               <view class="obj1-numbox-tex">{{meContinuousChick}}天</view>
             </view>
           </view>
-          <view class="obj2">积累打卡7天，超过20%人</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>
 
-    <van-notice-bar color="#1989fa" color='#000' background="#ecf9ff" background="#fff" left-icon="volume-o" custom-class='a' text="在微信开发者工具中进行测试，确保定位和轨迹绘制的准确性。完成测试后，提交审核并发布小程序。通过以上步骤，您就可以在微信小程序中使用高德地图实现实时运动轨迹的功能。" />
+    <van-notice-bar color="#1989fa" color='#000' background="#ecf9ff" background="#fff" left-icon="volume-o" custom-class='a' text="{{notice||'欢迎加入儒乐湖健身~'}}" />
     <!-- 类型 -->
     <view class="typebox">
       <view class="column" wx:for="{{rows}}" wx:key="index" data-url="{{item.url}}" bindtap="gourl" data-active="{{item.active}}">
@@ -82,10 +82,10 @@
           <view class="paiming" wx:if="{{index>=3}}">{{index+1}}</view>
           <image class="avarter" src="{{item.avatar}}"></image>
           <view class="name">
-            {{item.nickname}}
+            {{item.nickname||'微信用户'}}
             <view class="name2">已打卡{{item.count||0}}天</view>
           </view>
-          <view class="num">{{item.totalSteps}}</view>
+          <view class="num">{{item.totalSteps||0}}</view>
         </view>
       </block>
       <block wx:if="{{todayList.length<=0}}">

nova-werun/components/my/index.js

@@ -6,299 +6,299 @@ const uid = Parse?.User?.current()?.id
 let getSportData = require('../../service/getSportData')
 
 Component({
-    /**
-     * 组件的属性列表
-     */
-    properties: {
+  /**
+   * 组件的属性列表
+   */
+  properties: {
 
-    },
+  },
 
-    /**
-     * 组件的初始数据
-     */
-    data: {
-        //屏幕高度
-        statusBarHeight: 0, // 状态栏高度
-        screenHeight: 0, // 屏幕高度
-        customHeight: 0, // 自定义导航栏高度（如小程序右上角胶囊按钮）
-        bottomNavHeight: 0, // 底部导航栏高度
-        contentHeight: 0, // 可用内容高度
-        contentpadding: 0, //顶部padding高度
-        navheight: 0,
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    //屏幕高度
+    statusBarHeight: 0, // 状态栏高度
+    screenHeight: 0, // 屏幕高度
+    customHeight: 0, // 自定义导航栏高度（如小程序右上角胶囊按钮）
+    bottomNavHeight: 0, // 底部导航栏高度
+    contentHeight: 0, // 可用内容高度
+    contentpadding: 0, //顶部padding高度
+    navheight: 0,
 
-        circlecount: 0,
-        likesCount: 0,
-        User1List: [],
-        profile1List2: [],
-        meChick:0,//当前用户累计签到天数
-    },
-    lifetimes: {
+    circlecount: 0,
+    likesCount: 0,
+    User1List: [],
+    profile1List2: [],
+    meChick: 0, //当前用户累计签到天数
+  },
+  lifetimes: {
 
-        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;
+    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;
 
-            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.getcircle()
-            this.getname()
-        },
+      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.getcircle()
+      this.getname()
+      this.getMeChick()
     },
+  },
 
-    /**
-     * 组件的方法列表
-     */
-    methods: {
-      /**获取累计签到天数 */
-      async getMeChick() {
-        let meChick = await getSportData.getChickCount(uid, 'ActivityData')||0
-        this.setData({
-          meChick
-        })
-      },
-        gourl(e) {
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    /**获取中部数据 */
+    async getMeChick() {
+      let meChick = await getSportData.getChickCount(uid, 'EventLog') || 0
+      this.setData({
+        meChick
+      })
+    },
+    gourl(e) {
+      const url = e.currentTarget.dataset.url
+      wx.navigateTo({
+        url: `${url}` // 目标页面的路径
+      });
+    },
+    gourl2(e) {
+      const type = e.currentTarget.dataset.type
+      const url = e.currentTarget.dataset.url
+      wx.navigateTo({
+        url: `${url}?type=` + type // 目标页面的路径
+      });
+    },
+    //查全部朋友圈
+    // async getcircle() {
+    //     const currentUser = Parse.User.current();
+    //     let Profilequery2 = new Parse.Query('Profile');
+    //     Profilequery2.equalTo('company', company);
+    //     Profilequery2.equalTo('user', currentUser.id);
+    //     Profilequery2.equalTo('isCheck', true);
+    //     Profilequery2.notEqualTo('isDeleted', true)
+    //     let P2 = await Profilequery2.find();
+    //     let profile1List2 = P2.map(item => item.toJSON());
 
-            const url = e.currentTarget.dataset.url
-            wx.navigateTo({
-                url: `${url}` // 目标页面的路径
-            });
-        },
-        gourl2(e) {
-            const type = e.currentTarget.dataset.type
-            const url = e.currentTarget.dataset.url
-            wx.navigateTo({
-                url: `${url}?type=` + type // 目标页面的路径
-            });
-        },
-        //查全部朋友圈
-        // async getcircle() {
-        //     const currentUser = Parse.User.current();
-        //     let Profilequery2 = new Parse.Query('Profile');
-        //     Profilequery2.equalTo('company', company);
-        //     Profilequery2.equalTo('user', currentUser.id);
-        //     Profilequery2.equalTo('isCheck', true);
-        //     Profilequery2.notEqualTo('isDeleted', true)
-        //     let P2 = await Profilequery2.find();
-        //     let profile1List2 = P2.map(item => item.toJSON());
+    //     let Profilequery = new Parse.Query('AIMoment');
+    //     Profilequery.equalTo('company', company);
+    //     Profilequery.equalTo('isVisible', true);
+    //     Profilequery.notEqualTo('isDeleted', true)
+    //     Profilequery.equalTo('profile', profile1List2[0].objectId);
+    //     Profilequery.descending('createdAt');
 
-        //     let Profilequery = new Parse.Query('AIMoment');
-        //     Profilequery.equalTo('company', company);
-        //     Profilequery.equalTo('isVisible', true);
-        //     Profilequery.notEqualTo('isDeleted', true)
-        //     Profilequery.equalTo('profile', profile1List2[0].objectId);
-        //     Profilequery.descending('createdAt');
+    //     let count = await Profilequery.count();
 
-        //     let count = await Profilequery.count();
+    //     if (count) {
+    //         this.setData({
+    //             circlecount: count
+    //         })
+    //     }
+    // },
+    async getcircle() {
+      const currentUser = Parse.User.current();
+      let Profilequery2 = new Parse.Query('Profile');
+      Profilequery2.equalTo('company', company);
+      Profilequery2.equalTo('user', currentUser?.id);
+      Profilequery2.equalTo('isCheck', true);
+      Profilequery2.notEqualTo('isDeleted', true);
+      Profilequery2.include('user');
+      Profilequery2.include('center');
+      Profilequery2.include('department');
+      let P2 = await Profilequery2.find();
+      let profile1List2 = P2.map(item => item.toJSON());
+      this.setData({
+        profile1List2,
+      })
 
-        //     if (count) {
-        //         this.setData({
-        //             circlecount: count
-        //         })
-        //     }
-        // },
-        async getcircle() {
-            const currentUser = Parse.User.current();
-            let Profilequery2 = new Parse.Query('Profile');
-            Profilequery2.equalTo('company', company);
-            Profilequery2.equalTo('user', currentUser?.id);
-            Profilequery2.equalTo('isCheck', true);
-            Profilequery2.notEqualTo('isDeleted', true);
-            Profilequery2.include('user');
-            Profilequery2.include('center');
-            Profilequery2.include('department');
-            let P2 = await Profilequery2.find();
-            let profile1List2 = P2.map(item => item.toJSON());
-            this.setData({
-                profile1List2,
-            })
+      console.log('信息', this.data.profile1List2);
+      let Profilequery = new Parse.Query('AIMoment');
+      Profilequery.equalTo('company', company);
+      Profilequery.equalTo('isVisible', true);
+      Profilequery.notEqualTo('isDeleted', true);
+      // Profilequery.equalTo('profile', profile1List2[0].objectId);
+      Profilequery.equalTo('user', currentUser.id);
+      Profilequery.descending('createdAt');
 
-            console.log('信息', this.data.profile1List2);
-            let Profilequery = new Parse.Query('AIMoment');
-            Profilequery.equalTo('company', company);
-            Profilequery.equalTo('isVisible', true);
-            Profilequery.notEqualTo('isDeleted', true);
-            // Profilequery.equalTo('profile', profile1List2[0].objectId);
-            Profilequery.equalTo('user', currentUser.id);
-            Profilequery.descending('createdAt');
+      let moments = await Profilequery.find(); // 查找所有动态
 
-            let moments = await Profilequery.find(); // 查找所有动态
+      if (moments.length) {
+        this.setData({
+          circlecount: moments.length
+        });
 
-            if (moments.length) {
-                this.setData({
-                    circlecount: moments.length
-                });
+        // 获取所有动态的ID
+        let momentIds = moments.map(moment => moment.id);
 
-                // 获取所有动态的ID
-                let momentIds = moments.map(moment => moment.id);
+        // 创建对 AIMomentLike 表的查询
+        let LikeQuery = new Parse.Query('AIMomentLike');
+        LikeQuery.equalTo('isLiked', true);
+        LikeQuery.equalTo('company', company);
+        LikeQuery.notEqualTo('isDeleted', true);
+        LikeQuery.containedIn('moment', momentIds); // 使用 containedIn 来一次性查询多个动态的点赞
 
-                // 创建对 AIMomentLike 表的查询
-                let LikeQuery = new Parse.Query('AIMomentLike');
-                LikeQuery.equalTo('isLiked', true);
-                LikeQuery.equalTo('company', company);
-                LikeQuery.notEqualTo('isDeleted', true);
-                LikeQuery.containedIn('moment', momentIds); // 使用 containedIn 来一次性查询多个动态的点赞
+        // 统计点赞数量
+        let likesCount = await LikeQuery.count();
 
-                // 统计点赞数量
-                let likesCount = await LikeQuery.count();
+        // 这里可以进一步处理 likesCount，按动态分配点赞数量
+        console.log(`总点赞数量: ${likesCount}`);
+        this.setData({
+          likesCount,
+        })
+      }
 
-                // 这里可以进一步处理 likesCount，按动态分配点赞数量
-                console.log(`总点赞数量: ${likesCount}`);
-                this.setData({
-                    likesCount,
-                })
-            }
+    },
+    //查看积分
+    async getpoint() {
 
+    },
+    //获取头像名称
+    async getname() {
+      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 P2 = await Userquery.find();
+      let User1List = P2.map(item => item.toJSON());
+      this.setData({
+        User1List
+      })
+      console.log(this.data.User1List);
+    },
+    /**退出登录 */
+    outLogin() {
+      wx.showModal({
+        title: '提示',
+        content: '你确定退出登录吗？',
+        showCancel: true,
+        cancelText: '取消',
+        cancelColor: '#000000',
+        confirmText: '确定',
+        confirmColor: '#3CC51F',
+        success: (result) => {
+          if (result.confirm) {
+            auth.logout()
+          }
         },
-        //查看积分
-        async getpoint() {
+        fail: () => {},
+        complete: () => {}
+      });
+    },
+    gourl(e) {
+      const url = e.currentTarget.dataset.url
+      wx.navigateTo({
+        url: `${url}` // 目标页面的路径
+      });
+    },
 
-        },
-        //获取头像名称
-        async getname() {
-            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 P2 = await Userquery.find();
-            let User1List = P2.map(item => item.toJSON());
-            this.setData({
-                User1List
-            })
-            console.log(this.data.User1List);
-        },
-        /**退出登录 */
-        outLogin() {
-          wx.showModal({
-            title: '提示',
-            content: '你确定退出登录吗？',
-            showCancel: true,
-            cancelText: '取消',
-            cancelColor: '#000000',
-            confirmText: '确定',
-            confirmColor: '#3CC51F',
-            success: (result) => {
-              if (result.confirm) {
-                auth.logout()
-              }
-            },
-            fail: () => {},
-            complete: () => {}
-          });
-        },
-        gourl(e) {
-            const url = e.currentTarget.dataset.url
-            wx.navigateTo({
-                url: `${url}` // 目标页面的路径
-            });
-        },
 
 
 
-        
 
-  /**隐私协议 */
-  async getArticle() {
-    let query = new Parse.Query("Article")
-    query.equalTo("company", company)
-    query.equalTo("type", 'home')
-    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({
-          attachment: r
-        })
-      }
-    }
-  },
-  //附件下载
-  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()
-            }
+    /**隐私协议 */
+    async getArticle() {
+      let query = new Parse.Query("Article")
+      query.equalTo("company", company)
+      query.equalTo("type", 'home')
+      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({
+            attachment: r
           })
         }
-      },
-      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'
-    }
-  },
-    }
+      }
+    },
+    //附件下载
+    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()
+              }
+            })
+          }
+        },
+        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'
+      }
+    },
+  }
 })

nova-werun/components/my/index.less

@@ -1,34 +1,39 @@
 /* nova-werun/components/my/index.wxss */
-.all{
+.all {
     width: 100vw;
     background-color: #F1F1F2;
     background-image: url(https://file-cloud.fmode.cn/qpFbRRSZrO/20241225/h1105d091940141.png);
-    background-repeat: no-repeat; /* 不重复背景图片 */
-    background-size: 750rpx 468rpx ; 
+    background-repeat: no-repeat;
+    /* 不重复背景图片 */
+    background-size: 750rpx 468rpx;
     display: flex;
     align-items: center;
     flex-direction: column;
     font-family: MicrosoftYaHei;
     color: #333333;
-    .navbox{
+
+    .navbox {
         width: 100vw;
         display: flex;
         align-items: flex-end;
-        .nav{
+
+        .nav {
             width: 100%;
             display: flex;
             justify-content: center;
             position: relative;
             margin-bottom: 20rpx;
             height: 40rpx;
-            image{
+
+            image {
                 position: absolute;
                 left: 38rpx;
                 top: 8rpx;
                 width: 44rpx;
                 height: 35rpx;
             }
-            .nav-title{
+
+            .nav-title {
                 height: 36rpx;
                 font-family: MicrosoftYaHei;
                 font-size: 36rpx;
@@ -38,69 +43,81 @@
             }
         }
     }
-    .perxonalbox{
+
+    .perxonalbox {
         width: 100%;
         height: 162rpx;
         padding-top: 20rpx;
         display: flex;
         position: relative;
         margin-bottom: 70rpx;
-        padding-left:34rpx;
+        padding-left: 34rpx;
         padding-right: 34rpx;
         align-items: center;
-        .avatar{
+
+        .avatar {
             width: 120rpx;
             height: 120rpx;
             border-radius: 50%;
         }
-        .namebox{
+
+        .namebox {
             width: 450rpx;
             height: 162rpx;
             display: flex;
             justify-content: center;
             flex-direction: column;
             margin-left: 20rpx;
-            .name{
+
+            .name {
                 font-size: 32rpx;
             }
-            .databox{
+
+            .databox {
                 width: 100%;
                 height: 40rpx;
                 display: flex;
                 color: #d81e06;
                 margin-top: 10rpx;
                 align-items: center;
-                .data{
+
+                .data {
                     font-size: 28rpx;
                 }
-                image{
+
+                image {
                     width: 30rpx;
                     height: 30rpx;
                     margin-left: 10rpx;
                 }
             }
-            .numberbox{
+
+            .numberbox {
                 width: 100%;
                 font-size: 26rpx;
                 margin-top: 20rpx;
             }
         }
-        .picbox{
+
+        .picbox {
             height: 100%;
             display: flex;
             justify-content: center;
             align-items: center;
             margin-left: auto;
-            image{
+
+            image {
                 width: 34rpx;
                 height: 34rpx;
             }
-            image:nth-child(2){
+
+            image:nth-child(2) {
                 margin-left: 20rpx;
             }
         }
     }
-    .infobox{
+
+    .infobox {
         width: 627rpx;
         height: 139rpx;
         display: flex;
@@ -108,7 +125,8 @@
         align-items: center;
         background-color: white;
         border-radius: 20rpx;
-        .info{
+
+        .info {
             width: 120rpx;
             height: 100rpx;
             display: flex;
@@ -117,45 +135,53 @@
             flex-direction: column;
             margin-left: 10rpx;
             margin-right: 10rpx;
-            .info-num{
+
+            .info-num {
                 font-weight: bold;
                 font-size: 31rpx;
                 color: #333333;
             }
-            .info-tex{
+
+            .info-tex {
                 font-size: 26rpx;
                 color: #333333;
                 margin-top: 4rpx;
             }
         }
     }
-    .textbox{
+
+    .textbox {
         width: 100%;
         height: auto;
         padding-left: 33rpx;
         padding-right: 33rpx;
         background-color: white;
         margin-top: 26rpx;
-        .text1box{
+
+        .text1box {
             width: 100%;
             height: 110rpx;
             display: flex;
             align-items: center;
             justify-content: flex-end;
             border-bottom: #E0E0E0 2rpx solid;
-            image{
+
+            image {
                 width: 34rpx;
                 height: 34rpx;
                 margin-left: 10rpx;
             }
-            .text1{
+
+            .text1 {
                 font-size: 28rpx;
                 margin-right: auto;
                 margin-left: 10rpx;
             }
         }
+
         .text1box:last-child {
             border-bottom: #E0E0E0 0rpx solid;
         }
     }
-}
+}
+

nova-werun/components/my/index.wxml

@@ -31,7 +31,7 @@
       <view class="info-num">{{circlecount}}</view>
       <view class="info-tex">动态</view>
     </view>
-    <view class="info">
+    <view class="info" data-url="../../pages/home/signin/index" bind:tap="gourl">
       <view class="info-num">{{meChick}}</view>
       <view class="info-tex">打卡</view>
     </view>

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

@@ -174,6 +174,9 @@ Page({
       showCheckRank:false
     })
   },
+
+
+
   /**确认排序 */
   async confirmCheckRank(){
     let {fixedNum,checkRank,aid,rank}=this.data
@@ -215,9 +218,20 @@ Page({
       SELECT * FROM d2 
       ORDER BY d2."al_${checkRank=='steps'?'sportDate':'steps'}" ${rank}
       LIMIT 200 OFFSET 0`
+      let sql02 = `SELECT ad."objectId" AS "ad_objectId",ad."steps" AS "ad_steps",ad."distance" AS "ad_distance",
+      ad."burnCalories" AS "ad_burnCalories",ad."sportDate" AS "ad_sportDate",
+      ar."booking",u."nickname",u."avatar"
+      FROM "ActivityData" ad
+      LEFT JOIN "_User" u ON u."objectId"=ad."user"
+      LEFT JOIN "ActivityRegister" ar ON ar."objectId" = ad."actRegister"
+      WHERE ad."isDeleted" IS NOT TRUE
+      AND ad."company"='${company}'
+      AND ad."activity"='${aid}'
+      ORDER BY ad."rank" ${rank}
+      LIMIT 200 OFFSET 0`
       // console.log(sql)
-      let data = await request.customSQL(sql)
-      // console.log(data)
+      let data = await request.customSQL(sql02)
+      console.log(data)
       let rankList = data?.map(item => {
         let obj = item
         if (item?.booking?.from?.iso) obj.booking = dateF.formatTime("YYYY-mm-dd HH:MM", item?.booking?.from?.iso)
@@ -260,7 +274,19 @@ Page({
     SELECT * FROM d2 
     ORDER BY d2."al_sportDate" ASC
     LIMIT 200 OFFSET 0`
-    let medata = await request.customSQL(mesql)
+    let mesql02 = `SELECT ad."objectId" AS "ad_objectId",ad."steps" AS "ad_steps",ad."distance" AS "ad_distance",
+    ad."burnCalories" AS "ad_burnCalories",ad."sportDate" AS "ad_sportDate",
+    ar."booking",u."nickname",u."avatar"
+    FROM "ActivityData" ad
+    LEFT JOIN "_User" u ON u."objectId"=ad."user"
+    LEFT JOIN "ActivityRegister" ar ON ar."objectId" = ad."actRegister"
+    WHERE ad."isDeleted" IS NOT TRUE
+    AND ad."company"='${company}'
+    AND ad."activity"='${aid}'
+    AND ad."user"='${uid}'
+    ORDER BY ad."rank"
+    LIMIT 200 OFFSET 0`
+    let medata = await request.customSQL(mesql02)
     // console.log(medata)
     meRank = medata?.map(item => {
       let obj = item

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

@@ -147,8 +147,8 @@
               <image src="{{item.avatar}}" mode="" />
             </view>
             <view class="name">{{item.booking||''}}</view>
-            <view class="name"><text style="font-weight: bold;">{{item.al_steps}}</text> 步</view>
-            <view class="rang"><text style="font-weight: bold;">{{item.al_sportDate}}</text> 秒</view>
+            <view class="name"><text style="font-weight: bold;">{{item.ad_steps||0}}</text> 步</view>
+            <view class="rang"><text style="font-weight: bold;">{{item.ad_sportDate||0}}</text> 秒</view>
           </view>
         </block>
 
@@ -162,10 +162,10 @@
               </view>
             </view>
 
-            <van-radio-group style="font-size: 30rpx;" value="{{ checkRank }}" bind:change="onChangeRank" direction="horizontal">
+            <!-- <van-radio-group style="font-size: 30rpx;" value="{{ checkRank }}" bind:change="onChangeRank" direction="horizontal">
               <van-radio name="steps" icon-size="30rpx">步数</van-radio>
               <van-radio name="sportDate" icon-size="30rpx">用时</van-radio>
-            </van-radio-group>
+            </van-radio-group> -->
           </view>
 
           <block wx:for="{{rankList}}" wx:key="index">
@@ -179,8 +179,8 @@
                 {{item.nickname}}
                 <view class="name2">{{item.booking||''}}</view>
               </view>
-              <view class="num">{{item.al_steps}}步</view>
-              <view class="num">{{item.al_sportDate}}秒</view>
+              <view class="num">{{item.ad_steps||0}}步</view>
+              <view class="num">{{item.ad_sportDate||0}}秒</view>
             </view>
           </block>
           <block wx:if="{{rankList.length<=0}}">

nova-werun/pages/circle/my-circle/index.js

@@ -3,144 +3,144 @@ const Parse = getApp().Parse;
 const company = getApp().globalData.company;
 Page({
 
-    /**
-     * 页面的初始数据
-     */
-    data: {
-        //屏幕高度
-        statusBarHeight: 0, // 状态栏高度
-        screenHeight: 0, // 屏幕高度
-        customHeight: 0, // 自定义导航栏高度（如小程序右上角胶囊按钮）
-        bottomNavHeight: 0, // 底部导航栏高度
-        contentHeight: 0, // 可用内容高度
-        contentpadding: 0, //顶部padding高度
-
-        //朋友圈
-        cardList: [],
-        loadedItems: 0, // 已加载的商品数量
-        pageSize: 6, // 每次加载的商品数量
-        noMoreItems: 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 contentHeight = (screenHeight - bottomNavHeight - statusBarHeight - customHeight) * 750 / systemInfo.windowWidth;
-        this.setData({
-            statusBarHeight,
-            screenHeight,
-            customHeight,
-            bottomNavHeight,
-            contentHeight
-        });
-        console.log('123', contentHeight);
-        this.getcircle()
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload: function () {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh: function () {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom: function () {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage: function () {
-
-    },
-    //查全部朋友圈
-    async getcircle() {
-        const currentUser = Parse.User.current();
-        // let Profilequery2 = new Parse.Query('Profile');
-        // Profilequery2.equalTo('company', company);
-        // Profilequery2.equalTo('user', currentUser.id);
-        // Profilequery2.equalTo('isCheck', true);
-        // Profilequery2.notEqualTo('isDeleted', true)
-        // let P2 = await Profilequery2.find();
-        // let profile1List2 = P2.map(item => item.toJSON());
-
-
-
-        let Profilequery = new Parse.Query('AIMoment');
-        Profilequery.equalTo('company', company);
-        // Profilequery.equalTo('isVisible', true);
-        Profilequery.notEqualTo('isDeleted', true)
-        // Profilequery.equalTo('profile', profile1List2[0].objectId);
-        Profilequery.equalTo('user', currentUser.id);
-        Profilequery.include('user');
-        Profilequery.descending('createdAt');
-
-        // 设置查询的限制和偏移
-        Profilequery.limit(this.data.pageSize);
-        Profilequery.skip(this.data.loadedItems);
-        let P = await Profilequery.find();
-        let profile1List = P.map(item => item.toJSON());
-        // 检查是否还有更多商品
-        if (profile1List.length < this.data.pageSize) {
-            this.setData({
-                noMoreItems: true
-            });
-        } else {
-            this.setData({
-                noMoreItems: false
-            });
-        }
-
-        this.setData({
-            cardList: this.data.cardList.concat(profile1List),
-            loadedItems: this.data.loadedItems + profile1List.length
-        })
-        console.log(this.data.cardList);
-    },
-    loadMoreData: async function () {
-        // 触底时加载更多数据
-        if (!this.data.noMoreItems) {
-            await this.getcircle();
-        }
-    },
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    //屏幕高度
+    statusBarHeight: 0, // 状态栏高度
+    screenHeight: 0, // 屏幕高度
+    customHeight: 0, // 自定义导航栏高度（如小程序右上角胶囊按钮）
+    bottomNavHeight: 0, // 底部导航栏高度
+    contentHeight: 0, // 可用内容高度
+    contentpadding: 0, //顶部padding高度
+
+    //朋友圈
+    cardList: [],
+    loadedItems: 0, // 已加载的商品数量
+    pageSize: 6, // 每次加载的商品数量
+    noMoreItems: 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 contentHeight = (screenHeight - bottomNavHeight - statusBarHeight - customHeight) * 750 / systemInfo.windowWidth;
+    this.setData({
+      statusBarHeight,
+      screenHeight,
+      customHeight,
+      bottomNavHeight,
+      contentHeight
+    });
+    console.log('123', contentHeight);
+    this.getcircle()
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+  //查全部朋友圈
+  async getcircle() {
+    const currentUser = Parse.User.current();
+    // let Profilequery2 = new Parse.Query('Profile');
+    // Profilequery2.equalTo('company', company);
+    // Profilequery2.equalTo('user', currentUser.id);
+    // Profilequery2.equalTo('isCheck', true);
+    // Profilequery2.notEqualTo('isDeleted', true)
+    // let P2 = await Profilequery2.find();
+    // let profile1List2 = P2.map(item => item.toJSON());
+
+
+
+    let Profilequery = new Parse.Query('AIMoment');
+    Profilequery.equalTo('company', company);
+    // Profilequery.equalTo('isVisible', true);
+    Profilequery.notEqualTo('isDeleted', true)
+    // Profilequery.equalTo('profile', profile1List2[0].objectId);
+    Profilequery.equalTo('user', currentUser.id);
+    Profilequery.include('user');
+    Profilequery.descending('createdAt');
+
+    // 设置查询的限制和偏移
+    Profilequery.limit(this.data.pageSize);
+    Profilequery.skip(this.data.loadedItems);
+    let P = await Profilequery.find();
+    let profile1List = P.map(item => item.toJSON());
+    // 检查是否还有更多商品
+    if (profile1List.length < this.data.pageSize) {
+      this.setData({
+        noMoreItems: true
+      });
+    } else {
+      this.setData({
+        noMoreItems: false
+      });
+    }
+
+    this.setData({
+      cardList: this.data.cardList.concat(profile1List),
+      loadedItems: this.data.loadedItems + profile1List.length
+    })
+    console.log(this.data.cardList);
+  },
+  loadMoreData: async function () {
+    // 触底时加载更多数据
+    if (!this.data.noMoreItems) {
+      await this.getcircle();
+    }
+  },
 })

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

@@ -1,191 +1,170 @@
 // nova-werun/pages/home/medal/index.js
 const Parse = getApp().Parse;
 const company = getApp().globalData.company;
+const uid = Parse.User.current()?.id
+let sev = require('../../../service/getSportData')
+let request = require('../../../../utils/request')
+let dateF = require('../../../../utils/date')
+
 Page({
 
-    /**
-     * 页面的初始数据
-     */
-    data: {
-        //屏幕高度
-        statusBarHeight: 0, // 状态栏高度
-        screenHeight: 0, // 屏幕高度
-        customHeight: 0, // 自定义导航栏高度（如小程序右上角胶囊按钮）
-        bottomNavHeight: 0, // 底部导航栏高度
-        contentHeight: 0, // 可用内容高度
-        contentHeight2: 0,
-        contentpadding: 0, //顶部padding高度
-
-        userList: [],
-        alreadyList: [],
-        MedalList: [],
-        show: false,
-        title:''
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    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.getuser()
-        this.alreadyMedal()
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload: function () {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh: function () {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom: function () {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage: function () {
-
-    },
-    async getuser() {
-        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 userList = user.map(item => item.toJSON());
-        this.setData({
-            userList
-        })
-        console.log(this.data.userList);
-    },
-    // 已获得勋章
-    async alreadyMedal() {
-        const currentUser = Parse.User.current();
-        let MedalLogquery = new Parse.Query('MedalLog');
-        MedalLogquery.equalTo('company', company);
-        MedalLogquery.equalTo('user', currentUser.id);
-        MedalLogquery.notEqualTo('isDeleted', true);
-        MedalLogquery.include('medal');
-
-        let MedalLog = await MedalLogquery.find();
-        let alreadyList = MedalLog.map(item => {
-            let itemData = item.toJSON();
-            // 格式化 createdAt 为 YYYY-M-D
-            const createdAt = new Date(itemData.createdAt);
-            const formattedDate = `${createdAt.getFullYear()}-${createdAt.getMonth() + 1}-${createdAt.getDate()}`;
-            itemData.createdAt = formattedDate; // 将格式化后的日期赋值回 createdAt
-            return itemData;
-        });
-
-        this.setData({
-            alreadyList
-        });
-        console.log('alreadyList', this.data.alreadyList);
-
-        // 获取 MedalList，并剔除 alreadyList 中的勋章
-        await this.lossMedal(alreadyList);
-    },
-
-    // 未获得勋章
-    async lossMedal(alreadyList) {
-        let Medalquery = new Parse.Query('Medal');
-        Medalquery.equalTo('company', company);
-        Medalquery.notEqualTo('isDeleted', true);
-        Medalquery.ascending('order');
-
-        let r = await Medalquery.find();
-        let MedalList = r.map(item => item.toJSON());
-
-        // 创建一个集合存储 alreadyList 中的 medal.objectId
-        const alreadyMedalIds = new Set(alreadyList.map(item => item.medal.objectId));
-
-        // 从 MedalList 中剔除已获得的勋章
-        MedalList = MedalList.filter(item => !alreadyMedalIds.has(item.objectId));
-
-        this.setData({
-            MedalList
-        });
-        console.log('MedalList', this.data.MedalList);
-    },
-    showPopup(e) {
-        const objectId = e.currentTarget.dataset.id
-        const type = e.currentTarget.dataset.type
-        if(type=='alreadyList'){
-            this.data.alreadyList.forEach((item)=>{
-                if(item.objectId==objectId){
-                    this.setData({
-                        title:item.medal.title
-                    })
-                }
-            })
-            console.log(this.data.title);
-        }else{
-            this.data.MedalList.forEach((item)=>{
-                if(item.objectId==objectId){
-                    this.setData({
-                        title:item.title
-                    })
-                }
-            })
-            console.log(this.data.title);
-        }
-        
-        this.setData({ show: true });
-      },
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    alreadyList: [],
+    MedalList: [],
+    show: false,
+    title: '',
+    user: Parse.User.current(),
     
-      onClose() {
-        this.setData({ show: false });
-      },
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    this.setData({
+      user: Parse.User.current()?.toJSON()
+    });
+    this.refersh()
+  },
+  async refersh() {
+    await this.getMedal()
+    this.getCountSport()
+  },
+  /**获取勋章 */
+  async getMedal() {
+    let sql = `SELECT me."objectId",me."name",me."image",me."imageIn",me."condition",
+    ml."user",ml."createdAt"
+    FROM "Medal" me
+    LEFT JOIN "MedalLog" ml ON me."objectId"=ml."medal" AND ml."user"='${uid}'
+    WHERE me."company"='${company}'
+    AND me."isDeleted" IS NOT TRUE
+    ORDER BY me."order" ASC`
+    let data = await request.customSQL(sql)
+    let medalList = data?.map(item => {
+      item.createdAt = dateF.formatTime('YYYY-MM-dd', item.createdAt)
+      return item
+    })
+    this.setData({
+      medalList
+    });
+  },
+  /**获取用户累计运动步数-授予勋章 */
+  async getCountSport() {
+    let {
+      medalList
+    } = this.data
+    let fromTo = {
+      from: Parse.User.current()?.get('createdAt'),
+      to: new Date()
+    }
+    let d = await sev.getwalk('distance', '', fromTo) || 0
+    console.log(d)
+    let logList = medalList?.filter(item => parseInt(item.condition.distance) <= d && !item.user)
+    console.log(logList)
+    if (logList?.length > 0) {
+      wx.showToast({
+        title: `太厉害啦！您已累计运动${ (d/1000).toFixed(2) ||0} km，为您解锁${logList?.length}枚勋章。`,
+        icon: 'none',
+        duration: 5000
+      })
+      for (let i in logList) {
+        let item = logList[i]
+        if (parseInt(item.condition.distance) <= d && !item.user) {
+          let MedalLog = Parse.Object.extend('MedalLog')
+          let log = new MedalLog()
+          log.set('company', {
+            __type: 'Pointer',
+            className: 'Company',
+            objectId: company
+          })
+          log.set('user', {
+            __type: 'Pointer',
+            className: '_User',
+            objectId: uid
+          })
+          log.set('medal', {
+            __type: 'Pointer',
+            className: 'Medal',
+            objectId: item.objectId
+          })
+          await log.save()
+        }
+      }
+      this.getMedal()
+    }
+    this.setData({distance: (d/1000).toFixed(2) ||0})
+  },
+  /**勋章详情 */
+  showPopup(e) {
+    let {
+      medalList
+    } = this.data
+    let {
+      index
+    } = e.currentTarget.dataset
+    console.log(medalList[index])
+    this.setData({
+      chickMedal: medalList[index],
+      show: true
+    });
+  },
+
+  onClose() {
+    this.setData({
+      show: false
+    });
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+
+
 })

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

@@ -86,20 +86,30 @@
                     color: black;
                 }
             }
-            .med-rul{
-                margin-top: 10rpx;
-                font-size: 34rpx;
-                margin-left: 40rpx;
-                margin-left: 10rpx;
-            }
-            .title-title{
-                font-size: 40rpx;
-                font-weight: 600;
-                width: 100%;
-                display: flex;
-                justify-content: center;
-            }
+           
         }
 
     }
-}
+}
+.medPopup{
+    min-height: 50vh;
+    max-height: 70vh;
+    overflow-y: auto;
+    
+    .title-title{
+        padding: 20rpx;
+        font-size: 40rpx;
+        font-weight: 600;
+        width: 100%;
+        display: flex;
+        justify-content: center;
+        border-bottom: 1rpx solid whitesmoke;
+    }
+    .text{
+        margin: 20rpx;
+    }
+    .li{
+        margin: 10rpx 30rpx;
+        font-size: 30rpx;
+    }
+}

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

@@ -1,44 +1,42 @@
 <!--nova-werun/pages/home/medal/index.wxml-->
 <nav type="back" title="我的勋章" background-color="{{'#4F9AF7'}}" front-color="{{'#333333'}}"></nav>
-<view class="all" style="height: {{contentHeight}}rpx;">
-    <view class="infobox">
-        <image class="avater" src="{{userList[0].avatar}}"></image>
-        <view class="info">
-            <view class="name">{{userList[0].nickname}}</view>
-            <!-- <view class="but-box">
-                <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20250113/314h43042541125.png?imageView2/1/w/200/h/200"></image>
-                <view class="text">分享 ></view>
-            </view> -->
-        </view>
+<view class="all">
+  <view class="infobox">
+    <image class="avater" src="{{user.avatar}}"></image>
+    <view class="info">
+      <view class="name">{{user.nickname}}</view>
     </view>
+  </view>
 
-    <view class="medalbox">
-        <view class="med-text">全部勋章</view>
-        <view class="med-infobox">
-            <!-- 已获得 -->
-            <block wx:if="{{alreadyList.length>0}}" wx:for="{{alreadyList}}" wx:key="index">
-                <view class="med-info" bindtap="showPopup" data-id="{{item.objectId}}" data-type="alreadyList">
-                    <image src="{{item.medal.image}}" style="margin-top: 52rpx;"></image>
-                    <view class="med-name">{{item.medal.name}}</view>
-                    <!-- <view class="med-rul">勋章达成规则</view> -->
-                    <view class="med-time">{{item.createdAt}}</view>
-                </view>
-            </block>
-            <!-- 未获得 -->
-            <block wx:if="{{MedalList.length>0}}" wx:for="{{MedalList}}">
-                <view class="med-info" bindtap="showPopup" data-id="{{item.objectId}}" data-type="MedalList">
-                    <image src="{{item.imageIn}}" ></image>
-                    <view class="med-name">{{item.name}}</view>
-                </view>
-            </block>
-
-            <!-- 勋章介绍 -->
-            <van-popup show="{{ show }}" position="bottom" custom-style="height: 40%;" bind:close="onClose">
-                <view class="title-title">获取条件</view>
-                <view class="med-rul">{{title}}</view>
-            </van-popup>
+  <view class="medalbox">
+    <view class="med-text">全部勋章</view>
+    <view class="med-infobox">
+      <block wx:for="{{medalList}}" wx:key="index">
+        <view class="med-info" bindtap="showPopup" data-index="{{index}}">
+          <block wx:if="{{item.user}}">
+            <image src="{{item.image}}" style="margin-top: 52rpx;"></image>
+          </block>
+          <block wx:else>
+            <image src="{{item.imageIn}}" style="margin-top: 52rpx;"></image>
+          </block>
+          <view class="med-name">{{item.name}}</view>
+          <block wx:if="{{item.user}}">
+            <view class="med-time">{{item.createdAt}}</view>
+          </block>
         </view>
+      </block>
     </view>
+  </view>
+</view>
 
-
-</view>
+<!-- 勋章介绍 -->
+<van-popup round show="{{ show }}" position="bottom" bind:close="onClose">
+  <view class="medPopup">
+    <view class="title-title">{{chickMedal.name||'勋章介绍'}}</view>
+    <view class="text">您已累计运动 {{distance||0}} km</view>
+    <view class="text">解锁勋章需满足：</view>
+    <view class="li">累计运动距离达 {{(chickMedal.condition.distance/1000)||0}} km</view>
+    <view class="text" wx:if="{{chickMedal.user}}">已在 {{chickMedal.createdAt}} 解锁本勋章！</view>
+    <view class="text" wx:else>暂未解锁本勋章，一起加油吧！</view>
+  </view>
+</van-popup>

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

@@ -1 +1 @@
-.all{width:100vw;padding-left:40rpx;padding-right:40rpx;padding-top:20rpx;overflow-y:scroll;background:linear-gradient(to bottom, #4F9AF7, #FFFFFF);color:#0f65d0}.all .infobox{width:100%;height:130rpx;display:flex;align-items:center}.all .infobox .avater{width:110rpx;height:110rpx;border-radius:50%}.all .infobox .info{height:130rpx;margin-left:20rpx;display:flex;flex-direction:column;justify-content:center}.all .infobox .info .name{font-size:34rpx;color:white}.all .infobox .info .but-box{margin-top:10rpx;width:130rpx;height:45rpx;display:flex;justify-content:center;align-items:center;border-radius:12rpx;border:#0f65d0 solid 1px}.all .infobox .info .but-box image{width:26rpx;height:26rpx}.all .infobox .info .but-box .text{margin-left:5rpx;font-size:26rpx}.all .medalbox{width:100%;background-color:white;border-radius:15rpx;margin-bottom:40rpx;margin-top:25rpx;padding-top:20rpx}.all .medalbox .med-text{margin-left:20rpx;font-size:32rpx;margin-top:10rpx;color:black}.all .medalbox .med-infobox{width:100%;display:flex;flex-wrap:wrap}.all .medalbox .med-infobox .med-info{width:50%;height:370rpx;display:flex;align-items:center;justify-content:center;flex-direction:column}.all .medalbox .med-infobox .med-info image{width:180rpx;height:180rpx}.all .medalbox .med-infobox .med-info .med-name{margin-top:10rpx;font-size:30rpx;color:black}.all .medalbox .med-infobox .med-info .med-time{margin-top:10rpx;font-size:30rpx;color:black}.all .medalbox .med-infobox .med-rul{margin-top:10rpx;font-size:34rpx;margin-left:40rpx;margin-left:10rpx}.all .medalbox .med-infobox .title-title{font-size:40rpx;font-weight:600;width:100%;display:flex;justify-content:center}
+.all{width:100vw;padding-left:40rpx;padding-right:40rpx;padding-top:20rpx;overflow-y:scroll;background:linear-gradient(to bottom, #4F9AF7, #FFFFFF);color:#0f65d0}.all .infobox{width:100%;height:130rpx;display:flex;align-items:center}.all .infobox .avater{width:110rpx;height:110rpx;border-radius:50%}.all .infobox .info{height:130rpx;margin-left:20rpx;display:flex;flex-direction:column;justify-content:center}.all .infobox .info .name{font-size:34rpx;color:white}.all .infobox .info .but-box{margin-top:10rpx;width:130rpx;height:45rpx;display:flex;justify-content:center;align-items:center;border-radius:12rpx;border:#0f65d0 solid 1px}.all .infobox .info .but-box image{width:26rpx;height:26rpx}.all .infobox .info .but-box .text{margin-left:5rpx;font-size:26rpx}.all .medalbox{width:100%;background-color:white;border-radius:15rpx;margin-bottom:40rpx;margin-top:25rpx;padding-top:20rpx}.all .medalbox .med-text{margin-left:20rpx;font-size:32rpx;margin-top:10rpx;color:black}.all .medalbox .med-infobox{width:100%;display:flex;flex-wrap:wrap}.all .medalbox .med-infobox .med-info{width:50%;height:370rpx;display:flex;align-items:center;justify-content:center;flex-direction:column}.all .medalbox .med-infobox .med-info image{width:180rpx;height:180rpx}.all .medalbox .med-infobox .med-info .med-name{margin-top:10rpx;font-size:30rpx;color:black}.all .medalbox .med-infobox .med-info .med-time{margin-top:10rpx;font-size:30rpx;color:black}.medPopup{min-height:50vh;max-height:70vh;overflow-y:auto}.medPopup .title-title{padding:20rpx;font-size:40rpx;font-weight:600;width:100%;display:flex;justify-content:center;border-bottom:1rpx solid whitesmoke}.medPopup .text{margin:20rpx}.medPopup .li{margin:10rpx 30rpx;font-size:30rpx}

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

@@ -171,6 +171,10 @@ Page({
           filePath: res.tempFilePath,
           success: (res) => {
             console.log('success', res)
+            wx.showToast({
+              title: '已下载图片',
+              icon:'none'
+            })
           },
           fail: (err) => {
             // console.log('err',err)

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

@@ -157,6 +157,8 @@ Page({
           issigin: true
         })
         console.log("打卡成功");
+        this.accumulateChink()
+        this.continuousChink()
       } catch (error) {
         console.error("保存数据时出现错误:", error);
       }

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

@@ -25,7 +25,7 @@ Page({
     showPermissions: true, //权限弹框-开
     journey: 0, //运动的路程-米
     calorie: 0, //卡路里-千卡
-    pace: 0, //配速-min/km
+    pace: 0, //配速-m/s
     timer: 0, //已记的时长-秒
     status: 'noStart', //运动状态 'noStart'未开始,'inSports'运动中,'paused'暂停
     percentage: '', //长按结束运动百分比
@@ -41,6 +41,14 @@ Page({
     actDataList: [], //未运动结束数据
     isShowActDataList: false, //是否展示未运动结束的数据
     checkActDataId: null, //点击的未结束运动
+    lastSpeed: 0, //上次记录的速度-m/s
+    lastTime: 0, //上次记录的时间点-Date
+    intervalStartTime: 0, //计时器开始时间-Date用于获取实时秒数
+    saveTime: 0, //上次保存log时间-Date用于熄屏后持续每10s记录log
+    hideTime: 0, //熄屏时间点
+    timerInterval: null, //运动时长计时器
+    pageStatus: 'show', //当前页面状态 show/hide 展示中/未展示
+    polyline: null, //运动轨迹
   },
 
   /**
@@ -60,6 +68,201 @@ Page({
     // this.getWeRun()
   },
 
+  /**监听位置变化 */
+  monitorLocationChange() {
+    let that = this
+    wx.startLocationUpdateBackground({
+      success: (res) => {
+        wx.onLocationChange(async (change_res) => {
+          // console.log(change_res.speed, change_res.longitude, change_res.latitude)
+          let currentTime = new Date()
+          let currentSpeed = change_res.speed
+          if(currentSpeed>=200)return
+          let {
+            longitude, //经度
+            latitude, //纬度
+            journey, //路程-m
+            calorie, //卡路里-千卡
+            pace, //配速-m/s
+            isRefershLaLo,
+            lastSpeed, //上次记录的配速-m/s
+            lastTime, //上次记录的时间点-Date
+            pageStatus, //当前页面状态 show/hide 展示中/未展示
+            saveTime, //上次保存log时间-Date用于息屏后持续每10s记录log
+          } = that.data
+          /**相距时长-s */
+          let during = (currentTime - lastTime) / 1000
+          /** 平均速度-m/s*/
+          let svg_speed = (currentSpeed + lastSpeed) / 2
+          if (isRefershLaLo) {
+            longitude = change_res.longitude
+            latitude = change_res.latitude
+            let {
+              actData
+            } = that.data
+            console.log(actData)
+            actData.set('status', 'inSports')
+            await actData.save()
+            //首次获取速度
+            svg_speed = currentSpeed
+            that.setData({
+              isRefershLaLo: false,
+              actData,
+              longitude: change_res.longitude,
+              latitude: change_res.latitude,
+              lastSpeed: currentSpeed,
+            })
+          
+          }
+            /**相隔距离 */
+            let distance = during * svg_speed
+            journey = (parseFloat(journey || 0) + parseFloat(distance || 0))?.toFixed(2)
+            calorie = that.getCalorie(50, journey) //体重50kg
+            pace = svg_speed
+            let step = parseInt(parseInt(journey) / 0.6)
+            console.log(step, journey, calorie, pace)
+            console.log(`运动步数：${step}，运动距离${journey},卡路里${calorie},速度${pace}`)
+            await that.setData({
+              step: step < 0 ? 0 : step,
+              journey: journey < 0 ? 0 : journey,
+              longitude: change_res.longitude,
+              latitude: change_res.latitude,
+              calorie: calorie < 0 ? 0 : calorie,
+              pace: parseFloat(pace)?.toFixed(2) < 0 ? 0 : parseFloat(pace)?.toFixed(2),
+              lastTime: currentTime,
+              lastSpeed: currentSpeed
+            })
+            if (pageStatus == 'hide') {
+              let duTimer = new Date() - saveTime
+              if (duTimer >= 10000) {
+                // let dut = parseInt(duTimer / 1000)
+                // let {
+                //   timer
+                // } = that.data
+                // timer = timer + dut
+                // that.setData({
+                //   timer
+                // })
+                await that.setActivityRunLog()
+              }
+            }
+        });
+      },
+      fail: (res) => {
+        this.openPermissions()
+      }
+    });
+  },
+
+  /**
+   * 位置监听开启
+   */
+  async setTime() {
+    await this.setData({
+      status: 'inSports',
+      isRefershLaLo: true,
+    })
+    let that = this
+    wx.offLocationChange()
+    setTimeout(() => {
+      that.monitorLocationChange()
+      console.log('执行经纬度获取')
+    }, 1000);
+  },
+
+  /**计时器计算秒数 */
+  async intervalGetTimer() {
+    let {
+      intervalStartTime, //计时器开始时间-Date用于获取实时秒数
+      saveTime, //上次保存log时间-Date用于息屏后持续每10s记录log
+      timer,
+    } = this.data
+    let that = this
+    this.setData({
+      intervalStartTime: new Date()
+    })
+    let timerInterval = setInterval(async () => {
+      timer = timer + 1 || 0
+      let formattedTime = that.formatTime(parseInt(timer))
+      this.setData({
+        timer,
+        formattedTime
+      })
+      let time = timer % 10
+      if (time === 0) {
+        await that.setActivityRunLog()
+        that.setData({
+          stage: 'progress',
+          saveTime: new Date(),
+        })
+      }
+    }, 1000);
+    this.setData({
+      timerInterval
+    })
+  },
+
+  /**开始运动 */
+  async startInterval() {
+    await this.setData({
+      longitude: 0, //经度
+      latitude: 0, //纬度
+      markers: [], //地图标记点
+      journey: 0, //运动的路程-米
+      step: 0,
+      calorie: 0, //卡路里-千卡
+      pace: 0, //配速-m/s
+      interval: null, //计时器
+      timer: 0, //已记的时长-秒
+      formattedTime: '00:00:00', // 用于存储格式化后的时间
+      status: 'inSports', //运动中
+      stage: 'start',
+
+    })
+    setTimeout(() => {
+      this.intervalGetTimer()
+      this.setTime()
+    }, 1000);
+  },
+  /** 暂停运动*/
+  async pausedInterval() {
+    wx.offLocationChange()
+    this.setData({
+      status: 'paused',
+    })
+    let {
+      actData,
+      timer,
+      pace,
+      calorie,
+      journey,
+      step,
+      timerInterval
+    } = this.data
+    clearInterval(timerInterval)
+    this.setData({
+      timerInterval: null,
+      isRefershLaLo: true,
+    })
+    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.intervalGetTimer()
+    this.setTime()
+  },
+
+
+
 
   /**获取运动数据 */
   async getActivityData() {
@@ -107,7 +310,7 @@ Page({
         })
       }
     } else { //未传递-显示当前类型（run/walk）所有未结束的运动
-      console.log('/未传递-显示当前类型所有未结束的运动')
+      console.log('未传递-显示当前类型所有未结束的运动')
       let actDataCount
       actDataCount = await query.count()
       if (actDataCount <= 0 || !actDataCount) {
@@ -244,7 +447,7 @@ Page({
   async itemId() {
     wx.showModal({
       content: '确认结束列表内显示的全部运动吗？',
-      success:async (res)=> {
+      success: async (res) => {
         if (res.confirm) {
           wx.showLoading({
             title: '...',
@@ -476,93 +679,6 @@ Page({
     });
   },
 
-  /**
-   * 位置监听开启
-   */
-  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()
@@ -590,6 +706,7 @@ Page({
       endHaloStartDate,
       endHaloInterval,
       actData,
+      timerInterval
     } = this.data
     let endHaloEndDate = new Date()
     let a = endHaloEndDate - endHaloStartDate
@@ -605,13 +722,15 @@ Page({
         }
       });
 
+      clearInterval(timerInterval)
       await this.setData({
         status: 'noStart',
         endHaloStartDate: null,
         endHaloStartDate: null,
         percentage: '',
         endHaloInterval: null,
-        stage: 'end'
+        stage: 'end',
+        timerInterval: null,
       })
       await this.setActivityRunLog()
       let {
@@ -645,68 +764,7 @@ Page({
       })
     }
   },
-  /**监听位置变化 */
-  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('执行保存数据')
-          }
-        });
-      },
-      fail: (res) => {
-        this.openPermissions()
-      }
-    });
-  },
+
 
   /**微信步数获取-弃用-使用0.6米/步 */
   async getWeRun() {
@@ -783,7 +841,7 @@ Page({
     return (caloriesBurned / 1000).toFixed(2);
   },
 
-  /**记录运动过程-每5秒保存一次 */
+  /**记录运动过程-每10秒保存一次 */
   async setActivityRunLog() {
     let {
       actData,
@@ -793,9 +851,10 @@ Page({
       journey, //运动的路程-米
       step,
       calorie, //卡路里-千卡
-      pace, //配速-min/km
+      pace, //配速-m/s
       timer, //已记的时长-秒
       type, //步行/跑步
+      polyline, //运动轨迹
     } = this.data
     let ActivityRunLog = Parse.Object.extend('ActivityRunLog')
     let log = new ActivityRunLog()
@@ -828,6 +887,23 @@ Page({
     });
     log.set('location', location)
     await log.save()
+    let points = [...(polyline?.[0]?.points || []), {
+      longitude,
+      latitude
+    }]
+    this.setData({
+      saveTime: new Date(),
+      longitude,
+      latitude,
+      polyline: [{
+        points: points,
+        color: '#58c16c',
+        width: 5,
+        borderColor: '#fff',
+        borderWidth: 1
+      }],
+    })
+    console.log('执行一次保存函数', this.data.polyline)
   },
 
   /**时间格式显示 */
@@ -856,14 +932,51 @@ Page({
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow: function () {
+  onShow: async function () {
+    this.setData({
+      pageStatus: 'show'
+    })
+    let {
+      hideTime,
+      timer
+    } = this.data
+    if (hideTime) {
+      let currentTime = new Date()
+      let during = parseInt((currentTime - hideTime) / 1000)
+      timer = parseInt(timer) + during
+      console.log(`离开了${during}秒，从${timer}继续计时`)
+      let formattedTime = this.formatTime(parseInt(timer))
+      await this.setData({
+        timer,
+        hideTime: 0,
+        formattedTime
+      })
+      this.intervalGetTimer()
+    }
     this.examineAuthorization()
   },
 
   /**
    * 生命周期函数--监听页面隐藏
    */
-  onHide: function () {},
+  onHide: function () {
+    console.log('退出了这个页面，息屏了这个页面')
+    let {
+      status,
+      timerInterval
+    } = this.data
+    console.log(status)
+    if (status == 'inSports') {
+      clearInterval(timerInterval)
+      this.setActivityRunLog()
+      this.setData({
+        saveTime: new Date(),
+        hideTime: new Date(),
+        pageStatus: 'hide',
+        timerInterval: null,
+      })
+    }
+  },
 
   /**
    * 生命周期函数--监听页面卸载

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

@@ -11,7 +11,7 @@
 
 <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>
+    <map style="width: 100% ;height: 100%;" polyline="{{polyline}}" 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">
@@ -26,7 +26,7 @@
     <view class="number">
       <view class="num">
         <view class="num-num">{{pace}}</view>
-        <view class="num-text">配速（min/km）</view>
+        <view class="num-text">配速（m/s）</view>
       </view>
       <view class="num">
         <view class="num-num">{{formattedTime}}</view>

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

@@ -13,7 +13,7 @@
     </view>
     <view class="num">
       <view class="num-num">
-        {{sportsDate.sportDate||0}}
+        {{sportsDate.sportDate/60||0}}
         <view class="numtext">分钟</view>
       </view>
       <view class="num-text">
@@ -22,7 +22,7 @@
       </view>
     </view>
     <view class="num">
-      <view class="num-num">{{sportsDate.distance||0}}</view>
+      <view class="num-num">{{sportsDate.distance/1000||0}}</view>
       <view class="num-text">
         <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20250102/9i4h5l044715444.png?imageView2/1/w/200/h/200"></image>
         公里

nova-werun/pages/index/index.js

@@ -106,6 +106,7 @@ Page({
     let {
       active
     } = this.data
+    console.log(active)
     let componentPage = this.selectComponent(`#comp${active}`)
     if (!componentPage) {
       return
@@ -117,8 +118,9 @@ Page({
       case 1:
    
         break;
-      case 2:
-       
+      case 4:
+        componentPage.getMeChick()
+        componentPage.getcircle()
         break;
       case 3:
         

nova-werun/pages/index/index.wxml

@@ -15,10 +15,10 @@
 </template>
 <template name="nova-circle">
 	<!-- <cart id="comp{{id}}" take="{{takeAddress}}" give="giveAddress" /> -->
-	<circle id="comp{{id}}" />
+	<circle id="comp1" />
 </template>
 <template name="nova-my">
-	<my id="comp{{id}}" />
+	<my id="comp4" />
 </template>
 <!-- 底部导航 -->
 <van-tabbar

nova-werun/pages/my/my-way/index.js

@@ -3,7 +3,7 @@ const Parse = getApp().Parse;
 const company = getApp().globalData.company;
 const uid = Parse.User.current()?.id
 const dateF = require("../../../../utils/date")
-
+let sev = require('../../../service/getSportData')
 Page({
 
   /**
@@ -11,6 +11,8 @@ Page({
    */
   data: {
     actData: [], //运动数据
+    show: false, //轨迹弹框
+    points: [], //运动轨迹-点
   },
 
   /**
@@ -40,28 +42,132 @@ Page({
         icon: 'none'
       })
     }
-    console.log(d)
     let that = this
     let data = d?.map(item => {
       let obj = item?.toJSON()
-      console.log(obj.startDate)
       obj.startDate = dateF.formatTime("YYYY年mm月dd日 HH:MM", obj?.startDate?.iso || item.createdAt)
-      obj.sportDate=that.formatSeconds(obj.sportDate)
+      obj.sportDate = that.formatSeconds(obj.sportDate)
       return obj
     })
-    console.log(data)
     this.setData({
       actData: [...actData, ...data]
+
     })
   },
   /** 秒 转 时分秒*/
   formatSeconds(seconds) {
-    if(!seconds) return '00:00:00'
+    if (!seconds) return '00:00:00'
     const hours = Math.floor(seconds / 3600);
     const minutes = Math.floor((seconds % 3600) / 60);
     const secs = seconds % 60;
     return `${String(hours).padStart(2, '0')}:${String(minutes).padStart(2, '0')}:${String(secs).padStart(2, '0')}`;
   },
+
+  async getPoints(aid) {
+    let {
+      points
+    } = this.data
+    let query = new Parse.Query('ActivityRunLog')
+    query.equalTo('company', company)
+    query.equalTo('user', uid)
+    query.equalTo('actData', aid)
+    query.select('location')
+    query.limit(20)
+    query.skip(points?.length)
+    let d = await query.find()
+    let list = d?.map(item => {
+      return {
+        longitude: item.get('location')?._longitude,
+        latitude: item.get('location')?._latitude
+      }
+    })
+    await this.setData({
+      points: [...(points || []), ...(list || [])]
+    })
+    this.getActLog()
+  },
+
+  /**获取运动轨迹 */
+  async getActLog() {
+    let {
+      points
+    } = this.data
+    let obj = sev.getScale(points)
+    if (!obj?.center?.latitude || !points[0]?.latitude || !obj?.center?.longitude || !points[0]?.longitude) {
+      wx.showToast({
+        title: '未记录运动轨迹',
+        icon: 'none'
+      })
+      return
+    }
+    this.setData({
+      scale: obj?.scale,
+      latitude: obj?.center?.latitude || points[0]?.latitude,
+      longitude: obj?.center?.longitude || points[0]?.longitude,
+      polyline: [{
+        points: points,
+        color: '#58c16c',
+        width: 5,
+        borderColor: '#fff',
+        borderWidth: 1
+      }],
+
+      markers: [{
+          id: 1,
+          latitude: points[0].latitude,
+          longitude: points[0].longitude,
+          iconPath: 'https://file-cloud.fmode.cn/13WZ0W7u3l/20240724/7ebg0k104325941.png?imageView2/1/w/200/h/200', // 自定义标记图标
+          width: 20,
+          height: 20,
+        },
+        {
+          id: 2,
+          latitude: points[points?.length - 1].latitude,
+          longitude: points[points?.length - 1].longitude,
+          iconPath: 'https://file-cloud.fmode.cn/qpFbRRSZrO/20250311/ug4h1k042739214.jpg?imageView2/1/w/200/h/200', // 自定义标记图标
+          width: 20,
+          height: 20,
+        }
+      ]
+    })
+  },
+
+  async onOpen(e) {
+    let {
+      index
+    } = e.currentTarget.dataset
+    let {
+      actData
+    } = this.data
+    let query = new Parse.Query('ActivityRunLog')
+    query.equalTo('company', company)
+    query.equalTo('user', uid)
+    query.equalTo('actData', actData[index]?.objectId)
+    let count = await query.count()
+    if (!count || count <= 0) {
+      wx.showToast({
+        title: '未记录运动轨迹',
+        icon: 'none'
+      })
+      return
+    }
+    this.setData({
+      chickAct: actData[index],
+      show: true,
+      points: [],
+      logCount:count,
+    })
+    for (let i = 0; i < Math.ceil(count / 20); i++) {
+      await this.getPoints(actData[index]?.objectId)
+    }
+  },
+  onClose() {
+    this.setData({
+      show: false
+    });
+  },
+
+
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

nova-werun/pages/my/my-way/index.json

@@ -1,3 +1,6 @@
 {
-  "usingComponents": {}
+  "usingComponents": {
+    "van-popup": "@vant/weapp/popup/index",
+    "van-overlay": "@vant/weapp/overlay/index"
+  }
 }

nova-werun/pages/my/my-way/index.less

@@ -25,4 +25,13 @@
         width: 200rpx;
         text-align: center;
     }
+}
+.mapBox {
+    width: 100vw;
+    height: 70vh;
+    background: white;
+    .map{
+        width: 750rpx;
+        height:calc( 70vh - 150rpx) ;
+    }
 }

nova-werun/pages/my/my-way/index.wxml

@@ -1,15 +1,15 @@
 <nav type="back" title="运动记录" background-color="#4F9AF7" front-color="#ffffff"></nav>
 
 <block wx:for="{{actData}}" wx:key="index">
-  <view class="li">
+  <view class="li" data-index="{{index}}" bind:tap="onOpen">
     <view class="left">
       <view class="top">
-      <block wx:if="{{item.activity.objectId}}">
-        <text>{{item.activity.title}}</text>
-      </block>
-      <block wx:else>
-        <text>日常{{item.type=='run'?'跑步':'步行'}}</text>
-      </block>
+        <block wx:if="{{item.activity.objectId}}">
+          <text>{{item.activity.title}}</text>
+        </block>
+        <block wx:else>
+          <text>日常{{item.type=='run'?'跑步':'步行'}}</text>
+        </block>
         <text>{{item.distance||0}} m</text>
       </view>
       <view class="under">
@@ -19,4 +19,40 @@
     </view>
     <view class="right">{{item.startDate||'未知'}}</view>
   </view>
-</block>
+</block>
+
+<van-popup round position="bottom" show="{{ show }}" bind:close="onClose">
+  <van-overlay show="{{ points.length<logCount }}" bind:click="onClickHide">
+  <view style="width: 100%;height: 100%; z-index: 999;display: flex;justify-content: center;align-items: center;color: white;font-size: 30rpx;">
+    路线轨迹生成中... {{points.length||0}}/{{logCount}}
+  </view>
+</van-overlay>
+  <view style="padding: 20rpx;display: flex;justify-content: center;font-weight: bold;border-bottom: 1rpx solid whitesmoke;">运动详情</view>
+  <view class="mapBox">
+
+    <view style="border-radius: 10rpx;">
+      <view class="li" style="border: none;" data-index="{{index}}" bind:tap="getActLog">
+        <view class="left">
+          <view class="top">
+            <block wx:if="{{chickAct.activity.objectId}}">
+              <text>{{chickAct.activity.title}}</text>
+            </block>
+            <block wx:else>
+              <text>日常{{chickAct.type=='run'?'跑步':'步行'}}</text>
+            </block>
+            <text>{{chickAct.distance||0}} m</text>
+          </view>
+          <view class="under">
+            <text>用时 {{chickAct.sportDate||'未知'}}</text>
+            <text>配速 {{chickAct.matchSpeed||0}}</text>
+          </view>
+        </view>
+        <view class="right">{{chickAct.startDate||'未知'}}</view>
+      </view>
+    </view>
+    <block wx:if="{{polyline}}">
+      <map class="map" scale="{{scale}}" latitude="{{latitude}}" longitude="{{longitude}}" polyline="{{polyline}}" markers="{{markers}}" />
+    </block>
+  </view>
+
+</van-popup>

nova-werun/pages/my/my-way/index.wxss

@@ -1,26 +1 @@
-.li {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 20rpx;
-  margin: 20rpx;
-  border-bottom: 2rpx solid whitesmoke;
-}
-.li .left .top {
-  font-size: 30rpx;
-  font-weight: bold;
-}
-.li .left .top text {
-  margin-right: 20rpx;
-}
-.li .left .under {
-  font-size: 28rpx;
-}
-.li .left .under text {
-  margin-right: 20rpx;
-}
-.li .right {
-  font-size: 28rpx;
-  width: 200rpx;
-  text-align: center;
-}
+.li{display:flex;justify-content:space-between;align-items:center;padding:20rpx;margin:20rpx;border-bottom:2rpx solid whitesmoke}.li .left .top{font-size:30rpx;font-weight:bold}.li .left .top text{margin-right:20rpx}.li .left .under{font-size:28rpx}.li .left .under text{margin-right:20rpx}.li .right{font-size:28rpx;width:200rpx;text-align:center}.mapBox{width:100vw;height:70vh;background:white}.mapBox .map{width:750rpx;height:calc(70vh - 150rpx)}

nova-werun/service/getSportData.js

@@ -281,7 +281,7 @@ async function getChickCount(user_id, table) {
 
 /**获取当前位置信息 */
 async function getLocation() {
-  let address=''
+  let address = ''
   wx.getLocation({
     type: 'wgs84',
     success: (res) => {
@@ -296,7 +296,7 @@ async function getLocation() {
           'Content-Type': 'application/json'
         },
         success: (ops) => {
-           address = ops.data.result.formatted_address;
+          address = ops.data.result.formatted_address;
           console.log(address);
         },
         fail: function (resq) {
@@ -318,7 +318,102 @@ async function getLocation() {
     }
   });
 }
+let disList = [5,10,20,50,100,200,500,1000,2000,5000,10000,20000,25000,50000,100000,200000,500000,1000000]
+let wxScaleMap = {
+  5: 20,
+  10: 19,
+  20: 18,
+  50: 17,
+  100: 16,
+  200: 15,
+  500: 14,
+  1000: 13,
+  2000: 12,
+  5000: 11,
+  10000: 10,
+  20000: 9,
+  25000: 8,
+  50000: 7,
+  100000: 6,
+  200000: 5,
+  500000: 4,
+  1000000: 3,
+}
+/**
+ * 计算路径比例尺，中心经纬
+ * @param {*} points 运动轨迹[{longitude,latitude}]
+ */
+function getScale(points) {
+  if(!points) return{center:null,scale:null}
+  let maxLongitude = 0
+  let minLatitude = 0
+  let minLongitude = 0
+  let maxLatitude = 0
+  for (let i in points) {
+    let item = points[i]
+    if (!maxLongitude || !minLatitude || !minLongitude || !maxLatitude) {
+      maxLongitude = item.longitude
+      minLongitude = item.longitude
+      minLatitude = item.latitude
+      maxLatitude = item.latitude
+      continue
+    }
+    if (maxLongitude < item.longitude) maxLongitude = item.longitude
+    if (minLongitude > item.longitude) minLongitude = item.longitude
+    if (minLatitude > item.latitude) minLatitude = item.latitude
+    if (maxLatitude < item.latitude) maxLatitude = item.latitude
+  }
+  let distance =  haversine(maxLatitude, maxLongitude, minLatitude, minLongitude)
 
+  let center = {
+    longitude: (maxLongitude + minLongitude) / 2,
+    latitude: (minLatitude + maxLatitude) / 2
+  }
+  return {
+    center,scale:wxScaleMap[distance]
+  }
+}
+/**
+ * 两点距离-米
+ * @param {*} lat1 纬1
+ * @param {*} lon1 经1,
+ * @param {*} lat2 纬2
+ * @param {*} lon2 经2
+ */
+function haversine(lat1, lon1, lat2, lon2) {
+  const R = 6371000;
+  const φ1 = toRadians(parseFloat(lat1));
+  const φ2 = toRadians(parseFloat(lat2));
+  const Δφ = toRadians(parseFloat(lat2) - parseFloat(lat1));
+  const Δλ = 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 findValue(distance) ;
+}
+function findValue(inputNumber) {
+  if (inputNumber < disList[0]) {
+      return disList[0]; // 返回最小值
+  } else if (inputNumber >= disList[disList.length - 1]) {
+      return disList[disList.length - 1]; // 返回最大值
+  } else {
+      let maxValue = -1; // 初始化为-1，表示没有找到合适的值
+      for (let i = 0; i < disList.length; i++) {
+          if (disList[i] <= inputNumber) {
+              maxValue = disList[i]; // 更新最大值
+          } else {
+              break; // 一旦找到大于inputNumber的值，退出循环
+          }
+      }
+      return maxValue;
+  }
+}
+
+function toRadians(degrees) {
+  return degrees * (Math.PI / 180);
+}
 module.exports = {
   getwalk,
   setEndSport,
@@ -326,5 +421,6 @@ module.exports = {
   getUserRank,
   getContinuousCount,
   getChickCount,
-  getLocation
+  getLocation,
+  getScale
 };

project.private.config.json

@@ -20,9 +20,9 @@
     "miniprogram": {
       "list": [
         {
-          "name": "nova-werun/pages/activity/detail-activity/index",
-          "pathName": "nova-werun/pages/activity/detail-activity/index",
-          "query": "id=NwzxcVxCV1",
+          "name": "nova-werun/pages/home/sport/sport-start/index",
+          "pathName": "nova-werun/pages/home/sport/sport-start/index",
+          "query": "type=run",
           "launchMode": "default",
           "scene": null
         }