From 7bf4d2fad199b88254551f02a62ab7a62ec739f2 Mon Sep 17 00:00:00 2001 From: weidizhu_admin Date: Fri, 16 Aug 2024 10:11:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=89=AB=E7=A0=81=E7=99=BB?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/api.js | 16 +- .../detail_components/detail_components.vue | 5 +- config/request.js | 12 +- pages/index/detail_info.vue | 44 +- pages/login/login.vue | 100 +- store/modules/api.js | 13 +- uni_modules/Sansnn-uQRCode/LICENSE.md | 201 +++ uni_modules/Sansnn-uQRCode/README.md | 392 ++++++ uni_modules/Sansnn-uQRCode/changelog.md | 12 + uni_modules/Sansnn-uQRCode/common/cache.js | 1 + uni_modules/Sansnn-uQRCode/common/queue.js | 41 + .../Sansnn-uQRCode/common/types/cache.d.ts | 3 + .../Sansnn-uQRCode/common/types/queue.d.ts | 4 + .../components/u-qrcode/u-qrcode.vue | 1131 ++++++++++++++++ .../components/uqrcode/uqrcode.vue | 1131 ++++++++++++++++ .../js_sdk/gcanvas/bridge/bridge-weex.js | 241 ++++ .../context-2d/FillStyleLinearGradient.js | 18 + .../gcanvas/context-2d/FillStylePattern.js | 8 + .../context-2d/FillStyleRadialGradient.js | 17 + .../gcanvas/context-2d/RenderingContext.js | 666 +++++++++ .../gcanvas/context-webgl/ActiveInfo.js | 11 + .../js_sdk/gcanvas/context-webgl/Buffer.js | 21 + .../gcanvas/context-webgl/Framebuffer.js | 21 + .../js_sdk/gcanvas/context-webgl/GLenum.js | 298 +++++ .../js_sdk/gcanvas/context-webgl/GLmethod.js | 142 ++ .../js_sdk/gcanvas/context-webgl/GLtype.js | 23 + .../js_sdk/gcanvas/context-webgl/Program.js | 21 + .../gcanvas/context-webgl/Renderbuffer.js | 21 + .../gcanvas/context-webgl/RenderingContext.js | 1191 +++++++++++++++++ .../js_sdk/gcanvas/context-webgl/Shader.js | 22 + .../context-webgl/ShaderPrecisionFormat.js | 11 + .../js_sdk/gcanvas/context-webgl/Texture.js | 22 + .../gcanvas/context-webgl/UniformLocation.js | 22 + .../gcanvas/context-webgl/classUtils.js | 3 + .../js_sdk/gcanvas/env/canvas.js | 74 + .../js_sdk/gcanvas/env/image.js | 96 ++ .../Sansnn-uQRCode/js_sdk/gcanvas/env/tool.js | 24 + .../Sansnn-uQRCode/js_sdk/gcanvas/index.js | 39 + .../Sansnn-uQRCode/js_sdk/uqrcode/uqrcode.js | 34 + uni_modules/Sansnn-uQRCode/package.json | 80 ++ unpackage/dist/build/web/index.html | 2 +- .../build/web/static/js/index.0930e969.js | 1 - .../build/web/static/js/index.b2cf881e.js | 1 + .../static/js/pages-index-detail.0bcf4137.js | 1 - .../static/js/pages-index-detail.25218aeb.js | 1 + .../js/pages-index-detail_info.0ca4b927.js | 1 - .../js/pages-index-detail_info.3c9409cb.js | 1 + .../static/js/pages-login-login.532f442e.js | 1 + .../static/js/pages-login-login.f1aaf10b.js | 1 - 49 files changed, 6203 insertions(+), 39 deletions(-) create mode 100644 uni_modules/Sansnn-uQRCode/LICENSE.md create mode 100644 uni_modules/Sansnn-uQRCode/README.md create mode 100644 uni_modules/Sansnn-uQRCode/changelog.md create mode 100644 uni_modules/Sansnn-uQRCode/common/cache.js create mode 100644 uni_modules/Sansnn-uQRCode/common/queue.js create mode 100644 uni_modules/Sansnn-uQRCode/common/types/cache.d.ts create mode 100644 uni_modules/Sansnn-uQRCode/common/types/queue.d.ts create mode 100644 uni_modules/Sansnn-uQRCode/components/u-qrcode/u-qrcode.vue create mode 100644 uni_modules/Sansnn-uQRCode/components/uqrcode/uqrcode.vue create mode 100644 uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/bridge/bridge-weex.js create mode 100644 uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-2d/FillStyleLinearGradient.js create mode 100644 uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-2d/FillStylePattern.js create mode 100644 uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-2d/FillStyleRadialGradient.js create mode 100644 uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-2d/RenderingContext.js create mode 100644 uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/ActiveInfo.js create mode 100644 uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/Buffer.js create mode 100644 uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/Framebuffer.js create mode 100644 uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/GLenum.js create mode 100644 uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/GLmethod.js create mode 100644 uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/GLtype.js create mode 100644 uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/Program.js create mode 100644 uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/Renderbuffer.js create mode 100644 uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/RenderingContext.js create mode 100644 uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/Shader.js create mode 100644 uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/ShaderPrecisionFormat.js create mode 100644 uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/Texture.js create mode 100644 uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/UniformLocation.js create mode 100644 uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/classUtils.js create mode 100644 uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/env/canvas.js create mode 100644 uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/env/image.js create mode 100644 uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/env/tool.js create mode 100644 uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/index.js create mode 100644 uni_modules/Sansnn-uQRCode/js_sdk/uqrcode/uqrcode.js create mode 100644 uni_modules/Sansnn-uQRCode/package.json delete mode 100644 unpackage/dist/build/web/static/js/index.0930e969.js create mode 100644 unpackage/dist/build/web/static/js/index.b2cf881e.js delete mode 100644 unpackage/dist/build/web/static/js/pages-index-detail.0bcf4137.js create mode 100644 unpackage/dist/build/web/static/js/pages-index-detail.25218aeb.js delete mode 100644 unpackage/dist/build/web/static/js/pages-index-detail_info.0ca4b927.js create mode 100644 unpackage/dist/build/web/static/js/pages-index-detail_info.3c9409cb.js create mode 100644 unpackage/dist/build/web/static/js/pages-login-login.532f442e.js delete mode 100644 unpackage/dist/build/web/static/js/pages-login-login.f1aaf10b.js 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 @@