u

app.json

@@ -7,8 +7,11 @@
     "startLocationUpdateBackground",
     "getLocation"
   ],
-  "requiredBackgroundModes": ["location"],
-  "subpackages": [{
+  "requiredBackgroundModes": [
+    "location"
+  ],
+  "subpackages": [
+    {
       "root": "nova-werun",
       "name": "werun",
       "pages": [
@@ -28,7 +31,8 @@
         "pages/home/step/index",
         "pages/my/feedback/index",
         "pages/activity/index",
-        "pages/activity/detail-activity/index"
+        "pages/activity/detail-activity/index",
+        "pages/my/my-way/index"
       ]
     },
     {

nova-werun/components/circle/index.js

@@ -2,188 +2,162 @@
 const Parse = getApp().Parse;
 const company = getApp().globalData.company;
 Component({
-    /**
-     * 组件的属性列表
-     */
-    properties: {
+  /**
+   * 组件的属性列表
+   */
+  properties: {
 
-    },
+  },
 
-    /**
-     * 组件的初始数据
-     */
-    data: {
-        //屏幕高度
-        statusBarHeight: 0, // 状态栏高度
-        screenHeight: 0, // 屏幕高度
-        customHeight: 0, // 自定义导航栏高度（如小程序右上角胶囊按钮）
-        bottomNavHeight: 0, // 底部导航栏高度
-        contentHeight: 0, // 可用内容高度
-        contentpadding: 0, //顶部padding高度
-        navheight: 0, //nav栏高度
-        //朋友圈
-        cardList: [],
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    //屏幕高度
+    statusBarHeight: 0, // 状态栏高度
+    screenHeight: 0, // 屏幕高度
+    customHeight: 0, // 自定义导航栏高度（如小程序右上角胶囊按钮）
+    bottomNavHeight: 0, // 底部导航栏高度
+    contentHeight: 0, // 可用内容高度
+    contentpadding: 0, //顶部padding高度
+    navheight: 0, //nav栏高度
+    //朋友圈
+    cardList: [],
+
+    loadedItems: 0, // 已加载的商品数量
+    pageSize: 6, // 每次加载的商品数量
+    noMoreItems: false, // 是否还有更多商品
 
-        loadedItems: 0, // 已加载的商品数量
-        pageSize: 6, // 每次加载的商品数量
-        noMoreItems: false, // 是否还有更多商品
+    ActivityList: [],
+  },
+  lifetimes: {
 
-        ActivityList:[],
+    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 contentHeight = (screenHeight - 50 - bottomNavHeight - 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,
+        navheight
+      });
+      // console.log('123', contentHeight);
+      // this.iddepe()
+      this.getcircle()
+      this.getact()
     },
-    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;
-            const contentHeight = (screenHeight - 50 - bottomNavHeight - 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,
-                navheight
-            });
-            // console.log('123', contentHeight);
-            // this.iddepe()
-            this.getcircle()
-            this.getact()
-        },
+  },
 
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    //查全部朋友圈
+    async getcircle() {
+      let Profilequery = new Parse.Query('AIMoment');
+      Profilequery.equalTo('company', company);
+      Profilequery.equalTo('isVisible', true);
+      Profilequery.notEqualTo('isDeleted', true)
+      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();
+      }
+    },
+    getcircle2() {
+      this.setData({
+        cardList: [],
+        loadedItems: 0,
+        noMoreItems: false
+      })
+      console.log('运行了');
+      this.getcircle()
+    },
+    //跳转
+    gourl(e) {
+      const url = e.currentTarget.dataset.url
+      wx.navigateTo({
+        url: `${url}` // 目标页面的路径
+      });
+    },
+    //跳转活动
+    goactivity(e) {
+      const url = e.currentTarget.dataset.url
+      const acid = e.currentTarget.dataset.acid
+      wx.navigateTo({
+        url: `${url}?id=` + acid // 目标页面的路径
+      });
+    },
+    //判断是否有部门
+    //    async  iddepe(){
+    //         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.first();
+    //         if(P2){
+    //             this.getcircle()
+    //         }else{
+    //             wx.navigateTo({
+    //                 url: '../../pages/my/my-profile/index?type='+'资料认证'// 目标页面的路径
+    //             });
+    //         }
+    //     }
 
-    /**
-     * 组件的方法列表
-     */
-    methods: {
-
-        //查全部朋友圈
-        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());
-            // // console.log(profile1List2);
-            // const department = profile1List2[0].department.objectId
-            // // console.log(department);
-            // let queryWhere = {
-            //     where: {
-            //         profile: {
-            //             $inQuery: {
-            //                 where: {
-            //                     department: department
-            //                 },
-            //                 className: 'Profile',
-            //             },
-            //         }
-            //     }
-            // }
-            // let Profilequery = Parse.Query.fromJSON('AIMoment', queryWhere);
-            let Profilequery = new Parse.Query('AIMoment');
-            Profilequery.equalTo('company', company);
-            Profilequery.equalTo('isVisible', true);
-            Profilequery.notEqualTo('isDeleted', true)
-            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
-                });
-            }
+    //首页活动
+    async getact() {
+      let Activityquery = new Parse.Query('Activity');
+      Activityquery.equalTo('company', company);
+      Activityquery.notEqualTo('isDeleted', true);
+      Activityquery.equalTo('isEnabled', true);
+      Activityquery.ascending('index'); // 按index升序排序
+      Activityquery.limit(4); // 限制结果为前四个
 
-            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();
-            }
-        },
-        getcircle2() {
-            this.setData({
-                cardList: [],
-                loadedItems: 0,
-                noMoreItems: false
-            })
-            console.log('运行了');
-            this.getcircle()
-        },
-        //跳转
-        gourl(e) {
-            const url = e.currentTarget.dataset.url
-            wx.navigateTo({
-                url: `${url}` // 目标页面的路径
-            });
-        },
-        //跳转活动
-        goactivity(e){
-            const url = e.currentTarget.dataset.url
-            const acid = e.currentTarget.dataset.acid
-            wx.navigateTo({
-                url: `${url}?id=` + acid // 目标页面的路径
-            });
-        },
-        //判断是否有部门
-        //    async  iddepe(){
-        //         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.first();
-        //         if(P2){
-        //             this.getcircle()
-        //         }else{
-        //             wx.navigateTo({
-        //                 url: '../../pages/my/my-profile/index?type='+'资料认证'// 目标页面的路径
-        //             });
-        //         }
-        //     }
+      let P = await Activityquery.find();
+      let ActivityList = P.map(item => item.toJSON());
 
