diff --git a/common/api.js b/common/api.js
index 79dded5..916b9b1 100644
--- a/common/api.js
+++ b/common/api.js
@@ -46,6 +46,11 @@ export const getIndexData = (data) => {
export const forgotPassword = (data) => {
return post('watch/login/forgotPassword', data)
}
+// 获取用户信息
+export const getUserInfo = (data) => {
+ return post('watch/user/getUserInfo', data)
+}
+
@@ -59,5 +64,6 @@ export default {
getDeviceListDays,
getVersion,
getIndexData,
- forgotPassword
+ forgotPassword,
+ getUserInfo
}
\ No newline at end of file
diff --git a/components/body_info_components/body_info_components.vue b/components/body_info_components/body_info_components.vue
index b09e325..327e1b0 100644
--- a/components/body_info_components/body_info_components.vue
+++ b/components/body_info_components/body_info_components.vue
@@ -63,9 +63,7 @@
default:0
}
},
- mounted() {
-
- },
+
data() {
return {
open:false,
@@ -80,6 +78,7 @@
icon_info:{
},
+
bodyDataExample:{
BMI:{
name:"BMI",
@@ -110,7 +109,7 @@
}
],
unit:'',// 计量单位
- icon:''
+ icon:'https://img.agrimedia.cn/-_BMI-tuya.png'
},
bodyFatPercentage:{
name:"体脂率",
@@ -141,7 +140,7 @@
}
],
unit:'%',// 计量单位
- icon:''
+ icon:'https://img.agrimedia.cn/%E4%BD%93%E8%84%82%E7%8E%871-tuya.png'
},
leanBodyMass:{
name:"去脂体重",
@@ -167,7 +166,7 @@
],
unit:'千克',// 计量单位
- icon:''
+ icon:'https://img.agrimedia.cn/%E5%8E%BB%E8%84%82%E4%BD%93%E9%87%8D-tuya.png'
},
muscleRate:{
name:"肌肉率",
@@ -193,7 +192,7 @@
],
unit:'%',// 计量单位
- icon:''
+ icon:'https://img.agrimedia.cn/Surgery-tuya.png'
},
muscleMass:{
name:"肌肉量",
@@ -219,7 +218,7 @@
],
unit:'千克',// 计量单位
- icon:''
+ icon:'https://img.agrimedia.cn/watch-app/exercise-tuya.png'
},
subcutaneousFat:{
name:"皮下脂肪",
@@ -245,7 +244,7 @@
],
unit:'%',// 计量单位
- icon:''
+ icon:'https://img.agrimedia.cn/008%E7%9A%AE%E4%B8%8B%E8%84%82%E8%82%AA-tuya.png'
},
bodyMoisture:{
name:"体内水分",
@@ -271,7 +270,7 @@
],
unit:'%',// 计量单位
- icon:''
+ icon:'https://img.agrimedia.cn/watch-app/%E6%B0%B42-tuya.png'
},
skeletalMuscleRate:{
name:"骨骼肌",
@@ -292,12 +291,12 @@
name:'完美',
colorIdx:4,
val:0,
- icon_key:"icon-up-arrow"
+ icon_key:"icon-success"
},
],
unit:'%',// 计量单位
- icon:''
+ icon:'https://img.agrimedia.cn/watch-app/%E9%AA%A8%E9%AA%BC%E8%82%8C%E7%8E%87-tuya.png'
},
boneMass:{
name:"骨重",
@@ -323,7 +322,7 @@
],
unit:'千克',// 计量单位
- icon:''
+ icon:'https://img.agrimedia.cn/%E9%AA%A8%E9%87%8D.png'
},
proteinAmount:{
name:"蛋白质",
@@ -349,7 +348,7 @@
],
unit:'%',// 计量单位
- icon:''
+ icon:'https://img.agrimedia.cn/%E8%9B%8B%E7%99%BD%E8%B4%A8-tuya.png'
},
basalMetabolicRate:{
name:"基础代谢",
@@ -369,14 +368,14 @@
],
unit:'千卡',// 计量单位
- icon:''
+ icon:'https://img.agrimedia.cn/%E5%9F%BA%E7%A1%80%E4%BB%A3%E8%B0%A2.png'
},
}
};
},
- created() {
- let val = this.getKeyInfo(this.value)
-
+ mounted() {
+ // let val = this.getKeyInfo(this.value)
+ // let body =this.$utils.getPwd('123456')
},
methods:{
look(){
diff --git a/pages/index/body_info.vue b/pages/index/body_info.vue
index bf94afd..ac4f4c3 100644
--- a/pages/index/body_info.vue
+++ b/pages/index/body_info.vue
@@ -1,20 +1,109 @@
+
+
+
+
+
+ {{bodyDesc.name}}
+
+
+
+
+
+
+
+
+ {{ dataInfo.data_msg.basalMetabolicRate }}
+
+
+ 千卡
+
+
+
+ 基础代谢
+
+
+
+
+
+ {{ dataInfo.data_msg.boneMass }}
+
+
+ 千克
+
+
+
+ 骨重
+
+
+
+
+
+ {{ dataInfo.data_msg.waterContent }}
+
+
+ 千克
+
+
+
+ 水分
+
+
+
+
+
+
+
+
+ {{ dataInfo.data_msg.fatMass }}
+
+
+ 千克
+
+
+
+ 脂肪
+
+
+
+
+
+ {{ dataInfo.data_msg.proteinAmount }}
+
+
+ 千克
+
+
+
+ 蛋白质
+
+
+
+
+
+
+
+
+
+
-
diff --git a/static/icon-font/css/iconfont.css b/static/icon-font/css/iconfont.css
index 7f7e135..45473f6 100644
--- a/static/icon-font/css/iconfont.css
+++ b/static/icon-font/css/iconfont.css
@@ -28,4 +28,6 @@
.icon-up-arrow:before {
content: "\e844";
}
-
+.icon-wode:before {
+ content: "\e60b";
+}
\ No newline at end of file
diff --git a/static/icon-font/css/iconfont.ttf b/static/icon-font/css/iconfont.ttf
index c119b78..f5076c7 100644
Binary files a/static/icon-font/css/iconfont.ttf and b/static/icon-font/css/iconfont.ttf differ
diff --git a/static/icon-font/css/iconfont.woff b/static/icon-font/css/iconfont.woff
index f565474..e0820ee 100644
Binary files a/static/icon-font/css/iconfont.woff and b/static/icon-font/css/iconfont.woff differ
diff --git a/static/icon-font/css/iconfont.woff2 b/static/icon-font/css/iconfont.woff2
index a14d03c..5c86203 100644
Binary files a/static/icon-font/css/iconfont.woff2 and b/static/icon-font/css/iconfont.woff2 differ
diff --git a/static/image/body.png b/static/image/body.png
new file mode 100644
index 0000000..4681565
Binary files /dev/null and b/static/image/body.png differ
diff --git a/store/modules/api.js b/store/modules/api.js
index 95d8f77..0306609 100644
--- a/store/modules/api.js
+++ b/store/modules/api.js
@@ -8,7 +8,8 @@ import {
getDeviceListDays,
getVersion,
getIndexData,
- forgotPassword
+ forgotPassword,
+ getUserInfo
} from '@/common/api.js';
let state = {
@@ -86,6 +87,10 @@ let state = {
const res = await forgotPassword(data)
return res
},
+ async getUserInfo({commit}, data) {
+ const res = await getUserInfo(data)
+ return res
+ },
}
export default {
diff --git a/unpackage/dist/build/web/index.html b/unpackage/dist/build/web/index.html
index 1f18d31..fdd1ad2 100644
--- a/unpackage/dist/build/web/index.html
+++ b/unpackage/dist/build/web/index.html
@@ -1,2 +1,2 @@
智能终端
\ No newline at end of file
+ document.write('')