From 012d417a46d857ecff543eb643f94ee8fd50cc29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Wed, 8 Nov 2023 16:47:27 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/protocol/protocol.vue | 2 +- pagesC/Onlinesigning/Onlinesigning.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/protocol/protocol.vue b/components/protocol/protocol.vue index c9e230d..a3396ad 100644 --- a/components/protocol/protocol.vue +++ b/components/protocol/protocol.vue @@ -41,7 +41,7 @@

- 专病管理服务团队成员 + 家庭医生服务团队成员 姓名 职称 固定电话 diff --git a/pagesC/Onlinesigning/Onlinesigning.vue b/pagesC/Onlinesigning/Onlinesigning.vue index 7ccdda2..876d539 100644 --- a/pagesC/Onlinesigning/Onlinesigning.vue +++ b/pagesC/Onlinesigning/Onlinesigning.vue @@ -558,7 +558,7 @@ that.query.userNo = item.userNo that.query.teamNo = item.teamNo that.query.teamName = item.teamName - getDoctorListtwo(1, 20, item.teamNo).then(res => { + getDoctorListtwo(1, 20, item.teamNo, '').then(res => { that.query.DoctorList = res.rows }) uni.$off('doctordata') From 80a841629c9eabd526eca156fd3d3a11b6d73e66 Mon Sep 17 00:00:00 2001 From: shidongli Date: Wed, 8 Nov 2023 17:13:05 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AD=BE=E7=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/homepage/homepage.vue | 105 +++++++++++++++--- pagesB/mysigning/mysigning.vue | 8 +- pagesC/Onlinesigning/Onlinesigning.vue | 8 +- .../selectInstitution/selectInstitution.vue | 1 + 4 files changed, 101 insertions(+), 21 deletions(-) diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue index 721deb8..0a7d8f1 100644 --- a/pages/homepage/homepage.vue +++ b/pages/homepage/homepage.vue @@ -117,11 +117,16 @@ if (this.userinfo && this.region!="3") { this.patientName = this.userinfo.patientName checkSignApply(this.userinfo.cardNo).then(res => { - if (res.data.code != 0) { - this.checkSign = true - } else { - this.checkSign = false + if(res.data){ + this.checkSign=res.data.code + this.info=res.data.info + } + // if (res.data.code == 0) { + // this.checkSign = true + // } else { + // this.checkSign = false + // } }) } else { this.patientName = '' @@ -169,14 +174,23 @@ this.family() } else { if (this.cityCode == "1" || this.cityCode == "2") { - if (!this.checkSign) { + if (this.checkSign=="0") { this.$refs.uToast.show({ title: '未签约，请先签约', type: 'error', duration: '1000', url: "/pagesC/Onlinesigning/Onlinesigning" }) - } else { + } else if(this.checkSign=="01"){ + this.$refs.uToast.show({ + title: this.info, + type: 'error', + duration: '2000', + + }) + + } + else { uni.navigateTo({ url: "/pagesB/mysigning/mysigning" }) @@ -200,14 +214,33 @@ this.family() } else { if (this.cityCode == "1" || this.cityCode == "2") { - if (!this.checkSign) { + if (this.checkSign=="0") { this.$refs.uToast.show({ - title: '未签约，请先签约', + title: this.info, type: 'error', duration: '1000', url: "/pagesC/Onlinesigning/Onlinesigning" }) - } else { + } + else if(this.checkSign=="01"){ + this.$refs.uToast.show({ + title: this.info, + type: 'error', + duration: '2000', + + }) + + } + else if(this.checkSign=="01"){ + this.$refs.uToast.show({ + title: this.info, + type: 'error', + duration: '2000', + + }) + + } + else { uni.navigateTo({ url: '/pagesB/Behaviorpoints/Behaviorpoints' }) @@ -282,14 +315,24 @@ // this.family() // } else { // if (this.cityCode == "1" || this.cityCode == "2") { - if (!this.checkSign) { + if (this.checkSign=="0") { this.$refs.uToast.show({ title: '未签约，请先签约', type: 'error', duration: '1000', url: "/pagesC/Onlinesigning/Onlinesigning" }) - } else { + } + else if(this.checkSign=="01"){ + this.$refs.uToast.show({ + title: this.info, + type: 'error', + duration: '2000', + + }) + + } + else { uni.navigateTo({ url: "/pagesC/ServiceAppointment/ServiceAppointment" }) @@ -319,9 +362,29 @@ this.family() } else { if (this.cityCode == "1" || this.cityCode == "2") { - uni.navigateTo({ - url: "/pagesC/servicerecord/servicerecord" - }) + if (this.checkSign=="0") { + this.$refs.uToast.show({ + title: '未签约，请先签约', + type: 'error', + duration: '1000', + url: "/pagesC/Onlinesigning/Onlinesigning" + }) + } + else if(this.checkSign=="01"){ + this.$refs.uToast.show({ + title: this.info, + type: 'error', + duration: '2000', + + }) + + }else{ + uni.navigateTo({ + url: "/pagesC/servicerecord/servicerecord" + }) + + } + } else { this.family() @@ -341,14 +404,24 @@ this.family() } else { if (this.cityCode == "1" || this.cityCode == "2") { - if (!this.checkSign) { + if (this.checkSign=="0") { this.$refs.uToast.show({ title: '未签约，请先签约', type: 'error', duration: '1000', url: "/pagesC/Onlinesigning/Onlinesigning" }) - } else { + } + else if(this.checkSign=="01"){ + this.$refs.uToast.show({ + title: this.info, + type: 'error', + duration: '2000', + + }) + + } + else { uni.navigateTo({ url: "/pagesC/Myappointment/Myappointment" }) diff --git a/pagesB/mysigning/mysigning.vue b/pagesB/mysigning/mysigning.vue index 5cd70e5..35eeb71 100644 --- a/pagesB/mysigning/mysigning.vue +++ b/pagesB/mysigning/mysigning.vue @@ -159,6 +159,12 @@ url: "/pages/homepage/homepage" }) }, 2000) + }else{ + this.$refs.uToast.show({ + title: res.msg, + type: 'error', + }) + } }) }, @@ -215,4 +221,4 @@ \ No newline at end of file + diff --git a/pagesC/Onlinesigning/Onlinesigning.vue b/pagesC/Onlinesigning/Onlinesigning.vue index 876d539..60cc5d5 100644 --- a/pagesC/Onlinesigning/Onlinesigning.vue +++ b/pagesC/Onlinesigning/Onlinesigning.vue @@ -223,7 +223,7 @@ crowdNoList: null, packageList: null, packageNoList: null, - signYears: null, + signYears: 1, BasePackage: null, //基础包 PersonalityPack: null, // 个性包 packSignCost: 0, //价格 @@ -314,8 +314,8 @@ title: '签约成功', type: 'success', }) - uni.redirectTo({ - url: "/pagesB/mysigning/mysigning" + uni.switchTab({ + url: "/pages/homepage/homepage" }) } else { this.$refs.uToast.show({ @@ -568,4 +568,4 @@ \ No newline at end of file + diff --git a/pagesC/selectInstitution/selectInstitution.vue b/pagesC/selectInstitution/selectInstitution.vue index d938e79..02bd08d 100644 --- a/pagesC/selectInstitution/selectInstitution.vue +++ b/pagesC/selectInstitution/selectInstitution.vue @@ -64,6 +64,7 @@ watch: { 'query.orgName': { handler(newval, oldval) { + this.query.pageNum=1 this.getNearbyOrginfo(); } } From 235678453c2fe5d7b7e32750b4d3abc1538c2ef7 Mon Sep 17 00:00:00 2001 From: shidongli Date: Thu, 9 Nov 2023 09:10:32 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/myinformation/myinformation.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/myinformation/myinformation.vue b/pages/myinformation/myinformation.vue index f908819..cb54b20 100644 --- a/pages/myinformation/myinformation.vue +++ b/pages/myinformation/myinformation.vue @@ -56,7 +56,7 @@ - + 0 From 50f8c9d8e49accfe0c9bd9395a0f8f5d21ab4fc3 Mon Sep 17 00:00:00 2001 From: shidongli Date: Thu, 9 Nov 2023 09:26:50 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E7=AD=9B=E6=9F=A5=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/pagesB/SelectItem/SelectItem.js | 4 ++-- pagesB/SelectItem/SelectItem.vue | 7 +++++-- pagesC/Screeningrecords/Screeningrecords.vue | 10 ++++++---- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/api/pagesB/SelectItem/SelectItem.js b/api/pagesB/SelectItem/SelectItem.js index 31d1bc8..8ed7458 100644 --- a/api/pagesB/SelectItem/SelectItem.js +++ b/api/pagesB/SelectItem/SelectItem.js @@ -1,8 +1,8 @@ import request from "../../request.js" // 获取项目 -export function projectTypedata(projectType) { +export function projectTypedata(patientId) { return request({ - url: `/nurseApplet/screening/project/list?projectType=${projectType}`, + url: `/nurseApplet/screening/project/list?patientId=${patientId}`, method: 'GET', header: { Authorization: 'Bearer' + ' ' + uni.getStorageSync('token') diff --git a/pagesB/SelectItem/SelectItem.vue b/pagesB/SelectItem/SelectItem.vue index c4b9f4f..a6bb2e4 100644 --- a/pagesB/SelectItem/SelectItem.vue +++ b/pagesB/SelectItem/SelectItem.vue @@ -19,11 +19,14 @@ return { prejectlist:{}, + userinfo:{} }; }, onShow() { - var projectType=1 - projectTypedata(projectType).then(res=>{ + + this.userinfo=uni.getStorageSync('userinfo'); + var patientId=this.userinfo.id + projectTypedata(patientId).then(res=>{ this.prejectlist=res.data console.log(res) diff --git a/pagesC/Screeningrecords/Screeningrecords.vue b/pagesC/Screeningrecords/Screeningrecords.vue index 6d997b4..f5392f2 100644 --- a/pagesC/Screeningrecords/Screeningrecords.vue +++ b/pagesC/Screeningrecords/Screeningrecords.vue @@ -34,14 +34,16 @@ data() { return { prejectlist:{}, + userinfo:{} }; }, onShow() { - var projectType=1 - projectTypedata(projectType).then(res=>{ + this.userinfo=uni.getStorageSync('userinfo'); + var patientId=this.userinfo.id + projectTypedata(patientId).then(res=>{ this.prejectlist=res.data - console.log(res) - + + }) // this.resultstype(); }, From 6ccff7eeca71953dbb88bf4164712d40e62f470e Mon Sep 17 00:00:00 2001 From: shidongli Date: Thu, 9 Nov 2023 10:04:35 +0800 Subject: [PATCH 05/14] region --- api/pages/myinformation/myinformation.js | 3 ++- api/pagesB/modify/modify.js | 3 ++- pagesB/AddMembers/AddMembers.vue | 2 +- pagesB/Serviceevaluation/Serviceevaluation.vue | 2 +- pagesB/modify/modify.vue | 4 ++-- pagesB/myevaluation/myevaluation.vue | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/api/pages/myinformation/myinformation.js b/api/pages/myinformation/myinformation.js index ff16787..4c016c6 100644 --- a/api/pages/myinformation/myinformation.js +++ b/api/pages/myinformation/myinformation.js @@ -4,7 +4,8 @@ export function appPersonal(patientId) { url: `/nurseApp/login/appPersonal?patientId=${patientId}`, method: 'GET', header: { - Authorization: 'Bearer' + ' ' + uni.getStorageSync('token') + Authorization: 'Bearer' + ' ' + uni.getStorageSync('token'), + region: uni.getStorageSync('region'), }, }) } diff --git a/api/pagesB/modify/modify.js b/api/pagesB/modify/modify.js index 8468e5d..38fefc2 100644 --- a/api/pagesB/modify/modify.js +++ b/api/pagesB/modify/modify.js @@ -17,7 +17,8 @@ export function appPersonal(patientId) { url: `/nurseApp/login/appPersonal?patientId=${patientId}`, method: 'GET', header: { - Authorization: 'Bearer' + ' ' + uni.getStorageSync('token') + Authorization: 'Bearer' + ' ' + uni.getStorageSync('token'), + region: uni.getStorageSync('region'), }, }) } \ No newline at end of file diff --git a/pagesB/AddMembers/AddMembers.vue b/pagesB/AddMembers/AddMembers.vue index 03f59e1..411577c 100644 --- a/pagesB/AddMembers/AddMembers.vue +++ b/pagesB/AddMembers/AddMembers.vue @@ -367,7 +367,7 @@ const _this = this _this.userinfo = uni.getStorageSync('userinfo'); _this.form.openid = uni.getStorageSync('openid'); - _this.form.cityCode=_this.userinfo.cityCode + _this.form.cityCode= uni.getStorageSync('region'); console.log(_this.form, '000') if (_this.form.sexname == '男') { _this.form.sex = 'MALE'; diff --git a/pagesB/Serviceevaluation/Serviceevaluation.vue b/pagesB/Serviceevaluation/Serviceevaluation.vue index 30ab357..ef21e78 100644 --- a/pagesB/Serviceevaluation/Serviceevaluation.vue +++ b/pagesB/Serviceevaluation/Serviceevaluation.vue @@ -127,7 +127,7 @@ this.userinfo = uni.getStorageSync('userinfo'); this.cardNo = this.userinfo.cardNo; this.parentId = this.userinfo.id; - this.region = this.userinfo.cityCode; + this.region = uni.getStorageSync('region'); this.openId = uni.getStorageSync('openid'); // console.log(this.openId, '999') diff --git a/pagesB/modify/modify.vue b/pagesB/modify/modify.vue index fde3dd4..c04ac1a 100644 --- a/pagesB/modify/modify.vue +++ b/pagesB/modify/modify.vue @@ -298,7 +298,7 @@ timeout: 5000, success(res) { that.appPersonallist.headPictureUrl = JSON.parse(res.data).imgUrl - that.appPersonallist.cityCode = this.value.cityCode + that.appPersonallist.cityCode = uni.getStorageSync('region') registerdata(that.appPersonallist).then(res => { if (res.code == 200) { that.$refs.uToast.show({ @@ -325,7 +325,7 @@ } }) } else { - that.appPersonallist.cityCode = this.value.cityCode + that.appPersonallist.cityCode = uni.getStorageSync('region') registerdata(that.appPersonallist).then(res => { if (res.code == 200) { that.$refs.uToast.show({ diff --git a/pagesB/myevaluation/myevaluation.vue b/pagesB/myevaluation/myevaluation.vue index 34a4157..c094f88 100644 --- a/pagesB/myevaluation/myevaluation.vue +++ b/pagesB/myevaluation/myevaluation.vue @@ -60,7 +60,7 @@ this.parentId = this.userinfo.id; // this.cardNo = '372926199812187720'; // this.parentId = '88'; - this.region = this.userinfo.cityCode; + this.region = uni.getStorageSync('region'); this.getlist(); }, From 28d363d0eb26cc6d7b890f938eb66fd4f34aa850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Thu, 9 Nov 2023 11:02:59 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/BloodSugar/BloodSugar.vue | 92 ---------------- manifest.json | 1 - pages/myinformation/myinformation.scss | 2 +- pagesB/mysigning/mysigning.scss | 2 +- .../Physicalexamination.vue | 5 +- pagesC/addBMI/addBMI.vue | 7 +- pagesC/addBloodFat/addBloodFat.vue | 7 +- pagesC/addBloodOxygen/addBloodOxygen.vue | 7 +- pagesC/addHeartRate/addHeartRate.vue | 7 +- pagesC/addPressure/addPressure.vue | 5 +- pagesC/addTemperature/addTemperature.vue | 7 +- pagesC/addequipment/addequipment.vue | 13 +-- pagesC/addsugar/addsugar.vue | 103 +++++++++++++++++- pagesC/devicelist/devicelist.vue | 8 +- pagesC/healthdata/healthdata.vue | 5 +- pagesC/seekadvicefrom/seekadvicefrom.vue | 4 +- .../signseekadvicefrom/signseekadvicefrom.vue | 4 +- 17 files changed, 133 insertions(+), 146 deletions(-) diff --git a/components/BloodSugar/BloodSugar.vue b/components/BloodSugar/BloodSugar.vue index ef04598..2f5b793 100644 --- a/components/BloodSugar/BloodSugar.vue +++ b/components/BloodSugar/BloodSugar.vue @@ -94,8 +94,6 @@ }, ], timeindex: 0, - socketOpen: false, - timer: null, datalist: null, datalisttwo: null, pie_opts: { @@ -156,12 +154,6 @@ // } this.getServerData() }, - destroyed() { - clearInterval(this.timer); - if (this.socketOpen == true) { - uni.closeSocket(); - } - }, watch: { echartData: { handler() { @@ -169,18 +161,6 @@ }, deep: true }, - current(newValue, oldValue) { - if (newValue != 0) { - clearInterval(this.timer); - if (this.socketOpen == true) { - uni.closeSocket(); - } - } else { - setTimeout(() => { - this.scoket() - }, 800) - } - } }, methods: { taptimeindex(index) { @@ -233,78 +213,6 @@ }, 500) } }, - scoket() { - var SOCKETURL = 'ws://112.7.50.34:9002/webSocket/' + uni.getStorageSync('userinfo').cardNo - const that = this - uni.closeSocket() - this.socketOpen = false - try { - uni.connectSocket({ - url: SOCKETURL - }) - uni.onSocketOpen(res => { - console.log('webScoket连接已打开', res); - that.socketOpen = true - that.reset() - }) - - uni.onSocketError(err => { - console.log('webScoket连接打开失败', err); - if (err && err.code != 1000) { - setTimeout(() => { - that.socketOpen = true - uni.connectSocket({ - url: SOCKETURL - }) - }, 3 * 1000) - } - }) - - uni.onSocketClose(err => { - console.log('webScoket连接关闭', err); - if (err && err.code !== 1000) { - setTimeout(() => { - that.socketOpen = true - uni.connectSocket({ - url: SOCKETURL - }) - }, 3 * 1000) - } - }) - uni.onSocketMessage(res => { - console.log("webScoket监听收到的信息", res); - // that.newsList.push({ - // senderName: that.currentItem.senderName, - // content: JSON.parse(res.data).message - // }) - this.$emit('websocket-message'); - this.$forceUpdate() - }) - } catch (e) { - console.log(e); - } - }, - // 心跳响应 - reset() { - let that = this - var SOCKETURL = 'ws://112.7.50.34:9002/webSocket/' + uni.getStorageSync('userinfo').cardNo - clearInterval(that.timer); - that.timer = setInterval(() => { - uni.sendSocketMessage({ - data: 'ping', - success(res) { - console.log('正在发送心跳'); - }, - fail(err) { - console.log('心跳发送失败，重新连接...'); - _socketOpen = true - uni.connectSocket({ - url: SOCKETURL - }) - } - }) - }, 60000) - }, } } diff --git a/manifest.json b/manifest.json index dbb145e..5d3d598 100644 --- a/manifest.json +++ b/manifest.json @@ -51,7 +51,6 @@ /* 小程序特有相关 */ "mp-weixin": { "appid": "wxccb16a452ab5e4b4", - "__usePrivacyCheck__": true, "setting": { "urlCheck": false, "postcss": true, diff --git a/pages/myinformation/myinformation.scss b/pages/myinformation/myinformation.scss index a4c8a95..14b43be 100644 --- a/pages/myinformation/myinformation.scss +++ b/pages/myinformation/myinformation.scss @@ -52,7 +52,7 @@ left: 10%; width: 80%; height: 68rpx; - background-color: #55d0df; + background-color: #4AC4AB; margin: 0 auto; border-radius: 10rpx; margin-bottom: 30rpx; diff --git a/pagesB/mysigning/mysigning.scss b/pagesB/mysigning/mysigning.scss index dcb0c5c..5340d66 100644 --- a/pagesB/mysigning/mysigning.scss +++ b/pagesB/mysigning/mysigning.scss @@ -76,7 +76,7 @@ .Rescind { width: 50%; height: 100rpx; - color: #55d0df; + color: #4AC4AB; border-left: 0.5rpx solid #f6f6f6; } } diff --git a/pagesC/Physicalexamination/Physicalexamination.vue b/pagesC/Physicalexamination/Physicalexamination.vue index 10592a7..1aaea8a 100644 --- a/pagesC/Physicalexamination/Physicalexamination.vue +++ b/pagesC/Physicalexamination/Physicalexamination.vue @@ -366,8 +366,7 @@ }, methods: { info() { - // userinfo.cardNo, - recordlast('370882199909092123').then(res => { + recordlast(uni.getStorageSync('userinfo').cardNo).then(res => { res.data.forEach(e => { e.type == '1' ? this.dataone = e : '' e.type == '2' ? this.datatwo = e : '' @@ -401,4 +400,4 @@ \ No newline at end of file + diff --git a/pagesC/addBMI/addBMI.vue b/pagesC/addBMI/addBMI.vue index 815a9e1..3a87171 100644 --- a/pagesC/addBMI/addBMI.vue +++ b/pagesC/addBMI/addBMI.vue @@ -89,8 +89,7 @@ bmi: (this.weight / ((this.height / 100) * (this.height / 100))).toFixed(2), height: this.height, weight: this.weight, - // identity: uni.getStorageSync('userinfo').cardNo - identity: '370882199909092123', + identity: uni.getStorageSync('userinfo').cardNo, measureTime: this.timetext, } savebmi(data).then(res => { @@ -127,7 +126,7 @@ width: 60%; height: 98rpx; margin: 60rpx auto; - background-color: #55d0df; + background-color: #4AC4AB; border-radius: 10rpx; border: solid 0rpx #0c0c0c; color: #ffffff; @@ -233,4 +232,4 @@ } } } - \ No newline at end of file + diff --git a/pagesC/addBloodFat/addBloodFat.vue b/pagesC/addBloodFat/addBloodFat.vue index 505f067..6686bb2 100644 --- a/pagesC/addBloodFat/addBloodFat.vue +++ b/pagesC/addBloodFat/addBloodFat.vue @@ -92,8 +92,7 @@ ldl: this.ldl, tc: this.tc, tg: this.tg, - // identity: uni.getStorageSync('userinfo').cardNo - identity: '370882199909092123', + identity: uni.getStorageSync('userinfo').cardNo, measureTime: this.timetext, } savebf(data).then(res => { @@ -138,7 +137,7 @@ width: 60%; height: 98rpx; margin: 60rpx auto; - background-color: #55d0df; + background-color: #4AC4AB; border-radius: 10rpx; border: solid 0rpx #0c0c0c; color: #ffffff; @@ -244,4 +243,4 @@ } } } - \ No newline at end of file + diff --git a/pagesC/addBloodOxygen/addBloodOxygen.vue b/pagesC/addBloodOxygen/addBloodOxygen.vue index dae0974..3ca0e3d 100644 --- a/pagesC/addBloodOxygen/addBloodOxygen.vue +++ b/pagesC/addBloodOxygen/addBloodOxygen.vue @@ -70,8 +70,7 @@ let data = { pulse: this.pulse, spo2: this.spo2, - // identity: uni.getStorageSync('userinfo').cardNo - identity: '370882199909092123', + identity: uni.getStorageSync('userinfo').cardNo, measureTime: this.timetext, } savebo(data).then(res => { @@ -116,7 +115,7 @@ width: 60%; height: 98rpx; margin: 60rpx auto; - background-color: #55d0df; + background-color: #4AC4AB; border-radius: 10rpx; border: solid 0rpx #0c0c0c; color: #ffffff; @@ -222,4 +221,4 @@ } } } - \ No newline at end of file + diff --git a/pagesC/addHeartRate/addHeartRate.vue b/pagesC/addHeartRate/addHeartRate.vue index 7bf3b18..a42a8d8 100644 --- a/pagesC/addHeartRate/addHeartRate.vue +++ b/pagesC/addHeartRate/addHeartRate.vue @@ -60,8 +60,7 @@ let data = { hr: this.hr, uploadType: 1, - // identity: uni.getStorageSync('userinfo').cardNo - identity: '370882199909092123', + identity: uni.getStorageSync('userinfo').cardNo, measureTime: this.timetext, } savehr(data).then(res => { @@ -106,7 +105,7 @@ width: 60%; height: 98rpx; margin: 60rpx auto; - background-color: #55d0df; + background-color: #4AC4AB; border-radius: 10rpx; border: solid 0rpx #0c0c0c; color: #ffffff; @@ -212,4 +211,4 @@ } } } - \ No newline at end of file + diff --git a/pagesC/addPressure/addPressure.vue b/pagesC/addPressure/addPressure.vue index 99325a3..d27dc7c 100644 --- a/pagesC/addPressure/addPressure.vue +++ b/pagesC/addPressure/addPressure.vue @@ -81,8 +81,7 @@ dbp: this.dbp, sbp: this.sbp, hr: this.hr, - // identity: uni.getStorageSync('userinfo').cardNo - identity: '370882199909092123', + identity: uni.getStorageSync('userinfo').cardNo, measureTime: this.timetext, uploadType: 1, } @@ -128,7 +127,7 @@ width: 60%; height: 98rpx; margin: 60rpx auto; - background-color: #55d0df; + background-color: #4AC4AB; border-radius: 10rpx; border: solid 0rpx #0c0c0c; color: #ffffff; diff --git a/pagesC/addTemperature/addTemperature.vue b/pagesC/addTemperature/addTemperature.vue index a94685a..41beb63 100644 --- a/pagesC/addTemperature/addTemperature.vue +++ b/pagesC/addTemperature/addTemperature.vue @@ -58,8 +58,7 @@ submit() { if (this.timetext && this.temp) { let data = { - // identity: uni.getStorageSync('userinfo').cardNo - identity: '370882199909092123', + identity: uni.getStorageSync('userinfo').cardNo, measureTime: this.timetext, temp: this.temp, } @@ -105,7 +104,7 @@ width: 60%; height: 98rpx; margin: 60rpx auto; - background-color: #55d0df; + background-color: #4AC4AB; border-radius: 10rpx; border: solid 0rpx #0c0c0c; color: #ffffff; @@ -203,4 +202,4 @@ } } } - \ No newline at end of file + diff --git a/pagesC/addequipment/addequipment.vue b/pagesC/addequipment/addequipment.vue index ca82717..bcc16c4 100644 --- a/pagesC/addequipment/addequipment.vue +++ b/pagesC/addequipment/addequipment.vue @@ -39,8 +39,7 @@ return { data: { deviceType: undefined, - // identity: uni.getStorageSync('userinfo').cardNo, - identity: '370882199909092123', + identity: uni.getStorageSync('userinfo').cardNo, sn: '', bindTime: undefined, //绑定时间 state: 1, @@ -116,7 +115,7 @@ width: 60%; height: 98rpx; margin: 60rpx auto; - background-color: #55d0df; + background-color: #4AC4AB; border-radius: 10rpx; border: solid 0rpx #0c0c0c; color: #ffffff; @@ -150,8 +149,8 @@ height: 60rpx; background-color: #ffffff; border-radius: 10rpx; - border: solid 1rpx #55d0df; - color: #55d0df; + border: solid 1rpx #4AC4AB; + color: #4AC4AB; } } @@ -191,9 +190,9 @@ .left { width: 8rpx; height: 32rpx; - background-color: #55d0df; + background-color: #4AC4AB; border-radius: 4rpx; } } } - \ No newline at end of file + diff --git a/pagesC/addsugar/addsugar.vue b/pagesC/addsugar/addsugar.vue index 527fda3..001751b 100644 --- a/pagesC/addsugar/addsugar.vue +++ b/pagesC/addsugar/addsugar.vue @@ -45,16 +45,36 @@ import { savebg } from '@/api/examinationapi/add.js' + import { + bound, + } from '@/api/examinationapi/add.js' export default { data() { return { + uploadType: undefined, number: '', timetext: this.formatDate(Date.now()), measureTime: this.formatDate(Date.now()), bucketchoice: 1, + timeoutObj: null, + socketOpen: false, + SOCKETURL: '', + // 德州的用：ws://112.6.122.71:8009/fd/webSocket/{sn} + // 东营的用：ws://218.58.213.15:8009/fd/webSocket/{sn} }; }, - onLoad(options) {}, + onLoad(options) { + bound(uni.getStorageSync('userinfo').cardNo).then(res => { + if (res.code == 200) { + res.data.forEach(e => { + if (e.deviceType == 2) { + this.SOCKETURL = `ws://112.6.122.71:8009/fd/webSocket/${e.sn}` + this.scoket(); + } + }) + } + }) + }, methods: { timeconfirm(time) { this.timetext = time @@ -83,9 +103,8 @@ bg: this.number, bucket: this.bucketchoice, measureTime: this.measureTime, - uploadType: 1, - // identity: uni.getStorageSync('userinfo').cardNo - identity: '370882199909092123' + uploadType: this.uploadType ? this.uploadType : 1, + identity: uni.getStorageSync('userinfo').cardNo } savebg(data).then(res => { if (res.code == 200) { @@ -100,8 +119,80 @@ }, 1000) } }) + }, + scoket() { + const that = this + this.socketOpen = false + try { + uni.connectSocket({ + url: that.SOCKETURL + }) + uni.onSocketOpen(res => { + console.log('webScoket连接已打开', res); + that.socketOpen = true + that.reset() + }) + + uni.onSocketError(err => { + console.log('webScoket连接打开失败', err); + if (err && err.code != 1000) { + setTimeout(() => { + that.socketOpen = true + uni.connectSocket({ + url: that.SOCKETURL + }) + }, 3 * 1000) + } + }) + + uni.onSocketClose(err => { + console.log('webScoket连接关闭', err); + if (err && err.code !== 1000) { + setTimeout(() => { + that.socketOpen = true + uni.connectSocket({ + url: that.SOCKETURL + }) + }, 3 * 1000) + } + }) + uni.onSocketMessage(res => { + console.log("webScoket监听收到的信息", res); + this.uploadType = 2 + this.number = JSON.parse(res.data).fbg + this.$forceUpdate() + }) + } catch (e) { + console.log(e); + } + }, + // 心跳响应 + reset() { + let that = this + clearInterval(that.timeoutObj); + that.timeoutObj = setInterval(() => { + uni.sendSocketMessage({ + data: 'ping', + success(res) { + console.log('正在发送心跳'); + }, + fail(err) { + console.log('心跳发送失败，重新连接...'); + console.log(this.SOCKETURL) + that.socketOpen = true + uni.connectSocket({ + url: this.SOCKETURL + }) + } + }) + }, 60000) + }, + }, + onUnload() { + if (this.socketOpen) { + uni.closeSocket(); } - } + }, } @@ -225,4 +316,4 @@ } } } - \ No newline at end of file + diff --git a/pagesC/devicelist/devicelist.vue b/pagesC/devicelist/devicelist.vue index 390f135..ad05ccc 100644 --- a/pagesC/devicelist/devicelist.vue +++ b/pagesC/devicelist/devicelist.vue @@ -35,8 +35,7 @@ }, methods: { getbindDeviceList() { - // uni.getStorageSync('userinfo').cardNo - bound('370882199909092123').then(res => { + bound(uni.getStorageSync('userinfo').cardNo).then(res => { if (res.code == 200) { this.deviceList = res.data } @@ -53,8 +52,7 @@ remark: e.remark, id: e.id, bindTime: e.bindTime, - // identity: uni.getStorageSync('userinfo').cardNo, - identity: '370882199909092123', + identity: uni.getStorageSync('userinfo').cardNo, sn: e.sn, unbindTime: that.timeFormat(), state: 0, @@ -162,4 +160,4 @@ } } } - \ No newline at end of file + diff --git a/pagesC/healthdata/healthdata.vue b/pagesC/healthdata/healthdata.vue index 0e9739c..3b6f5f0 100644 --- a/pagesC/healthdata/healthdata.vue +++ b/pagesC/healthdata/healthdata.vue @@ -93,8 +93,7 @@ let userinfo = uni.getStorageSync('userinfo'); var obj = { label: Number(this.tabindex) + 1, - // identity: userinfo.cardNo, - identity: '370882199909092123', + identity: userinfo.cardNo, type: this.type, } record(obj).then(res => { @@ -120,4 +119,4 @@ ::v-deep .u-tabs { background-color: #F7F5F5 !important; } - \ No newline at end of file + diff --git a/pagesC/seekadvicefrom/seekadvicefrom.vue b/pagesC/seekadvicefrom/seekadvicefrom.vue index ecc07f5..38c9dbd 100644 --- a/pagesC/seekadvicefrom/seekadvicefrom.vue +++ b/pagesC/seekadvicefrom/seekadvicefrom.vue @@ -701,7 +701,7 @@ } .sendBox { - background-color: #55d0df7d; + background-color: #4AC4AB; padding: 18rpx 20rpx; border-radius: 0 0 10rpx 10rpx; font-size: 34rpx; @@ -764,4 +764,4 @@ bottom: 38rpx; } } - \ No newline at end of file + diff --git a/pagesC/signseekadvicefrom/signseekadvicefrom.vue b/pagesC/signseekadvicefrom/signseekadvicefrom.vue index fec5500..7abaf5c 100644 --- a/pagesC/signseekadvicefrom/signseekadvicefrom.vue +++ b/pagesC/signseekadvicefrom/signseekadvicefrom.vue @@ -684,7 +684,7 @@ } .sendBox { - background-color: #55d0df7d; + background-color: #4AC4AB; padding: 18rpx 20rpx; border-radius: 0 0 10rpx 10rpx; font-size: 34rpx; @@ -747,4 +747,4 @@ bottom: 38rpx; } } - \ No newline at end of file + From 1efff531ba544af15f009057503c000f218c1534 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Thu, 9 Nov 2023 11:35:38 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pagesC/addHeartRate/addHeartRate.vue | 94 +++++++++++++++++++++++++- pagesC/addPressure/addPressure.vue | 99 +++++++++++++++++++++++++++- pagesC/addsugar/addsugar.vue | 2 +- 3 files changed, 188 insertions(+), 7 deletions(-) diff --git a/pagesC/addHeartRate/addHeartRate.vue b/pagesC/addHeartRate/addHeartRate.vue index a42a8d8..f241562 100644 --- a/pagesC/addHeartRate/addHeartRate.vue +++ b/pagesC/addHeartRate/addHeartRate.vue @@ -37,8 +37,24 @@ hr: '', timetext: this.formatDate(Date.now()), measureTime: this.formatDate(Date.now()), + uploadType: undefined, + timeoutObj: null, + socketOpen: false, + SOCKETURL: '', }; }, + onLoad(options) { + bound(uni.getStorageSync('userinfo').cardNo).then(res => { + if (res.code == 200) { + res.data.forEach(e => { + if (e.deviceType == 1) { + this.SOCKETURL = `ws://112.6.122.71:8009/fd/webSocket/${e.sn}` + this.scoket(); + } + }) + } + }) + }, methods: { formatDate(timestamp) { const now = new Date(parseInt(timestamp)) @@ -55,11 +71,78 @@ timeconfirm(time) { this.timetext = time }, + scoket() { + const that = this + this.socketOpen = false + try { + uni.connectSocket({ + url: that.SOCKETURL + }) + uni.onSocketOpen(res => { + console.log('webScoket连接已打开', res); + that.socketOpen = true + that.reset() + }) + + uni.onSocketError(err => { + console.log('webScoket连接打开失败', err); + if (err && err.code != 1000) { + setTimeout(() => { + that.socketOpen = true + uni.connectSocket({ + url: that.SOCKETURL + }) + }, 3 * 1000) + } + }) + + uni.onSocketClose(err => { + console.log('webScoket连接关闭', err); + if (err && err.code !== 1000) { + setTimeout(() => { + that.socketOpen = true + uni.connectSocket({ + url: that.SOCKETURL + }) + }, 3 * 1000) + } + }) + uni.onSocketMessage(res => { + console.log("webScoket监听收到的信息", res); + this.uploadType = 2 + this.hr = JSON.parse(res.data).pulse + this.$forceUpdate() + }) + } catch (e) { + console.log(e); + } + }, + // 心跳响应 + reset() { + let that = this + clearInterval(that.timeoutObj); + that.timeoutObj = setInterval(() => { + uni.sendSocketMessage({ + data: 'ping', + success(res) { + console.log('正在发送心跳'); + }, + fail(err) { + console.log('心跳发送失败，重新连接...'); + console.log(this.SOCKETURL) + that.socketOpen = true + uni.connectSocket({ + url: this.SOCKETURL + }) + } + }) + }, 60000) + }, submit() { if (this.hr) { let data = { hr: this.hr, - uploadType: 1, + uploadType: this.uploadType ? this.uploadType : 1, identity: uni.getStorageSync('userinfo').cardNo, measureTime: this.timetext, } @@ -91,7 +174,12 @@ return true } } - } + }, + onUnload() { + if (this.socketOpen) { + uni.closeSocket(); + } + }, } @@ -211,4 +299,4 @@ } } } - + \ No newline at end of file diff --git a/pagesC/addPressure/addPressure.vue b/pagesC/addPressure/addPressure.vue index d27dc7c..22b4644 100644 --- a/pagesC/addPressure/addPressure.vue +++ b/pagesC/addPressure/addPressure.vue @@ -49,6 +49,9 @@ import { savebp } from '@/api/examinationapi/add.js' + import { + bound, + } from '@/api/examinationapi/add.js' export default { data() { return { @@ -57,8 +60,24 @@ hr: '', timetext: this.formatDate(Date.now()), measureTime: this.formatDate(Date.now()), + uploadType: undefined, + timeoutObj: null, + socketOpen: false, + SOCKETURL: '', }; }, + onLoad(options) { + bound(uni.getStorageSync('userinfo').cardNo).then(res => { + if (res.code == 200) { + res.data.forEach(e => { + if (e.deviceType == 1) { + this.SOCKETURL = `ws://112.6.122.71:8009/fd/webSocket/${e.sn}` + this.scoket(); + } + }) + } + }) + }, methods: { formatDate(timestamp) { const now = new Date(parseInt(timestamp)) @@ -75,6 +94,75 @@ timeconfirm(time) { this.timetext = time }, + scoket() { + const that = this + this.socketOpen = false + try { + uni.connectSocket({ + url: that.SOCKETURL + }) + uni.onSocketOpen(res => { + console.log('webScoket连接已打开', res); + that.socketOpen = true + that.reset() + }) + + uni.onSocketError(err => { + console.log('webScoket连接打开失败', err); + if (err && err.code != 1000) { + setTimeout(() => { + that.socketOpen = true + uni.connectSocket({ + url: that.SOCKETURL + }) + }, 3 * 1000) + } + }) + + uni.onSocketClose(err => { + console.log('webScoket连接关闭', err); + if (err && err.code !== 1000) { + setTimeout(() => { + that.socketOpen = true + uni.connectSocket({ + url: that.SOCKETURL + }) + }, 3 * 1000) + } + }) + uni.onSocketMessage(res => { + console.log("webScoket监听收到的信息", res); + this.uploadType = 2 + this.dbp = JSON.parse(res.data).dbp + this.sbp = JSON.parse(res.data).sbp + this.hr = JSON.parse(res.data).pulse + this.$forceUpdate() + }) + } catch (e) { + console.log(e); + } + }, + // 心跳响应 + reset() { + let that = this + clearInterval(that.timeoutObj); + that.timeoutObj = setInterval(() => { + uni.sendSocketMessage({ + data: 'ping', + success(res) { + console.log('正在发送心跳'); + }, + fail(err) { + console.log('心跳发送失败，重新连接...'); + console.log(this.SOCKETURL) + that.socketOpen = true + uni.connectSocket({ + url: this.SOCKETURL + }) + } + }) + }, 60000) + }, submit() { if (this.ruls(this.dbp) && this.ruls(this.sbp) && this.ruls(this.hr)) { let data = { @@ -83,7 +171,7 @@ hr: this.hr, identity: uni.getStorageSync('userinfo').cardNo, measureTime: this.timetext, - uploadType: 1, + uploadType: this.uploadType ? this.uploadType : 1, } savebp(data).then(res => { if (res.code == 200) { @@ -112,8 +200,13 @@ } else { return true } + }, + }, + onUnload() { + if (this.socketOpen) { + uni.closeSocket(); } - } + }, } @@ -228,4 +321,4 @@ } } } - + \ No newline at end of file diff --git a/pagesC/addsugar/addsugar.vue b/pagesC/addsugar/addsugar.vue index 001751b..f44fd55 100644 --- a/pagesC/addsugar/addsugar.vue +++ b/pagesC/addsugar/addsugar.vue @@ -316,4 +316,4 @@ } } } - + \ No newline at end of file From 0b17a0a0224574d8b78b40f82d3d45cef73cca29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Thu, 9 Nov 2023 13:55:40 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pagesB/healthybeans/healthybeans.vue | 56 ++++++++++++++-------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/pagesB/healthybeans/healthybeans.vue b/pagesB/healthybeans/healthybeans.vue index a2f1f7a..25a74cc 100644 --- a/pagesB/healthybeans/healthybeans.vue +++ b/pagesB/healthybeans/healthybeans.vue @@ -352,34 +352,34 @@ }) }) // 画文字 - await this.$refs.rCanvas.drawText({ - // text: "智慧康养，医护关怀到家", - x: 150, - y: 300, - font_color: "#444444", - font_size: 12, - font_weight: 600, - text_align: 'center' - }).catch(err_msg => { - uni.showToast({ - title: err_msg, - icon: "none" - }) - }) - await this.$refs.rCanvas.drawText({ - // text: "超多福利，快来体验吧！", - x: 150, - y: 320, - font_color: "#444444", - font_size: 12, - font_weight: 600, - text_align: 'center' - }).catch(err_msg => { - uni.showToast({ - title: err_msg, - icon: "none" - }) - }) + // await this.$refs.rCanvas.drawText({ + // text: "", + // x: 150, + // y: 300, + // font_color: "#444444", + // font_size: 12, + // font_weight: 600, + // text_align: 'center' + // }).catch(err_msg => { + // uni.showToast({ + // title: err_msg, + // icon: "none" + // }) + // }) + // await this.$refs.rCanvas.drawText({ + // text: "", + // x: 150, + // y: 320, + // font_color: "#444444", + // font_size: 12, + // font_weight: 600, + // text_align: 'center' + // }).catch(err_msg => { + // uni.showToast({ + // title: err_msg, + // icon: "none" + // }) + // }) await this.$refs.rCanvas.drawText({ text: "新医路健康服务平台", x: 150, From 2f2570249639be030ab8c4157035c04d44a35b0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Thu, 9 Nov 2023 13:58:54 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pagesB/healthybeans/healthybeans.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pagesB/healthybeans/healthybeans.vue b/pagesB/healthybeans/healthybeans.vue index 25a74cc..54e24aa 100644 --- a/pagesB/healthybeans/healthybeans.vue +++ b/pagesB/healthybeans/healthybeans.vue @@ -77,7 +77,7 @@ 已签到 - + From ed9e38483ab088931240c1a8c32078ac4c9ab650 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Thu, 9 Nov 2023 13:59:00 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pagesC/Physicalexamination/Physicalexamination.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pagesC/Physicalexamination/Physicalexamination.vue b/pagesC/Physicalexamination/Physicalexamination.vue index 1aaea8a..64cb118 100644 --- a/pagesC/Physicalexamination/Physicalexamination.vue +++ b/pagesC/Physicalexamination/Physicalexamination.vue @@ -8,7 +8,7 @@ 绑定设备，关注健康 - + 检测报告 @@ -394,10 +394,15 @@ url: `/pagesC/healthdata/healthdata?index=${index}` }) }, + gotestreport() { + uni.navigateTo({ + url: "/pagesC/testreport/testreport" + }) + }, } } + \ No newline at end of file From bd1a7db910ec231672a10c33ce19cdcad5b9dd29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Thu, 9 Nov 2023 15:20:47 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pagesB/CommodityDetails/CommodityDetails.vue | 23 +++++++++++--------- pagesB/ProductList/ProductList.vue | 6 ++--- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/pagesB/CommodityDetails/CommodityDetails.vue b/pagesB/CommodityDetails/CommodityDetails.vue index 44b7a48..7d9c8dc 100644 --- a/pagesB/CommodityDetails/CommodityDetails.vue +++ b/pagesB/CommodityDetails/CommodityDetails.vue @@ -731,10 +731,10 @@ if (list.length >= 1) { this.updata.receiver = list[0].receiveName var areaName - if(res.data[0].areaName){ - areaName=res.data[0].areaName - }else{ - areaName="" + if (res.data[0].areaName) { + areaName = res.data[0].areaName + } else { + areaName = "" } this.updata.receiveAddress = list[0].areaName + list[0].receiveAddress this.updata.phone = list[0].receivePhone @@ -743,14 +743,14 @@ this.updata.receiver = res.data[0].receiveName var areaName - if(res.data[0].areaName){ - areaName=res.data[0].areaName + if (res.data[0].areaName) { + areaName = res.data[0].areaName - }else{ - areaName="" + } else { + areaName = "" } - this.updata.receiveAddress =areaName + res.data[0].receiveAddress + this.updata.receiveAddress = areaName + res.data[0].receiveAddress this.updata.phone = res.data[0].receivePhone this.userid = res.data[0].id } @@ -777,6 +777,9 @@ this.baseurl = baseurl; this.usershow = false; this.loginFlag = false + this.couponId = null + this.Paidinprice = null + this.coupon = null const value = uni.getStorageSync('patientId'); if (value) { AppIdentification(value).then(res => { @@ -853,4 +856,4 @@ + \ No newline at end of file diff --git a/pagesB/ProductList/ProductList.vue b/pagesB/ProductList/ProductList.vue index 71b7f61..e3b313d 100644 --- a/pagesB/ProductList/ProductList.vue +++ b/pagesB/ProductList/ProductList.vue @@ -20,9 +20,7 @@ 分类 - - - - 诊断结果： - {{screeningResultData.diagnosticResult}} - + + 诊断结果： + {{screeningResultData.diagnosticResult}} + - - - @@ -90,21 +85,15 @@ this.projectId = e.projectId this.getLastScreeningResult() console.log(e) - }, onShow() { this.baseurl = baseurl - - }, - methods: { // 获取最新的筛查结果 getLastScreeningResult() { - lastScreeningResult(this.patientld, this.projectId).then(res => { this.screeningResultData = res.data - }) }, // 查看报告 diff --git a/pagesC/testreport/testreport.vue b/pagesC/testreport/testreport.vue new file mode 100644 index 0000000..d7d5e57 --- /dev/null +++ b/pagesC/testreport/testreport.vue @@ -0,0 +1,172 @@ + + + + + \ No newline at end of file From 1b8d333ba48c63c826206a2219c5f67bda420286 Mon Sep 17 00:00:00 2001 From: shidongli Date: Thu, 9 Nov 2023 15:54:09 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E6=B3=A8=E5=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/register/register.vue | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/pages/register/register.vue b/pages/register/register.vue index db7a54e..9aa283a 100644 --- a/pages/register/register.vue +++ b/pages/register/register.vue @@ -248,10 +248,7 @@ }, { value: '3', label: '高血脂' - }, { - value: '0', - label: '无' - }], + },], arealist: [], //区街道list list: [{ id: "", @@ -274,7 +271,6 @@ homeLatitude: null, nurseTypeIdList: [], diseaseInfoList: [], - diseaseList: [], patientId: '', locationName: '', sex: '', @@ -372,7 +368,6 @@ // console.log(that.query.diseaseList.length,'000') that.query.openid = uni.getStorageSync('openid'); that.query.cityCode = uni.getStorageSync('region'); - if (that.query.sexname == '男') { that.query.sex = 'MALE'; } else if (that.query.sexname == '女') { @@ -401,23 +396,26 @@ title: '请选择出生日期', type: 'error' }) - } else if (that.query.diseaseList.length == 0) { - that.$refs.uToast.show({ - title: '请选择基础疾病', - type: 'error' - }) - } else { + } + // else if (that.query.diseaseList.length == 0) { + // that.$refs.uToast.show({ + // title: '请选择基础疾病', + // type: 'error' + // }) + // } + else { registerdata(that.query).then(res => { if (res.code == 200) { getCurrentUser(that.query.openid, that.query.cityCode).then(res => { uni.setStorageSync('patientId', res.data.id); uni.setStorageSync('patientName', res.data.patientName); uni.setStorageSync("userinfo", res.data) - }) - that.$refs.uToast.show({ - title: '注册成功', - type: 'success', - back: 1, + that.$refs.uToast.show({ + title: '注册成功', + type: 'success', + duration: '1000', + back: 1, + }) }) } else { that.$refs.uToast.show({ @@ -576,6 +574,10 @@ justify-content: center; align-items: center; background: #fff; + ::v-deep .select-modal .select-dialog{ + height: 370rpx !important; + + } .Agreement { width: 100%;