diff --git a/common/api.js b/common/api.js index 916b9b1..bed8b6a 100644 --- a/common/api.js +++ b/common/api.js @@ -51,6 +51,18 @@ export const getUserInfo = (data) => { return post('watch/user/getUserInfo', data) } +// 检查二维码是否登录 +export const checkLoginCode = (data) => { + return post('watch/login/checkLoginCode', data,{custom:{hideLoading:true}}) +} + +// 获取登录二维码 +export const getLoginCode = (data) => { + return post('watch/login/getLoginCode', data) +} + + + @@ -65,5 +77,7 @@ export default { getVersion, getIndexData, forgotPassword, - getUserInfo + getUserInfo, + checkLoginCode, + getLoginCode } \ No newline at end of file diff --git a/components/detail_components/detail_components.vue b/components/detail_components/detail_components.vue index b443d54..fa8fc77 100644 --- a/components/detail_components/detail_components.vue +++ b/components/detail_components/detail_components.vue @@ -52,7 +52,7 @@ - {{ item.data_msg[v] }} + {{ item.data_msg[v] == undefined?item.data_msg[ECGData[v].keyname]: item.data_msg[v] }} {{ ECGData[v].unit }} @@ -123,14 +123,17 @@ meanHeartRate:{ name:'心率', unit:'次/分', + keyname:'heartRate' }, averageHRV:{ name:'HRV', unit:'毫秒', + keyname:'hrv' }, averageTimeInterval:{ name:'QTc', unit:'毫秒', + keyname:'QTC' } }, colorArr:[ diff --git a/config/request.js b/config/request.js index 196b056..45e7e98 100644 --- a/config/request.js +++ b/config/request.js @@ -36,13 +36,15 @@ export default () => { config.header.systemType = 0; config.header.ApiToken = apiToken config.header.timestamp = serverTime - let ob = (config.method == 'GET'? config.params : config.data) + const custom = config.custom.hideLoading || false + if(!custom){ + uni.showLoading({ + mask: true, + title:"加载中..." + }); + } - uni.showLoading({ - mask: true, - title:"加载中..." - }); return config }, config => { // 可使用async await 做异步操作 return Promise.reject(config) diff --git a/pages/index/detail_info.vue b/pages/index/detail_info.vue index 9f433c6..5509764 100644 --- a/pages/index/detail_info.vue +++ b/pages/index/detail_info.vue @@ -61,8 +61,8 @@ - + + @@ -75,12 +75,12 @@ - + - + @@ -291,26 +291,30 @@ let heart = [] let pwv = [] let resRate = [] - this.xinlv.jisuan[0].times = data.data_msg.meanHeartRate + this.xinlv.jisuan[0].times = data.data_msg.meanHeartRate == undefined?data.data_msg.heartRate:data.data_msg.meanHeartRate if(data.data_msg.wavefrom == undefined){ return } data.data_msg.wavefrom.map((v,i) => { - if(v.HRV != 0){ - HRV.push(v.HRV) - } - if(v.QT != 0){ - QT.push(v.QT) - } - if(v.heart != 0){ - heart.push(v.heart) - } - if(v.pwv != 0){ - pwv.push(v.pwv) - } - if(v.resRate != 0){ - resRate.push(v.resRate) + if(!(v instanceof Array)){ + console.log(v) + if(v.HRV != 0){ + HRV.push(v.HRV) + } + if(v.QT != 0){ + QT.push(v.QT) + } + if(v.heart != 0){ + heart.push(v.heart) + } + if(v.pwv != 0){ + pwv.push(v.pwv) + } + if(v.resRate != 0){ + resRate.push(v.resRate) + } } + }) this.xinlv.jisuan[1].times = Math.max(...heart) this.xinlv.jisuan[2].times = Math.min(...heart) diff --git a/pages/login/login.vue b/pages/login/login.vue index 58619a1..d6098d3 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -1,6 +1,37 @@