u

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

@@ -235,7 +235,7 @@ Component({
             AIMomentCommentquery2.equalTo('company', company);
             AIMomentCommentquery2.equalTo('type', 'chickin');
             AIMomentCommentquery2.equalTo('moment', this.data.objectId);
-            AIMomentCommentquery2.equalTo('user', currentUser.id);
+            AIMomentCommentquery2.equalTo('user', currentUser?.id);
             let moment2 = await AIMomentCommentquery2.find()
             let AIMoment1List2 = moment2.map(item => item.toJSON());
             if (AIMoment1List2.length != 0) {

nova-werun/components/ec-canvas/ec-canvas.js

@@ -1,5 +1,5 @@
 import WxCanvas from './wx-canvas';
-import * as echarts from './echarts.min';
+import * as echarts from './echarts';
 
 let ctx;
 

nova-werun/components/home/index.js

@@ -2,6 +2,7 @@
 const Parse = getApp().Parse;
 const company = getApp().globalData.company;
 let getSportData = require('../../service/getSportData')
+const uid = Parse.User.current()?.id
 
 
 Component({
@@ -81,7 +82,7 @@ Component({
     todayList: [],
     changetitle: 0,
     changetitleMap: {
-      0:'历史',
+      0: '历史',
       'today': '本日',
       'toweek': '本周',
       'tomonth': '本月',
@@ -89,7 +90,8 @@ Component({
     },
     steps: 0,
     //正序
-    rank: 'DESC'
+    rank: 'DESC',
+    meContinuousChick: 0, //当前用户连续打卡数
   },
   lifetimes: {
 
@@ -119,7 +121,6 @@ Component({
         contentpadding,
         navheight,
       });
-      this.gettarget()
       this.Getlocation()
       this.refersh()
     },
@@ -129,11 +130,20 @@ Component({
    * 组件的方法列表
    */
   methods: {
-    async refersh(){
+    async refersh() {
+      await this.gettarget()
       this.order()
       this.gettoday()
+      this.getMeChick()
     },
 
+    /**当前用户连续打卡数 */
+    async getMeChick() {
+      let meContinuousChick = await getSportData.getContinuousCount(uid, 'ActivityData') || 0
+      this.setData({
+        meContinuousChick
+      })
+    },
     //跳转
     gourl(e) {
       const url = e.currentTarget.dataset.url
@@ -155,20 +165,20 @@ Component({
       const currentUser = Parse.User.current();
       let userquery = new Parse.Query('_User');
       userquery.equalTo('company', company);
-      userquery.equalTo('objectId', currentUser.id);
+      userquery.equalTo('objectId', currentUser?.id);
       userquery.notEqualTo('isDeleted', true)
       let user = await userquery.first();
       let num = user?.toJSON()
-      if (num.num) {
+      if (num?.num) {
         this.setData({
-          target: num.num
+          target: num?.num
         })
         console.log('当前步数', this.data.target);
       } else {
         const currentUser2 = Parse.User.current();
         let userquery2 = new Parse.Query('_User');
         userquery2.equalTo('company', company);
-        userquery2.equalTo('objectId', currentUser2.id);
+        userquery2.equalTo('objectId', currentUser2?.id);
         userquery2.notEqualTo('isDeleted', true)
         let user2 = await userquery2.first();
         user2.set('num', 5000)
@@ -194,8 +204,9 @@ Component({
       this.getBackgroundColor()
       // console.log('sharList', steps);
     },
-     /** 修改进度条*/
+    /** 修改进度条*/
     getBackgroundColor() {
+      console.log(this.data.steps, this.data.target)
       let percentage = (this.data.steps / this.data.target) * 100;
       if (percentage > 100) {
         percentage = 100;
@@ -252,7 +263,7 @@ Component({
         }
       });
     },
- 
+
     /** 切换 历史/本日/本周/本月*/
     change() {
       // 使用数组来简化切换逻辑
@@ -271,9 +282,14 @@ Component({
         changetitle
       } = this.data
       let data = await getSportData.getRanking('', changetitle, '', '', rank)
-      console.log(data)
+      let todayList = []
+      for (let i in data) {
+        let obj = data[i]
+        obj.count = await getSportData.getChickCount(obj.user, 'ActivityData')
+        todayList.push(obj)
+      }
       this.setData({
-        todayList: data,
+        todayList
       });
     },
     /** 正序逆序*/
@@ -289,6 +305,6 @@ Component({
       }
       this.gettoday()
     },
-   
+
   }
 })

nova-werun/components/home/index.wxml

@@ -16,7 +16,7 @@
         健康运动 go
       </view>
       <view class="top-tex2">
-        积累运动
+        累计运动
         <view class="top-tex2-tex">225</view>
         天
       </view>
@@ -43,7 +43,7 @@
             <view class="boj1-ti">连续打卡</view>
             <view class="obj1-numbox">
               <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20250102/tii6p6035434602.png"></image>
-              <view class="obj1-numbox-tex">7天</view>
+              <view class="obj1-numbox-tex">{{meContinuousChick}}天</view>
             </view>
           </view>
           <view class="obj2">积累打卡7天，超过20%人</view>
@@ -83,7 +83,7 @@
           <image class="avarter" src="{{item.avatar}}"></image>
           <view class="name">
             {{item.nickname}}
-            <view class="name2">已打卡12天</view>
+            <view class="name2">已打卡{{item.count||0}}天</view>
           </view>
           <view class="num">{{item.totalSteps}}</view>
         </view>

nova-werun/components/my/index.js

@@ -1,6 +1,10 @@
 // nova-werun/components/my/index.js
 const Parse = getApp().Parse;
 const company = getApp().globalData.company;
+const auth = require('../../service/auth.service')
+const uid = Parse?.User?.current()?.id
+let getSportData = require('../../service/getSportData')
+
 Component({
     /**
      * 组件的属性列表
@@ -25,7 +29,8 @@ Component({
         circlecount: 0,
         likesCount: 0,
         User1List: [],
-        profile1List2: []
+        profile1List2: [],
+        meChick:0,//当前用户累计签到天数
     },
     lifetimes: {
 
@@ -63,7 +68,15 @@ Component({
      * 组件的方法列表
      */
     methods: {
+      /**获取累计签到天数 */
+      async getMeChick() {
+        let meChick = await getSportData.getChickCount(uid, 'ActivityData')||0
+        this.setData({
+          meChick
+        })
+      },
         gourl(e) {
+
             const url = e.currentTarget.dataset.url
             wx.navigateTo({
                 url: `${url}` // 目标页面的路径
@@ -106,7 +119,7 @@ Component({
             const currentUser = Parse.User.current();
             let Profilequery2 = new Parse.Query('Profile');
             Profilequery2.equalTo('company', company);
-            Profilequery2.equalTo('user', currentUser.id);
+            Profilequery2.equalTo('user', currentUser?.id);
             Profilequery2.equalTo('isCheck', true);
             Profilequery2.notEqualTo('isDeleted', true);
             Profilequery2.include('user');
@@ -164,7 +177,7 @@ Component({
             const currentUser = Parse.User.current();
             let Userquery = new Parse.Query('_User');
             Userquery.equalTo('company', company);
-            Userquery.equalTo('objectId', currentUser.id);
+            Userquery.equalTo('objectId', currentUser?.id);
             Userquery.notEqualTo('isDeleted', true)
             let P2 = await Userquery.find();
             let User1List = P2.map(item => item.toJSON());
@@ -173,11 +186,119 @@ Component({
             })
             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()
+            }
+          })
+        }
+      },
+      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.wxml

@@ -1,72 +1,75 @@
 <!--nova-werun/components/my/index.wxml-->
 <view class="all" style="height: {{screenHeight}}rpx;">
-    <view class="navbox" style="height: {{navheight}}rpx;">
-        <view class="nav">
-            <view class="nav-title">个人中心</view>
-        </view>
+  <view class="navbox" style="height: {{navheight}}rpx;">
+    <view class="nav">
+      <view class="nav-title">个人中心</view>
     </view>
-    <view class="perxonalbox">
-        <image class="avatar" src="{{User1List[0].avatar||'https://file-cloud.fmode.cn/qpFbRRSZrO/20241120/63c55i022235020.png?imageView2/1/w/200/h/200'}}" mode="scaleToFill"></image>
-        <view class="namebox">
-            <view class="name">{{User1List[0].nickname}}</view>
-            <!-- <view class="databox" data-url="../../pages/my/my-profile/index" bindtap="gourl">
+  </view>
+  <view class="perxonalbox">
+    <image class="avatar" src="{{User1List[0].avatar||'https://file-cloud.fmode.cn/qpFbRRSZrO/20241120/63c55i022235020.png?imageView2/1/w/200/h/200'}}" mode="scaleToFill"></image>
+    <view class="namebox">
+      <view class="name">{{User1List[0].nickname}}</view>
+      <!-- <view class="databox" data-url="../../pages/my/my-profile/index" bindtap="gourl">
                 <view class="data">完善资料</view>
                 <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241120/1ssc1a102512989.png?imageView2/1/w/200/h/200"></image>
             </view> -->
-            <view class="numberbox">
-                <view wx:if="{{profile1List2[0].center}}" class="num">{{profile1List2[0].user.mobile}} | {{profile1List2[0].center.name}}</view>
-                <view wx:if="{{!profile1List2[0].center}}" class="num">暂未认证</view>
-            </view>
-        </view>
-        <view class="picbox">
-            <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241225/k17mbg095037093.png"></image>
-            <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241225/dkebge095058533.png" data-url="../../pages/my/my-profile/index" bindtap="gourl2" data-type="完善资料"></image>
-        </view>
+      <view class="numberbox">
+        <view wx:if="{{profile1List2[0].center}}" class="num">{{profile1List2[0].user.mobile}} | {{profile1List2[0].center.name}}</view>
+        <view wx:if="{{!profile1List2[0].center}}" class="num">暂未认证</view>
+      </view>
     </view>
-    <view class="infobox">
-        <view class="info">
-            <view class="info-num">{{circlecount}}</view>
-            <view class="info-tex">动态</view>
-        </view>
-        <view class="info">
-            <view class="info-num">0</view>
-            <view class="info-tex">积分</view>
-        </view>
-        <view class="info">
-            <view class="info-num">{{likesCount}}</view>
-            <view class="info-tex">点赞</view>
-        </view>
+    <view class="picbox">
+      <button style="background: none;" open-type="contact">
+        <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241225/k17mbg095037093.png"></image>
+      </button>
+    
+      <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241225/dkebge095058533.png" data-url="../../pages/my/my-profile/index" bindtap="gourl2" data-type="完善资料"></image>
     </view>
-    <view class="textbox">
-        <view class="text1box">
-            <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241225/rpfahq101147971.png"></image>
-            <view class="text1">我的路线</view>
-            <van-icon name="arrow" size='30rpx' />
-        </view>
-        <view class="text1box" bindtap="gourl" data-url="../../pages/circle/my-circle/index">
-            <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241225/rpfahq101147971.png"></image>
-            <view class="text1">我的动态</view>
-            <van-icon name="arrow" size='30rpx' />
-        </view>
-        <view class="text1box" data-url="../../pages/my/my-profile/index" data-type="资料认证" bindtap="gourl2">
-            <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241225/rpfahq101147971.png"></image>
-            <view class="text1">资料认证</view>
-            <van-icon name="arrow" size='30rpx' />
-        </view>
-        <view class="text1box" bindtap="gourl" data-url="../../pages/my/feedback/index">
-            <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241225/rpfahq101147971.png"></image>
-            <view class="text1">问题反馈</view>
-            <van-icon name="arrow" size='30rpx' />
-        </view>
-        <view class="text1box">
-            <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241225/rpfahq101147971.png"></image>
-            <view class="text1">隐私协议</view>
-            <van-icon name="arrow" size='30rpx' />
-        </view>
-        <view class="text1box">
-            <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241225/rpfahq101147971.png"></image>
-            <view class="text1">退出登录</view>
-            <van-icon name="arrow" size='30rpx' />
-        </view>
+  </view>
+  <view class="infobox">
+    <view class="info">
+      <view class="info-num">{{circlecount}}</view>
+      <view class="info-tex">动态</view>
     </view>
+    <view class="info">
+      <view class="info-num">{{meChick}}</view>
+      <view class="info-tex">打卡</view>
+    </view>
+    <view class="info">
+      <view class="info-num">{{likesCount}}</view>
+      <view class="info-tex">点赞</view>
+    </view>
+  </view>
+  <view class="textbox">
+    <view class="text1box">
+      <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241225/rpfahq101147971.png"></image>
+      <view class="text1">我的路线</view>
+      <van-icon name="arrow" size='30rpx' />
+    </view>
+    <view class="text1box" bindtap="gourl" data-url="../../pages/circle/my-circle/index">
+      <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241225/rpfahq101147971.png"></image>
+      <view class="text1">我的动态</view>
+      <van-icon name="arrow" size='30rpx' />
+    </view>
+    <view class="text1box" data-url="../../pages/my/my-profile/index" data-type="资料认证" bindtap="gourl2">
+      <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241225/rpfahq101147971.png"></image>
+      <view class="text1">资料认证</view>
+      <van-icon name="arrow" size='30rpx' />
+    </view>
+    <view class="text1box" bindtap="gourl" data-url="../../pages/my/feedback/index">
+      <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241225/rpfahq101147971.png"></image>
+      <view class="text1">问题反馈</view>
+      <van-icon name="arrow" size='30rpx' />
+    </view>
+    <view class="text1box" bind:tap="openFile">
+      <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241225/rpfahq101147971.png"></image>
+      <view class="text1">隐私协议</view>
+      <van-icon name="arrow" size='30rpx' />
+    </view>
+    <view class="text1box" bind:tap="outLogin">
+      <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241225/rpfahq101147971.png"></image>
+      <view class="text1">退出登录</view>
+      <van-icon name="arrow" size='30rpx' />
+    </view>
+  </view>
 </view>

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

@@ -3,6 +3,9 @@ const Parse = getApp().Parse;
 const company = getApp().globalData.company;
 const uid = Parse.User.current()?.id
 const login = require("../../../../utils/login");
+let getSportData = require('../../../service/getSportData')
+let request = require('../../../../utils/request')
+
 Page({
 
   /**
@@ -11,11 +14,9 @@ Page({
   data: {
     attachment: null,
     isAttachment: null,
-
     showpopup: false,
     name: null,
     mobile: null,
-
     sex: null,
     idcard: null,
     birthdate: null,
@@ -24,27 +25,18 @@ Page({
     centerDesc: null,
     teacher: null,
     tel: null,
-
     date: '',
     showDate: false,
-    storeVal: null,
     active: 0,
-    comList: [],
-    comCount: 0,
-    comVal: null,
-    replyObj: {
-      placeholder: '你猜我的评论区在等谁？'
-    },
-    autosize: {
-      maxHeight: 100,
-      minHeight: 50
-    },
     idcard: null,
     teacher: null,
-    teacherAdd: null,
-    remark: null,
     optionKeyList: [],
-    isAttend:false,//当前活动是否可参与（报名时间结束即可参与运动）
+    isAttend: false, //当前活动是否可参与（报名时间结束即可参与运动）
+    rank: 'DESC',
+    rankType:'',
+    rankList: [], //排行榜
+    meRank: [], //我的排行
+    
   },
 
   /**
@@ -61,6 +53,7 @@ Page({
       userInfo
     })
     this.refersh()
+    // this.refersh02()
   },
 
 
@@ -91,16 +84,20 @@ Page({
     let activity = data.toJSON()
     console.log(activity)
     let now = new Date()
-    if(activity.signFromTo?.to?.iso){//当前时间大于可签到结束时间-可参与
+    if (activity.signFromTo?.to?.iso) { //当前时间大于可签到结束时间-可参与
       let signTo = new Date(activity.signFromTo?.to?.iso)
-      if(now > signTo){
-        this.setData({isAttend:true})
+      if (now > signTo) {
+        this.setData({
+          isAttend: true
+        })
       }
     }
-    if(activity.endDate){//当前时间大于活动结束时间-不可参与
+    if (activity.endDate) { //当前时间大于活动结束时间-不可参与
       let end = new Date(activity.endDate)
-      if(now > end){
-        this.setData({isAttend:false})
+      if (now > end) {
+        this.setData({
+          isAttend: false
+        })
       }
     }
     let optionKeyList = Object.keys(activity.limitOptions || {}) || []
@@ -108,15 +105,15 @@ Page({
     activity.end = dateF.formatTime("mm.dd HH:MM", activity.endDate?.iso)
     activity.startDate = new Date(activity.startDate?.iso)
     activity.endDate = new Date(activity.endDate?.iso)
-    
+
     if (activity.signFromTo?.from && activity.signFromTo?.to) {
       activity.signFromTo.fromDate = new Date(activity.signFromTo?.from?.iso) || null
       activity.signFromTo.toDate = new Date(activity.signFromTo?.to?.iso) || null
       activity.signFromTo.from = dateF.formatTime("YYYY.mm.dd HH:MM", activity.signFromTo?.from?.iso)
       activity.signFromTo.to = dateF.formatTime("mm.dd HH:MM", activity.signFromTo?.to?.iso)
     }
- 
-   
+
+
     this.setData({
       activity,
       optionKeyList,
@@ -137,13 +134,116 @@ Page({
   },
   /**切换 活动详情/排行榜 */
   async changeTab(e) {
-    if (e.detail.name == 1 && !this.data?.comList?.length) {
+    if (e.detail.name == 1) {
       // this.getHomeCom()
+      this.refersh02()
     }
     this.setData({
       active: e.detail.name
     })
   },
+  async refersh02() {
+    this.getRank()
+    this.getMeRank()
+  },
+  /** 正序逆序*/
+  async changeup() {
+    if (this.data.rank == 'DESC') {
+      await this.setData({
+        rank: 'ASC'
+      })
+    } else {
+      await this.setData({
+        rank: 'DESC'
+      })
+    }
+    this.getRank()
+  },
+  /**获取排行榜 */
+  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
+    })
+    this.setData({
+      rankList: data,
+    });
+  },
+  /**获取我的成绩 */
+  async getMeRank() {
+    let {
+      aid,
+      meRank
+    } = this.data
+    let mesql = `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."user"='${uid}'
+    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 medata = await request.customSQL(mesql)
+    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)
+    this.setData({
+      meRank,
+    });
+  },
   /**获取报名记录 */
   async getActRegister() {
     let {
@@ -428,12 +528,13 @@ Page({
   /**选择位置 */
   chooseShop(e) {
     let {
-      shopList,tips
+      shopList,
+      tips
     } = this.data
-    if(!tips.isEdit){
+    if (!tips.isEdit) {
       wx.showToast({
-        title:`${tips.title},无法修改`,
-        icon:'none'
+        title: `${tips.title},无法修改`,
+        icon: 'none'
       })
       this.setData({
         showStorePopup: false
@@ -768,23 +869,23 @@ Page({
     });
   },
 
-  /**参与活动 */
-  involved(){
 
-  },
 
   async goUrl() {
-    let {isAttachment,aRegister}=this.data
+    let {
+      isAttachment,
+      aRegister
+    } = this.data
     let actQuery = new Parse.Query('ActivityData')
     actQuery.equalTo('company', company)
     actQuery.equalTo('user', uid)
     actQuery.notEqualTo('isDeleted', true)
     actQuery.equalTo('actRegister', aRegister?.id)
     let actDate = await actQuery.first()
-    if(actDate?.get('status')=='end'){
+    if (actDate?.get('status') == 'end') {
       wx.showToast({
         title: '成绩已结算，查看其他预约或参与其他活动吧',
-        icon:'none'
+        icon: 'none'
       })
       return
     }
@@ -796,7 +897,7 @@ Page({
       })
       return
     }
-   let url = `${aRegister?.get('activity')?.get('url')}&a_reg=${aRegister?.id}`
+    let url = `${aRegister?.get('activity')?.get('url')}&a_reg=${aRegister?.id}`
     wx.navigateTo({
       url: url,
     })

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

@@ -11,6 +11,7 @@
     "van-radio": "@vant/weapp/radio/index",
     "van-radio-group": "@vant/weapp/radio-group/index",
     "van-cell": "@vant/weapp/cell/index",
-    "van-cell-group": "@vant/weapp/cell-group/index"
+    "van-cell-group": "@vant/weapp/cell-group/index",
+    "van-empty": "@vant/weapp/empty/index"
   }
 }

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

@@ -194,6 +194,45 @@
       background: #4F9AF7;
       font-size: 35rpx;
     }
+
+    .meItem {
+      background: #4F9AF7;
+      padding: 20rpx;
+      margin: 20rpx;
+      color: white;
+      border-radius: 20rpx;
+      display: flex;
+      align-items: center;
+      justify-content: space-around;
+
+      .h3 {
+        font-size: 29rpx;
+        width: 60rpx;
+      }
+
+      .avatar {
+        image {
+          margin: 0 20rpx;
+          width: 100rpx;
+          height: 100rpx;
+          border-radius: 100rpx;
+        }
+      }
+
+      .name {
+        margin: 0 5rpx;
+        font-size: 25rpx;
+        width: 150rpx;
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 2;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+      .rang{
+        font-size: 30rpx;
+      }
+    }
   }
 }
 
@@ -202,21 +241,22 @@
   overflow-y: auto;
 
   .topTitle {
-    
+
     position: fixed;
     // top: 300rpx;
     left: 0rpx;
     z-index: 9;
   }
-.topBox{
-  border-radius:40rpx 40rpx 0 0;
-  background: white;
-  width: 100vw;
-  padding: 20rpx;
-  border-bottom: 1rpx solid rgb(206, 206, 206);
-  text-align: center;
-  font-weight: bold;
-}
+
+  .topBox {
+    border-radius: 40rpx 40rpx 0 0;
+    background: white;
+    width: 100vw;
+    padding: 20rpx;
+    border-bottom: 1rpx solid rgb(206, 206, 206);
+    text-align: center;
+    font-weight: bold;
+  }
 
   .registerStartDate {
     padding: 20rpx;
@@ -298,7 +338,8 @@
     position: fixed;
     bottom: 0rpx;
     z-index: 9;
-    button{
+
+    button {
       color: white;
       font-size: 30rpx;
     }
@@ -341,4 +382,155 @@ van-cell {
       margin: 20rpx 0;
     }
   }
+}
+
+
+
+.rankbox {
+  width: 686rpx;
+  background-color: white;
+  min-height: 618rpx;
+  margin-top: 30rpx;
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+  border-radius: 15rpx;
+  margin-bottom: 40rpx;
+
+  .ran-top {
+    width: 100%;
+    height: 120rpx;
+    padding-right: 16rpx;
+    padding-left: 16rpx;
+    display: flex;
+    align-items: center;
+    border-bottom: 2rpx solid #E0E0E0;
+
+    .top-til {
+      height: 34rpx;
+      font-size: 30rpx;
+      padding-left: 14rpx;
+      border-left: solid 8rpx #58A5FE;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+
+    .top-box {
+      display: flex;
+      margin-left: auto;
+      font-size: 20rpx;
+      justify-content: center;
+      align-items: center;
+
+      image {
+        width: 20rpx;
+        height: 18rpx;
+        margin-left: 4rpx;
+      }
+    }
+  }
+
+  .cardbox {
+    width: 100%;
+    height: 120rpx;
+    padding-right: 16rpx;
+    display: flex;
+    align-items: center;
+    border-bottom: 2rpx solid #E0E0E0;
+
+    .paiming {
+      width: 37rpx;
+      height: 37rpx;
+      font-size: 24rpx;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+
+    .image1 {
+      width: 37rpx;
+      height: 37rpx;
+      margin-left: 6rpx;
+      background-image: url(https://file-cloud.fmode.cn/qpFbRRSZrO/20241226/n5b6q2120548337.png);
+      background-position: center;
+      background-size: cover;
+      background-repeat: no-repeat;
+      color: white;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      font-size: 24rpx;
+    }
+
+    .image2 {
+      width: 37rpx;
+      height: 37rpx;
+      margin-left: 6rpx;
+      background-image: url(https://file-cloud.fmode.cn/qpFbRRSZrO/20241226/d61fa4120559975.png);
+      background-position: center;
+      background-size: cover;
+      background-repeat: no-repeat;
+      color: white;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      font-size: 24rpx;
+    }
+
+    .image3 {
+      width: 37rpx;
+      height: 37rpx;
+      margin-left: 6rpx;
+      background-image: url(https://file-cloud.fmode.cn/qpFbRRSZrO/20241226/2c1osg120613150.png);
+      background-position: center;
+      background-size: cover;
+      background-repeat: no-repeat;
+      color: white;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      font-size: 24rpx;
+    }
+
+    .avarter {
+      width: 82rpx;
+      height: 82rpx;
+      border-radius: 50%;
+      margin-left: 10rpx;
+    }
+
+    .name {
+      font-size: 24rpx;
+      margin-left: 20rpx;
+
+      .name2 {
+        font-size: 18rpx;
+      }
+    }
+
+    .num {
+      font-size: 32rpx;
+      color: #00B108;
+      margin-left: auto;
+    }
+
+    .good {
+      margin-left: 20rpx;
+      font-size: 22rpx;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+
+      .good-num {
+        font-size: 22rpx;
+      }
+
+      image {
+        width: 34rpx;
+        height: 34rpx;
+      }
+    }
+  }
 }

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

@@ -140,7 +140,51 @@
 
       </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="" />
+          </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>
+      
+        <view class="rankbox">
+          <view class="ran-top">
+            <view class="top-til">{{changetitleMap[changetitle]}}排行榜</view>
+            <view class="top-box" bindtap="change">
+              切换
+              <image style="width: 22rpx;height: 22rpx;" src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241226/fejv43122812199.png"></image>
+            </view>
+            <view class="top-box" style="margin-left: 20rpx;" bindtap="changeup">
+              {{rank=='ASC'?'逆序':'正序'}}
+              <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241226/8lu1od115228414.png"></image>
+            </view>
+          </view>
 
+          <block wx:for="{{rankList}}" wx:key="index">
+            <view class="cardbox">
+              <view class="image1" wx:if="{{index==0}}">1</view>
+              <view class="image2" wx:if="{{index==1}}">2</view>
+              <view class="image3" wx:if="{{index==2}}">3</view>
+              <view class="paiming" wx:if="{{index>=3}}">{{index+1}}</view>
+              <image class="avarter" src="{{item.avatar}}"></image>
+              <view class="name">
+                {{item.nickname}}
+                <view class="name2">{{item.booking||''}}</view>
+              </view>
+              <view class="num">{{item.al_steps}}步</view>
+              <view class="num">{{item.al_sportDate}}秒</view>
+            </view>
+          </block>
+          <block wx:if="{{rankList.length<=0}}">
+            <van-empty description="榜单静悄悄，运动一下吧~">
+            </van-empty>
+          </block>
+        </view>
       </block>
     </block>
     <block wx:else>

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

@@ -146,6 +146,39 @@
   background: #4F9AF7;
   font-size: 35rpx;
 }
+.box .detail .meItem {
+  background: #4F9AF7;
+  padding: 20rpx;
+  margin: 20rpx;
+  color: white;
+  border-radius: 20rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+}
+.box .detail .meItem .h3 {
+  font-size: 29rpx;
+  width: 60rpx;
+}
+.box .detail .meItem .avatar image {
+  margin: 0 20rpx;
+  width: 100rpx;
+  height: 100rpx;
+  border-radius: 100rpx;
+}
+.box .detail .meItem .name {
+  margin: 0 5rpx;
+  font-size: 25rpx;
+  width: 150rpx;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.box .detail .meItem .rang {
+  font-size: 30rpx;
+}
 .popup {
   height: 70vh;
   overflow-y: auto;
@@ -256,3 +289,135 @@
 van-cell van-radio-group van-radio {
   margin: 20rpx 0;
 }
+.rankbox {
+  width: 686rpx;
+  background-color: white;
+  min-height: 618rpx;
+  margin-top: 30rpx;
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+  border-radius: 15rpx;
+  margin-bottom: 40rpx;
+}
+.rankbox .ran-top {
+  width: 100%;
+  height: 120rpx;
+  padding-right: 16rpx;
+  padding-left: 16rpx;
+  display: flex;
+  align-items: center;
+  border-bottom: 2rpx solid #E0E0E0;
+}
+.rankbox .ran-top .top-til {
+  height: 34rpx;
+  font-size: 30rpx;
+  padding-left: 14rpx;
+  border-left: solid 8rpx #58A5FE;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.rankbox .ran-top .top-box {
+  display: flex;
+  margin-left: auto;
+  font-size: 20rpx;
+  justify-content: center;
+  align-items: center;
+}
+.rankbox .ran-top .top-box image {
+  width: 20rpx;
+  height: 18rpx;
+  margin-left: 4rpx;
+}
+.rankbox .cardbox {
+  width: 100%;
+  height: 120rpx;
+  padding-right: 16rpx;
+  display: flex;
+  align-items: center;
+  border-bottom: 2rpx solid #E0E0E0;
+}
+.rankbox .cardbox .paiming {
+  width: 37rpx;
+  height: 37rpx;
+  font-size: 24rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.rankbox .cardbox .image1 {
+  width: 37rpx;
+  height: 37rpx;
+  margin-left: 6rpx;
+  background-image: url(https://file-cloud.fmode.cn/qpFbRRSZrO/20241226/n5b6q2120548337.png);
+  background-position: center;
+  background-size: cover;
+  background-repeat: no-repeat;
+  color: white;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 24rpx;
+}
+.rankbox .cardbox .image2 {
+  width: 37rpx;
+  height: 37rpx;
+  margin-left: 6rpx;
+  background-image: url(https://file-cloud.fmode.cn/qpFbRRSZrO/20241226/d61fa4120559975.png);
+  background-position: center;
+  background-size: cover;
+  background-repeat: no-repeat;
+  color: white;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 24rpx;
+}
+.rankbox .cardbox .image3 {
+  width: 37rpx;
+  height: 37rpx;
+  margin-left: 6rpx;
+  background-image: url(https://file-cloud.fmode.cn/qpFbRRSZrO/20241226/2c1osg120613150.png);
+  background-position: center;
+  background-size: cover;
+  background-repeat: no-repeat;
+  color: white;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 24rpx;
+}
+.rankbox .cardbox .avarter {
+  width: 82rpx;
+  height: 82rpx;
+  border-radius: 50%;
+  margin-left: 10rpx;
+}
+.rankbox .cardbox .name {
+  font-size: 24rpx;
+  margin-left: 20rpx;
+}
+.rankbox .cardbox .name .name2 {
+  font-size: 18rpx;
+}
+.rankbox .cardbox .num {
+  font-size: 32rpx;
+  color: #00B108;
+  margin-left: auto;
+}
+.rankbox .cardbox .good {
+  margin-left: 20rpx;
+  font-size: 22rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+.rankbox .cardbox .good .good-num {
+  font-size: 22rpx;
+}
+.rankbox .cardbox .good image {
+  width: 34rpx;
+  height: 34rpx;
+}

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

@@ -2,647 +2,548 @@
 const qiniuUploader = require("../../../../utils/qiniuUploader");
 const Parse = getApp().Parse;
 const company = getApp().globalData.company;
+const user = Parse.User.current()
+let getSportData = require('../../../service/getSportData')
+const dateF = require("../../../../utils/date")
+
+
 Page({
 
-    /**
-     * 页面的初始数据
-     */
-    data: {
-        //屏幕高度
-        statusBarHeight: 0, // 状态栏高度
-        screenHeight: 0, // 屏幕高度
-        customHeight: 0, // 自定义导航栏高度（如小程序右上角胶囊按钮）
-        bottomNavHeight: 0, // 底部导航栏高度
-        contentHeight: 0, // 可用内容高度
-        contentHeight2: 0,
-        contentpadding: 0, //顶部padding高度
-
-        sharList: [],
-
-        images: [
-            // 'https://file-cloud.fmode.cn/qpFbRRSZrO/20250113/1p97lf053250915.png',
-            'https://file-cloud.fmode.cn/qpFbRRSZrO/20250113/bt19fm050427168.png'
-        ],
-        randomImage: '',
-        saveimage: '',
-
-        uptokenURL: '',
-        domain: '',
-        uploadURL: '',
-
-        userList:[],
-
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    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.order()
-        this.showRandomImage()
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload: function () {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh: function () {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom: function () {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage: function () {
-
-    },
-    //获取当天运动数据
-    async order() {
-        const currentUser = Parse.User.current();
-        let ActivityDataquery = new Parse.Query('ActivityData');
-        ActivityDataquery.equalTo('company', company);
-        ActivityDataquery.notEqualTo('isDeleted', true);
-    
-        // 获取今天的日期
-        const today = new Date();
-        const todayStart = new Date(today.getFullYear(), today.getMonth(), today.getDate()); // 今天的开始时间
-        const todayEnd = new Date(todayStart);
-        todayEnd.setHours(23, 59, 59, 999); // 今天的结束时间
-        console.log(todayStart, todayEnd);
-        
-        // 在查询条件中添加对 createdAt 的限制
-        ActivityDataquery.greaterThanOrEqualTo('createdAt', todayStart);
-        ActivityDataquery.lessThanOrEqualTo('createdAt', todayEnd);
-    
-        // 根据 steps 字段进行降序排序
-        ActivityDataquery.include('user');
-    
-        try {
-            let P = await ActivityDataquery.find();
-            let todayList = P.map(item => {
-                let itemData = item.toJSON();
-                // 获取当前时间并格式化
-                const now = new Date();
-                const formattedTime = `${now.getFullYear()}/${String(now.getMonth() + 1).padStart(2, '0')}/${String(now.getDate()).padStart(2, '0')} ${String(now.getHours()).padStart(2, '0')}:${String(now.getMinutes()).padStart(2, '0')}`;
-                itemData.currentTime = formattedTime; // 将当前时间添加到 item 中
-                return itemData;
-            });
-    
-            // 创建一个对象来存储用户的总步数
-            const userStepsMap = {};
-    
-            // 遍历数据，累加相同用户的步数
-            todayList.forEach(item => {
-                const userId = item.user.objectId;
-                const steps = item.steps;
-                const distance = item.distance||0;
-                if (steps) {
-                    if (!userStepsMap[userId]) {
-                        userStepsMap[userId] = {
-                            ...item.user, // 包含用户信息
-                            currentTime: item.currentTime,
-                            totalSteps: 0, // 初始化总步数
-                            totaldistance:0,
-                        };
-                    }
-                    userStepsMap[userId].totalSteps += steps;
-                    userStepsMap[userId].totaldistance += distance; // 累加步数
-                }
-            });
-    
-            // 将对象转换为数组
-            const aggregatedList = Object.values(userStepsMap);
-    
-            // 按总步数降序排序
-            aggregatedList.sort((a, b) => b.totalSteps - a.totalSteps);
-    
-            // 添加排名
-            let currentRank = 1; // 当前排名
-            for (let i = 0; i < aggregatedList.length; i++) {
-                if (i > 0 && aggregatedList[i].totalSteps === aggregatedList[i - 1].totalSteps) {
-                    // 如果步数相同，排名相同
-                    aggregatedList[i].rank = aggregatedList[i - 1].rank;
-                } else {
-                    // 否则，更新当前排名
-                    aggregatedList[i].rank = currentRank;
-                }
-                currentRank++;
-            }
-            console.log('aggregatedList',aggregatedList);
-            aggregatedList.forEach(item=>{
-                if(item.objectId == currentUser.id){
-                    this.setData({
-                        sharList:item,
-                    });
-                    console.log('sharList',this.data.sharList);
-                    this.saveImage()
-                }
-            })
-            
-        } catch (error) {
-            console.error('Error fetching today\'s data:', error);
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    sharList: [],
+    images: [
+      // 'https://file-cloud.fmode.cn/qpFbRRSZrO/20250113/1p97lf053250915.png',
+      'https://file-cloud.fmode.cn/qpFbRRSZrO/20250113/bt19fm050427168.png'
+    ],
+    randomImage: '',
+    saveimage: '',
+    uptokenURL: '',
+    domain: '',
+    uploadURL: '',
+    userList: [],
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    this.refersh()
+  },
+  async refersh() {
+    let {
+      screenWidth
+    } = wx.getWindowInfo()
+    let rate_px_rpx = (screenWidth / 750)
+
+    await this.showRandomImage()
+    await this.setData({
+      user_json: user.toJSON(),
+      rate_px_rpx
+    })
+    await this.getData()
+    this.setCanvas()
+  },
+  /**随机展示图片 */
+  showRandomImage() {
+    const randomIndex = Math.floor(Math.random() * this.data.images.length);
+    this.setData({
+      randomImage: this.data.images[randomIndex]
+    });
+  },
+  /**获取数据 */
+  async getData() {
+    let rank = '200名之后'
+    let step = await getSportData.getwalk('steps', '', '') || 0
+    let distance = await getSportData.getwalk('distance', '', '') || 0
+    if (distance) {
+      let rd = await getSportData.getUserRank(user?.id, '', 'today')
+      rank = rd[0]?.rank || 0
+    }
+    console.log(rank, step, distance)
+    this.setData({
+      rank,
+      step,
+      distance
+    })
+  },
+
+  /**绘制canvas */
+  setCanvas() {
+    let {
+      rank,
+      step,
+      distance,
+      user_json,
+      randomImage
+    } = this.data
+    let that = this
+    wx.createSelectorQuery()
+      .select('#myCanvas') // 在 WXML 中填入的 id
+      .fields({
+        node: true,
+        size: true
+      })
+      .exec((res) => {
+        const canvas = res[0].node
+        const ctx = canvas.getContext('2d')
+        const width = res[0].width
+        const height = res[0].height
+
+        // 初始化画布大小
+        const dpr = wx.getWindowInfo().pixelRatio
+        canvas.width = width * dpr
+        canvas.height = height * dpr
+        ctx.scale(dpr, dpr)
+        ctx.clearRect(0, 0, width, height)
+        //========背景=====
+        let bg = canvas.createImage()
+        bg.onload = () => {
+          ctx.drawImage(bg, 0, 0, width, height)
+          const gradient = ctx.createLinearGradient(0, 0, 0, height);
+          gradient.addColorStop(0, 'rgba(255, 255, 255, 0)');
+          gradient.addColorStop(1, 'rgb(255, 255, 255)');
+          ctx.fillStyle = gradient;
+          ctx.fillRect(0, 0, width, height);
+          //=========头像=========
+          let avatar = canvas.createImage();
+          avatar.onload = () => {
+            const radius = 20; // 圆的半径
+            const x = 40;
+            const y = height - 185;
+            ctx.save();
+            ctx.beginPath();
+            ctx.arc(x, y, radius, 0, Math.PI * 2, false);
+            ctx.closePath();
+            ctx.clip();
+            ctx.drawImage(avatar, x - radius, y - radius, radius * 2, radius * 2);
+            ctx.restore();
+          };
+          avatar.src = user_json.avatar;
+          ctx.fillStyle = '#4F9AF7';
+          ctx.font = '15px bold Arial';
+          ctx.fillText(user_json.nickname, 70, height - 185);
+          ctx.font = '10px Arial';
+          ctx.fillText(dateF.formatTime("YYYY.mm.dd HH:MM", user_json.createdAt), 70, height - 170);
+          ctx.font = 'bold 20px  Arial';
+          ctx.fillText('梦想家', 20, height - 140);
+          ctx.font = '10px Arial';
+          ctx.fillText('用汗水实现想象，用脚步丈量梦想', 20, height - 125);
+          ctx.font = '15px Arial';
+          ctx.fillText('今日排名', 20, height - 100);
+          ctx.fillText('今日步数', width / 2 - 20, height - 100);
+          ctx.fillText('公里数', width - 60, height - 100);
+          ctx.font = 'bold 15px  Arial';
+          ctx.fillText(rank, 20, height - 80);
+          ctx.fillText(step, width / 2 - 20, height - 80);
+          ctx.fillText(distance, width - 60, height - 80);
+          ctx.font = '10px  Arial';
+          ctx.fillText('长按二维码加入跑团', width - 170, height - 45);
+          ctx.fillText('和我一起运动', width - 140, height - 30);
+          let qr = canvas.createImage();
+          qr.onload = () => {
+            ctx.drawImage(qr, width - 70, height - 70, 70, 70)
+          };
+          qr.src = 'https://file-cloud.fmode.cn/qpFbRRSZrO/20250220/ig1167052435205.jpg?imageView2/1/w/200/h/200'
         }
-    },
-    //随机展示图片
-    showRandomImage: function () {
-        const randomIndex = Math.floor(Math.random() * this.data.images.length);
-        this.setData({
-            randomImage: this.data.images[randomIndex]
-        });
-    },
-    //绘制canvas
-    rpxToPx(rpx) {
-        const systemInfo = wx.getSystemInfoSync();
-        return rpx * (systemInfo.windowWidth / 750);
-    },
-    getImageInfo(url) {
-        console.log(url);
-        return new Promise((result) => {
-            wx.getImageInfo({
-                src: url, //服务器返回的图片地址
-                success: function (res) {
-                    // res.path是网络图片的本地地址
-                    let Path = res.path;
-                    result(Path)
-                },
-                fail(err) {
-                    console.log(err);
-                    result()
-                }
-            });
+        bg.src = 'https://file-cloud.fmode.cn/qpFbRRSZrO/20250113/bt19fm050427168.png'
+        that.setData({
+          canvas
         })
-    },
-    //获取用户信息
-   async  getuser(){
-        const currentUser = Parse.User.current();
-        let user = new Parse.Query('_User');
-        user.equalTo('company', company);
-        user.notEqualTo('isDeleted', true);
-        user.equalTo('objectId', currentUser.id);
-        let P = await user.find();
-        let userList = P.map(item => item.toJSON());
-        this.setData({
-            userList,
+      })
+  },
+
+  /**保存图片 */
+  saveCanvas() {
+    let {
+      canvas
+    } = this.data
+    let that = this
+    wx.canvasToTempFilePath({
+      canvas: canvas,
+      success(res) {
+        that.setData({saveimage: res.tempFilePath})
+        wx.saveImageToPhotosAlbum({
+          filePath: res.tempFilePath,
+          success: (res) => {
+            console.log('success',res)
+          },
+          fail: (err) => {
+            // console.log('err',err)
+          }
         })
-        console.log('userList',this.data.userList);
-    },
-    //rpx
-    async saveImage() {
-        // console.log('运行了');
-        const canvas = wx.createCanvasContext('myCanvas');
-        const width = this.rpxToPx(670);
-        const height = this.rpxToPx(1100);
-        // console.log(width, height);
-        canvas.width = this.rpxToPx(670);
-        canvas.height = this.rpxToPx(1100);
-        const backgroundImage2 = await this.getImageInfo(this.data.randomImage);
-
-        // 绘制背景图片
-        canvas.drawImage(backgroundImage2, 0, 0, width, height);
-        // 加载背景图片
-        const backgroundImage1 = await this.getImageInfo('https://file-cloud.fmode.cn/qpFbRRSZrO/20250113/1r3o3q045323287.png');
-
-        // 绘制背景图片
-        canvas.drawImage(backgroundImage1, 0, 0, width, height);
-        // 绘制背景
-        // canvas.setFillStyle('#CAE1FD'); // 背景色
-        // canvas.fillRect(0, 0, width, height);
-        canvas.setFillStyle('#0178EE');
-        // let mainimage = await this.getImageInfo(this.data.randomImage)
-        let avatar = Parse.User.current()?.get('avatar')
-        console.log('avatar', avatar);
-        let userAvatar = await this.getImageInfo(avatar)
-        console.log('userAvatar', userAvatar);
-        //主图片
-        // canvas.drawImage(mainimage, 0, 0, width, this.rpxToPx(500)); // 调整图片高度
-        //头像
-        if (userAvatar) {
-            // 绘制带圆角的头像
-            const avatarX = this.rpxToPx(40);
-            const avatarY = this.rpxToPx(540);
-            const avatarSize = this.rpxToPx(83);
-            const radius = avatarSize / 2; // 半径为头像大小的一半
-
-            // 绘制圆角矩形
-            canvas.save(); // 保存当前状态
-            canvas.beginPath(); // 开始路径
-            canvas.moveTo(avatarX + radius, avatarY); // 左上角
-            canvas.lineTo(avatarX + avatarSize - radius, avatarY); // 上边
-            canvas.arc(avatarX + avatarSize - radius, avatarY + radius, radius, 1.5 * Math.PI, 0, false); // 右上角
-            canvas.lineTo(avatarX + avatarSize, avatarY + avatarSize - radius); // 右边
-            canvas.arc(avatarX + avatarSize - radius, avatarY + avatarSize - radius, radius, 0, 0.5 * Math.PI, false); // 右下角
-            canvas.lineTo(avatarX + radius, avatarY + avatarSize); // 下边
-            canvas.arc(avatarX + radius, avatarY + avatarSize - radius, radius, 0.5 * Math.PI, Math.PI, false); // 左下角
-            canvas.lineTo(avatarX, avatarY + radius); // 左边
-            canvas.arc(avatarX + radius, avatarY + radius, radius, Math.PI, 1.5 * Math.PI, false); // 左上角
-            canvas.closePath(); // 关闭路径
-            canvas.clip(); // 剪切
-
-            // 绘制头像
-            canvas.drawImage(userAvatar, avatarX, avatarY, avatarSize, avatarSize); // 头像位置和大小
-            canvas.restore(); // 恢复状态
+      },
+      fail: (err) => {
+        console.log(err)
+
+      }
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+
+
+  //绘制canvas
+  rpxToPx(rpx) {
+    const systemInfo = wx.getSystemInfoSync();
+    return rpx * (systemInfo.windowWidth / 750);
+  },
+  getImageInfo(url) {
+    console.log(url);
+    return new Promise((result) => {
+      wx.getImageInfo({
+        src: url, //服务器返回的图片地址
+        success: function (res) {
+          // res.path是网络图片的本地地址
+          let Path = res.path;
+          result(Path)
+        },
+        fail(err) {
+          console.log(err);
+          result()
         }
+      });
+    })
+  },
+  //获取用户信息
+  async getuser() {
+    const currentUser = Parse.User.current();
+    let user = new Parse.Query('_User');
+    user.equalTo('company', company);
+    user.notEqualTo('isDeleted', true);
+    user.equalTo('objectId', currentUser.id);
+    let P = await user.find();
+    let userList = P.map(item => item.toJSON());
+    this.setData({
+      userList,
+    })
+    console.log('userList', this.data.userList);
+  },
+  //rpx
+  async saveImage() {
+    // console.log('运行了');
+    const canvas = wx.createCanvasContext('myCanvas');
+    const width = this.rpxToPx(670);
+    const height = this.rpxToPx(1100);
+    // console.log(width, height);
+    canvas.width = this.rpxToPx(670);
+    canvas.height = this.rpxToPx(1100);
+    const backgroundImage2 = await this.getImageInfo(this.data.randomImage);
+
+    // 绘制背景图片
+    canvas.drawImage(backgroundImage2, 0, 0, width, height);
+    // 加载背景图片
+    const backgroundImage1 = await this.getImageInfo('https://file-cloud.fmode.cn/qpFbRRSZrO/20250113/1r3o3q045323287.png');
+
+    // 绘制背景图片
+    canvas.drawImage(backgroundImage1, 0, 0, width, height);
+    // 绘制背景
+    // canvas.setFillStyle('#CAE1FD'); // 背景色
+    // canvas.fillRect(0, 0, width, height);
+    canvas.setFillStyle('#0178EE');
+    // let mainimage = await this.getImageInfo(this.data.randomImage)
+    let avatar = Parse.User.current()?.get('avatar')
+    console.log('avatar', avatar);
+    let userAvatar = await this.getImageInfo(avatar)
+    console.log('userAvatar', userAvatar);
+    //主图片
+    // canvas.drawImage(mainimage, 0, 0, width, this.rpxToPx(500)); // 调整图片高度
+    //头像
+    if (userAvatar) {
+      // 绘制带圆角的头像
+      const avatarX = this.rpxToPx(40);
+      const avatarY = this.rpxToPx(540);
+      const avatarSize = this.rpxToPx(83);
+      const radius = avatarSize / 2; // 半径为头像大小的一半
+
+      // 绘制圆角矩形
+      canvas.save(); // 保存当前状态
+      canvas.beginPath(); // 开始路径
+      canvas.moveTo(avatarX + radius, avatarY); // 左上角
+      canvas.lineTo(avatarX + avatarSize - radius, avatarY); // 上边
+      canvas.arc(avatarX + avatarSize - radius, avatarY + radius, radius, 1.5 * Math.PI, 0, false); // 右上角
+      canvas.lineTo(avatarX + avatarSize, avatarY + avatarSize - radius); // 右边
+      canvas.arc(avatarX + avatarSize - radius, avatarY + avatarSize - radius, radius, 0, 0.5 * Math.PI, false); // 右下角
+      canvas.lineTo(avatarX + radius, avatarY + avatarSize); // 下边
+      canvas.arc(avatarX + radius, avatarY + avatarSize - radius, radius, 0.5 * Math.PI, Math.PI, false); // 左下角
+      canvas.lineTo(avatarX, avatarY + radius); // 左边
+      canvas.arc(avatarX + radius, avatarY + radius, radius, Math.PI, 1.5 * Math.PI, false); // 左上角
+      canvas.closePath(); // 关闭路径
+      canvas.clip(); // 剪切
+
+      // 绘制头像
+      canvas.drawImage(userAvatar, avatarX, avatarY, avatarSize, avatarSize); // 头像位置和大小
+      canvas.restore(); // 恢复状态
+    }
 
-        // 绘制昵称和时间
-        const nickname = this.data.userList[0].nickname;
-        const currentTime = this.data.sharList.currentTime;
-        const rank = this.data.sharList.rank;
-        const steps = this.data.sharList.totalSteps || 0;
-        const distance = this.data.sharList.totaldistance || 0;
-
-        canvas.setFontSize(this.rpxToPx(30));
-        canvas.fillText(nickname, this.rpxToPx(140), this.rpxToPx(580)); // 昵称位置
-        // console.log('昵称加载成功');
-        canvas.setFontSize(this.rpxToPx(28));
-        canvas.fillText(currentTime, this.rpxToPx(140), this.rpxToPx(610)); // 时间位置
-        // console.log('时间加载成功');
-
-        // 绘制其他文本
-        canvas.setFontSize(this.rpxToPx(55));
-        canvas.fillText('梦想家', this.rpxToPx(40), this.rpxToPx(720));
-        // console.log('梦想家加载成功');
-        canvas.setFontSize(this.rpxToPx(30));
-        canvas.fillText('用汗水实现想象，用脚步丈量梦想', this.rpxToPx(40), this.rpxToPx(780));
-        // console.log('汗水加载成功');
-
-        // 绘制排名、步数和公里数
-        canvas.setFontSize(this.rpxToPx(22));
-        // canvas.fillText('今日排名: ' + rank, 20, 400);
-        canvas.fillText('今日排名', this.rpxToPx(40), this.rpxToPx(840));
-        // console.log('排名加载成功');
-        // canvas.fillText('今日步数: ' + steps, 20, 420);
-        canvas.fillText('今日步数', this.rpxToPx(180), this.rpxToPx(840));
-        // console.log('步数加载成功');
-        // canvas.fillText('公里数: ' + distance + 'km', 20, 430);
-        canvas.fillText('公里数', this.rpxToPx(320), this.rpxToPx(840));
-        // console.log('公里数加载成功');
-        canvas.setFontSize(this.rpxToPx(34));
-        canvas.fillText(rank, this.rpxToPx(70), this.rpxToPx(900));
-        canvas.fillText(steps, this.rpxToPx(180), this.rpxToPx(900));
-        canvas.fillText(distance + 'km', this.rpxToPx(320), this.rpxToPx(900));
-
-        // 加载二维码图片
-        const qrCodeImage = await this.getImageInfo('https://file-cloud.fmode.cn/qpFbRRSZrO/20250113/t2vst6051431547.png');
-
-        // 绘制二维码
-        canvas.drawImage(qrCodeImage, width - this.rpxToPx(140), height - this.rpxToPx(160), this.rpxToPx(120), this.rpxToPx(120));
-
-        canvas.setFillStyle('#0178EE');
-        canvas.setFontSize(this.rpxToPx(28));
-        canvas.fillText('长按二维码加入儒乐湖健身跑', width - this.rpxToPx(510), height - this.rpxToPx(120));
-        canvas.fillText('和我一起运动', width - this.rpxToPx(405), height - this.rpxToPx(80));
-        // 完成绘制
-        canvas.draw(false, () => {
-            console.log('123');
-            wx.canvasToTempFilePath({
-                canvasId: 'myCanvas',
-                success: (res) => {
-                    console.log('绘制完成', res);
-                    this.setData({
-                        saveimage: res.tempFilePath
-                    });
-                    this.getUptoken()
-                    console.log(this.data.saveimage);
-                },
-                fail: (err) => {
-                    console.error('canvasToTempFilePath 失败', err);
-                }
-            });
+    // 绘制昵称和时间
+    const nickname = this.data.userList[0].nickname;
+    const currentTime = this.data.sharList.currentTime;
+    const rank = this.data.sharList.rank;
+    const steps = this.data.sharList.totalSteps || 0;
+    const distance = this.data.sharList.totaldistance || 0;
+
+    canvas.setFontSize(this.rpxToPx(30));
+    canvas.fillText(nickname, this.rpxToPx(140), this.rpxToPx(580)); // 昵称位置
+    // console.log('昵称加载成功');
+    canvas.setFontSize(this.rpxToPx(28));
+    canvas.fillText(currentTime, this.rpxToPx(140), this.rpxToPx(610)); // 时间位置
+    // console.log('时间加载成功');
+
+    // 绘制其他文本
+    canvas.setFontSize(this.rpxToPx(55));
+    canvas.fillText('梦想家', this.rpxToPx(40), this.rpxToPx(720));
+    // console.log('梦想家加载成功');
+    canvas.setFontSize(this.rpxToPx(30));
+    canvas.fillText('用汗水实现想象，用脚步丈量梦想', this.rpxToPx(40), this.rpxToPx(780));
+    // console.log('汗水加载成功');
+
+    // 绘制排名、步数和公里数
+    canvas.setFontSize(this.rpxToPx(22));
+    // canvas.fillText('今日排名: ' + rank, 20, 400);
+    canvas.fillText('今日排名', this.rpxToPx(40), this.rpxToPx(840));
+    // console.log('排名加载成功');
+    // canvas.fillText('今日步数: ' + steps, 20, 420);
+    canvas.fillText('今日步数', this.rpxToPx(180), this.rpxToPx(840));
+    // console.log('步数加载成功');
+    // canvas.fillText('公里数: ' + distance + 'km', 20, 430);
+    canvas.fillText('公里数', this.rpxToPx(320), this.rpxToPx(840));
+    // console.log('公里数加载成功');
+    canvas.setFontSize(this.rpxToPx(34));
+    canvas.fillText(rank, this.rpxToPx(70), this.rpxToPx(900));
+    canvas.fillText(steps, this.rpxToPx(180), this.rpxToPx(900));
+    canvas.fillText(distance + 'km', this.rpxToPx(320), this.rpxToPx(900));
+
+    // 加载二维码图片
+    const qrCodeImage = await this.getImageInfo('https://file-cloud.fmode.cn/qpFbRRSZrO/20250113/t2vst6051431547.png');
+
+    // 绘制二维码
+    canvas.drawImage(qrCodeImage, width - this.rpxToPx(140), height - this.rpxToPx(160), this.rpxToPx(120), this.rpxToPx(120));
+
+    canvas.setFillStyle('#0178EE');
+    canvas.setFontSize(this.rpxToPx(28));
+    canvas.fillText('长按二维码加入儒乐湖健身跑', width - this.rpxToPx(510), height - this.rpxToPx(120));
+    canvas.fillText('和我一起运动', width - this.rpxToPx(405), height - this.rpxToPx(80));
+    // 完成绘制
+    canvas.draw(false, () => {
+      console.log('123');
+      wx.canvasToTempFilePath({
+        canvasId: 'myCanvas',
+        success: (res) => {
+          console.log('绘制完成', res);
+          this.setData({
+            saveimage: res.tempFilePath
+          });
+          this.getUptoken()
+          console.log(this.data.saveimage);
+        },
+        fail: (err) => {
+          console.error('canvasToTempFilePath 失败', err);
+        }
+      });
+    });
+
+
+  },
+  uploadImageToServer() {
+    const that = this;
+    const tempFilePath = this.data.saveimage; // 获取本地临时文件路径
+
+    qiniuUploader.upload(
+      tempFilePath, // 本地文件路径
+      (res) => {
+        const imageURL = res.imageURL; // 上传成功后的网络地址
+        console.log('上传成功，网络地址:', imageURL);
+        that.setData({
+          saveimage: imageURL // 更新 saveimage 为网络地址
         });
-
-
-    },
-    uploadImageToServer() {
-        const that = this;
-        const tempFilePath = this.data.saveimage; // 获取本地临时文件路径
-
-        qiniuUploader.upload(
-            tempFilePath, // 本地文件路径
-            (res) => {
-                const imageURL = res.imageURL; // 上传成功后的网络地址
-                console.log('上传成功，网络地址:', imageURL);
-                that.setData({
-                    saveimage: imageURL // 更新 saveimage 为网络地址
-                });
-            },
-            (error) => {
-                console.error('上传失败:', error);
-            }, {
-                region: "SCN", // 七牛云区域
-                uploadURL: that.data.uploadURL, // 上传地址
-                domain: that.data.domain, // 域名
-                uptoken: that.data.uptokenURL, // 上传凭证
-            }
-        );
-        console.log('saveimage', this.data.saveimage);
-    },
-    async getUptoken() {
-        let res = await Parse.Cloud.run('qiniu_uptoken', {
-            company: company
-        })
-        this.setData({
-            uptokenURL: res.uptoken,
-            domain: res.domain,
-            uploadURL: res.zoneUrl
-        })
-        this.uploadImageToServer()
-        console.log(this.data.uptokenURL, this.data.domain, this.data.uploadURL);
-    },
-    //px
-    // saveImage() {
-    //     // console.log('运行了');
-    //     const canvas = wx.createCanvasContext('myCanvas');
-    //     const width = 335;
-    //     const height = 550;
-    //     // console.log(width, height);
-    //     canvas.width = 335;
-    //     canvas.height = 550;
-
-    //     // 绘制背景
-    //     canvas.setFillStyle('#CAE1FD'); // 背景色
-    //     canvas.fillRect(0, 0, width, height);
-    //     canvas.setFillStyle('#0178EE');
-
-    //     // 加载主图片
-    //     wx.getImageInfo({
-    //         src: this.data.randomImage,
-    //         success: (res) => {
-    //             canvas.drawImage(res.path, 0, 0, width, 250); // 调整图片高度
-    //             // console.log('主图片加载成功');
-
-    //             // 加载用户头像
-    //             wx.getImageInfo({
-    //                 src: this.data.sharList[0].user.avatar,
-    //                 success: (avatarRes) => {
-    //                     // 绘制带圆角的头像
-    //                     const avatarX = 20;
-    //                     const avatarY = 270;
-    //                     const avatarSize = 42.5;
-    //                     const radius = avatarSize / 2; // 半径为头像大小的一半
-
-    //                     // 绘制圆角矩形
-    //                     canvas.save(); // 保存当前状态
-    //                     canvas.beginPath(); // 开始路径
-    //                     canvas.moveTo(avatarX + radius, avatarY); // 左上角
-    //                     canvas.lineTo(avatarX + avatarSize - radius, avatarY); // 上边
-    //                     canvas.arc(avatarX + avatarSize - radius, avatarY + radius, radius, 1.5 * Math.PI, 0, false); // 右上角
-    //                     canvas.lineTo(avatarX + avatarSize, avatarY + avatarSize - radius); // 右边
-    //                     canvas.arc(avatarX + avatarSize - radius, avatarY + avatarSize - radius, radius, 0, 0.5 * Math.PI, false); // 右下角
-    //                     canvas.lineTo(avatarX + radius, avatarY + avatarSize); // 下边
-    //                     canvas.arc(avatarX + radius, avatarY + avatarSize - radius, radius, 0.5 * Math.PI, Math.PI, false); // 左下角
-    //                     canvas.lineTo(avatarX, avatarY + radius); // 左边
-    //                     canvas.arc(avatarX + radius, avatarY + radius, radius, Math.PI, 1.5 * Math.PI, false); // 左上角
-    //                     canvas.closePath(); // 关闭路径
-    //                     canvas.clip(); // 剪切
-
-    //                     // 绘制头像
-    //                     canvas.drawImage(avatarRes.path, avatarX, avatarY, avatarSize, avatarSize); // 头像位置和大小
-    //                     canvas.restore(); // 恢复状态
-    //                     // console.log('头像加载成功');
-
-    //                     // 绘制昵称和时间
-    //                     const nickname = this.data.sharList[0].user.nickname;
-    //                     const currentTime = this.data.sharList[0].currentTime;
-    //                     const rank = this.data.sharList[0].rank;
-    //                     const steps = this.data.sharList[0].steps || 0;
-    //                     const distance = this.data.sharList[0].distance || 0;
-
-    //                     canvas.setFontSize(15);
-    //                     canvas.fillText(nickname, 70, 290); // 昵称位置
-    //                     // console.log('昵称加载成功');
-    //                     canvas.setFontSize(14);
-    //                     canvas.fillText(currentTime, 70, 305); // 时间位置
-    //                     // console.log('时间加载成功');
-
-    //                     // 绘制其他文本
-    //                     canvas.setFontSize(27.5);
-    //                     canvas.fillText('梦想家', 20, 360);
-    //                     // console.log('梦想家加载成功');
-    //                     canvas.setFontSize(15);
-    //                     canvas.fillText('用汗水实现想象，用脚步丈量梦想', 20, 390);
-    //                     // console.log('汗水加载成功');
-
-    //                     // 绘制排名、步数和公里数
-    //                     canvas.setFontSize(14);
-    //                     // canvas.fillText('今日排名: ' + rank, 20, 400);
-    //                     canvas.fillText('今日排名', 20, 420);
-    //                     // console.log('排名加载成功');
-    //                     // canvas.fillText('今日步数: ' + steps, 20, 420);
-    //                     canvas.fillText('今日步数', 120, 420);
-    //                     // console.log('步数加载成功');
-    //                     // canvas.fillText('公里数: ' + distance + 'km', 20, 430);
-    //                     canvas.fillText('公里数', 220, 420);
-    //                     // console.log('公里数加载成功');
-    //                     canvas.setFontSize(20);
-    //                     canvas.fillText(rank, 40, 450);
-    //                     canvas.fillText(steps, 122, 450);
-    //                     canvas.fillText(distance + 'km', 222, 450);
-
-    //                     // 绘制二维码（如果有）
-    //                     canvas.setFillStyle('red'); // 示例二维码
-    //                     canvas.fillRect(width - 70, height - 80, 60, 60); // QR 位置
-    //                     // console.log('二维码绘制');
-
-    //                     canvas.setFillStyle('#0178EE');
-    //                     canvas.setFontSize(14);
-    //                     canvas.fillText('长按二维码加入跑团', width - 210, height - 60);
-    //                     canvas.fillText('和我一起运动', width - 190, height - 40);
-    //                     // 完成绘制
-    //                     canvas.draw(false, () => {
-    //                         console.log('123');
-    //                         wx.canvasToTempFilePath({
-    //                             canvasId: 'myCanvas',
-    //                             success: (res) => {
-    //                                 console.log('绘制完成', res);
-    //                                 this.setData({
-    //                                     saveimage: res.tempFilePath
-    //                                 });
-    //                                 console.log(this.data.saveimage);
-    //                             },
-    //                             fail: (err) => {
-    //                                 console.error('canvasToTempFilePath 失败', err);
-    //                             }
-    //                         });
-    //                     });
-    //                 },
-    //                 fail: () => {
-    //                     console.error('用户头像加载失败');
-    //                 }
-    //             });
-    //         },
-    //         fail: () => {
-    //             console.error('主图片加载失败');
-    //         }
-    //     });
-
-    // },
-    //点击保存图片
-    async savepic() {
-        await this.saveImage()
-        const imagePath = this.data.saveimage; // 获取保存的图片路径
-        if (imagePath) {
-            // 调用保存图片到相册的方法
-            wx.saveImageToPhotosAlbum({
-                filePath: imagePath,
-                success: () => {
-                    wx.showToast({
+      },
+      (error) => {
+        console.error('上传失败:', error);
+      }, {
+        region: "SCN", // 七牛云区域
+        uploadURL: that.data.uploadURL, // 上传地址
+        domain: that.data.domain, // 域名
+        uptoken: that.data.uptokenURL, // 上传凭证
+      }
+    );
+    console.log('saveimage', this.data.saveimage);
+  },
+  async getUptoken() {
+    let res = await Parse.Cloud.run('qiniu_uptoken', {
+      company: company
+    })
+    this.setData({
+      uptokenURL: res.uptoken,
+      domain: res.domain,
+      uploadURL: res.zoneUrl
+    })
+    this.uploadImageToServer()
+    console.log(this.data.uptokenURL, this.data.domain, this.data.uploadURL);
+  },
+  //点击保存图片
+  async savepic() {
+    await this.saveImage()
+    const imagePath = this.data.saveimage; // 获取保存的图片路径
+    if (imagePath) {
+      // 调用保存图片到相册的方法
+      wx.saveImageToPhotosAlbum({
+        filePath: imagePath,
+        success: () => {
+          wx.showToast({
+            title: '图片已保存到相册',
+            icon: 'success'
+          });
+        },
+        fail: (err) => {
+          console.error('保存失败', err);
+          wx.showToast({
+            title: '保存失败',
+            icon: 'none'
+          });
+        }
+      });
+    } else {
+      wx.showToast({
+        title: '没有可保存的图片',
+        icon: 'none'
+      });
+    }
+  },
+  //保存图片到相册
+  savepic2: function () {
+    let that = this;
+    wx.canvasToTempFilePath({
+      x: 0,
+      y: 0,
+      width: 670,
+      height: 1100,
+      destWidth: 670,
+      destHeight: 1100,
+      canvasId: 'myCanvas',
+      success: function (result) {
+        wx.getSetting({
+          success(res) {
+            if (!res.authSetting['scope.writePhotosAlbum']) {
+              wx.authorize({
+                scope: 'scope.writePhotosAlbum',
+                success() {
+                  //这里是用户同意授权后的回调
+                  // that.saveImgToLocal();
+                  wx.saveImageToPhotosAlbum({
+                    filePath: result.tempFilePath,
+                    success(res) {
+                      wx.showToast({
                         title: '图片已保存到相册',
                         icon: 'success'
-                    });
+                      });
+                    }
+                  })
                 },
-                fail: (err) => {
-                    console.error('保存失败', err);
-                    wx.showToast({
-                        title: '保存失败',
-                        icon: 'none'
-                    });
+                fail() { //这里是用户拒绝授权后的回调
+                  wx.showToast({
+                    title: '打开相册授权，才能保存图片哦~',
+                    icon: 'none',
+                    duration: 2000
+                  })
+                  that.setData({
+                    openSettingBtnHidden: false
+                  })
                 }
-            });
-        } else {
-            wx.showToast({
-                title: '没有可保存的图片',
-                icon: 'none'
-            });
-        }
-    },
-    //保存图片到相册
-    savepic2: function () {
-        let that = this;
-        wx.canvasToTempFilePath({
-            x: 0,
-            y: 0,
-            width: 670,
-            height: 1100,
-            destWidth: 670,
-            destHeight: 1100,
-            canvasId: 'myCanvas',
-            success: function (result) {
-                wx.getSetting({
-                    success(res) {
-                        if (!res.authSetting['scope.writePhotosAlbum']) {
-                            wx.authorize({
-                                scope: 'scope.writePhotosAlbum',
-                                success() {
-                                    //这里是用户同意授权后的回调
-                                    // that.saveImgToLocal();
-                                    wx.saveImageToPhotosAlbum({
-                                        filePath: result.tempFilePath,
-                                        success(res) {
-                                            wx.showToast({
-                                                title: '图片已保存到相册',
-                                                icon: 'success'
-                                            });
-                                        }
-                                    })
-                                },
-                                fail() { //这里是用户拒绝授权后的回调
-                                    wx.showToast({
-                                        title: '打开相册授权，才能保存图片哦~',
-                                        icon: 'none',
-                                        duration: 2000
-                                    })
-                                    that.setData({
-                                        openSettingBtnHidden: false
-                                    })
-                                }
-                            })
-                        } else {
-                            //调取小程序当中获取图片
-                            console.log(result.tempFilePath);
-                            wx.saveImageToPhotosAlbum({
-                                filePath: result.tempFilePath,
-                                success(res) {
-                                    wx.showToast({
-                                        title: '图片已保存到相册',
-                                        icon: 'success'
-                                    });
-                                }
-                            })
-                        }
-                    }
-                })
-
-            },
-            fail: function (res) {
-                console.log(res)
+              })
+            } else {
+              //调取小程序当中获取图片
+              console.log(result.tempFilePath);
+              wx.saveImageToPhotosAlbum({
+                filePath: result.tempFilePath,
+                success(res) {
+                  wx.showToast({
+                    title: '图片已保存到相册',
+                    icon: 'success'
+                  });
+                }
+              })
             }
+          }
         })
-    },
-    shar() {
-        wx.downloadFile({
-            url: this.data.saveimage, //图片服务器地址
-            success: (res) => {
-                wx.showShareImageMenu({
-                    path: res.tempFilePath, //转为本地地址showShareImageMenu进行分享
-                    success: (res) => {
-                        uni.hideLoading();
-                        this.modalShare = null;
-                    },
-                    fail: (err) => {
-                        uni.hideLoading();
-                        this.modalShare = null;
-                    },
-                });
-            },
-        });
-    },
-    sharecircle() {
-        console.log('this.data.saveimage', this.data.saveimage);
-        wx.navigateTo({
-            url: '../../circle/send-circle/index?image=' + this.data.saveimage // 目标页面的路径
+
+      },
+      fail: function (res) {
+        console.log(res)
+      }
+    })
+  },
+  shar() {
+    wx.downloadFile({
+      url: this.data.saveimage, //图片服务器地址
+      success: (res) => {
+        wx.showShareImageMenu({
+          path: res.tempFilePath, //转为本地地址showShareImageMenu进行分享
+          success: (res) => {
+            uni.hideLoading();
+            this.modalShare = null;
+          },
+          fail: (err) => {
+            uni.hideLoading();
+            this.modalShare = null;
+          },
         });
-    }
+      },
+    });
+  },
+  sharecircle() {
+    console.log('this.data.saveimage', this.data.saveimage);
+    wx.navigateTo({
+      url: '../../circle/send-circle/index?image=' + this.data.saveimage // 目标页面的路径
+    });
+  }
 })

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

@@ -2,106 +2,17 @@
 .all{
     width: 100vw; 
     padding-top: 15rpx;
-    padding-left: 40rpx;
-    padding-right: 40rpx;
+    // padding-left: 40rpx;
+    // padding-right: 40rpx;
     background: linear-gradient(to bottom, #4F9AF7, #FFFFFF); 
-    .box{
-        width: 100%;
-        height: 1100rpx;
-        border: solid #0178EE 1px;
-        border-radius: 15rpx;
-        background: linear-gradient(to bottom, #4F9AF7, #FFFFFF);
-        color: #0178EE;
-        .picture{
-            width: 100%;
-            height: 500rpx;
-            border-radius: 15rpx 15rpx 0 0; 
-        }
-        .namebox{
-            height: 150rpx;
-            display: flex;
-            align-items: center;
-            margin-left: 40rpx;
-            margin-right: 40rpx;
-            image{
-                width: 85rpx;
-                height: 85rpx;
-                border-radius: 50%;
-            }
-            .textbox{
-                margin-left: 20rpx;
-               
-                .name{
-                    font-size: 30rpx;
-                }
-                .time{
-                    font-size: 28rpx;
-                    margin-top: 4rpx;
-                }
-            }
-        }
-        .bigtext{
-            margin-left: 40rpx;
-            font-size: 55rpx;
-        }
-        .setence{
-            margin-left: 40rpx;
-            margin-top: 20rpx;
-            font-size: 30rpx;
-        }
-        .numberbox{
-            height: 120rpx;
-            display: flex;
-            margin-left: 40rpx;
-            margin-top: 20rpx;
-            .num-tex{
-                height: 100rpx;
-                margin-left: 50rpx;
-                .nu-nam{
-                    font-size: 28rpx;
-                }
-                .num{
-                    font-size: 40rpx;
-                    display: flex;
-                    justify-content: center;
-                    margin-top: 10rpx;
-                }
-            }
-            .num-tex:nth-child(1){
-                margin-left: 0;
-            }
-        }
-        .erweimabox{
-            width: 100%;
-            height: 120rpx;
-            display: flex;
-            align-items: flex-end;
-            justify-content: flex-end;
-            .er-texbox{
-                height: 100%;
-                display: flex;
-                flex-direction: column;
-                align-items: center;
-                justify-content: center;
-                font-size: 28rpx;
-                .we-tex2{
-                    margin-top: 10rpx;
-                }
-            }
-            .erweima{
-                width: 120rpx;
-                height: 120rpx;
-                background-color: red;
-                margin-left: 20rpx;
-                margin-right:20rpx ;
-                display: flex;
-            }
-        }
-    }
+   #myCanvas{
+    margin: auto;
+   }
+
     .sharebox{
         width: 100%;
-        height: 250rpx;
-        padding-top: 15rpx;
+        // height: 250rpx;
+        padding: 20rpx;
         .share-text{
             width: 100%;
             font-size: 30rpx;
@@ -114,7 +25,7 @@
             height: 178rpx;
             margin-top: 16rpx;
             display: flex;
-            justify-content: space-between;
+            justify-content: space-around;
             .share-pic{
                 width: 130rpx;
                 height: 178rpx;
@@ -127,8 +38,8 @@
                     justify-content: center;
                     background-color: #4F9AF7;
                     .image{
-                        width: 90rpx;
-                        height: 90rpx;
+                        width: 60rpx;
+                        height: 60rpx;
                     }
                 }
                 .pic-tex{

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

@@ -1,68 +1,28 @@
 <!--nova-werun/pages/home/share/index.wxml-->
 <nav type="back" title="转发分享" background-color="{{'#4F9AF7'}}" front-color="{{'#333333'}}"></nav>
-<view class="all" style="height: {{contentHeight}}rpx;">
-    <!-- <view class="box">
-        <image class="picture" src="{{randomImage}}" mode="aspectFit"></image>
-        <view class="namebox">
-            <image src="{{sharList[0].user.avatar}}"></image>
-            <view class="textbox">
-                <view class="name">{{sharList[0].user.nickname}}</view>
-                <view class="time">{{sharList[0].currentTime}}</view>
-            </view>
-        </view>
-        <view class="bigtext">梦想家</view>
-        <view class="setence">用汗水实现想象，用脚步丈量梦想</view>
-        <view class="numberbox">
-            <view class="num-tex">
-                <view class="nu-nam">今日排名</view>
-                <view class="num">{{sharList[0].rank}}</view>
-            </view>
-            <view class="num-tex">
-                <view class="nu-nam">今日步数</view>
-                <view class="num">{{sharList[0].steps||0}}</view>
-            </view>
-            <view class="num-tex">
-                <view class="nu-nam">公里数</view>
-                <view class="num">
-                    <view class="num-num">{{sharList[0].distance||0}}</view>
-                    <view class="num-km">km</view>
-                </view>
-            </view>
-        </view>
-        <view class="erweimabox">
-            <view class="er-texbox">
-                <view class="er-tex">长按二维码加入跑团</view>
-                <view class="we-tex2">和我一起运动</view>
-            </view>
-            <view class="erweima"></view>
-        </view>
-    </view> -->
-    <canvas canvas-id="myCanvas" style=" width: 670rpx;height: 1100rpx;"></canvas>
-    <view class="sharebox">
-        <view class="share-text">分享到</view>
-        <view class="share-picbox">
-            <view class="share-pic" bindtap="shar">
-                <view class="share-pic-box">
-                    <image class="image"  src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241112/1djefq104546048.png?imageView2/1/w/200/h/200"></image>
-                </view>
-
-                <view class="pic-tex">微信</view>
-            </view>
-            <view class="share-pic" bindtap="sharecircle">
-                <view class="share-pic-box">
-                    <image class="image" src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241112/opdtpm104104293.png?imageView2/1/w/200/h/200"></image>
-                </view>
-
-                <view class="pic-tex">步小圈</view>
-            </view>
-            <view class="share-pic" bindtap="savepic2">
-                <view class="share-pic-box">
-                    <image class="image" src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241112/kbm618104717414.png?imageView2/1/w/200/h/200"></image>
-                </view>
-
-                <view class="pic-tex" >保存图片</view>
-            </view>
-
-        </view>
+<view class="all">
+  <canvas id="myCanvas" type="2d" style=" width: 600rpx; height: 850rpx" />
+  <view class="sharebox">
+    <view class="share-text">分享到</view>
+    <view class="share-picbox">
+      <view class="share-pic" bindtap="shar">
+        <button class="share-pic-box" open-type="share">
+          <image class="image" src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241112/1djefq104546048.png?imageView2/1/w/200/h/200"></image>
+        </button>
+        <view class="pic-tex">微信</view>
+      </view>
+      <view class="share-pic" bindtap="sharecircle">
+        <button class="share-pic-box">
+          <image class="image" src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241112/opdtpm104104293.png?imageView2/1/w/200/h/200"></image>
+        </button>
+        <view class="pic-tex">步小圈</view>
+      </view>
+      <view class="share-pic" bindtap="saveCanvas">
+        <button class="share-pic-box">
+          <image class="image" src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241112/kbm618104717414.png?imageView2/1/w/200/h/200"></image>
+        </button>
+        <view class="pic-tex">保存图片</view>
+      </view>
     </view>
-</view>
+  </view>
+</view>

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

@@ -1,214 +1,222 @@
 // nova-werun/pages/home/signin/index.js
 const Parse = getApp().Parse;
 const company = getApp().globalData.company;
+const uid = Parse.User.current()?.id
+const getSportData = require('../../../service/getSportData')
 const {
-    getConsecutiveSignIns
+  getConsecutiveSignIns
 } = require("../../../service/day")
 Page({
 
-    /**
-     * 页面的初始数据
-     */
-    data: {
-        //屏幕高度
-        statusBarHeight: 0, // 状态栏高度
-        screenHeight: 0, // 屏幕高度
-        customHeight: 0, // 自定义导航栏高度（如小程序右上角胶囊按钮）
-        bottomNavHeight: 0, // 底部导航栏高度
-        contentHeight: 0, // 可用内容高度
-        contentHeight2: 0,
-        contentpadding: 0, //顶部padding高度
-        //是否打卡
-        issigin: false,
-        images: [
-            // 'https://file-cloud.fmode.cn/qpFbRRSZrO/20250113/1p97lf053250915.png',
-            // 'https://file-cloud.fmode.cn/qpFbRRSZrO/20250113/bt19fm050427168.png',
-            'https://file-cloud.fmode.cn/qpFbRRSZrO/20250113/191d1m053251615.png'
-        ],
-        randomImage: '',
-        accumulateChink:0,
-        continuousChink:0
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad: function (options) {
-        // 计算
-        const systemInfo = wx.getSystemInfoSync();
-        const statusBarHeight = systemInfo.statusBarHeight || 0;
-        const screenHeight = systemInfo.screenHeight || 0;
-        const custom = wx.getMenuButtonBoundingClientRect();
-        const customHeight = custom.height + 10 + 2 || 0;
-        const bottomNavHeight = systemInfo.screenHeight - systemInfo.safeArea.bottom || 0;
-
-        const contentpadding = (statusBarHeight + customHeight) * 750 / systemInfo.windowWidth;
-        const contentHeight = (screenHeight - bottomNavHeight - statusBarHeight - customHeight) * 750 / systemInfo.windowWidth;
-        this.setData({
-            statusBarHeight,
-            screenHeight,
-            customHeight,
-            bottomNavHeight,
-            contentpadding,
-            contentHeight
-        });
-        this.showRandomImage()
-        this.order()
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    //屏幕高度
+    statusBarHeight: 0, // 状态栏高度
+    screenHeight: 0, // 屏幕高度
+    customHeight: 0, // 自定义导航栏高度（如小程序右上角胶囊按钮）
+    bottomNavHeight: 0, // 底部导航栏高度
+    contentHeight: 0, // 可用内容高度
+    contentHeight2: 0,
+    contentpadding: 0, //顶部padding高度
+    //是否打卡
+    issigin: false,
+    images: [
+      // 'https://file-cloud.fmode.cn/qpFbRRSZrO/20250113/1p97lf053250915.png',
+      // 'https://file-cloud.fmode.cn/qpFbRRSZrO/20250113/bt19fm050427168.png',
+      'https://file-cloud.fmode.cn/qpFbRRSZrO/20250113/191d1m053251615.png'
+    ],
+    randomImage: '',
+    accumulateChink: 0,
+    continuousChink: 0
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    // 计算
+    const systemInfo = wx.getSystemInfoSync();
+    const statusBarHeight = systemInfo.statusBarHeight || 0;
+    const screenHeight = systemInfo.screenHeight || 0;
+    const custom = wx.getMenuButtonBoundingClientRect();
+    const customHeight = custom.height + 10 + 2 || 0;
+    const bottomNavHeight = systemInfo.screenHeight - systemInfo.safeArea.bottom || 0;
+
+    const contentpadding = (statusBarHeight + customHeight) * 750 / systemInfo.windowWidth;
+    const contentHeight = (screenHeight - bottomNavHeight - statusBarHeight - customHeight) * 750 / systemInfo.windowWidth;
+    this.setData({
+      statusBarHeight,
+      screenHeight,
+      customHeight,
+      bottomNavHeight,
+      contentpadding,
+      contentHeight
+    });
+    this.showRandomImage()
+    this.order()
+    this.accumulateChink()
+    this.continuousChink()
+  },
+  /**连续打卡 */
+  async continuousChink() {
+    console.log(uid)
+    let d = await getSportData.getContinuousCount(uid, 'EventLog')
+    this.setData({
+      continuousChink: d||0
+    })
+  },
+  /** 积累打卡*/
+  async accumulateChink() {
+    const currentUser = Parse.User.current();
+    let EventLogquery = new Parse.Query('EventLog');
+    EventLogquery.equalTo('user', currentUser.id);
+    EventLogquery.equalTo('company', company);
+    EventLogquery.notEqualTo('isDeleted', true)
+    let count = await EventLogquery.count();
+    this.setData({
+      accumulateChink: count || 0
+    })
+  },
+  /** 随机展示图片*/
+  showRandomImage: function () {
+    const randomIndex = Math.floor(Math.random() * this.data.images.length);
+    this.setData({
+      randomImage: this.data.images[randomIndex]
+    });
+  },
+  /**检查当天是否签到 */
+  async order() {
+    const currentUser = Parse.User.current();
+    let EventLogquery = new Parse.Query('EventLog');
+    EventLogquery.equalTo('user', currentUser.id);
+    EventLogquery.equalTo('company', company);
+    EventLogquery.notEqualTo('isDeleted', true)
+    // 获取今天的日期
+    const today = new Date();
+    const todayStart = new Date(today.getFullYear(), today.getMonth(), today.getDate()); // 今天的开始时间
+    const todayEnd = new Date(todayStart);
+    todayEnd.setHours(23, 59, 59, 999); // 今天的结束时间
+
+    // 在查询条件中添加对 createdAt 的限制
+    EventLogquery.greaterThanOrEqualTo('createdAt', todayStart);
+    EventLogquery.lessThanOrEqualTo('createdAt', todayEnd);
+    let P = await EventLogquery.first();
+
+    if (P) {
+      this.setData({
+        issigin: true
+      })
+      return;
+    }
+  },
+  /**打卡 */
+  async submit() {
+    const currentUser = Parse.User.current();
+    let EventLogquery = new Parse.Query('EventLog');
+    EventLogquery.equalTo('user', currentUser.id);
+    EventLogquery.equalTo('company', company);
+    EventLogquery.notEqualTo('isDeleted', true)
+    // 获取今天的日期
+    const today = new Date();
+    const todayStart = new Date(today.getFullYear(), today.getMonth(), today.getDate()); // 今天的开始时间
+    const todayEnd = new Date(todayStart);
+    todayEnd.setHours(23, 59, 59, 999); // 今天的结束时间
+
+    // 在查询条件中添加对 createdAt 的限制
+    EventLogquery.greaterThanOrEqualTo('createdAt', todayStart);
+    EventLogquery.lessThanOrEqualTo('createdAt', todayEnd);
+    let P = await EventLogquery.first();
+
+    if (P) {
+      this.setData({
+        issigin: true
+      })
+      console.log('今日已打卡');
+      return;
+    } else {
+      const currentUser = Parse.User.current();
+      let userquery = new Parse.Query('_User');
+      userquery.equalTo('company', company);
+      userquery.equalTo('objectId', currentUser.id);
+      userquery.notEqualTo('isDeleted', true)
+      let user = await userquery.first();
+
+      let companyPointer = Parse.Object.extend('Company').createWithoutData(company);
+      let EventLog = new Parse.Object('EventLog');
+      EventLog.set('points', 10)
+      EventLog.set('company', companyPointer);
+      EventLog.set('user', user.toPointer());
+
+      try {
+        let saveDate = await EventLog.save();
+        console.log(saveDate);
         this.accumulateChink()
-        this.continuousChink()
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady: function () {
-        
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload: function () {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh: function () {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom: function () {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage: function () {
-
-    },
-    //检查当天是否签到
-    async order() {
-        const currentUser = Parse.User.current();
-        let EventLogquery = new Parse.Query('EventLog');
-        EventLogquery.equalTo('user', currentUser.id);
-        EventLogquery.equalTo('company', company);
-        EventLogquery.notEqualTo('isDeleted', true)
-        // 获取今天的日期
-        const today = new Date();
-        const todayStart = new Date(today.getFullYear(), today.getMonth(), today.getDate()); // 今天的开始时间
-        const todayEnd = new Date(todayStart);
-        todayEnd.setHours(23, 59, 59, 999); // 今天的结束时间
-
-        // 在查询条件中添加对 createdAt 的限制
-        EventLogquery.greaterThanOrEqualTo('createdAt', todayStart);
-        EventLogquery.lessThanOrEqualTo('createdAt', todayEnd);
-        let P = await EventLogquery.first();
-
-        if (P) {
-            this.setData({
-                issigin: true
-            })
-            return;
-        }
-    },
-    async submit() {
-        const currentUser = Parse.User.current();
-        let EventLogquery = new Parse.Query('EventLog');
-        EventLogquery.equalTo('user', currentUser.id);
-        EventLogquery.equalTo('company', company);
-        EventLogquery.notEqualTo('isDeleted', true)
-        // 获取今天的日期
-        const today = new Date();
-        const todayStart = new Date(today.getFullYear(), today.getMonth(), today.getDate()); // 今天的开始时间
-        const todayEnd = new Date(todayStart);
-        todayEnd.setHours(23, 59, 59, 999); // 今天的结束时间
-
-        // 在查询条件中添加对 createdAt 的限制
-        EventLogquery.greaterThanOrEqualTo('createdAt', todayStart);
-        EventLogquery.lessThanOrEqualTo('createdAt', todayEnd);
-        let P = await EventLogquery.first();
-
-        if (P) {
-            this.setData({
-                issigin: true
-            })
-            console.log('今日已打卡');
-            return;
-        } else {
-            const currentUser = Parse.User.current();
-            let userquery = new Parse.Query('_User');
-            userquery.equalTo('company', company);
-            userquery.equalTo('objectId', currentUser.id);
-            userquery.notEqualTo('isDeleted', true)
-            let user = await userquery.first();
-
-            let companyPointer = Parse.Object.extend('Company').createWithoutData(company);
-            let EventLog = new Parse.Object('EventLog');
-            EventLog.set('points', 10)
-            EventLog.set('company', companyPointer);
-            EventLog.set('user', user.toPointer());
-
-            try {
-                let saveDate = await EventLog.save();
-                console.log(saveDate);
-                this.accumulateChink()
-                this.setData({
-                    issigin: true
-                })
-                console.log("打卡成功");
-            } catch (error) {
-                console.error("保存数据时出现错误:", error);
-            }
-        }
-
-    },
-    //随机展示图片
-    showRandomImage: function () {
-        const randomIndex = Math.floor(Math.random() * this.data.images.length);
         this.setData({
-            randomImage: this.data.images[randomIndex]
-        });
-    },
-    //积累打卡
-    async accumulateChink(){
-        const currentUser = Parse.User.current();
-        let EventLogquery = new Parse.Query('EventLog');
-        EventLogquery.equalTo('user', currentUser.id);
-        EventLogquery.equalTo('company', company);
-        EventLogquery.notEqualTo('isDeleted', true)
-        let P = await EventLogquery.find();
-        let chickList = P.map(item => item.toJSON());
-        this.setData({
-            accumulateChink:chickList.length
+          issigin: true
         })
-    },
-    //连续打卡
-    async continuousChink() {
-        const currentUser = Parse.User.current();
-        let day = await getConsecutiveSignIns({
-            userId: currentUser.id,
-        });
-
-        console.log('day',day);
+        console.log("打卡成功");
+      } catch (error) {
+        console.error("保存数据时出现错误:", error);
+      }
     }
+
+  },
+
+
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+
+
+
+
+
 })

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

@@ -9,7 +9,7 @@
                 <view class="chick">
                     <view class="chick-text">连续打卡</view>
                     <view class="numberbox">
-                        <view class="number">{{continuousChink}}</view>
+                        <view class="number">{{continuousChink||0}}</view>
                         <view class="number-text">天</view>
                     </view>
                 </view>

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

@@ -57,6 +57,7 @@ Page({
     console.log(options)
     this.getActivityData()
     this.beforeUnload()
+    // this.getWeRun()
   },
 
 
@@ -153,8 +154,8 @@ Page({
             return obj
           })
           this.setData({
-            actDataList:actDataList2,
-            isShowActDataList:true,
+            actDataList: actDataList2,
+            isShowActDataList: true,
           })
           console.log(actDataList2)
         }
@@ -189,14 +190,14 @@ Page({
     let log = await log_query.first()
     let that = this
     console.log(actDataList[index])
-    if(actDataList[index].isAttend||!actDataList[index].title){
+    if (actDataList[index].isAttend || !actDataList[index].title) {
       wx.showModal({
         title: `${actDataList[index].title||'日常运动'}`,
         content: `${actDataList[index].sport_startDate||'未知时间'}开始运动，已运动 ${log?.get('distance')||0} m, ${log?.get('steps')||0} 步，消耗 ${log?.get('burnCalories')||0} 千卡,是否继续进行？`,
-        success:async(res)=> {
+        success: async (res) => {
           if (res.confirm) {
             console.log('用户点击确定')
-  
+
             await that.assignmentFun(act_end_data_id)
             that.setData({
               isShowActDataList: false
@@ -206,26 +207,28 @@ Page({
           }
         }
       })
-    }else if(!actDataList[index].isAttend){
+    } else if (!actDataList[index].isAttend) {
       wx.showModal({
         title: `${actDataList[index].title||'日常运动'}`,
         content: `${actDataList[index].sport_startDate||'未知时间'}开始运动，已运动 ${log?.get('distance')||0} m, ${log?.get('steps')||0} 步，消耗 ${log?.get('burnCalories')||0} 千卡。当前报名记录已过期，可查看其他报名或其他活动。`,
-        showCancel:false,
-        confirmText:'结束运动',
-        success:async(res)=> {
+        showCancel: false,
+        confirmText: '结束运动',
+        success: async (res) => {
           if (res.confirm) {
             await that.setEndActDateFun(act_end_data_id)
-            actDataList.splice(index,1)
-            that.setData({actDataList})
+            actDataList.splice(index, 1)
+            that.setData({
+              actDataList
+            })
             wx.showToast({
               title: '已结束',
-              icon:'none'
+              icon: 'none'
             })
           }
         }
       })
     }
- 
+
   },
   /**继续未结束运动 */
   async goOnactEndDate() {
@@ -237,7 +240,32 @@ Page({
       isShowActDataList: false
     })
   },
+  /**全部结束 */
+  async itemId() {
+    wx.showModal({
+      content: '确认结束列表内显示的全部运动吗？',
+      success:async (res)=> {
+        if (res.confirm) {
+          wx.showLoading({
+            title: '...',
+          })
+          let {
+            actDataList
+          } = this.data
+          for (let i in actDataList) {
+            let itemId = actDataList[i].objectId
+            await this.setEndActDateFun(itemId)
+          }
+          this.creatActDateFun()
+          wx.hideLoading()
+          this.setData({
+            isShowActDataList: false
+          })
+        }
+      }
+    })
 
+  },
 
   /**
    * 新建运动数据
@@ -296,7 +324,9 @@ Page({
     let log = await log_query.first()
     let data_query = new Parse.Query('ActivityData')
     let actData = await data_query.get(actDataId)
-    this.setData({actData})
+    this.setData({
+      actData
+    })
     this.setData({
       stage: 'progress',
       status: 'paused',
@@ -307,9 +337,10 @@ Page({
       journey: log?.get('distance') || 0,
       step: log?.get('steps' || 0),
       formattedTime: this.formatTime(log?.get('sportDate') || 0),
-      
+
     })
   },
+
   /**
    * 结束运动
    * @param {*} actDataId 运动数据id

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

@@ -114,6 +114,6 @@
       </block>
     </view>
 
-    <button>全部结束</button>
+    <button bind:tap="itemId">全部结束</button>
   </view>
 </van-popup>

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

@@ -1,490 +1,438 @@
 // nova-werun/pages/home/statistics/index.js
-import * as echarts from "../../../components/ec-canvas/echarts.min"
+import * as echarts from "../../../components/ec-canvas/echarts"
 const Parse = getApp().Parse;
 const company = getApp().globalData.company;
-
+const getSportData = require("../../../service/getSportData.js");
+const uid = Parse.User.current()?.id
+const user = Parse.User.current()
+const dateF = require("../../../../utils/date")
 
 Page({
-
-    /**
-     * 页面的初始数据
-     */
-    data: {
-        //屏幕高度
-        statusBarHeight: 0, // 状态栏高度
-        screenHeight: 0, // 屏幕高度
-        customHeight: 0, // 自定义导航栏高度（如小程序右上角胶囊按钮）
-        bottomNavHeight: 0, // 底部导航栏高度
-        contentHeight: 0, // 可用内容高度
-        contentHeight2: 0,
-        contentpadding: 0, //顶部padding高度
-
-        active: 0,
-        //
-        day: '7',
-        target: '',
-        sharList: [],
-        //生涯数据
-        stardate: '',
-        daysDifference: "",
-        totalSteps: 0,
-        totalDistance: 0,
-        totalBurnCalories: 0,
-        totalsportDate: 0,
-
-        ec: {
-            onInit: null
-        },
-        resultList: [],
-        stepsData: [], //统计图柱状
-        xAxis: [], //x轴
-
-        percentage: '',
-        percent: '',
-
-        //排名百分比
-        percebtage: 0,
-        //
-        average: 0,
-        totle: 0,
-
-        //显示日历
-        todatDate:null,
-        minDate: null,
-        maxDate: null,
-        formatter(day) {
-            day.topInfo = '11111'
-            return day;
-        },
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad: async function (options) {
-        // 计算
-        const systemInfo = wx.getSystemInfoSync();
-        const statusBarHeight = systemInfo.statusBarHeight || 0;
-        const screenHeight = systemInfo.screenHeight || 0;
-        const custom = wx.getMenuButtonBoundingClientRect();
-        const customHeight = custom.height + 10 + 2 || 0;
-        const bottomNavHeight = systemInfo.screenHeight - systemInfo.safeArea.bottom || 0;
-
-        const contentpadding = (statusBarHeight + customHeight) * 750 / systemInfo.windowWidth;
-        const contentHeight = (screenHeight - 50 - bottomNavHeight - statusBarHeight - customHeight) * 750 / systemInfo.windowWidth;
-        this.setData({
-            statusBarHeight,
-            screenHeight,
-            customHeight,
-            bottomNavHeight,
-            contentpadding,
-            contentHeight
-        });
-        await this.gettarget()
-        await this.order()
-        this.allorder()
-        await this.getweekday()
-        this.echartsComponnet = this.selectComponent('#mychart')
-        await this.initChart()
-        this.gettoday()
-    },
-    //图表
-    // 将 initChart 定义在 Page 上下文中
-    initChart() {
-        if (this.chart) {
-            this.chart.clear();
-        }
-        this.echartsComponnet.init((canvas, width, height, dpr) => {
-            // 初始化图表
-            this.chart = echarts.init(canvas, null, {
-                width: width,
-                height: height,
-                devicePixelRatio: dpr // 清晰度 使canvas的图表更加清晰
-            });
-            this.chart.setOption(this.getOption())
-            return this.chart;
-        });
-    },
-
-    getOption() {
-        var option = {
-            xAxis: {
-                type: 'category',
-                data: ['周一', '周二', '周三', '周四', '周五', '周六', '周日'],
-                axisLabel: {
-                    formatter: (value, index) => this.formatter(value, index)
-                }
-            },
-            yAxis: {
-                type: 'value',
-                max: 20000, // 设置Y轴最大值为20000
-                axisLabel: {
-                    formatter: function (value) {
-                        if (value >= 10000) {
-                            return (value / 1000) + 'k'; // 格式化为20k
-                        }
-                        return value;
-                    }
-                }
-            },
-            series: [{
-                // data: [
-                //     12000,
-                //     {
-                //         value: 12000,
-                //         itemStyle: {
-                //             color: '#a90000',
-                //         }
-                //     },
-                //     12000,
-                //     12000,
-                //     12000,
-                //     12000,
-                //     12000
-                // ],
-                data: this.data.stepsData,
-                type: 'bar',
-                barWidth: '10',
-                itemStyle: {
-                    borderRadius: 15,
-                }
-            }],
-        };
-        return option; // 返回 option 对象
-    },
-    // 返回x轴底下的字
-    formatter(value, index) {
-        let daylist = this.data.resultList.map(item => {
-            const day = new Date(item.createdAt); // 获取当前日期
-            const dayOfMonth = day.getDate(); // 获取今天是几号
-            return dayOfMonth
-        })
-        daylist.reverse()
-        const dayindex = daylist.length - 1
-        if (daylist.length < 7) {
-            for (let i = daylist.length; i < 7; i++) {
-                const lastDay = daylist[daylist.length - 1];
-                daylist.push(lastDay + (i - daylist.length + 1)); // 补充后续日期
-            }
-        }
-        const dates = daylist.map(item => {
-            return `${item}号`
-        })
-        return index === dayindex ? '今天' + '\n' + '\n' + dates[index] : value + '\n' + '\n' + dates[index];
-    },
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload: function () {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh: function () {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom: function () {
-
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    //屏幕高度
+    statusBarHeight: 0, // 状态栏高度
+    screenHeight: 0, // 屏幕高度
+    customHeight: 0, // 自定义导航栏高度（如小程序右上角胶囊按钮）
+    bottomNavHeight: 0, // 底部导航栏高度
+    contentHeight: 0, // 可用内容高度
+    contentHeight2: 0,
+    contentpadding: 0, //顶部padding高度
+
+    active: 0,
+    sportsDate: null, //运动数据 卡路里/时间/公里/步数
+    option: null, //图表数据
+    careerData: null, //生涯数据 注册日/卡路里/时间/公里/步数
+    rankOfAll: null, //全网排名
+    rece: 7, //近期趋势 7天/30天
+    receDate: null, //趋势数据 每日平均/总计
+
+
+
+    //
+    day: '7',
+    target: '',
+    sharList: [],
+    //生涯数据
+    stardate: '',
+    daysDifference: "",
+    totalSteps: 0,
+    totalDistance: 0,
+    totalBurnCalories: 0,
+    totalsportDate: 0,
+
+
+    resultList: [],
+    stepsData: [], //统计图柱状
+    xAxis: [], //x轴
+
+    percentage: '',
+    percent: '',
+
+    //排名百分比
+    percebtage: 0,
+    //
+    average: 0,
+    totle: 0,
+
+    //显示日历
+    todatDate: null,
+    minDate: null,
+    maxDate: null,
+    formatter(day) {
+      day.topInfo = '11111'
+      return day;
     },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage: function () {
-
-    },
-    //底部tab栏修改
-    onChange(event) {
-        this.setData({
-            active: event.detail
-        });
-        this.echartsComponnet = this.selectComponent('#mychart')
-        this.initChart()
-    },
-    //修改30天或者7天数据
-    changeday() {
-        if (this.data.day == '7') {
-            this.setData({
-                day: '30',
-            })
-            this.gettodaydate()
-        } else {
-            this.setData({
-                day: '7'
-            })
-            this.echartsComponnet = this.selectComponent('#mychart')
-            this.initChart()
-            this.getweekday()
-        }
-    },
-    //获取目标步数
-    async gettarget() {
-        const currentUser = Parse.User.current();
-        let userquery = new Parse.Query('_User');
-        userquery.equalTo('company', company);
-        userquery.equalTo('objectId', currentUser.id);
-        userquery.notEqualTo('isDeleted', true)
-        let user = await userquery.find();
-        let num = user.map(item => item.toJSON());
-        if (num[0].num) {
-            this.setData({
-                target: num[0].num
-            })
-            console.log('当前步数', this.data.target);
-        }
-    },
-    //获取当天运动数据
-    async order() {
-        const currentUser = Parse.User.current();
-        let ActivityDataquery = new Parse.Query('ActivityData');
-        ActivityDataquery.equalTo('user', currentUser.id);
-        ActivityDataquery.equalTo('company', company);
-        ActivityDataquery.equalTo('type', 'today');
-        ActivityDataquery.notEqualTo('isDeleted', true);
-
-        // 获取今天的日期
-        const today = new Date();
-        const todayStart = new Date(today.getFullYear(), today.getMonth(), today.getDate()); // 今天的开始时间
-        const todayEnd = new Date(todayStart);
-        todayEnd.setHours(23, 59, 59, 999); // 今天的结束时间
-
-        // 在查询条件中添加对 createdAt 的限制
-        ActivityDataquery.greaterThanOrEqualTo('createdAt', todayStart);
-        ActivityDataquery.lessThanOrEqualTo('createdAt', todayEnd);
-        ActivityDataquery.include('user');
-
-        let r = await ActivityDataquery.find();
-        let sharList = r.map(item => item.toJSON());
-
-        this.setData({
-            sharList
-        });
-        this.getBackgroundColor()
-        console.log(this.data.sharList);
-    },
-    //获取生涯运动数据
-    async allorder() {
-        const currentUser = Parse.User.current();
-        let ActivityDataquery = new Parse.Query('ActivityData');
-        ActivityDataquery.equalTo('user', currentUser.id);
-        ActivityDataquery.equalTo('company', company);
-        ActivityDataquery.equalTo('type', 'today');
-        ActivityDataquery.notEqualTo('isDeleted', true);
-
-        let r = await ActivityDataquery.find();
-        let allList = r.map(item => item.toJSON());
-
-        // 根据 createdAt 日期从以前到现在排列
-        allList.sort((a, b) => new Date(a.createdAt) - new Date(b.createdAt));
-
-        // 获取最早的 createdAt 日期
-        const earliestDate = new Date(allList[0].createdAt);
-
-        // 格式化为 YYYY年MM月DD日
-        const formattedDate = `${earliestDate.getFullYear()}年${String(earliestDate.getMonth() + 1).padStart(2, '0')}月${String(earliestDate.getDate()).padStart(2, '0')}日`;
-
-        // 计算从最早日期到今天的天数
-        const today = new Date();
-
-        // 清零时间部分
-        earliestDate.setHours(0, 0, 0, 0); // 将最早日期的时间部分清零
-        today.setHours(0, 0, 0, 0); // 将今天的时间部分清零
-
-        // 计算日期差值
-        const timeDifference = today - earliestDate; // 时间差（毫秒）
-        const daysDifference = Math.floor(timeDifference / (1000 * 60 * 60 * 24)); // 转换为天数
-
-        // 计算 steps、distance 和 burnCalories 的总和
-        let totalSteps = 0;
-        let totalDistance = 0;
-        let totalBurnCalories = 0;
-        let totalsportDate = 0;
-
-        allList.forEach(item => {
-            totalSteps += Number(item.steps) || 0; // 确保为数字类型，避免 NaN
-            totalDistance += Number(item.distance) || 0; // 确保为数字类型，避免 NaN
-            totalBurnCalories += Number(item.burnCalories) || 0; // 确保为数字类型，避免 NaN
-            totalsportDate += Number(item.sportDate) || 0;
-        });
-
-        // 将总运动时间转换为天、小时、分钟
-        const days = Math.floor(totalsportDate / (60 * 24)); // 转换为天数
-        const hours = Math.floor((totalsportDate % (60 * 24)) / 60); // 剩余小时
-        const minutes = totalsportDate % 60; // 剩余分钟
-        // 设置 stardate 和 daysDifference
-        this.setData({
-            stardate: formattedDate,
-            daysDifference: daysDifference,
-            totalSteps,
-            totalDistance,
-            totalBurnCalories,
-            totalsportDate: `${days}天 ${hours}小时 ${minutes}分钟` // 格式化为字符串
-        });
-
-        console.log(allList, this.data.totalsportDate);
-    },
-    //修改光圈
-    getBackgroundColor() {
-        const steps = this.data.sharList[0].steps || 0;
-
-        let percent = (steps / this.data.target) * 100;
-        console.log('目标', percent);
-        if (percent > 100) {
-            percent = 100;
-        }
-        // 保留两位小数
-        percent = parseFloat(percent.toFixed(2));
-        this.setData({
-            percent,
-            percentage: `conic-gradient(from 0deg, #015EEA ${percent}%, white 0%)`,
-        })
-        console.log('百分比', this.data.percentage);
-    },
-    //获取本周记录
-    async getweekday() {
-        const currentUser = Parse.User.current();
-        let ActivityDataquery = new Parse.Query('ActivityData');
-        ActivityDataquery.equalTo('user', currentUser.id);
-        ActivityDataquery.equalTo('company', company);
-        ActivityDataquery.equalTo('type', 'today');
-        ActivityDataquery.notEqualTo('isDeleted', true);
-
-        let r = await ActivityDataquery.find();
-        let allList = r.map(item => item.toJSON());
-
-        // 按时间降序排序（从现在到以前）
-        allList.sort((a, b) => new Date(b.createdAt) - new Date(a.createdAt));
-
-        // 获取今天是星期几（0 = 周日, 1 = 周一, ..., 6 = 周六）
-        const today = new Date();
-        const dayOfWeek = today.getDay(); // 获取当前星期几
-
-        // 根据星期几决定取多少条数据
-        let numItemsToTake;
-        if (dayOfWeek === 0) {
-            numItemsToTake = 7; // 周日取7条数据
-        } else {
-            numItemsToTake = dayOfWeek; // 周一至周六取对应条数
-        }
-
-        // 取出对应数量的数据
-        const resultList = allList.slice(0, numItemsToTake);
-        const stepsData = resultList.map((item, index) => {
-            if (index === 0) {
-                // 如果是第一条数据，设置特殊样式
-                return {
-                    value: item.steps,
-                    itemStyle: {
-                        color: '#a90000',
-                    }
-                };
-            } else {
-                // 其他数据直接返回 steps
-                return item.steps;
-            }
-        });
-        stepsData.reverse()
-        //总计，平均
-        let totle = 0
-        for (let i = 0; i < resultList.length; i++) {
-            totle = totle + Number(resultList[i].steps)
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: async function (options) {
+    let that = this
+
+
+    // 计算
+    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 - 50 - bottomNavHeight - statusBarHeight - customHeight) * 750 / systemInfo.windowWidth;
+    this.setData({
+      statusBarHeight,
+      screenHeight,
+      customHeight,
+      bottomNavHeight,
+      contentpadding,
+      contentHeight
+    });
+
+    this.refersh01()
+  },
+  /** 底部tab栏修改*/
+  async onChange(event) {
+    if (event.detail == 0) {
+      this.refersh01()
+    } else {
+      this.refersh02()
+    }
+    await this.setData({
+      active: event.detail
+    });
+  },
+  /**今日步数页面刷新 */
+  async refersh01() {
+    let that = this
+    await this.getSportDate()
+    this.gettarget()
+    await this.getWeekData()
+    this.setData({
+      ec: {
+        onInit: that.initChart
+      },
+    })
+  },
+  /**周期统计页面刷新 */
+  async refersh02() {
+    this.getCareer()
+    this.getRankingOfAll()
+    this.getTrend()
+    this.getTrendSum()
+  },
+
+  /**获取运动数据 */
+  async getSportDate() {
+    let burnCalories = await getSportData.getwalk('burnCalories') || 0
+    let sportDate = await getSportData.getwalk('sportDate') || 0
+    let distance = await getSportData.getwalk('distance') || 0
+    let steps = await getSportData.getwalk('steps') || 0
+    this.setData({
+      sportsDate: {
+        burnCalories,
+        sportDate,
+        distance,
+        steps
+      }
+    })
+  },
+  /** 获取目标步数*/
+  async gettarget() {
+    const currentUser = Parse.User.current();
+    let userquery = new Parse.Query('_User');
+    userquery.equalTo('company', company);
+    userquery.equalTo('objectId', currentUser.id);
+    userquery.notEqualTo('isDeleted', true)
+    let user = await userquery.first();
+    let num = user?.toJSON()
+    if (num.num) {
+      await this.setData({
+        target: num.num
+      })
+      this.getBackgroundColor()
+    }
+  },
+  /** 修改光圈*/
+  getBackgroundColor() {
+    const steps = this.data.sportsDate.steps || 0;
+    let percent = (steps / this.data.target) * 100;
+    if (percent > 100) {
+      percent = 100;
+    }
+    percent = parseFloat(percent.toFixed(2));
+    this.setData({
+      percent,
+      percentage: `conic-gradient(from 0deg, #015EEA ${percent}%, white 0%)`,
+    })
+  },
+  /**获取本周步数 */
+  async getWeekData() {
+    let dates = [];
+    let now = new Date();
+    let currentDate = now.getDate();
+    let currentDay = now.getDay();
+    let monday = new Date(now);
+    monday.setDate(currentDate - currentDay + 1);
+    for (let i = 0; i < 7; i++) {
+      let date = new Date(monday);
+      date.setDate(monday.getDate() + i);
+      date.setHours(0, 0, 0, 0);
+      let nextDate = new Date(monday);
+      nextDate.setDate(monday.getDate() + i + 1);
+      nextDate.setHours(0, 0, 0, 0);
+      let fromto = {
+        from: date,
+        to: nextDate
+      }
+      let d = await getSportData.getwalk('steps', '', fromto) || 0
+      let item = {
+        value: d,
+        itemStyle: {
+          color: '#4F9AF7'
         }
-        const average = totle / resultList.length
-        console.log('totle', totle, average);
-        this.setData({
-            resultList,
-            stepsData,
-            totle,
-            average,
-        })
-        console.log('resultList', resultList);
-
-    },
-    //获取今日排名百分比
-    async gettoday() {
-        const currentUser = Parse.User.current();
-        let ActivityDataquery = new Parse.Query('ActivityData');
-        ActivityDataquery.equalTo('company', company);
-        ActivityDataquery.equalTo('type', "today");
-        ActivityDataquery.notEqualTo('isDeleted', true);
-
-        // 获取今天的日期
-        const today = new Date();
-        const todayStart = new Date(today.getFullYear(), today.getMonth(), today.getDate()); // 今天的开始时间
-        const todayEnd = new Date(todayStart);
-        todayEnd.setHours(23, 59, 59, 999); // 今天的结束时间
-        console.log(todayStart, todayEnd);
-        // 在查询条件中添加对 createdAt 的限制
-        ActivityDataquery.greaterThanOrEqualTo('createdAt', todayStart);
-        ActivityDataquery.lessThanOrEqualTo('createdAt', todayEnd);
-
-        // 根据 steps 字段进行降序排序
-        ActivityDataquery.descending('steps');
-        ActivityDataquery.include('user');
-
-        try {
-            let P = await ActivityDataquery.find();
-            let todayList = P.map(item => item.toJSON());
-            console.log('todayList', todayList);
-            let rank = 0
-            // 更新页面数据
-            todayList.forEach((item, index) => {
-                if (item.user.objectId == currentUser.id) {
-                    rank = index + 1;
-                    return
-                }
-            })
-
-            var ranper = 100 - (rank / todayList.length) * 100
-            ranper = parseFloat(ranper.toFixed(2));
-            this.setData({
-                percebtage: ranper
-            })
-            console.log('percebtage', this.data.percebtage);
-        } catch (error) {
-            console.error('Error fetching today\'s data:', error);
+      }
+      dates.push(item);
+    }
+    let option = {
+      graphic: {
+        z: -1
+      },
+      xAxis: {
+        type: 'category',
+        data: ['周一', '周二', '周三', '周四', '周五', '周六', '周日']
+      },
+      yAxis: {
+        type: 'value'
+      },
+      series: [{
+        data: dates,
+        type: 'bar'
+      }]
+    }
+    this.setData({
+      option
+    })
+  },
+
+  /**获取生涯合计 */
+  async getCareer() {
+    let startDate = dateF.formatTime("YYYY年mm月dd日", user?.get('createdAt'))
+    let fromTo = {
+      from: user?.get('createdAt'),
+      to: new Date()
+    }
+    let diff = Math.abs(fromTo.from.getTime() - fromTo.to.getTime());
+    let days = 1000 * 60 * 60 * 24;
+    let difDays = parseInt(Math.floor(diff / days))
+    let steps = await getSportData.getwalk('steps', '', fromTo) || 0
+    let burnCalories = await getSportData.getwalk('burnCalories', '', fromTo) || 0
+    let sportDate = await getSportData.getwalk('sportDate', '', fromTo) || 0
+    let distance = await getSportData.getwalk('distance', '', fromTo) / 1000 || 0
+    sportDate = this.convertSeconds(sportDate)
+    distance = distance.toFixed(2)
+    this.setData({
+      careerData: {
+        startDate,
+        difDays,
+        steps,
+        burnCalories,
+        sportDate,
+        distance
+      }
+    })
+  },
+  /**秒换算天小时 */
+  convertSeconds(seconds) {
+    let secondsInAnHour = 3600;
+    let hours = Math.floor(seconds / secondsInAnHour);
+    let days = Math.floor(hours / 24);
+    return {
+      days: days,
+      hours: hours % 24 // 计算剩余的小时数
+    };
+  },
+  /**获取全网排名 */
+  async getRankingOfAll() {
+    let steps = await getSportData.getwalk('steps', '')
+    let rd = await getSportData.getUserRank(uid, '', 'today')
+    let rank = rd[0]?.rank || 0
+    // console.log(steps, rd, rank)
+    let percent = 0
+    if (rank > 0) {
+      let query = new Parse.Query('_User')
+      query.equalTo('company', company)
+      query.equalTo('type', 'user')
+      query.notEqualTo('isDeleted', true)
+      let uCount = await query.count()
+      percent = (100 * ((uCount - parseInt(rank) + 1) / uCount)).toFixed(2)
+    }
+    let rankOfAll = {
+      steps,
+      percent
+    }
+    this.setData({
+      rankOfAll
+    })
+  },
+  /**获取近期趋势 平均/总计 */
+  async getTrendSum() {
+    let {
+      rece
+    } = this.data
+    rece = parseInt(rece)
+    let to = new Date();
+    let from = new Date(to);
+    from.setDate(to.getDate() - rece);
+    from.setHours(0, 0, 0, 0);
+    let count = await getSportData.getwalk('steps', '', {from,to}) || 0
+    let svg = parseInt(count / rece)
+    this.setData({
+      receDate: {
+        count,
+        svg
+      }
+    })
+  },
+  /**获取近期趋势 */
+  async getTrend() {
+    this.setData({
+      option: null
+    })
+    let {
+      rece
+    } = this.data
+    let dates = [];
+    let xList = []
+    let today = new Date();
+    today.setHours(0, 0, 0, 0);
+    let tomorrow = new Date(today);
+    tomorrow.setDate(today.getDate() + 1);
+    tomorrow.setHours(0, 0, 0, 0);
+    for (let i = 0; i < rece; i++) {
+      let from = new Date(today);
+      from.setDate(today.getDate() - i)
+      let to = new Date(tomorrow);
+      to.setDate(tomorrow.getDate() - i)
+      let fromTo = {
+        from,
+        to
+      }
+      let d = await getSportData.getwalk('steps', '', fromTo) || 0
+      let item = {
+        value: d,
+        itemStyle: {
+          color: '#4F9AF7'
         }
-    },
-    //获取当月第一天日期和最后一天日期
-    gettodaydate() {
-
-        // 获取今天的日期
-        const today = new Date();
-        // 获取当月第一天的日期
-        const startOfMonth = new Date(today.getFullYear(), today.getMonth(), 1).getTime();
-        // 获取当月最后一天的日期
-        const endOfMonth = new Date(today.getFullYear(), today.getMonth() + 1, 0).getTime();
-        this.setData({
-            minDate:startOfMonth,
-            maxDate:endOfMonth,
-            todatDate:today.getTime()
-        })
+      }
+      xList.push(dateF.formatTime("mm-dd", from))
+      dates.push(item);
+    }
+    let option = {
+      xAxis: {
+        type: 'category',
+        data: xList
+      },
+      yAxis: {
+        type: 'value'
+      },
+      series: [{
+        data: dates,
+        type: 'bar'
+      }]
     }
+    await this.setData({
+      option
+    })
+    let that = this
+    this.setData({
+      ec: {
+        onInit: that.initChart
+      },
+    })
+  },
+  /**修改近期7/30 天 */
+  async changeTrend(e) {
+    let {
+      rece
+    } = this.data
+    let {
+      t
+    } = e.currentTarget.dataset
+    t = parseInt(t)
+    // console.log(t, rece)
+    if (t == rece) return
+    await this.setData({
+      rece: t
+    })
+    this.getTrendSum()
+    this.getTrend()
+  },
+
+  /**设置图表 */
+  initChart(canvas, width, height, dpr) {
+    let {
+      option
+    } = this.data
+    let chart = echarts.init(canvas, null, {
+      width: width,
+      height: height,
+      devicePixelRatio: dpr
+    });
+    canvas.setChart(chart);
+    chart.setOption(option);
+    return chart;
+  },
+
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {},
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
 })

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

@@ -291,13 +291,11 @@
     }
     .card3{
         width: 100%;
-        min-height: 538rpx;
         padding: 20rpx;
         padding-bottom: 0rpx;
         border: solid #015EEA 2px;
         border-radius: 20rpx;
         margin-top: 26rpx;
-        position: relative;
         .card3-top{
             width: 100%;
             display: flex;
@@ -363,15 +361,10 @@
         }
         .card3-bottom{
             width: 100%;
-            height: 380rpx;
-            position: absolute;
-            left: 20rpx;
-            bottom: 0;
         }
         .card4-bottom{
             width: 100%;
             height: auto;
-            padding-bottom: 30rpx;
             margin-top: 20rpx;
             border-radius: 15rpx;
             overflow: hidden;

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

@@ -1,142 +1,161 @@
 <!--nova-werun/pages/home/statistics/index.wxml-->
 <nav type="back" title="步数统计" background-color="{{'#4F9AF7'}}" front-color="{{'#333333'}}"></nav>
-<view class="all" style="height: {{contentHeight}}rpx;" wx:if="{{active==0}}">
-    <view class="number">
-        <view class="num">
-            <view class="num-num">{{sharList[0].burnCalories||0}}</view>
-            <view class="num-text">
-                <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20250102/p7a8bu044758822.png?imageView2/1/w/200/h/200"></image>
-                卡路里
-            </view>
-        </view>
-        <view class="num">
-            <view class="num-num">
-                {{sharList[0].sportDate||0}}
-                <view class="numtext">分钟</view>
-            </view>
-            <view class="num-text">
-                <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20250102/opj155044741516.png?imageView2/1/w/200/h/200"></image>
-                步数时间
-            </view>
-        </view>
-        <view class="num">
-            <view class="num-num">{{sharList[0].distance||0}}</view>
-            <view class="num-text">
-                <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20250102/9i4h5l044715444.png?imageView2/1/w/200/h/200"></image>
-                公里
-            </view>
-        </view>
+
+
+<view class="all" wx:if="{{active==0}}">
+  <view class="number">
+    <view class="num">
+      <view class="num-num">{{sportsDate.burnCalories||0}}</view>
+      <view class="num-text">
+        <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20250102/p7a8bu044758822.png?imageView2/1/w/200/h/200"></image>
+        卡路里
+      </view>
     </view>
-    <view class="circlebox">
-        <view class="runbox" style="background:{{percentage}}">
-            <view class="run">
-                <view class="tody-steps">今日步数</view>
-                <view class="step-num">{{sharList[0].steps}}</view>
-                <view class="objective">
-                    <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241102/q12pc1114226514.png?imageView2/1/w/200/h/200" alt="" />
-                    <view class="ob-num">目标：{{target}}</view>
-                </view>
-                <view class="achieve">{{percent}}% 已完成</view>
-            </view>
-        </view>
-        <!-- <image class="image2" src="https://file-cloud.fmode.cn/qpFbRRSZrO/20250102/14819p045007276.png?imageView2/1/w/200/h/200"></image> -->
+    <view class="num">
+      <view class="num-num">
+        {{sportsDate.sportDate||0}}
+        <view class="numtext">分钟</view>
+      </view>
+      <view class="num-text">
+        <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20250102/opj155044741516.png?imageView2/1/w/200/h/200"></image>
+        步数时间
+      </view>
     </view>
-    <view class="sharebox">
-        <button class="share" open-type="share">分享给好友</button>
-        <!-- <view class="share">分享给好友</view> -->
+    <view class="num">
+      <view class="num-num">{{sportsDate.distance||0}}</view>
+      <view class="num-text">
+        <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20250102/9i4h5l044715444.png?imageView2/1/w/200/h/200"></image>
+        公里
+      </view>
     </view>
-    <view class="text">
-        <view class="text2">|</view>
-        <view class="text3">本周记录</view>
+  </view>
+  <view class="circlebox">
+    <view class="runbox" style="background:{{percentage}}">
+      <view class="run">
+        <view class="tody-steps">今日步数</view>
+        <view class="step-num">{{sportsDate.steps||0}}</view>
+        <view class="objective">
+          <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241102/q12pc1114226514.png?imageView2/1/w/200/h/200" alt="" />
+          <view class="ob-num">目标：{{target}}</view>
+        </view>
+        <view class="achieve">{{percent||0}}% 已完成</view>
+      </view>
     </view>
-    <view class="chart">
-        <ec-canvas id="mychart" canvas-id="mychart" ec="{{ec}}"></ec-canvas>
+    <!-- <image class="image2" src="https://file-cloud.fmode.cn/qpFbRRSZrO/20250102/14819p045007276.png?imageView2/1/w/200/h/200"></image> -->
+  </view>
+  <view class="sharebox">
+    <button class="share" open-type="share">分享给好友</button>
+  </view>
+  <view class="text">
+    <view class="text2">|</view>
+    <view class="text3">本周记录</view>
+  </view>
+  <block>
+    <view style="width: 100vw; height: 800rpx;z-index: 0;">
+      <ec-canvas wx:if="{{option}}" style="width: 100vw; height: 800rpx;z-index: 0;" ec="{{ ec }}"></ec-canvas>
     </view>
+  </block>
 </view>
-<view class="all2" style="height: {{contentHeight}}rpx;" wx:if="{{active==1}}">
-    <view class="card1">
-        <view class="card1-title">
-            <view>|</view>
-            生涯合计
-        </view>
-        <view class="card1-in">自{{stardate||0}}开始，共{{daysDifference||0}}天，您走了</view>
-        <view class="card1-card">
-            <view class="card1card-number">{{totalSteps||0}}</view>
-            <view class="card1card-text">步，相当于</view>
-        </view>
-        <view class="card1-card2">
-            <view class="card1-c2c">
-                <view class="card1-c2cnum">{{totalBurnCalories||0}}</view>
-                <view class="card1-c2ctex">卡路里</view>
-            </view>
-            <view class="card1-c2c">
-                <view class="card1-c2cnum">{{totalsportDate||0}}</view>
-                <view class="card1-c2ctex">时间</view>
-            </view>
-            <view class="card1-c2c">
-                <view class="card1-c2cnum">{{totalDistance||0}}</view>
-                <view class="card1-c2ctex">公里</view>
-            </view>
 
-        </view>
+<view class="all2" wx:if="{{active==1}}">
+  <view class="card1">
+    <view class="card1-title">
+      <view>|</view>
+      生涯合计
     </view>
-    <view class="card2">
-        <view class="card2-top">
-            <view class="card2-title">
-                <view>|</view>
-                生涯合计
-            </view>
-            <view class="card2-title2">今日{{sharList[0].steps||0}}步</view>
-        </view>
-        <view class="card2-bottom">
-            <view class="card2-bottom1">今日步数已超过</view>
-            <view class="card2-bottom2">
-                <view class="card2-bottom2t">{{percebtage}}</view>
-                <view class="card2-bottom2t2">%</view>
-            </view>
-            <view class="card2-bottom3">的用户，赶紧行动起来</view>
+    <view class="card1-in">自{{careerData.startDate||0}}开始，共{{careerData.difDays||0}}天，您走了</view>
+    <view class="card1-card">
+      <view class="card1card-number">{{careerData.steps||0}}</view>
+      <view class="card1card-text">步,累计</view>
+    </view>
+    <view class="card1-card2">
+      <view class="card1-c2c">
+        <view class="card1-c2cnum">{{careerData.burnCalories||0}}</view>
+        <view class="card1-c2ctex">卡路里</view>
+      </view>
+      <view class="card1-c2c">
+        <view class="card1-c2cnum" wx:if="{{careerData.sportDate.days||careerData.sportDate.hours}}">{{careerData.sportDate.days}}天{{careerData.sportDate.hours}}小时</view>
+        <view class="card1-c2cnum" wx:else>不足1小时</view>
+        <view class="card1-c2ctex">时间</view>
+      </view>
+      <view class="card1-c2c">
+        <view class="card1-c2cnum">{{careerData.distance||0}}</view>
+        <view class="card1-c2ctex">公里</view>
+      </view>
 
-        </view>
     </view>
-    <view class="card3">
-        <view class="card3-top">
-            <view class="card3-title">
-                <view>|</view>
-                生涯合计
-            </view>
-            <view class="card3-title2">
-                <view class="{{day=='7'?'card3-bu2':'card3-bu'}}" bindtap="changeday">7天</view>
-                <view class="{{day=='30'?'card3-bu2':'card3-bu'}}" bindtap="changeday">30天</view>
-            </view>
-        </view>
-        <view class="card3-midin">
-            <view class="card3-midin2">
-                <view class="card3-midinnum">{{average}}步</view>
-                <view class="card3-midintex">平均</view>
-            </view>
-            <view class="card3-midin2">
-                <view class="card3-midinnum">{{totle}}步</view>
-                <view class="card3-midintex">总计</view>
-            </view>
-        </view>
-        <view class="card3-bottom" wx:if="{{day=='7'}}">
-            <ec-canvas wx:if="{{day=='7'}}" id="mychart" canvas-id="mychart" ec="{{ec}}"></ec-canvas>
+  </view>
+  <view class="card2">
+    <view class="card2-top">
+      <view class="card2-title">
+        <view>|</view>
+        全网排名
+      </view>
+      <view class="card2-title2">今日{{rankOfAll.steps||0}}步</view>
+    </view>
+    <view class="card2-bottom">
+      <block wx:if="{{rankOfAll.percent||rankOfAll.steps}}">
+        <view class="card2-bottom1">今日步数已超过</view>
+        <view class="card2-bottom2">
+          <view class="card2-bottom2t">{{rankOfAll.percent}}</view>
+          <view class="card2-bottom2t2">%</view>
         </view>
-        <view class="card4-bottom" wx:if="{{day=='30'}}">
-            <van-calendar title='运动数据' poppable="{{ false }}" show-confirm="{{ false }}"  min-date="{{ minDate }}"  max-date="{{ maxDate }}"  formatter="{{ formatter }}" color='#015EEA' default-date="{{todatDate}}" />
+        <view class="card2-bottom3">的用户，赶紧行动起来</view>
+      </block>
+      <block wx:else>
+        <view class="card2-bottom1">今日排名</view>
+        <view class="card2-bottom2">
+          <view class="card2-bottom2t">200</view>
+          <view class="card2-bottom2t2">之外</view>
         </view>
+        <view class="card2-bottom3">赶紧行动起来吧</view>
+      </block>
+    </view>
+  </view>
+  <view class="card3">
+    <view class="card3-top">
+      <view class="card3-title">
+        <view>|</view>
+        近期趋势
+      </view>
+      <view class="card3-title2">
+        <view class="{{rece==7?'card3-bu2':'card3-bu'}}" data-t="7" bindtap="changeTrend">7天</view>
+        <view class="{{rece==30?'card3-bu2':'card3-bu'}}" data-t="30" bindtap="changeTrend">30天</view>
+      </view>
+    </view>
+    <view class="card3-midin">
+      <view class="card3-midin2">
+        <view class="card3-midinnum">{{receDate.svg||0}}步</view>
+        <view class="card3-midintex">每日平均</view>
+      </view>
+      <view class="card3-midin2">
+        <view class="card3-midinnum">{{receDate.count||0}}步</view>
+        <view class="card3-midintex">总计</view>
+      </view>
     </view>
+    <view class="card3-bottom">
+      <view style="height: 600rpx;z-index: 0;">
+        <block>
+          <ec-canvas wx:if="{{option}}" ec="{{ ec }}"></ec-canvas>
+        </block>
+      </view>
+    </view>
+  </view>
 </view>
-<van-tabbar active="{{ active }}" bind:change="onChange" placeholder='true'>
-    <van-tabbar-item>
-        <image slot="icon" src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241113/o1c3n1030041552.png?imageView2/1/w/200/h/200" mode="aspectFit" style="width: 50rpx; height: 50rpx;" />
-        <image slot="icon-active" src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241113/g5fcr1030200091.png?imageView2/1/w/200/h/200" mode="aspectFit" style="width: 50rpx; height: 50rpx;" />
-        今日步数
-    </van-tabbar-item>
-    <van-tabbar-item>
-        <image slot="icon" src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241113/hc5guq030414553.png?imageView2/1/w/200/h/200" mode="aspectFit" style="width: 50rpx; height: 50rpx;" />
-        <image slot="icon-active" src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241113/v1hhkk030354434.png?imageView2/1/w/200/h/200" mode="aspectFit" style="width: 50rpx; height: 50rpx;" />
-        周期统计
-    </van-tabbar-item>
+
+
+
+
+<van-tabbar fixed="{{false}}" active="{{ active }}" z-index='9999' bind:change="onChange">
+  <van-tabbar-item>
+    <image slot="icon" src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241113/o1c3n1030041552.png?imageView2/1/w/200/h/200" mode="aspectFit" style="width: 50rpx; height: 50rpx;" />
+    <image slot="icon-active" src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241113/g5fcr1030200091.png?imageView2/1/w/200/h/200" mode="aspectFit" style="width: 50rpx; height: 50rpx;" />
+    今日步数
+  </van-tabbar-item>
+  <van-tabbar-item>
+    <image slot="icon" src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241113/hc5guq030414553.png?imageView2/1/w/200/h/200" mode="aspectFit" style="width: 50rpx; height: 50rpx;" />
+    <image slot="icon-active" src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241113/v1hhkk030354434.png?imageView2/1/w/200/h/200" mode="aspectFit" style="width: 50rpx; height: 50rpx;" />
+    周期统计
+  </van-tabbar-item>
 
 </van-tabbar>

nova-werun/pages/index/index.js

@@ -3,8 +3,6 @@ const company = getApp().globalData.company;
 const getTabs = require("../../../utils/getTabs")
 const login = require("../../../utils/login");
 const dateF = require("../../../utils/date")
-import Toast from '@vant/weapp/toast/toast';
-
 Page({
 
   /**
@@ -19,7 +17,11 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: async function (options) {
-    login.loginNow()
+    
+    let currentIndex = options.detail;
+
+ 
+    // login.loginNow()
     this.setData({
       active: options?.active || 0
     })
@@ -45,7 +47,7 @@ Page({
   async onChange(event) {
     let currentIndex = event.detail;
     let userInfo = wx.getStorageSync("userLogin");
-    if (currentIndex != 0 && userInfo == '') {
+    if ( userInfo == ''||!userInfo) {
       console.log(userInfo);
       login.loginNow()
       return

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

@@ -1,590 +1,251 @@
 // nova-werun/pages/my/my-profile/index.js
 const Parse = getApp().Parse;
 const company = getApp().globalData.company;
-Page({
-
-    /**
-     * 页面的初始数据
-     */
-    data: {
-        //屏幕高度
-        statusBarHeight: 0, // 状态栏高度
-        screenHeight: 0, // 屏幕高度
-        customHeight: 0, // 自定义导航栏高度（如小程序右上角胶囊按钮）
-        bottomNavHeight: 0, // 底部导航栏高度
-        contentHeight: 0, // 可用内容高度
-        contentpadding: 0, //顶部padding高度
-        User1List: [],
-        actions: [{
-                name: '男',
-            },
-            {
-                name: '女',
-            },
-        ],
-        avatar: null,
-        sex: '男',
-        nickname: null,
-        height: null,
-        idnumber:null,//身份证号码
-        //  选择部门
-        // mainActiveIndex: 0,
-        // activeId: null,
-        // items: [],
-        Departmentlist:[],
-        departs:['1','2','3'],
-        //显示遮罩层
-        show: false,
-        selectname: '', //部门名字
-        departname: '', //工会名字
-        selectobjectid: '',
-        upiobjectid: '',
-        // 图片
-        fileList: [],
-        uptokenURL: '',
-        domain: '',
-        uploadURL: '',
-        title: '',
-
-        //
-        name: '',
-        phone: '',
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad: async function (options) {
-        // 计算
-        const systemInfo = wx.getSystemInfoSync();
-        const statusBarHeight = systemInfo.statusBarHeight || 0;
-        const screenHeight = systemInfo.screenHeight || 0;
-        const custom = wx.getMenuButtonBoundingClientRect();
-        const customHeight = custom.height + 10 + 2 || 0;
-        const bottomNavHeight = systemInfo.screenHeight - systemInfo.safeArea.bottom || 0;
-
-        const contentpadding = (statusBarHeight + customHeight) * 750 / systemInfo.windowWidth;
-        const contentHeight = (screenHeight - bottomNavHeight - statusBarHeight - customHeight) * 750 / systemInfo.windowWidth;
-        this.setData({
-            statusBarHeight,
-            screenHeight,
-            customHeight,
-            bottomNavHeight,
-            contentHeight,
-            contentpadding
-        });
-        this.setData({
-            title: options.type
-        })
-       await this.getname()
-       await this.getdep()
-        // this.getDepartment()
-        this.getwritedep()
-        this.getUptoken()
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady: function () {
-
-    },
+const uid = Parse.User.current()?.id
+const real = require("../../../../utils/real")
 
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow: function () {
+Page({
 
-    },
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    name: '',
+    idcard: '',
+    sex: '',
+    mobile: '',
+    fittingCosts: '', //身高
+    center: '', //部门
+    showStorePopup: false,
+    shop: null,
+    shopList: null,
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: async function (options) {
+    // await this.getname()
+    // await this.getdep()
+    // // this.getDepartment()
+    // this.getwritedep()
+    // this.getUptoken()
+
+    this.refersh()
+  },
+
+  async refersh() {
+    this.getUserProfile()
+  },
+
+  /**打开选择位置 */
+  openStore() {
+    this.getShop()
+    this.setData({
+      showStorePopup: true
+    })
+  },
+  /**关闭位置选择 */
+  closeStore() {
+    this.setData({
+      showStorePopup: false
+    })
+  },
+  /**获取可选位置 */
+  async getShop() {
+    let query = new Parse.Query('Department')
+    query.equalTo('company', company)
+    query.notEqualTo('isDeleted', true)
+    query.equalTo('isEnabled', true)
+    let d = await query.find()
+    let shopList = d.map(item => item.toJSON())
+    this.setData({
+      shopList
+    })
+  },
+  /**选择位置 */
+  chooseShop(e) {
+    let {
+      shopList,
+    } = this.data
+    let {
+      index
+    } = e.currentTarget.dataset
+    console.log(shopList[index])
+    this.setData({
+      shop: shopList[index],
+      showStorePopup: false
+    })
+  },
+  /**获取当前用户和身份 */
+  async getUserProfile() {
+    let profile
+    let query = new Parse.Query('Profile')
+    query.notEqualTo("isDeleted", true)
+    query.equalTo('user', uid)
+    query.include('center')
+    profile = await query.first()
+    if (!profile?.id) {
+      let Pro = Parse.Object.extend('Profile')
+      profile = new Pro()
+    } else {
+      this.setData({
+        name: profile.get('name') || '',
+        idcard: profile.get('idcard') || '',
+        sex: profile.get('sex') || '',
+        mobile: profile.get('mobile') || '',
+        fittingCosts: profile.get('fittingCosts') || '',
+        center: profile.get('center') || '',
+        shop: profile.get('center')?.toJSON()
+      })
+    }
+    this.setData({
+      profile
+    })
+  },
+
+  onChangeSex(event) {
+    this.setData({
+      sex: event.detail,
+    });
+  },
+
+  /** 立即预约*/
+  async enlists(e) {
+    let {
+      name,
+      idcard,
+      sex,
+      mobile,
+      fittingCosts,
+      center,
+    } = this.data
+    console.log(name,
+      idcard,
+      sex,
+      mobile,
+      fittingCosts, )
+    if (!name || !idcard || !sex || !fittingCosts || !mobile) {
+      wx.showToast({
+        title: '存在未填项',
+        icon: 'none',
+        duration: 5000
+      })
+      return
+    }
+    if (!real.IdentityCodeValid(idcard)) {
+      wx.showToast({
+        title: '身份证格式错误',
+        icon: 'none',
+      });
+      return
+    }
+    if (!real.isPoneAvailable(mobile)) {
+      wx.showToast({
+        title: '手机号有误',
+        icon: 'none',
+      });
+      return
+    }
+    let {
+      shop
+    } = this.data
+    if (!shop?.objectId) {
+      wx.showToast({
+        title: '请选择位置',
+        icon: 'none',
+        duration: 5000
+      })
+      return
+    }
+    let {
+      profile,
+    } = this.data
+    profile.set('name', name || '')
+    profile.set('mobile', mobile || '')
+    profile.set('sex', sex || '')
+    profile.set('idcard', idcard || '')
+    profile.set('fittingCosts', parseFloat(fittingCosts || '0') || 0)
+    profile.set('company', {
+      className: 'Company',
+      __type: 'Pointer',
+      objectId: company
+    })
+    profile.set('user', {
+      className: '_User',
+      __type: 'Pointer',
+      objectId: uid
+    })
+    profile.set('center', {
+      className: 'Department',
+      __type: 'Pointer',
+      objectId: shop?.objectId
+    })
+    // profile.set('isCheck', false)
+    let proSave = await profile.save()
+    wx.showToast({
+      title: '已提交',
+      icon: 'none'
+    })
+    wx.navigateBack({
+      delta: 1
+    })
+  },
 
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide: function () {
 
-    },
 
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload: function () {
 
-    },
 
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh: function () {
 
-    },
 
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom: function () {
 
-    },
 
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage: function () {
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
 
-    },
-    //获取身高
-    getHeight(e) {
-        let height = e.detail.value;
-        // 身高范围在 50 到 250 之间的正则表达式，允许浮点数
-        let a = /^(?:[5-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|250)(\.\d)?$/;
-        if (!height.match(a)) {
-            wx.showToast({
-                icon: "none",
-                title: "请填写正确的身高格式",
-            });
-            return;
-        } else {
-            this.setData({
-                height: height
-            });
-            console.log(this.data.height);
-        }
-    },
-    //点击清空
-    clearHeight() {
-        this.setData({
-            height: null
-        })
-        console.log('清空', this.data.height);
-    },
-    //获取头像名称
-    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
-        })
-        this.setData({
-            avatar: User1List[0].avatar || 'https://file-cloud.fmode.cn/qpFbRRSZrO/20241120/95uip6030022742.png?imageView2/1/w/200/h/200',
-            nickname: User1List[0].nickname || '微信用户',
-            sex: User1List[0].sex || '男',
+  },
 
-        })
-        if (User1List[0].diyform) {
-            this.setData({
-                height: User1List[0].diyform.height
-            })
-        }
-        console.log(this.data.User1List);
-    },
-    //获取填写部门信息
-    async getwritedep() {
-        let Userquery = new Parse.Query('Department');
-        Userquery.equalTo('company', company); 
-        Userquery.equalTo('isEnabled', true);
-        // Userquery.equalTo('type', 'center');
-        Userquery.notEqualTo('isDeleted', true);
-        // Userquery.include('parent');
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
 
-        let P2 = await Userquery.find();
-        let Departmentlist = P2.map(item => item.toJSON());
-        let departs=[]
-        Departmentlist.forEach((item)=>{
-            departs.push(item.name)
-        })
-        this.setData({
-            departs,
-            Departmentlist,
-        })
-        console.log('departs',this.data.Departmentlist);
-    },
-    //获取部门
-    async getdep() {
-        const currentUser = Parse.User.current();
-        let Userquery = new Parse.Query('Profile');
-        Userquery.equalTo('company', company);
-        Userquery.equalTo('user', currentUser.id);
-        // Userquery.equalTo('isCheck', true);
-        Userquery.notEqualTo('isDeleted', true)
-        Userquery.include('center');
-        Userquery.include('department');
-        let P2 = await Userquery.find();
-        let dep = P2.map(item => item.toJSON());
-        console.log('getdep', dep);
-        if (dep.length!=0) {
-            if (dep[0].isCheck == true) {
-                this.setData({
-                    name: dep[0].name,
-                    phone: dep[0].mobile,
-                    // departname: dep[0].department.name,//工会
-                    selectname: dep[0].center.name,//部门
-                    selectobjectid: dep[0].center.objectId,//部门
-                    // upiobjectid: dep[0].department.objectId//工会
-                })
-            } else {
-                this.setData({
-                    name: dep[0].name,
-                    phone: dep[0].mobile,
-                    // departname: dep[0].department.name,
-                    selectname: dep[0].center.name,
-                    selectobjectid: dep[0].center.objectId,
-                    // upiobjectid: dep[0].department.objectId
-                })
-                wx.showToast({
-                    title: '您之前提交信息在审核当中',
-                    icon: 'none',
-                    duration: 2000
-                })
-            }
-        }else{
-            this.setData({
-                phone:this.data.User1List[0].mobile
-            })
-        }
-       
-    },
-    onSelect(event) {
-        let {
-            name
-        } = event.detail
-        this.setData({
-            sex: name,
-            show2: false
-        })
-        console.log(this.data.sex);
-    },
-    showSelect() {
-        this.setData({
-            show2: true
-        })
-    },
-    //修改昵称
-    changenickname(e) {
-        this.setData({
-            nickname: e.detail
-        })
-        console.log(this.data.nickname);
-    },
-    //上传信息
-    async setinfo() {
-        if (this.data.title == '资料认证') {
-            if (!this.data.name || !this.data.sex || !this.data.selectobjectid || !this.data.height || !this.data.phone) {
-                wx.showToast({
-                    title: '请输入相关内容',
-                    icon: 'none',
-                    duration: 2000
-                })
-                return
-            }
-            const currentUser = Parse.User.current();
-            let Userquery = new Parse.Query('_User');
-            Userquery.equalTo('company', company);
-            Userquery.equalTo('objectId', currentUser.id);
-            Userquery.notEqualTo('isDeleted', true)
-            let user = await Userquery.first();
-            user.set('sex', this.data.sex)
-            // user.set('avatar', this.data.avatar)
-            let diyform = {
-                height: this.data.height
-            }
-            user.set('diyform', diyform)
-            // user.set('nickname', this.data.nickname)
-            try {
-                user.save()
-                console.log('昵称保存成功');
-            } catch {
-                console.log('保存失败');
-            }
+  },
 
-            let Profilerquery = new Parse.Query('Profile');
-            Profilerquery.equalTo('company', company);
-            Profilerquery.equalTo('user', currentUser.id);
-            Profilerquery.notEqualTo('isDeleted', true)
-            let Profile = await Profilerquery.first();
-            //工会
-            // let Departmentquery = new Parse.Query('Department');
-            // Departmentquery.equalTo('company', company);
-            // Departmentquery.equalTo('objectId', this.data.upiobjectid);
-            // Departmentquery.notEqualTo('isDeleted', true)
-            // let Department = await Departmentquery.first();
-            //部门
-            let unionquery = new Parse.Query('Department');
-            unionquery.equalTo('company', company);
-            unionquery.equalTo('objectId', this.data.selectobjectid);
-            unionquery.notEqualTo('isDeleted', true)
-            let union = await unionquery.first();
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
 
-            if (Profile) {
-                // Profile.set('department', Department.toPointer())
-                Profile.set('center', union.toPointer())
-                Profile.set('name', this.data.name)
-                Profile.set('mobile', this.data.phone)
-                try {
-                    Profile.save()
-                    wx.showToast({
-                        title: '提交成功',
-                        icon: 'success',
-                        duration: 2000
-                    })
-                    setTimeout(() => {
-                        this.goback()
-                    }, 2000);
-                    console.log('部门保存成功');
-                } catch {
-                    console.log('部门保存失败');
-                }
-            } else {
-                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.first();
+  },
 
-                let companyPointer = Parse.Object.extend('Company').createWithoutData(company);
-                console.log(companyPointer);
-                let Profile = new Parse.Object('Profile');
-                Profile.set('company', companyPointer);
-                Profile.set('isCheck', false);
-                Profile.set('user', P2.toPointer());
-                // Profile.set('department', Department.toPointer());
-                Profile.set('center', union.toPointer());
-                Profile.set('name', this.data.name)
-                Profile.set('mobile', this.data.phone)
-                try {
-                    Profile.save()
-                    wx.showToast({
-                        title: '提交成功',
-                        icon: 'success',
-                        duration: 2000
-                    })
-                    setTimeout(() => {
-                        this.goback()
-                    }, 2000);
-                    console.log('部门保存成功');
-                } catch {
-                    console.log('部门保存失败');
-                }
-            }
-        }
-        if (this.data.title == '完善资料') {
-            if (!this.data.avatar || !this.data.nickname) {
-                wx.showToast({
-                    title: '请输入相关内容',
-                    icon: 'none',
-                    duration: 2000
-                })
-                return
-            }
-            const currentUser = Parse.User.current();
-            let Userquery = new Parse.Query('_User');
-            Userquery.equalTo('company', company);
-            Userquery.equalTo('objectId', currentUser.id);
-            Userquery.notEqualTo('isDeleted', true)
-            let user = await Userquery.first();
-            user.set('avatar', this.data.avatar)
-            user.set('nickname', this.data.nickname)
-            try {
-                user.save()
-                wx.showToast({
-                    title: '提交成功',
-                    icon: 'success',
-                    duration: 2000
-                })
-                setTimeout(() => {
-                    this.goback()
-                }, 2000);
-            } catch {
-                console.log('保存失败');
-            }
-        }
-    },
-    // 获取部门信息
-    // async getDepartment() {
-    //     const currentUser = Parse.User.current();
-    //     let Userquery = new Parse.Query('Department');
-    //     Userquery.equalTo('company', company); // 假设 company 是你要查询的公司对象
-    //     Userquery.equalTo('isEnabled', true);
-    //     Userquery.notEqualTo('isDeleted', true);
-    //     Userquery.include('parent');
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
 
-    //     let P2 = await Userquery.find();
-    //     let Departmentlist = P2.map(item => item.toJSON());
+  },
 
-    //     // 创建一个以工会为键的对象，以便于匹配
-    //     const unionsMap = {};
-    //     console.log(Departmentlist);
-    //     // 遍历部门列表，构建工会映射
-    //     Departmentlist.forEach(department => {
-    //         //有工会的部门
-    //         if (department.parent && department.parent.objectId) {
-    //             const unionId = department.parent.objectId; //工会id
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
 
-    //             // 如果工会还没有在映射中，创建一个新的工会对象
-    //             if (!unionsMap[unionId]) {
-    //                 unionsMap[unionId] = {
-    //                     text: department.parent.name, // 工会名称
-    //                     objectId: department.parent.objectId,
-    //                     children: [] // 初始化子部门数组
-    //                 };
-    //             }
-    //             // 将部门添加到对应的工会子项中
-    //             unionsMap[unionId].children.push({
-    //                 text: department.name, // 部门名称
-    //                 id: department.objectId, // 部门 ID
-    //                 upid: department.parent.objectId
-    //             });
-    //         } else {
-    //             if (!unionsMap[department.objectId]) {
-    //                 unionsMap[department.objectId] = {
-    //                     text: department.name, // 工会名称
-    //                     objectId: department.objectId,
-    //                     children: [] // 初始化子部门数组
-    //                 };
-    //             }
-    //         }
-    //     });
+  },
 
-    //     // 将映射转换为数组
-    //     const result = Object.values(unionsMap);
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
 
-    //     console.log(result);
-    //     this.setData({
-    //         items: result
-    //     })
-    //     console.log(this.data.items);
-    // },
-    //点击工会
-    // onClickNav({
-    //     detail = {}
-    // }) {
-    //     this.setData({
-    //         mainActiveIndex: detail.index || 0,
-    //     });
-    //     console.log(detail);
-    // },
-    //点击部门
-    onClickItem(
-        {
-        detail = {}
-    }
-    ) {
-        // const activeId = this.data.activeId === detail.id ? null : detail.id;
-        // this.data.items.forEach((item) => {
-        //     if (item.objectId == detail.upid) {
-        //         this.setData({
-        //             departname: item.text
-        //         })
-        //     }
-        // })
-       const id =  this.data.Departmentlist[detail.index].objectId
+  },
 
-        this.setData({
-            // activeId,
-            selectname: detail.value,
-            selectobjectid:id
-            // selectobjectid: detail.id,
-            // upiobjectid: detail.upid
-        });
-        this.onClickHide()
-        console.log(this.data.selectobjectid);
-    },
-    //显示遮罩层
-    onClickShow() {
-        this.setData({
-            show: true
-        });
-    },
-    //关闭遮罩层
-    onClickHide() {
-        this.setData({
-            show: false
-        });
-    },
-    //返回上一页
-    async goback() {
-        let pages = getCurrentPages(); //页面对象
-        let prevpage = pages[pages.length - 2]; //上一个页面对象
-        console.log(prevpage);
-        await prevpage.updateCom3()
-        wx.navigateBack({
-            delta: 1 // 返回上一页
-        });
-    },
-    //删除头像
-    deleteavater() {
-        this.setData({
-            avatar: ''
-        })
-    },
-    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
-        let url = []
-        for (let i = 0; i < FileList.length; i++) {
-            url.push(FileList[i].url)
-        }
-        this.setData({
-            fileList: url
-        })
-        this.setData({
-            avatar: this.data.fileList[0]
-        })
-        console.log('图片', this.data.fileList);
-    },
-    //修改姓名
-    changename(e) {
-        this.setData({
-            name: e.detail
-        })
-        console.log(this.data.name);
-    },
-    //修改电话
-    changephone(e) {
-        const mobileNumber = e.detail.value; // 假设手机号是通过 e.detail.value 传递的
-        console.log(mobileNumber);
-        // 正则表达式：匹配中国大陆手机号
-        const mobilePattern = /^1[3-9]\d{9}$/;
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
 
-        // 验证手机号格式
-        if (mobilePattern.test(mobileNumber)) {
-            this.setData({
-                phone: mobileNumber
-            })
-            console.log("手机号格式正确");
-            // 这里可以执行其他操作，比如保存手机号或进行下一步操作
-        } else {
-            wx.showToast({
-                title: '手机号格式不正确',
-                icon: 'none',
-            })
-            console.log("手机号格式不正确");
-            // 这里可以提示用户手机号格式不正确
-        }
-        console.log(this.data.phone);
-    },
-    //身份证号码
-    changeidnumber(e){
-        const idnumber = e.detail;
-        this.setData({
-            idnumber,
-        })
-        console.log(idnumber);
-    },
+  },
 })

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

@@ -4,6 +4,9 @@
     "van-action-sheet": "@vant/weapp/action-sheet/index",
     "van-tree-select": "@vant/weapp/tree-select/index",
     "van-overlay": "@vant/weapp/overlay/index",
-    "van-picker": "@vant/weapp/picker/index"
+    "van-picker": "@vant/weapp/picker/index",
+    "van-radio": "@vant/weapp/radio/index",
+    "van-popup": "@vant/weapp/popup/index",
+    "van-radio-group": "@vant/weapp/radio-group/index"
   }
 }

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

@@ -1,71 +1,146 @@
 /* nova-werun/pages/my/my-profile/index.wxss */
-.all{
-    width: 100vw;
-    .avatarbox{
-        width: 100%;
-        height: 270rpx;
-        background-color: #4F9AF7;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        .avatar-box{
-            width: 150rpx;
-            height: 150rpx;
-            position: relative;
-            .avatar{
-                width: 150rpx;
-                height: 150rpx;
-                border-radius: 50%;
-            }
-            .photo{
-                width: 40rpx;
-                height: 40rpx;
-                position: absolute;
-                right: -20rpx;
-            }
+.popup {
+    height: 70vh;
+    overflow-y: auto;
+  
+    .topTitle {
+  
+      position: fixed;
+      // top: 300rpx;
+      left: 0rpx;
+      z-index: 9;
+    }
+  
+    .topBox {
+      border-radius: 40rpx 40rpx 0 0;
+      background: white;
+      width: 100vw;
+      padding: 20rpx;
+      border-bottom: 1rpx solid rgb(206, 206, 206);
+      text-align: center;
+      font-weight: bold;
+    }
+  
+    .registerStartDate {
+      padding: 20rpx;
+      display: flex;
+      align-items: center;
+  
+      .title {
+        width: 220rpx;
+        font-size: 28rpx;
+  
+        text {
+          color: red;
         }
+      }
+  
+      .date {
+        font-size: 28rpx;
+        font-weight: bold;
+      }
     }
-    .selectbox{
-        width: 100%;
-        height: 88rpx;
+  
+    .registerStartTime {
+      // height:;
+  
+      padding: 20rpx;
+  
+      .title {
+        width: 220rpx;
+        font-size: 28rpx;
+  
+        text {
+          color: red;
+        }
+      }
+  
+      .box {
         display: flex;
+        margin: 20rpx;
         align-items: center;
-        padding-left: 16rpx;
-        padding-right: 32rpx;
-        padding-top: 20rpx;
-        padding-bottom: 20rpx;
-        .fuhao{
-            color:#E22525ed;
-            margin-right: 2rpx;
-        }
-        .selecttext{
-            width: 174rpx;
-            height: 48rpx;
+        justify-content: space-between;
+        padding: 20rpx;
+        box-shadow: 1rpx 1rpx 10rpx rgb(204, 204, 204);
+        border-radius: 20rpx;
+  
+        .time {
+          .from {
+            margin: 10rpx 0;
+            font-size: 35rpx;
+  
+            van-icon {
+              font-size: 35rpx;
+            }
+  
+            font-weight: bold;
+          }
+  
+          .to {
             font-size: 28rpx;
-            color: #646566;
+  
+            van-icon {
+              font-size: 35rpx;
+            }
+          }
         }
-        .selectname{
-            font-size: 28rpx;
-            margin-left: 22rpx;
+  
+        .btn {
+          font-size: 30rpx;
+          background: #4F9AF7;
+          padding: 10rpx 20rpx;
+          border-radius: 100rpx;
+          color: white;
         }
+      }
+    }
+  
+    .btn_btm {
+      width: 100vw;
+      background: white;
+      position: fixed;
+      bottom: 0rpx;
+      z-index: 9;
+  
+      button {
+        color: white;
+        font-size: 30rpx;
+      }
     }
-    .submitbox{
-        width: 100%;
+  
+    .revise {
+      float: right;
+      background: #4F9AF7;
+      margin: 20rpx;
+  
+    }
+  }
+  .submitbox{
+    width: 100%;
+    height: 80rpx;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-top: 40rpx;
+    .submit{
+        width: 200rpx;
         height: 80rpx;
+        font-size: 30rpx;
+        color: white;
+        background-color: #4F9AF7;
         display: flex;
         justify-content: center;
         align-items: center;
-        margin-top: 40rpx;
-        .submit{
-            width: 200rpx;
-            height: 80rpx;
-            font-size: 30rpx;
-            color: white;
-            background-color: #4F9AF7;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            border-radius: 40rpx;
-        }
+        border-radius: 40rpx;
+    }
+}
+.company {
+    margin: 20rpx;
+  
+    .name {
+      font-size: 26rpx;
+      margin: 20rpx 40rpx;
+      padding: 20rpx;
+      border-bottom: 1rpx solid rgb(243, 243, 243);
     }
-}
+  }

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

@@ -1,42 +1,54 @@
 <!--nova-werun/pages/my/my-profile/index.wxml-->
 <nav type="back" title="{{title}}" background-color="{{'#4F9AF7'}}" front-color="{{'#ffffff'}}"></nav>
-<view class="all" style="height: {{contentHeight}}rpx;">
-    <view class="avatarbox" wx:if="{{title=='完善资料'}}">
-        <view class="avatar-box">
-            <image class="avatar" wx:if="{{avatar}}" src="{{avatar||'https://file-cloud.fmode.cn/qpFbRRSZrO/20241120/63c55i022235020.png?imageView2/1/w/200/h/200'}}" mode="scaleToFill"></image>
-            <image class="photo" wx:if="{{avatar}}" bindtap="deleteavater" src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241223/816ic1022338103.png?imageView2/1/w/200/h/200"></image>
-
-            <upload wx:if="{{!avatar}}" style="width: 50%;" bind:onChangeFile="picture" uploadURL="{{uploadURL}}" domain="{{domain}}" uptokenURL="{{uptokenURL}}" maxCount="1" />
-        </view>
-
+<view class="popup">
+  <van-cell-group>
+    <van-field model:value="{{ name }}" required clearable label="姓名" placeholder="请输入姓名" />
+    <van-field model:value="{{ idcard }}" type="number" required clearable label="身份证号" placeholder="请输入身份证号"/>
+  </van-cell-group>
+  <view class="registerStartDate">
+    <view class="title">
+      <text>*</text>
+      姓别
     </view>
-    <van-field value="{{ nickname }}" required clearable label="昵称" maxlength="8" placeholder="请输入昵称" bind:change="changenickname"  wx:if="{{title=='完善资料'}}" />
-    <van-field value="{{ name }}" required clearable label="姓名" maxlength="8" placeholder="请输入姓名" bind:change="changename"  wx:if="{{title=='资料认证'}}" />
-    <van-field value="{{ idnumber }}"  clearable label="身份证" maxlength="18" placeholder="请输入身份证号码" bind:change="changeidnumber"  wx:if="{{title=='资料认证'}}" />
-    <van-field class="field" required model:value="{{ sex }}" readonly maxlength="1" label="性别" bind:tap="showSelect" wx:if="{{title=='资料认证'}}" />
-    <van-field value="{{ phone }}" required clearable label="电话" maxlength="11" placeholder="请输入电话" bind:blur="changephone"  wx:if="{{title=='资料认证'}}" />
-    <van-field value="{{ height }}" required clearable label="身高" type="number" placeholder="请输入身高(例如：170)" bind:blur="getHeight" bind:clear='clearHeight' wx:if="{{title=='资料认证'}}" />
-    <van-action-sheet show="{{ show2 }}" actions="{{ actions }}" bind:select="onSelect"  />
-    <view class="selectbox" bindtap="onClickShow" wx:if="{{title=='资料认证'}}">
-        <view class="fuhao">*</view>
-        <view class="selecttext">部门</view>
-        <view class="selectname">{{selectname||'选择部门'}} ></view>
+    <view class="date">
+      <van-radio-group direction='horizontal' model:value="{{ sex }}" bind:change="onChangeSex">
+        <van-radio icon-size="35rpx" name="男">男</van-radio>
+        <van-radio icon-size="35rpx" name="女">女</van-radio>
+      </van-radio-group>
     </view>
-
-    <van-overlay show="{{ show }}">
-        <view class="wrapper" style="height: 100%;width: 100%; display: flex;align-items: flex-end;">
-            <!-- <view style="width: 100%;height: 300px;">
-                <van-tree-select items="{{ items }}" main-active-index="{{ mainActiveIndex }}" active-id="{{ activeId }}" bind:click-nav="onClickNav" bind:click-item="onClickItem" />
-            </view> -->
-            <van-picker style="width: 100%;height: 300px;" show-toolbar columns="{{ departs }}" bind:cancel='onClickHide' bind:confirm='onClickItem' />
-        </view>
-    </van-overlay>
-
-
-
-
-
-    <view class="submitbox">
-        <view class="submit" bindtap="setinfo">提交</view>
+  </view>
+  <van-cell-group>
+    <van-field model:value="{{ mobile }}" type="number" required clearable label="电话" placeholder="请输入电话" />
+    <van-field model:value="{{ fittingCosts }}" type="number" required clearable label="身高" placeholder="请输入身高（例如：170）" />
+  </van-cell-group>
+
+  <view class="registerStartDate" bindtap="openStore">
+      <view class="title">
+        <text>*</text>
+        部门
+      </view>
+      <view class="date">{{shop.name||'选择部门'}}</view>
     </view>
+</view>
+
+<van-popup show="{{ showStorePopup }}" bind:click-overlay='closeStore' round position="bottom" bind:close="closeStore">
+  <view style="height: 70vh;">
+    <view style="padding: 20rpx;border-bottom: 1rpx solid rgb(206, 206, 206);text-align: center;font-weight: bold;">选择部门</view>
+
+    <van-empty wx:if="{{!shopList.length}}" description="暂无可选地址" />
+    <scroll-view style="height:calc(70vh - 200rpx) ;" scroll-y="{{true}}">
+      <view class="company">
+        <block wx:for="{{shopList}}" wx:key="index">
+          <view data-index="{{index}}" bindtap="chooseShop" class="name" style="color: {{shop.objectId==item.objectId?'#4F9AF7':'gray'}};">{{item.name}}
+            <van-icon wx:if="{{shop.objectId==item.objectId}}" name="success" />
+          </view>
+        </block>
+      </view>
+    </scroll-view>
+  </view>
+</van-popup>
+
+
+<view class="submitbox">
+  <view class="submit" bindtap="enlists">提交</view>
 </view>

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

@@ -1 +1,119 @@
-.all{width:100vw}.all .avatarbox{width:100%;height:270rpx;background-color:#4F9AF7;display:flex;justify-content:center;align-items:center}.all .avatarbox .avatar-box{width:150rpx;height:150rpx;position:relative}.all .avatarbox .avatar-box .avatar{width:150rpx;height:150rpx;border-radius:50%}.all .avatarbox .avatar-box .photo{width:40rpx;height:40rpx;position:absolute;right:-20rpx}.all .selectbox{width:100%;height:88rpx;display:flex;align-items:center;padding-left:16rpx;padding-right:32rpx;padding-top:20rpx;padding-bottom:20rpx}.all .selectbox .fuhao{color:#E22525ed;margin-right:2rpx}.all .selectbox .selecttext{width:174rpx;height:48rpx;font-size:28rpx;color:#646566}.all .selectbox .selectname{font-size:28rpx;margin-left:22rpx}.all .submitbox{width:100%;height:80rpx;display:flex;justify-content:center;align-items:center;margin-top:40rpx}.all .submitbox .submit{width:200rpx;height:80rpx;font-size:30rpx;color:white;background-color:#4F9AF7;display:flex;justify-content:center;align-items:center;border-radius:40rpx}
+/* nova-werun/pages/my/my-profile/index.wxss */
+.popup {
+  height: 70vh;
+  overflow-y: auto;
+}
+.popup .topTitle {
+  position: fixed;
+  left: 0rpx;
+  z-index: 9;
+}
+.popup .topBox {
+  border-radius: 40rpx 40rpx 0 0;
+  background: white;
+  width: 100vw;
+  padding: 20rpx;
+  border-bottom: 1rpx solid #cecece;
+  text-align: center;
+  font-weight: bold;
+}
+.popup .registerStartDate {
+  padding: 20rpx;
+  display: flex;
+  align-items: center;
+}
+.popup .registerStartDate .title {
+  width: 220rpx;
+  font-size: 28rpx;
+}
+.popup .registerStartDate .title text {
+  color: red;
+}
+.popup .registerStartDate .date {
+  font-size: 28rpx;
+  font-weight: bold;
+}
+.popup .registerStartTime {
+  padding: 20rpx;
+}
+.popup .registerStartTime .title {
+  width: 220rpx;
+  font-size: 28rpx;
+}
+.popup .registerStartTime .title text {
+  color: red;
+}
+.popup .registerStartTime .box {
+  display: flex;
+  margin: 20rpx;
+  align-items: center;
+  justify-content: space-between;
+  padding: 20rpx;
+  box-shadow: 1rpx 1rpx 10rpx #cccccc;
+  border-radius: 20rpx;
+}
+.popup .registerStartTime .box .time .from {
+  margin: 10rpx 0;
+  font-size: 35rpx;
+  font-weight: bold;
+}
+.popup .registerStartTime .box .time .from van-icon {
+  font-size: 35rpx;
+}
+.popup .registerStartTime .box .time .to {
+  font-size: 28rpx;
+}
+.popup .registerStartTime .box .time .to van-icon {
+  font-size: 35rpx;
+}
+.popup .registerStartTime .box .btn {
+  font-size: 30rpx;
+  background: #4F9AF7;
+  padding: 10rpx 20rpx;
+  border-radius: 100rpx;
+  color: white;
+}
+.popup .btn_btm {
+  width: 100vw;
+  background: white;
+  position: fixed;
+  bottom: 0rpx;
+  z-index: 9;
+}
+.popup .btn_btm button {
+  color: white;
+  font-size: 30rpx;
+}
+.popup .revise {
+  float: right;
+  background: #4F9AF7;
+  margin: 20rpx;
+}
+.submitbox {
+  width: 100%;
+  height: 80rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 40rpx;
+}
+.submitbox .submit {
+  width: 200rpx;
+  height: 80rpx;
+  font-size: 30rpx;
+  color: white;
+  background-color: #4F9AF7;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius: 40rpx;
+}
+.company {
+  margin: 20rpx;
+}
+.company .name {
+  font-size: 26rpx;
+  margin: 20rpx 40rpx;
+  padding: 20rpx;
+  border-bottom: 1rpx solid #f3f3f3;
+}

nova-werun/service/auth.service.js

@@ -0,0 +1,60 @@
+const company = getApp().globalData.company
+const Parse = getApp().Parse
+
+
+/** 登录验证*/
+  function resetlogin() {
+    return new Promise((resolve, reject) => {
+      wx.login({
+        success: function (res) {
+          if (res.code) {
+            wx.request({
+              url: "https://server.fmode.cn/api/wxapp/auth_wxapp",
+              data: {
+                c: getApp().globalData.company,
+                code: res.code,
+              },
+              async success(res) {
+                wx.setStorageSync("userInfo", res.data);
+                resolve(res)
+              },
+            });
+          }
+        },
+        fail: function (err) {
+          wx.showToast({
+            title: '服务器繁忙，请稍后重试',
+          })
+        }
+      });
+    })
+  }
+  function logout() {
+    Parse.User.logOut().then(user => {
+      wx.showToast({
+        title: '退出成功',
+        icon: 'success',
+        image: '',
+        duration: 1500,
+        mask: false,
+      });
+      wx.clearStorage()
+      // wx.removeStorageSync('userLogin')
+      // wx.removeStorageSync('userInfo')
+      // wx.removeStorageSync('__plugins__/wx56d559d35ae6e502/userLogin')
+      // wx.removeStorageSync('__plugins__/wx56d559d35ae6e502/Parse/ncloudmaster/currentInstallationId')
+      // wx.setStorageSync('userLogin', '');
+      // wx.setStorageSync('userInfo', '');
+      // wx.setStorageSync('__plugins__/wx56d559d35ae6e502/userLogin', '');
+      // wx.setStorageSync('__plugins__/wx56d559d35ae6e502/Parse/ncloudmaster/currentInstallationId', '');
+      setTimeout(() => {
+        wx.redirectTo({
+          url: '/nova-werun/pages/index/index',
+        });
+      }, 1000);
+    });
+  }
+module.exports = { 
+  resetlogin,
+  logout:logout
+}

nova-werun/service/getSportData.js

@@ -4,35 +4,22 @@ const uid = Parse.User.current()?.id
 let request = require('../../utils/request')
 const dateF = require('../../utils/date')
 
-/**
- * 计算运动累加状况-页面使用
- * @param {*} column 累加字段
- */
-async function getwalk(column) {
-  let typeList = ['walk', 'run']
-  let distance = 0
-  for (let i in typeList) {
-    let type = typeList[i]
-    let d = await getData(column, type) || 0
-    console.log(d)
-    distance = distance + d
-  }
-  return distance < 0 ? 0 : distance
-}
-
-
 /**
  * 计算运动累加状况-getwalk使用
  * @param {*} column 累加字段 (未知则'distance')
  * @param {*} type 运动类型 walk/run(未知则不限制)
+ * @param {*} fromTo 时间范围 {from,to}(未知则今日)
  */
-async function getData(column, type) {
+async function getwalk(column, type, fromTo) {
   let todate = new Date(new Date().setHours(0, 0, 0, 0))
   let tomorrow = new Date(new Date(todate).setDate(todate.getDate() + 1))
+  if (fromTo?.from && fromTo?.to) {
+    todate = fromTo.from
+    tomorrow = fromTo.to
+  }
   let todaySql = dateF.formatTime(`YYYY-mm-dd HH:MM:SS`, todate)
   let yestodaySql = dateF.formatTime(`YYYY-mm-dd HH:MM:SS`, tomorrow)
-
-  let sql = `SELECT SUM(t1."num")- SUM(t1."ago_num") AS "sum"
+  let sql = `SELECT SUM(COALESCE(t1."num", 0))- SUM(COALESCE(t1."ago_num",0)) AS "sum"
   FROM(SELECT MAX(al."${column||'distance'}") AS "num" ,al."actData",(
    SELECT MAX(al2."${column||'distance'}")
     FROM "ActivityRunLog" al2
@@ -57,7 +44,7 @@ async function getData(column, type) {
   // console.log(sql)
   let data = await request.customSQL(sql)
   // console.log(data)
-  return data[0].sum || 0
+  return data[0].sum < 0 ? 0 : data[0].sum || 0
 }
 
 
@@ -118,13 +105,14 @@ async function setEndSport(actId) {
 
 /**
  * 获取排行榜
- * @param {*} type 运动类型
- * @param {*} fromto 时间范围 today/toweek/tomonth/空
- * @param {*} limit 默认20
- * @param {*} skip 默认0
- * @param {*} order 默认 DESC
+ * @param {*} type 运动类型 默认不限制
+ * @param {*} fromto 时间范围 默认为空 today/toweek/tomonth/空
+ * @param {*} limit limit默认20
+ * @param {*} skip skip默认0
+ * @param {*} order 顺序 默认 DESC
+ * @param {*} limitSql 其他限制语句 AND ad."xxx" = 'xxx'
  */
-async function getRanking(type, fromto, limit, skip,order) {
+async function getRanking(type, fromto, limit, skip, order, limitSql) {
   let fromtoSql = ``
   switch (fromto) {
     case 'today':
@@ -163,6 +151,7 @@ async function getRanking(type, fromto, limit, skip,order) {
   WHERE ad."company"='${company}'
   AND ad."isDeleted" IS NOT TRUE
   AND ad."status" = 'end'
+  ${limitSql||''}
   ${type?`AND ad."type" = '${type}'`:''}
   ${fromtoSql}
   GROUP BY ad."user",u."nickname",u."avatar"
@@ -174,9 +163,125 @@ async function getRanking(type, fromto, limit, skip,order) {
   return data
 }
 
+/**
+ * 获取用户排名
+ * @param {*} uid 用户id 默认当前用户
+ * @param {*} type 运动类型 默认不限制
+ * @param {*} fromto 时间范围 today/toweek/tomonth/空 默认不限制
+ */
+async function getUserRank(userid, type, fromto) {
+  let fromtoSql = ``
+  switch (fromto) {
+    case 'today':
+      let todate = new Date(new Date().setHours(0, 0, 0, 0))
+      let tomorrow = new Date(new Date(todate).setDate(todate.getDate() + 1))
+      let todaySql = dateF.formatTime(`YYYY-mm-dd HH:MM:SS`, todate)
+      let yestodaySql = dateF.formatTime(`YYYY-mm-dd HH:MM:SS`, tomorrow)
+      fromtoSql = `AND ad."endDate" >= '${todaySql}' AND ad."endDate" < '${yestodaySql}'`
+      break;
+    case 'toweek':
+      const today = new Date();
+      const dayOfWeek = today.getDay();
+      const thisSun = new Date(today);
+      thisSun.setDate(today.getDate() + (0 - dayOfWeek));
+      thisSun.setHours(0, 0, 0, 0);
+      const nextSun = new Date(thisSun);
+      nextSun.setDate(thisSun.getDate() + 7);
+      let thisSunSql = dateF.formatTime(`YYYY-mm-dd HH:MM:SS`, thisSun)
+      let nextSunSql = dateF.formatTime(`YYYY-mm-dd HH:MM:SS`, nextSun)
+      fromtoSql = `AND ad."endDate" >= '${thisSunSql}' AND ad."endDate" < '${nextSunSql}'`
+      break;
+    case 'tomonth':
+      const now = new Date();
+      const toMon = new Date(now.getFullYear(), now.getMonth(), 1, 0, 0, 0);
+      const nextMon = new Date(now.getFullYear(), now.getMonth() + 1, 1, 0, 0, 0);
+      let toMonSql = dateF.formatTime(`YYYY-mm-dd HH:MM:SS`, toMon)
+      let nextMonSql = dateF.formatTime(`YYYY-mm-dd HH:MM:SS`, nextMon)
+      fromtoSql = `AND ad."endDate" >= '${toMonSql}' AND ad."endDate" < '${nextMonSql}'`
+      break;
+    default:
+      break;
+  }
+  let sql = `WITH RankedUsers AS (
+    SELECT ad."user",
+      RANK() OVER (ORDER BY SUM(ad."steps") DESC) AS "rank"
+    FROM "ActivityData" ad
+    LEFT JOIN "_User" u ON u."objectId" = ad."user"
+    WHERE ad."company"='${company}'
+    AND ad."isDeleted" IS NOT TRUE
+    AND ad."status" = 'end'
+    ${type?`AND ad."type" = '${type}'`:''}
+    ${fromtoSql}
+    GROUP BY ad."user"
+    LIMIT 200
+  )
+  SELECT *
+  FROM RankedUsers
+  WHERE "user" = '${userid||uid}';`
+  // console.log(sql)
+  let data = await request.customSQL(sql)
+  // console.log(data)
+  return data
+}
 
+/**
+ * 获取至今日连续 签到/运动 天数
+ * @param {*} uid uid默认当前用户
+ * @param {*} table 查询那一张表，签到EventLog/运动ActivityData，默认EventLog
+ */
+async function getContinuousCount(user_id, table) {
+  let todate = new Date(new Date().setHours(0, 0, 0, 0))
+  let yestoday = new Date(new Date(todate).setDate(todate.getDate() - 1))
+  let yesSql = dateF.formatTime(`YYYY-mm-dd HH:MM:SS`, yestoday)
+  let sql = `SELECT * FROM (
+  SELECT MAX(t3."created_date") AS "end_date",COUNT(t3."result") AS "c_count",t3."result"
+  FROM(
+    SELECT *,(t2."created_date"-(t2."row" * INTERVAL '1 day')) AS "result"
+    FROM(
+      SELECT DISTINCT (t1."created_date"),t1."user",
+      ROW_NUMBER() OVER (PARTITION BY t1."user" ORDER BY DATE(t1."created_date")) AS "row"
+      FROM (
+        SELECT DISTINCT(DATE(el."createdAt")) AS "created_date",el."user"
+        FROM "${table||'EventLog'}" el
+        WHERE el."isDeleted" IS NOT TRUE
+        AND el."company"='${company||''}'
+        AND el."user"='${user_id||uid}'
+      )t1
+    )t2
+  )t3
+  GROUP BY t3."result"
+)t4
+WHERE t4."end_date" >='${yesSql}'
+ORDER BY t4."end_date" DESC
+LIMIT 1`
+// console.log(sql)
+  let data = await request.customSQL(sql)
+  // console.log(data)
+return data[0]?.c_count
+}
+/**
+ * 获取至今日累计 签到/运动 天数
+ * @param {*} uid uid默认当前用户
+ * @param {*} table 查询那一张表，签到EventLog/运动ActivityData，默认EventLog
+ */
+async function getChickCount(user_id,table){
+  let sql = `SELECT COUNT(*)
+  FROM (
+    SELECT DISTINCT(DATE(el."createdAt")) AS "created_date",el."user"
+    FROM "${table||'EventLog'}" el
+    WHERE el."isDeleted" IS NOT TRUE
+    AND el."company"='${company||''}'
+    AND el."user"='${user_id||uid}'
+  )t1`
+  // console.log(sql)
+  let data = await request.customSQL(sql)
+  // console.log(data)
+return data[0]?.count
+}
 module.exports = {
   getwalk,
   setEndSport,
-  getRanking
+  getRanking,
+  getUserRank,
+  getContinuousCount,getChickCount
 };

project.private.config.json

@@ -20,8 +20,8 @@
     "miniprogram": {
       "list": [
         {
-          "name": "nova-werun/pages/home/statistics/index",
-          "pathName": "nova-werun/pages/home/statistics/index",
+          "name": "nova-werun/pages/home/share/index",
+          "pathName": "nova-werun/pages/home/share/index",
           "query": "",
           "launchMode": "default",
           "scene": null