-        //首页活动
-        async getact() {
-            let Activityquery = new Parse.Query('Activity');
-            Activityquery.equalTo('company', company);
-            Activityquery.notEqualTo('isDeleted', true);
-            Activityquery.equalTo('isEnabled', true);
-            Activityquery.ascending('index'); // 按index升序排序
-            Activityquery.limit(4); // 限制结果为前四个
-        
-            let P = await Activityquery.find();
-            let ActivityList = P.map(item => item.toJSON());
-        
-            this.setData({
-                ActivityList,
-            });
-        },
+      this.setData({
+        ActivityList,
+      });
+    },
 
-    }
+  }
 })

nova-werun/components/home/index.js

@@ -92,6 +92,7 @@ Component({
     //正序
     rank: 'DESC',
     meContinuousChick: 0, //当前用户连续打卡数
+    sportTotal:0,//当前用户累计运动
   },
   lifetimes: {
 
@@ -131,10 +132,13 @@ Component({
    */
   methods: {
     async refersh() {
+      
       await this.gettarget()
       this.order()
       this.gettoday()
       this.getMeChick()
+      let sportTotal =await getSportData.getChickCount(uid,'ActivityData')
+      this.setData({sportTotal})
     },
 
     /**当前用户连续打卡数 */

nova-werun/components/home/index.wxml

@@ -17,7 +17,7 @@
       </view>
       <view class="top-tex2">
         累计运动
-        <view class="top-tex2-tex">225</view>
+        <view class="top-tex2-tex">{{sportTotal}}</view>
         天
       </view>
     </view>

nova-werun/components/my/index.wxml

@@ -41,7 +41,7 @@
     </view>
   </view>
   <view class="textbox">
-    <view class="text1box">
+    <view class="text1box" bindtap="gourl" data-url="/nova-werun/pages/my/my-way/index">
       <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241225/rpfahq101147971.png"></image>
       <view class="text1">我的路线</view>
       <van-icon name="arrow" size='30rpx' />

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

@@ -36,7 +36,9 @@ Page({
     rankType:'',
     rankList: [], //排行榜
     meRank: [], //我的排行
-    
+    checkRank:'steps',//排行关键字
+    showCheckRank:false,//选择排行关键字弹框
+    fixedNum:null,//指定数值
   },
 
   /**
@@ -143,7 +145,7 @@ Page({
     })
   },
   async refersh02() {
-    this.getRank()
+    this.confirmCheckRank()
     this.getMeRank()
   },
   /** 正序逆序*/
@@ -157,50 +159,76 @@ Page({
         rank: 'DESC'
       })
     }
-    this.getRank()
+    this.confirmCheckRank()
   },
-  /**获取排行榜 */
-  async getRank() {
-    let {
-      rank,
-      aid,
-      rankList,
-    } = this.data
-    let sql = `WITH d1 AS (
-  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",
-  al."steps" AS "al_steps",al."distance" AS "al_distance",al."burnCalories" AS "al_burnCalories",al."sportDate" AS "al_sportDate",
-  ar."booking",
-  u."nickname",u."avatar"
-  FROM "ActivityData" ad
-  LEFT JOIN "ActivityRunLog" al ON al."actData" = ad."objectId" 
-  LEFT JOIN "ActivityRegister" ar ON ar."objectId" = ad."actRegister"
-  LEFT JOIN "_User" u ON u."objectId"=ad."user"
-  WHERE ad."isDeleted" IS NOT TRUE
-  --AND ad."activity"='${aid}'
-  AND al."steps" > 43
-  AND al."steps" <109),
-  rank_t AS(
-    SELECT *, ROW_NUMBER() OVER (PARTITION BY d1."ad_objectId" ORDER BY ABS(d1."ad_steps" - 70)) AS rn
-    FROM d1
-  ),
-  d2 AS(
-    SELECT * FROM rank_t
-    WHERE rank_t."rn"=1
-  )
-  SELECT * FROM d2 
-  ORDER BY d2."al_sportDate" ASC
-  LIMIT 200 OFFSET 0`
-    let data = await request.customSQL(sql)
-    console.log(data)
-    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)
-      return obj
+  /**打开排序弹框 */
+  onChangeRank(e){
+    this.setData({
+      checkRank:e.detail,
+      showCheckRank:true,
     })
+  },
+  /**关闭排序弹框 */
+  onCloseCheckRank(){
     this.setData({
-      rankList: data,
-    });
+      showCheckRank:false
+    })
   },
+  /**确认排序 */
+  async confirmCheckRank(){
+    let {fixedNum,checkRank,aid,rank}=this.data
+    fixedNum = parseFloat(fixedNum)
+    let startNum = 0
+    let endNum = 0
+
+    //查找此跨度内最接近 fixedNum 的记录
+    if(checkRank=='steps'){
+      startNum = fixedNum-35//成人5秒可运动35步
+      endNum = fixedNum+35
+    }else{
+      startNum = fixedNum-5//每5秒记录运动状况
+      endNum = fixedNum+5
+    }
+    let sql = `WITH d1 AS (
+      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",
+      al."steps" AS "al_steps",al."distance" AS "al_distance",al."burnCalories" AS "al_burnCalories",al."sportDate" AS "al_sportDate",
+      ar."booking",
+      u."nickname",u."avatar"
+      FROM "ActivityData" ad
+      LEFT JOIN "ActivityRunLog" al ON al."actData" = ad."objectId" 
+      LEFT JOIN "ActivityRegister" ar ON ar."objectId" = ad."actRegister"
+      LEFT JOIN "_User" u ON u."objectId"=ad."user"
+      WHERE ad."isDeleted" IS NOT TRUE
+      AND ad."activity"='${aid}'
+      AND ad."company"='${company}'
+      ${fixedNum?`AND al."${checkRank}" >= ${startNum}
+      AND al."${checkRank}" <= ${endNum}`:''}
+      ),
+      rank_t AS(
+        SELECT *, ROW_NUMBER() OVER (PARTITION BY d1."ad_objectId" ORDER BY ABS(d1."ad_${checkRank}" - ${fixedNum||0})) AS rn
+        FROM d1
+      ),
+      d2 AS(
+        SELECT * FROM rank_t
+        WHERE rank_t."rn"=1
+      )
+      SELECT * FROM d2 
+      ORDER BY d2."al_${checkRank=='steps'?'sportDate':'steps'}" ${rank}
+      LIMIT 200 OFFSET 0`
+      // console.log(sql)
+      let data = await request.customSQL(sql)
+      // 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)
+        return obj
+      })
+      this.setData({
+        rankList,
+      });
+      this.onCloseCheckRank()
+  },
+
   /**获取我的成绩 */
   async getMeRank() {
     let {
@@ -217,7 +245,7 @@ Page({
     LEFT JOIN "ActivityRegister" ar ON ar."objectId" = ad."actRegister"
     LEFT JOIN "_User" u ON u."objectId"=ad."user"
     WHERE ad."isDeleted" IS NOT TRUE
-    --AND ad."activity"='${aid}'
+    AND ad."activity"='${aid}'
     AND ad."user"='${uid}'
     AND al."steps" > 43
     AND al."steps" <109),
@@ -233,13 +261,13 @@ Page({
     ORDER BY d2."al_sportDate" ASC
     LIMIT 200 OFFSET 0`
     let medata = await request.customSQL(mesql)
-    console.log(medata)
+    // console.log(medata)
     meRank = medata?.map(item => {
       let obj = item
       if (item?.booking?.from?.iso) obj.booking = dateF.formatTime("YYYY-mm-dd HH:MM", item?.booking?.from?.iso)
       return obj
     })
-    console.log(meRank)
+    // console.log(meRank)
     this.setData({
       meRank,
     });

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

@@ -533,4 +533,50 @@ van-cell {
       }
     }
   }
+}
+
+.model {
+  width: 80vw;
+  height: 400rpx;
+  .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;
+      }
+    }
+
+   .text{
+    margin-top: 50rpx;
+    font-size:30rpx;
+   }
+    .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/activity/detail-activity/index.wxml

@@ -140,29 +140,32 @@
 
       </block>
       <block wx:if="{{active==1}}">
-      <block wx:for="{{meRank}}" wx:key="index">
-        <view class="meItem">
-          <view class="h3">我的成绩</view>
-          <view class="avatar">
-            <image src="{{item.avatar}}" mode="" />
+        <block wx:for="{{meRank}}" wx:key="index">
+          <view class="meItem">
+            <view class="h3">我的成绩</view>
+            <view class="avatar">
+              <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>
-          <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>
-      </block>
-      
+        </block>
+
         <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 class="ran-top" style="display: flex;justify-content: space-between;">
+            <view style="display: flex;">
+              <view class="top-til">排行榜</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>
+
+            <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>
           </view>
 
           <block wx:for="{{rankList}}" wx:key="index">
@@ -172,7 +175,7 @@
               <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">
+              <view class="name" style="width: 150rpx;">
                 {{item.nickname}}
                 <view class="name2">{{item.booking||''}}</view>
               </view>
@@ -330,6 +333,42 @@
   </view>
 </van-popup>
 
+
+<van-popup round show="{{showCheckRank}}">
+  <view class="model">
+    <view class="content">
+      <view class="close">
+        <view class="h2">输入{{checkRank=='sportDate'?'用时':'步数'}}</view>
+        <van-icon name="cross" size="50rpx" bind:tap="onCloseCheckRank" />
+      </view>
+      <view class="text" wx:if="{{checkRank=='sportDate'}}">
+        <view style="display: flex;flex-wrap: wrap;">
+          设置排行榜为指定时长
+          <input placeholder='默认0' model:value="{{fixedNum}}" style="width: 100rpx;border-bottom: 1rpx solid black;margin:0 15rpx;padding: 0 15rpx;" type="number" />
+          秒，
+        </view>
+        步数越多排名越高
+      </view>
+      <view class="text" wx:else>
+        <view style="display: flex;">
+          设置排行榜为指定
+          <input placeholder='默认0' model:value="{{fixedNum}}" style="width: 100rpx;border-bottom: 1rpx solid black;margin:0 15rpx;padding: 0 15rpx;" type="number" />
+          步，
+        </view>
+        用时越短排名越高
+      </view>
+      <view class="btnBox">
+        <view class="btn" style="background: gray;" bind:tap="onCloseCheckRank">
+          取消
+        </view>
+        <view class="btn" bind:tap="confirmCheckRank">
+          确认
+        </view>
+      </view>
+    </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

@@ -421,3 +421,45 @@ van-cell van-radio-group van-radio {
   width: 34rpx;
   height: 34rpx;
 }
+.model {
+  width: 80vw;
+  height: 400rpx;
+}
+.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 .text {
+  margin-top: 50rpx;
+  font-size: 30rpx;
+}
+.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/circle/send-circle/index.js

@@ -1,274 +1,259 @@
 // nova-werun/pages/send-circle/index.js
 const Parse = getApp().Parse;
 const company = getApp().globalData.company;
+const uid = Parse.User.current()?.id
+let getSportData = require('../../../service/getSportData')
+
 Page({
 
-    /**
-     * 页面的初始数据
-     */
-    data: {
-        //屏幕高度
-        statusBarHeight: 0, // 状态栏高度
-        screenHeight: 0, // 屏幕高度
-        customHeight: 0, // 自定义导航栏高度（如小程序右上角胶囊按钮）
-        bottomNavHeight: 0, // 底部导航栏高度
-        contentHeight: 0, // 可用内容高度
-        contentHeight2: 0,
-        contentpadding: 0, //顶部padding高度
-        //输入框
-        inputValue: '', // 用于存储输入的内容
-        textareaHeight: 52, // 初始高度，单位为 rpx
-        // 图片
-        fileList: [],
-        fileLists: [],
-        uptokenURL: '',
-        domain: '',
-        uploadURL: '',
-        saveimage: false,
-        checked: false,
-        address: '',
-    },
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    //屏幕高度
+    statusBarHeight: 0, // 状态栏高度
+    screenHeight: 0, // 屏幕高度
+    customHeight: 0, // 自定义导航栏高度（如小程序右上角胶囊按钮）
+    bottomNavHeight: 0, // 底部导航栏高度
+    contentHeight: 0, // 可用内容高度
+    contentHeight2: 0,
+    contentpadding: 0, //顶部padding高度
+    //输入框
+    inputValue: '', // 用于存储输入的内容
+    textareaHeight: 100, // 初始高度，单位为 rpx
+    // 图片
+    fileList: [],
+    fileLists: [],
+    uptokenURL: '',
+    domain: '',
+    uploadURL: '',
+    saveimage: false,
+    checked: false,
+    address: '',
+  },
 
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    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;
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    const images = []
+    images.push({
+      url: options.image
+    })
+    console.log('options.image', options.image);
+    if (options.image) {
+      this.setData({
+        fileList: images,
+        saveimage: true,
+      })
+    }
+    this.getUptoken()
+  },
 
-        const contentpadding = (statusBarHeight + customHeight) * 750 / systemInfo.windowWidth;
-        const contentHeight = (screenHeight - bottomNavHeight - statusBarHeight - customHeight) * 750 / systemInfo.windowWidth;
-        this.setData({
-            statusBarHeight,
-            screenHeight,
-            customHeight,
-            bottomNavHeight,
-            contentpadding,
-            contentHeight
-        });
-        const images = []
-        images.push({
-            url: options.image
-        })
-        console.log('options.image', options.image);
-        if (options.image) {
-            this.setData({
-                fileList: images,
-                saveimage: true,
-            })
-        }
-        this.getUptoken()
-    },
+  /**保存步小圈 */
+  async saveAIMoment() {
+    wx.showLoading({
+      title: '加载中',
+    })
+    let {
+      fileList,
+      inputValue,
+      checked,
+      address
+    } = this.data
+    console.log(fileList, inputValue, checked)
+    if (fileList?.length <= 0 && !inputValue) {
+      wx.showToast({
+        title: '内容为空',
+        icon: 'error'
+      })
+      wx.hideLoading()
+      return
+    }
+    fileList=fileList?.map(item=>item.url)
+    let Profilequery = new Parse.Query('Profile');
+    Profilequery.equalTo('company', company);
+    Profilequery.equalTo('isCheck', true);
+    Profilequery.notEqualTo('isDeleted', true);
+    Profilequery.equalTo('user', uid);
+    let p = await Profilequery.first()
 
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady: function () {
+    let AIMoment = Parse.Object.extend("AIMoment")
+    let mom = new AIMoment()
+    mom.set("company", {
+      __type: "Pointer",
+      className: 'Company',
+      objectId: company
+    })
+    mom.set("user", {
+      __type: "Pointer",
+      className: '_User',
+      objectId: uid
+    })
+    if (p?.id) {
+      mom.set("profile", {
+        __type: "Pointer",
+        className: 'Profile',
+        objectId: p?.id
+      })
+      mom.set("isVisible", true)
+    }
+    mom.set("content", inputValue || '')
+    mom.set("images", fileList || [])
+    checked && mom.set("location", address)
+    await mom.save()
+ 
+    setTimeout(() => {
+      wx.hideLoading()
+      wx.showToast({
+        title: `发表成功${p?.id?'':'，等待审核'}`,
+        icon:'none'
+      })
+      wx.redirectTo({
+        url: '/nova-werun/pages/circle/my-circle/index'
+     })
+    }, 1000)
+  },
 
-    },
 
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow: function () {
+  /**选择展示当前位置 */
+  onChange(event) {
+    this.Getlocation()
+    this.setData({
+      checked: event.detail,
+    });
+  },
+  /**获取当前位置 */
+  Getlocation() {
+    wx.getLocation({
+      type: 'wgs84',
+      success: (res) => {
+        const {
+          latitude,
+          longitude
+        } = res;
+        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,
+            });
+          },
+          fail: function (resq) {
+            wx.showModal({
+              title: '信息提示',
+              content: '请求失败',
+              showCancel: false,
+              confirmColor: '#f37938'
+            });
+          },
+          complete: function () {}
+        })
 
-    },
+      },
+      fail: (err) => {
+        console.error(err);
+        wx.showToast({
+          title: '获取位置失败',
+          icon: 'none'
+        });
+      }
+    });
+  },
+  /** 获取图片数组*/
+  picture(event) {
+    let FileList = event.detail
+    this.setData({
+      fileList: FileList,
+    })
+  },
+  /**七牛云 */
+  async getUptoken() {
+    let res = await Parse.Cloud.run('qiniu_uptoken', {
+      company: company
+    })
+    this.setData({
+      uptokenURL: res.uptoken,
+      domain: res.domain,
+      uploadURL: res.zoneUrl
+    })
+    console.log(this.data.uptokenURL, this.data.domain, this.data.uploadURL);
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
 
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide: function () {
+  },
 
-    },
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
 
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload: function () {
+  },
 
-    },
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
 
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh: function () {
+  },
 
-    },
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
 
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom: function () {
+  },
 
-    },
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
 
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage: function () {
+  },
 
-    },
-    //输入框高度随字体增多而变大
-    onInput: function (event) {
-        const value = event.detail.value; // 获取当前输入的值
-        this.setData({
-            inputValue: value,
-        });
-        console.log(this.data.inputValue);
-    },
-    async getUptoken() {
-        let res = await Parse.Cloud.run('qiniu_uptoken', {
-            company: company
-        })
-        this.setData({
-            uptokenURL: res.uptoken,
-            domain: res.domain,
-            uploadURL: res.zoneUrl
-        })
-        console.log(this.data.uptokenURL, this.data.domain, this.data.uploadURL);
-    },
-    //获取图片数组
-    picture(event) {
-        console.log('event', event);
-        let FileList = event.detail
-        this.setData({
-            fileList: FileList,
-        })
-        console.log('图片', this.data.fileLists);
-    },
-    //上传函数
-    async send() {
-        const currentUser = Parse.User.current();
-        let Profilequery = new Parse.Query('Profile');
-        Profilequery.equalTo('company', company);
-        Profilequery.equalTo('isCheck', true);
-        Profilequery.notEqualTo('isDeleted', true);
-        Profilequery.equalTo('user', currentUser.id);
-        let p = await Profilequery.first()
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
 
-        let userequery = new Parse.Query('_User');
-        userequery.equalTo('company', company);
-        userequery.notEqualTo('isDeleted', true);
-        userequery.equalTo('objectId', currentUser.id);
-        let user = await userequery.first()
+  },
 
-        let companyPointer = Parse.Object.extend('Company').createWithoutData(company);
-        let Comment = new Parse.Object('AIMoment');
-        if(p){
-            Comment.set('profile', p.toPointer())
-            Comment.set('isVisible', true);
-        }
-        Comment.set('company', companyPointer);
-        Comment.set('user', user.toPointer());
-        
-        if (this.data.fileList.length > 0) {
-            let url = []
-            for (let i = 0; i < this.data.fileList.length; i++) {
-                url.push(this.data.fileList[i].url)
-            }
-            this.setData({
-                fileLists: url,
-            })
-            Comment.set('images', this.data.fileLists);
-        }
-        Comment.set('content', this.data.inputValue);
-        if (this.data.checked) {
-            Comment.set('location', this.data.address);
-        }
-        try {
-            if (this.data.fileList.length == 0 && !this.data.inputValue) {
-                console.log('新数据保存失败');
-            } else {
-                let saveDate2 = await Comment.save();
-                console.log(saveDate2);
-                console.log("新数据保存成功");
-                wx.showToast({
-                    title: '发布成功',
-                    icon: 'success',
-                    duration: 1000
-                });
-                setTimeout(() => {
-                    this.goback()
-                }, 1000)
-            }
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
 
+  },
+  //输入框高度随字体增多而变大
+  onInput: function (event) {
+    const value = event.detail.value; // 获取当前输入的值
+    this.setData({
+      inputValue: value,
+    });
+    console.log(this.data.inputValue);
+  },
 
-        } catch (error) {
-            console.error("保存数据时出现错误:", error);
-        }
 
 
-    },
-    async goback() {
-        if (!this.data.saveimage) {
-            let pages = getCurrentPages(); //页面对象
-            console.log(pages);
-            let prevpage = pages[pages.length - 2]; //上一个页面对象
-            console.log(prevpage);
-            await prevpage.updateCom()
-        }
-        wx.navigateBack({
-            delta: 1
-        });
-    },
-    //选择展示当前位置
-    onChange(event) {
-        this.setData({
-            checked: event.detail,
-        });
-        console.log(this.data.checked);
-        this.Getlocation()
-    },
-    //获取当前位置
-    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.formatted_address;
-                        this.setData({
-                            address: address,
-                        });
-                        console.log(this.data.address);
-                    },
-                    fail: function (resq) {
-                        wx.showModal({
-                            title: '信息提示',
-                            content: '请求失败',
-                            showCancel: false,
-                            confirmColor: '#f37938'
-                        });
-                    },
-                    complete: function () {}
-                })
+  async goback() {
+    if (!this.data.saveimage) {
+      let pages = getCurrentPages(); //页面对象
+      console.log(pages);
+      let prevpage = pages[pages.length - 2]; //上一个页面对象
+      console.log(prevpage);
+      await prevpage.updateCom()
+    }
+    wx.navigateBack({
+      delta: 1
+    });
+  },
 
-            },
-            fail: (err) => {
-                console.error(err);
-                wx.showToast({
-                    title: '获取位置失败',
-                    icon: 'none'
-                });
-            }
-        });
-    },
 })

nova-werun/pages/circle/send-circle/index.less

@@ -38,6 +38,7 @@
     }
     .clickbox{
         margin-top: 60rpx;
+        font-size: 32rpx;
         width: 100%;
     }
 }

nova-werun/pages/circle/send-circle/index.wxml

@@ -1,15 +1,18 @@
 <!--nova-werun/pages/send-circle/index.wxml-->
-<nav type="back" title="发布步小圈"  background-color="{{'#4F9AF7'}}" front-color="{{'#ffffff'}}"></nav>
-<view class="all" style="height: {{contentHeight}}rpx;">
-    <view class="{{fileList.length==0&&!inputValue?'send2':'send'}}" bindtap="send">发送</view>
-    <view class="text">
-        <textarea placeholder="输入内容" class="textarea" style="height: {{textareaHeight}}rpx;" maxlength='300' auto-height='true' bindinput="onInput" value="{{inputValue}}"></textarea>
-    </view>
-    <upload style="width: 50%;" bind:onChangeFile="picture" fileList="{{fileList}}" uploadURL="{{uploadURL}}" domain="{{domain}}" uptokenURL="{{uptokenURL}}" maxCount="12" />
-    <view class="clickbox">
-        <van-checkbox value="{{ checked }}" checked-color="#4F9AF7" bind:change="onChange">
-            实现展示所在位置
-        </van-checkbox>
-    </view>
-
+<nav type="back" title="发布步小圈" background-color="{{'#4F9AF7'}}" front-color="{{'#ffffff'}}"></nav>
+<view class="all">
+  <view class="text">
+    <textarea placeholder="输入内容" class="textarea" style="height: {{textareaHeight}}rpx;" maxlength='300' auto-height='true' bindinput="onInput" value="{{inputValue}}"></textarea>
+  </view>
+  <upload style="width: 50%;" bind:onChangeFile="picture" fileList="{{fileList}}" uploadURL="{{uploadURL}}" domain="{{domain}}" uptokenURL="{{uptokenURL}}" maxCount="9" />
+  <view class="clickbox">
+    <van-checkbox value="{{ checked }}" checked-color="#4F9AF7" bind:change="onChange">
+      实现展示所在位置
+      <block wx:if="{{checked||address}}">
+        - {{address}}
+      </block>
+    </van-checkbox>
+  </view>
+  <button wx:if="{{fileList.length==0&&!inputValue}}" style="background:gray ;width: 50vw;margin-top: 30rpx;font-size: 30rpx;color: white;">发布</button>
+  <button wx:else style="background:#4F9AF7 ;width: 50vw;margin-top: 30rpx;font-size: 30rpx;color: white;" bindtap="saveAIMoment">发布</button>
 </view>

nova-werun/pages/circle/send-circle/index.wxss

@@ -1 +1,44 @@
-.all{width:100vw;padding-top:10rpx;padding-left:20rpx;padding-right:20rpx}.all .send{margin-left:auto;width:100rpx;height:50rpx;font-size:30rpx;color:white;background-color:#4F9AF7;border-radius:10rpx;margin-right:20rpx ;display:flex;justify-content:center;align-items:center}.all .send2{margin-left:auto;width:100rpx;height:50rpx;font-size:30rpx;color:gray;background-color:#e6e6e6;border-radius:10rpx;margin-right:20rpx ;display:flex;justify-content:center;align-items:center}.all .textarea{width:100%;font-size:32rpx;margin-bottom:40rpx;margin-top:20rpx}.all .clickbox{margin-top:60rpx;width:100%}
+/* nova-werun/pages/send-circle/index.wxss */
+.all {
+  width: 100vw;
+  padding-top: 10rpx;
+  padding-left: 20rpx;
+  padding-right: 20rpx;
+}
+.all .send {
+  margin-left: auto;
+  width: 100rpx;
+  height: 50rpx;
+  font-size: 30rpx;
+  color: white;
+  background-color: #4F9AF7;
+  border-radius: 10rpx;
+  margin-right: 20rpx ;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.all .send2 {
+  margin-left: auto;
+  width: 100rpx;
+  height: 50rpx;
+  font-size: 30rpx;
+  color: gray;
+  background-color: #e6e6e6;
+  border-radius: 10rpx;
+  margin-right: 20rpx ;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.all .textarea {
+  width: 100%;
+  font-size: 32rpx;
+  margin-bottom: 40rpx;
+  margin-top: 20rpx;
+}
+.all .clickbox {
+  margin-top: 60rpx;
+  font-size: 32rpx;
+  width: 100%;
+}

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

@@ -164,11 +164,13 @@ Page({
     wx.canvasToTempFilePath({
       canvas: canvas,
       success(res) {
-        that.setData({saveimage: res.tempFilePath})
+        that.setData({
+          saveimage: res.tempFilePath
+        })
         wx.saveImageToPhotosAlbum({
           filePath: res.tempFilePath,
           success: (res) => {
-            console.log('success',res)
+            console.log('success', res)
           },
           fail: (err) => {
             // console.log('err',err)
@@ -541,9 +543,19 @@ Page({
     });
   },
   sharecircle() {
-    console.log('this.data.saveimage', this.data.saveimage);
-    wx.navigateTo({
-      url: '../../circle/send-circle/index?image=' + this.data.saveimage // 目标页面的路径
-    });
+    wx.showLoading({
+      title: '保存图片',
+    })
+    this.saveCanvas()
+    setTimeout(() => {
+      wx.hideLoading()
+      wx.navigateTo({
+        url: '../../circle/send-circle/index'
+      });
+    }, 1500);
+
+    // wx.navigateTo({
+    //   url: '../../circle/send-circle/index?image=' + this.data.saveimage // 目标页面的路径
+    // });
   }
 })

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

@@ -0,0 +1,113 @@
+// nova-werun/pages/my/my-way/index.js
+const Parse = getApp().Parse;
+const company = getApp().globalData.company;
+const uid = Parse.User.current()?.id
+const dateF = require("../../../../utils/date")
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    actData: [], //运动数据
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    this.getActData()
+  },
+
+  /** 获取运动数据*/
+  async getActData() {
+    let {
+      actData
+    } = this.data
+    let query = new Parse.Query('ActivityData')
+    query.equalTo('company', company)
+    query.equalTo('user', uid)
+    query.notEqualTo('isDeleted', true)
+    query.descending('createdAt')
+    query.include('activity')
+    query.limit(30)
+    query.skip(actData?.length || 0)
+    let d = await query.find()
+    if (d?.length <= 0) {
+      wx.showToast({
+        title: '到底了~',
+        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)
+      return obj
+    })
+    console.log(data)
+    this.setData({
+      actData: [...actData, ...data]
+    })
+  },
+  /** 秒 转 时分秒*/
+  formatSeconds(seconds) {
+    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')}`;
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+    this.getActData()
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

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

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

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

@@ -0,0 +1,28 @@
+.li{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 20rpx;
+    margin: 20rpx;
+    border-bottom: 2rpx solid whitesmoke;
+    .left{
+        .top{
+            font-size: 30rpx;
+            font-weight: bold;
+            text{
+                margin-right: 20rpx;
+            }
+        }
+        .under{
+            font-size: 28rpx;
+            text{
+                margin-right: 20rpx;
+            }
+        }
+    }
+    .right{
+        font-size: 28rpx;
+        width: 200rpx;
+        text-align: center;
+    }
+}

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

@@ -0,0 +1,22 @@
+<nav type="back" title="运动记录" background-color="#4F9AF7" front-color="#ffffff"></nav>
+
+<block wx:for="{{actData}}" wx:key="index">
+  <view class="li">
+    <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>
+        <text>{{item.distance||0}} m</text>
+      </view>
+      <view class="under">
+        <text>用时 {{item.sportDate||'未知'}}</text>
+        <text>配速 {{item.matchSpeed||0}}</text>
+      </view>
+    </view>
+    <view class="right">{{item.startDate||'未知'}}</view>
+  </view>
+</block>

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

@@ -0,0 +1,26 @@
+.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;
+}

nova-werun/service/getSportData.js

@@ -254,17 +254,17 @@ async function getContinuousCount(user_id, table) {
 WHERE t4."end_date" >='${yesSql}'
 ORDER BY t4."end_date" DESC
 LIMIT 1`
-// console.log(sql)
+  // console.log(sql)
   let data = await request.customSQL(sql)
   // console.log(data)
-return data[0]?.c_count
+  return data[0]?.c_count
 }
 /**
  * 获取至今日累计 签到/运动 天数
  * @param {*} uid uid默认当前用户
  * @param {*} table 查询那一张表，签到EventLog/运动ActivityData，默认EventLog
  */
-async function getChickCount(user_id,table){
+async function getChickCount(user_id, table) {
   let sql = `SELECT COUNT(*)
   FROM (
     SELECT DISTINCT(DATE(el."createdAt")) AS "created_date",el."user"
@@ -276,12 +276,55 @@ async function getChickCount(user_id,table){
   // console.log(sql)
   let data = await request.customSQL(sql)
   // console.log(data)
-return data[0]?.count
+  return data[0]?.count
+}
+
+/**获取当前位置信息 */
+async function getLocation() {
+  let address=''
+  wx.getLocation({
+    type: 'wgs84',
+    success: (res) => {
+      const {
+        latitude,
+        longitude
+      } = res;
+      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) => {
+           address = ops.data.result.formatted_address;
+          console.log(address);
+        },
+        fail: function (resq) {
+          wx.showModal({
+            title: '信息提示',
+            content: '请求失败',
+            showCancel: false,
+            confirmColor: '#f37938'
+          });
+        },
+      })
+    },
+    fail: (err) => {
+      console.error(err);
+      wx.showToast({
+        title: '获取位置失败',
+        icon: 'none'
+      });
+    }
+  });
 }
+
 module.exports = {
   getwalk,
   setEndSport,
   getRanking,
   getUserRank,
-  getContinuousCount,getChickCount
+  getContinuousCount,
+  getChickCount,
+  getLocation
 };

project.private.config.json

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