diff --git a/androidPrivacy.json b/androidPrivacy.json
index 0d726ca9..3d1bc3dd 100644
--- a/androidPrivacy.json
+++ b/androidPrivacy.json
@@ -1,3 +1,24 @@
{
- "prompt" : "template"
-}
+ "version": "1",
+ "prompt": "template",
+ "title": "服务协议和隐私政策",
+ "message": " 请你务必审慎阅读、充分理解“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
你可阅读《隐私政策》了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+ "buttonAccept": "同意并接受",
+ "buttonRefuse": "暂不同意",
+ "hrefLoader": "system",
+ "backToExit": "false",
+ "second": {
+ "title": "确认提示",
+ "message": " 进入应用前，你需先同意《隐私政策》，否则将退出应用。",
+ "buttonAccept": "同意并继续",
+ "buttonRefuse": "退出应用"
+ },
+ "styles": {
+ "buttonAccept": {
+ "color": "#327FE8"
+ },
+ "buttonRefuse": {
+ "color": "#666"
+ },
+ }
+}
\ No newline at end of file
diff --git a/assets/common.scss b/assets/common.scss
index a015af41..6ffe1ec0 100644
--- a/assets/common.scss
+++ b/assets/common.scss
@@ -104,6 +104,11 @@
padding: 5px 8px;
border-radius: 5px;
}
+ .redBtn {
+ color: #f5222d;
+ background: #fff1f0;
+ border: 1px solid #ffa39e;
+ }
.bold {
font-weight: bold;
@@ -449,8 +454,8 @@
background: $maincolor;
image {
- width: 100%;
- height: 100%;
+ width: 55px;
+ height: 55px;
border-radius: 50%;
}
@@ -467,6 +472,7 @@
width: 55px;
height: 55px;
}
+
.toggle {
width: 20px;
diff --git a/cardlist.json b/cardlist.json
deleted file mode 100644
index c61978cb..00000000
--- a/cardlist.json
+++ /dev/null
@@ -1,461 +0,0 @@
-{
- "selectllist": [{
- "id": "1",
- "key": "2",
- "disabled": true,
- "size": "big",
- "name": "身体数据",
- "time": "2024/2/29",
- "detailurl": "/pages/weight/weight",
- "Tutorialurl": "Weight",
- "height": "176.00",
- "heightUnit": "CM",
- "Hstandardtext": "达标",
- "Hstandardcolor": "#4DA2CA",
- "Weight": "76",
- "WeightUnit": "KG",
- "Wstandardtext": "达标",
- "Wstandardcolor": "#4DA2CA",
- "BMI": "176",
- "BMIUnit": "",
- "BMIstandardtext": "达标",
- "Bstandardcolor": "#4DA2CA"
- }, {
- "id": "2",
- "size": "big",
- "key": "6",
- "disabled": true,
- "unit": "个",
- "name": "跳绳数据",
- "time": "2024/2/29",
- "taketime": "00:05:03",
- "cnt": "20",
- "averagecnt": "48",
- "kcal": "4250",
- "detailurl": "/pages/skipping/skipping",
- "Tutorialurl": "Skip",
- "standardtext": "达标",
- "standardcolor": "#4DA2CA"
- }, {
- "id": "3",
- "disabled": true,
- "key": "8",
- "size": "small",
- "name": "肺活量",
- "unit": "ml",
- "time": "2024/2/29",
- "detailurl": "/pages/lung/lung",
- "Tutorialurl": "Lung",
- "standardtext": "达标",
- "standardcolor": "#EC808D"
- }],
- "addlist": [{
- "id": "2",
- "size": "small",
- "name": "肺活量",
- "unit": "ml",
- "time": "2024/2/29",
- "taketime": "00:05:03",
- "cnt": "20",
- "averagecnt": "48",
- "kcal": "4250",
- "detailurl": "",
- "Tutorialurl": "",
- "standardtext": "达标",
- "standardcolor": "#EC808D"
- }],
- "TrendList": [{
- "id": "08dbd378-27d1-42d2-87fc-dca513adb60f",
- "fat_r": 0.00,
- "muscle": 0.00,
- "createtime": "2023-10-23",
- "bmi": 24.60,
- "weight": 78.00,
- "height": 178.00,
- "time": "2023-10-23 11:28"
- }, {
- "id": "08dbd378-20a5-4991-84f4-a9702018f416",
- "fat_r": 0.00,
- "muscle": 0.00,
- "createtime": "2023-10-23",
- "bmi": 23.60,
- "weight": 75.00,
- "height": 178.00,
- "time": "2023-10-23 11:28"
- }, {
- "id": "08dbd378-1992-47be-8971-a99543d68e26",
- "fat_r": 0.00,
- "muscle": 0.00,
- "createtime": "2023-10-23",
- "bmi": 25.20,
- "weight": 80.00,
- "height": 178.00,
- "time": "2023-10-23 11:28"
- }, {
- "id": "08dbd377-eb1c-426c-8ceb-294f45773aca",
- "fat_r": 0.00,
- "muscle": 0.00,
- "createtime": "2023-10-23",
- "bmi": 26.80,
- "weight": 85.00,
- "height": 178.00,
- "time": "2023-10-23 11:27"
- }, {
- "id": "08dbd377-a553-4543-8231-086b3a71ed0a",
- "fat_r": 0.00,
- "muscle": 0.00,
- "createtime": "2023-10-23",
- "bmi": 22.00,
- "weight": 70.00,
- "height": 178.00,
- "time": "2023-10-23 11:25"
- }],
- "historylist": [{
- "createtime": "2023-10-23 11:28:42.0000000",
- "month": 0,
- "id": "08dbd378-27d1-42d2-87fc-dca513adb60f",
- "height": 178.00,
- "type": "false",
- "fat_r": 0.00,
- "muscle": 0.00,
- "water": 0.00,
- "bone": 0.00,
- "kcal": 0.00,
- "fat_w": 0.00,
- "visceral": 0.00,
- "protein": 0.00,
- "bodyage": 0,
- "bmi": 24.60,
- "cmi": 87.80,
- "sfr": 0.00,
- "sfrval": 0.0,
- "muscleval": 0.00,
- "proteinval": 0.00,
- "lbm": 78.00,
- "body": "异常",
- "fatlevel": "偏重",
- "weight": 78.00,
- "age": "28岁",
- "idealweight": 0.0,
- "skeletalmuscle": 0.0
- }, {
- "createtime": "2023-10-23 11:28:30.0000000",
- "month": 0,
- "type": "false",
- "id": "08dbd378-20a5-4991-84f4-a9702018f416",
- "height": 178.00,
- "fat_r": 0.00,
- "muscle": 0.00,
- "water": 0.00,
- "bone": 0.00,
- "kcal": 0.00,
- "fat_w": 0.00,
- "visceral": 0.00,
- "protein": 0.00,
- "bodyage": 0,
- "bmi": 23.60,
- "cmi": 91.50,
- "sfr": 0.00,
- "sfrval": 0.0,
- "muscleval": 0.00,
- "proteinval": 0.00,
- "lbm": 75.00,
- "body": "异常",
- "fatlevel": "标准",
- "weight": 75.00,
- "age": "28岁",
- "idealweight": 0.0,
- "skeletalmuscle": 0.0
- }, {
- "createtime": "2023-10-23 11:28:18.0000000",
- "month": 0,
- "id": "08dbd378-1992-47be-8971-a99543d68e26",
- "height": 178.00,
- "fat_r": 0.00,
- "muscle": 0.00,
- "water": 0.00,
- "type": "false",
- "bone": 0.00,
- "kcal": 0.00,
- "fat_w": 0.00,
- "visceral": 0.00,
- "protein": 0.00,
- "bodyage": 0,
- "bmi": 25.20,
- "cmi": 85.70,
- "sfr": 0.00,
- "sfrval": 0.0,
- "muscleval": 0.00,
- "proteinval": 0.00,
- "lbm": 80.00,
- "body": "异常",
- "fatlevel": "偏重",
- "weight": 80.00,
- "age": "28岁",
- "idealweight": 0.0,
- "skeletalmuscle": 0.0
- }, {
- "createtime": "2023-09-26 15:03:12.3740116",
- "month": 0,
- "id": "08dbbe5e-a5f7-4ca0-8b44-0ddd8f7f15cd",
- "height": 162.50,
- "fat_r": 23.60,
- "muscle": 72.40,
- "water": 59.20,
- "bone": 2.40,
- "kcal": 1227.00,
- "fat_w": 11.63,
- "visceral": 2.00,
- "protein": 12.90,
- "bodyage": 26,
- "bmi": 18.60,
- "cmi": 86.10,
- "sfr": 22.30,
- "sfrval": 0.0,
- "muscleval": 35.69,
- "proteinval": 6.35,
- "lbm": 37.66,
- "body": "标准肌肉型",
- "fatlevel": "偏瘦",
- "weight": 49.30,
- "age": "28岁",
- "idealweight": 0.0,
- "skeletalmuscle": 0.0
- }],
- "infoList": [{
- "value": 163.00,
- "desc": "人体纵向部分的长度，源于人体的纵向生长，受遗传因素的影响较大",
- "offset": "0",
- "color": "",
- "scale": 0,
- "ishasscale": false,
- "level": "",
- "list": [],
- "title": "身高",
- "unit": "cm",
- "name": "height"
- }, {
- "value": 50.23,
- "desc": "反映和衡量一个人健康状况的重要标志之一",
- "offset": "0",
- "color": "",
- "scale": 0,
- "ishasscale": false,
- "level": "",
- "list": [],
- "title": "体重",
- "unit": "kg",
- "name": "weight"
- }, {
- "value": 18.90,
- "desc": "BMI是身体质量指数,是目前国际上常用的衡量人体胖瘦程度以及是否健康的一个标准。",
- "offset": "26.5",
- "color": "#5ad06d",
- "scale": 0,
- "ishasscale": false,
- "level": "正常",
- "name": "bmi",
- "title": "BMI",
- "list": [{
- "maxvalue": 18.5,
- "minvalue": 0.0,
- "text": "消瘦",
- "color": "#ffda69",
- "level": 0
- }, {
- "maxvalue": 25.0,
- "minvalue": 18.5,
- "text": "正常",
- "color": "#5ad06d",
- "level": 0
- }, {
- "maxvalue": 30.0,
- "minvalue": 25.0,
- "text": "偏重",
- "color": "#ffab00",
- "level": 0
- }, {
- "maxvalue": 50.0,
- "minvalue": 30.0,
- "text": "肥胖",
- "color": "#ff5656",
- "level": 0
- }]
- }],
- "contrastList": [{
- "height": 165.00,
- "weight": 52.70,
- "head": 0.00,
- "sex": 1,
- "age": "29岁",
- "fat_r": 14.10,
- "muscle": 81.35,
- "water": 34.17,
- "bone": 2.40,
- "kcal": 1311.00,
- "fat_w": 7.43,
- "visceral": 2.00,
- "protein": 16.50,
- "bodyage": 28,
- "bmi": 19.30,
- "cmi": 89.35,
- "sfr": 12.70,
- "muscleval": 42.87,
- "proteinval": 8.70,
- "lbm": 45.27,
- "body": "标准肌肉型",
- "fatlevel": "偏瘦",
- "skeletalmuscle": 0.00,
- "createtime": "2024/03/24",
- "yeartime": "2024/03/24",
- "id": "08dc4e20-f1c5-416c-84ca-5aa26925eb81"
- }, {
- "height": 175.90,
- "weight": 64.50,
- "head": 0.00,
- "sex": 1,
- "age": "29岁",
- "fat_r": 18.00,
- "muscle": 77.66,
- "water": 39.90,
- "bone": 2.80,
- "kcal": 1514.00,
- "fat_w": 11.61,
- "visceral": 3.00,
- "protein": 15.80,
- "bodyage": 28,
- "bmi": 21.00,
- "cmi": 97.22,
- "sfr": 16.10,
- "muscleval": 50.09,
- "proteinval": 10.19,
- "lbm": 52.89,
- "body": "标准肌肉型",
- "fatlevel": "标准",
- "skeletalmuscle": 0.00,
- "createtime": "2023/04/04",
- "yeartime": "2023/04/04",
- "id": "08db34b7-60c0-4571-8e66-29157695b9a9"
- }],
- "contrastDetail": {
- "time": "2023/04/04-2024/03/24",
- "headimg": "https://klcz.pcxbc.com/image/adult_male.png",
- "name": "成人",
- "gender": 1,
- "day": 355,
- "weightdiff": -11.80,
- "heightdiff": -10.90,
- "fat_wdiff": -3.90,
- "firstresult": {
- "age": "1994-04-04 00:00:00",
- "height": 175.90,
- "head": 0.00,
- "weight": 64.50,
- "fat_r": 18.00,
- "muscle": 77.66,
- "water": 39.90,
- "bone": 2.80,
- "kcal": 1514.00,
- "fat_w": 11.61,
- "visceral": 3.00,
- "protein": 15.80,
- "bodyage": 28,
- "bmi": 21.00,
- "cmi": 97.22,
- "sfr": 16.10,
- "muscleval": 50.09,
- "proteinval": 10.19,
- "lbm": 52.89,
- "body": "标准肌肉型",
- "fatlevel": "标准",
- "skeletalmuscle": 0.00,
- "createtime": "2023-04-04 00:00:00",
- "heightlevel": "",
- "headlevel": null,
- "weightlevel": "",
- "fat_rlevel": "标准",
- "musclelevel": "优秀",
- "waterlevel": "不足",
- "bonelevel": "不足",
- "kcallevel": "偏低",
- "fat_wlevel": "标准",
- "viscerallevel": "标准",
- "proteinlevel": "异常",
- "bodyagelevel": "优秀",
- "bmilevel": "正常",
- "musulevallevel": "优秀",
- "proteinvallevel": "不足",
- "sfrlevel": "异常",
- "bodylevel": "标准肌肉型"
- },
- "secondresult": {
- "age": "1994-04-04 00:00:00",
- "height": 165.00,
- "head": 0.00,
- "weight": 52.70,
- "fat_r": 14.10,
- "muscle": 81.35,
- "water": 34.17,
- "bone": 2.40,
- "kcal": 1311.00,
- "fat_w": 7.43,
- "visceral": 2.00,
- "protein": 16.50,
- "bodyage": 28,
- "bmi": 19.30,
- "cmi": 89.35,
- "sfr": 12.70,
- "muscleval": 42.87,
- "proteinval": 8.70,
- "lbm": 45.27,
- "body": "标准肌肉型",
- "fatlevel": "偏瘦",
- "skeletalmuscle": 0.00,
- "createtime": "2024-03-24 00:00:00",
- "heightlevel": "",
- "headlevel": null,
- "weightlevel": "",
- "fat_rlevel": "标准",
- "musclelevel": "优秀",
- "waterlevel": "不足",
- "bonelevel": "标准",
- "kcallevel": "偏低",
- "fat_wlevel": "标准",
- "viscerallevel": "标准",
- "proteinlevel": "异常",
- "bodyagelevel": "优秀",
- "bmilevel": "正常",
- "musulevallevel": "优秀",
- "proteinvallevel": "标准",
- "sfrlevel": "异常",
- "bodylevel": "标准肌肉型"
- }
- },
- "familayList": [{
- "name": "栗子",
- "headimg": "https://ijt.pcxbc.com/image/adult_female.png",
- "headimgsrc": null,
- "sex": 2,
- "birthday": "1995-12-02",
- "age": "28岁",
- "height": 163.00,
- "weight": 50.23,
- "lastresulttime": "2024/04/17 11:14",
- "type": 1,
- "code": "",
- "id": "08db6332-e76a-4e3e-842c-b88a405f5178"
- }, {
- "name": "橙子🍊",
- "headimg": "https://ijt.pcxbc.com/image/child_female.png",
- "headimgsrc": null,
- "sex": 2,
- "birthday": "2014-11-02",
- "age": "9岁",
- "height": 0.00,
- "weight": 0.00,
- "lastresulttime": "",
- "type": 2,
- "code": "",
- "id": "08db6333-a5fa-48d8-82ab-44583a614434"
- }]
-}
\ No newline at end of file
diff --git a/components/manuallyAdd/lungAdd.vue b/components/manuallyAdd/lungAdd.vue
index 7b0b3280..72889799 100644
--- a/components/manuallyAdd/lungAdd.vue
+++ b/components/manuallyAdd/lungAdd.vue
@@ -58,6 +58,9 @@
endDate() {
return this.$tools.getDate("start")
},
+ startDate() {
+ return this.$tools.GetDateStr(-90);
+ },
},
methods: {
// 手动记录
diff --git a/components/manuallyAdd/weightAdd.vue b/components/manuallyAdd/weightAdd.vue
index 7874c65c..6b1f642f 100644
--- a/components/manuallyAdd/weightAdd.vue
+++ b/components/manuallyAdd/weightAdd.vue
@@ -71,6 +71,7 @@
that.$tools.msg("请输入测量体重")
return
}
+ that.$store.commit("changeRecord", false);
that.$model.getinsertmeasure({
aud_id: uni.getStorageSync('userid'),
time: that.regTime,
@@ -79,7 +80,6 @@
}).then(res => {
if (res.code != 0) return
that.$tools.msg(res.msg)
- that.$store.commit("changeRecord", false);
that.$store.dispatch("getResult", {
aud_id: uni.getStorageSync('userid')
})
diff --git a/components/ren-calendar/ren-calendar.vue b/components/ren-calendar/ren-calendar.vue
index 6120c7ce..6c9145e3 100644
--- a/components/ren-calendar/ren-calendar.vue
+++ b/components/ren-calendar/ren-calendar.vue
@@ -16,7 +16,7 @@
-