From 7868aef9486b9acc45968f82d61c2095e6b7ddf9 Mon Sep 17 00:00:00 2001 From: ltx <1006158920@qq.com> Date: Mon, 16 Jun 2025 14:11:47 +0800 Subject: [PATCH] =?UTF-8?q?update=EF=BC=9A=E6=A0=B7=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9&=E5=8D=95=E8=84=9A=E4=BA=A4=E6=8D=A2=E8=B7=B3?= =?UTF-8?q?=E7=BB=B3=E6=A3=80=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- module-sport/pages/sport-full-screen.js | 4 ++ pages/parent/report/report.js | 2 +- pages/parent/report/report.wxss | 1 + pages/student/talk/talk.wxss | 15 +++--- .../teacher/report-detail/report-detail.wxml | 23 ++++++-- .../teacher/report-detail/report-detail.wxss | 52 +++++++++++++++++++ 6 files changed, 84 insertions(+), 13 deletions(-) diff --git a/module-sport/pages/sport-full-screen.js b/module-sport/pages/sport-full-screen.js index 7790347..52f5657 100644 --- a/module-sport/pages/sport-full-screen.js +++ b/module-sport/pages/sport-full-screen.js @@ -74,6 +74,10 @@ Page({ // 创建运动实例 this.sport = SportBase.create(options.sportKey); + if(options.sportKey == 'Rope-Skipping'){ + console.log('降低單脚跳验证精度') + this.sport.rules.base.rules[1].offset = 60 + } // 运动计数回调 this.sport.onTick = (cnt, times) => { diff --git a/pages/parent/report/report.js b/pages/parent/report/report.js index 3116143..d4c0f54 100644 --- a/pages/parent/report/report.js +++ b/pages/parent/report/report.js @@ -23,7 +23,7 @@ Page({ * 生命周期函数--监听页面加载 */ async onLoad(options) { - if(wx.getStorageSync('roleId') && wx.getStorageSync('roleId') == 3 ){ + if(wx.getStorageSync('roleId') && wx.getStorageSync('roleId') == 5 ){ this.setData({ isTrainee:true },()=>{ diff --git a/pages/parent/report/report.wxss b/pages/parent/report/report.wxss index cdd4884..2bf49fc 100644 --- a/pages/parent/report/report.wxss +++ b/pages/parent/report/report.wxss @@ -173,6 +173,7 @@ display: flex; justify-content: space-between; padding-right: 20rpx; + font-size: 26rpx; } .more{ diff --git a/pages/student/talk/talk.wxss b/pages/student/talk/talk.wxss index 615ead0..700a636 100644 --- a/pages/student/talk/talk.wxss +++ b/pages/student/talk/talk.wxss @@ -10,7 +10,8 @@ page { height: 100vh; display: flex; flex-direction: column; - background: radial-gradient(50.00% 50.00% at 50% 50%,rgb(59, 255, 235),rgba(38, 165, 246, 0) 100%); + /* background: radial-gradient(50.00% 50.00% at 50% 50%,rgb(59, 255, 235) 800rpx,rgba(38, 165, 246, 0) 100%); */ + background: linear-gradient(190deg, #49a5fc 0%, #f7f7f7 800rpx, #f7f7f7 100%); background-size: cover; background-position: center; background-repeat: no-repeat; @@ -31,8 +32,8 @@ page { /* 内容区域（在遮罩上层） */ .login-content { - position: absolute; - z-index: 2; + /* position: absolute; + z-index: 2; */ flex: 1; display: flex; flex-direction: column; @@ -110,10 +111,10 @@ page { .page-content{ /* background-color: rgb(247, 247, 247); */ - background: linear-gradient(190deg, #359cfd 0%, #f7f7f7 800rpx, #f7f7f7 100%); - position: relative; + /* background: linear-gradient(190deg, #359cfd 0%, #f7f7f7 800rpx, #f7f7f7 100%); */ + /* position: relative; */ /* padding: 0 30rpx; */ - box-sizing: border-box; + /* box-sizing: border-box; */ /* padding-bottom: 300rpx; */ - min-height: 100vh; + /* min-height: 100vh; */ } \ No newline at end of file diff --git a/subpackage/teacher/report-detail/report-detail.wxml b/subpackage/teacher/report-detail/report-detail.wxml index 740ab3b..85fab75 100644 --- a/subpackage/teacher/report-detail/report-detail.wxml +++ b/subpackage/teacher/report-detail/report-detail.wxml @@ -13,18 +13,31 @@ - + + + + + 最大心率 + {{reportDetail.maxHR || '- -'}} + + + 最小心率 + {{reportDetail.minHR || '- -'}} + + + 平均心率 + {{reportDetail.avgHR || '- -'}} diff --git a/subpackage/teacher/report-detail/report-detail.wxss b/subpackage/teacher/report-detail/report-detail.wxss index 5cda942..9832027 100644 --- a/subpackage/teacher/report-detail/report-detail.wxss +++ b/subpackage/teacher/report-detail/report-detail.wxss @@ -338,4 +338,56 @@ font-size: 26rpx; text-align: center; margin-top: 30rpx; +} + +.heart-box{ + display: flex; + box-sizing: border-box; + padding: 0 30rpx; +} + +.heart-item{ + flex: 1; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + background-color: rgba(214, 114, 114, 0.5); + border-radius: 20rpx; + height: 130rpx; + margin: 0 20rpx; + + /* box-shadow: 0 0 10rpx rgb(223, 222, 222); */ + padding-top: 10rpx; + color: #fff; +} + +/* .heart-item:nth-child(1){ + box-shadow: 0 0 10rpx rgba(200, 85, 85, 0.5); +} +.heart-item:nth-child(3){ + box-shadow: 0 0 10rpx rgba(114, 214, 156, 0.5); +} */ +.heart-min{ + background-color: rgba(146, 146, 146,.5); +} + +.heart-max{ + background-color: rgba(92, 200, 85,.5); +} + +.heart-text1{ + color: rgb(14, 172, 3); + font-size: 38rpx; +} + +.heart-text2{ + color: rgb(80, 80, 80); + font-size: 38rpx; +} + +.heart-text3{ + color: rgb(211, 13, 13); + font-size: 38rpx; + } \ No newline at end of file