From 20585e24ede5b32f244f240c8dbf4b06633a27c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Mon, 9 Oct 2023 13:29:39 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/homepage/homepage.vue | 111 +++++++++++++++++++------- pages/myinformation/myinformation.vue | 12 ++- 2 files changed, 90 insertions(+), 33 deletions(-) diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue index 1f56e9c..2dfd073 100644 --- a/pages/homepage/homepage.vue +++ b/pages/homepage/homepage.vue @@ -2,7 +2,7 @@ - + 你好,请登录 @@ -59,6 +59,7 @@ + @@ -70,61 +71,111 @@ export default { data() { return { - title: 'Hello' + openid: null, } }, onLoad() { - this.login() + // this.login() + }, + onShow() { + this.openid = uni.getStorageSync('openid'); }, methods: { - goonline() { - uni.navigateTo({ - url: '/pagesB/mysigning/mysigning' + nologin() { + this.$refs.uToast.show({ + title: '您未登录,请先登录', + type: 'error', + duration: '1000', + url: '/pages/login/login' }) - // uni.navigateTo({ - // url: '/pagesC/Onlinesigning/Onlinesigning' - // }) }, + //家医签约 + goonline() { + if (this.openid) { + uni.navigateTo({ + url: '/pagesB/mysigning/mysigning' + }) + // uni.navigateTo({ + // url: '/pagesC/Onlinesigning/Onlinesigning' + // }) + } else { + this.nologin() + } + }, + //健康档案 goHealthrecords() { - uni.navigateTo({ - url: '/pagesC/Healthrecords/Healthrecords' - }) + if (this.openid) { + uni.navigateTo({ + url: '/pagesC/Healthrecords/Healthrecords' + }) + } else { + this.nologin() + } }, // 筛查记录 gorecords() { - uni.navigateTo({ - url: '/pagesC/Screeningrecords/Screeningrecords' - }) + if (this.openid) { + uni.navigateTo({ + url: '/pagesC/Screeningrecords/Screeningrecords' + }) + } else { + this.nologin() + } }, // 健康自评 healthtest() { - uni.navigateTo({ - url: '/pagesC/healthtest/healthtest' - }) + if (this.openid) { + uni.navigateTo({ + url: '/pagesC/healthtest/healthtest' + }) + } else { + this.nologin() + } }, // 体征检测 sign() { - uni.navigateTo({ - url: '/pagesC/Physicalexamination/Physicalexamination' - }) - + if (this.openid) { + uni.navigateTo({ + url: '/pagesC/Physicalexamination/Physicalexamination' + }) + } else { + this.nologin() + } }, // 服务预约 goappoint() { - uni.navigateTo({ - url: '/pagesC/ServiceAppointment/ServiceAppointment' - }) + if (this.openid) { + uni.navigateTo({ + url: '/pagesC/ServiceAppointment/ServiceAppointment' + }) + } else { + this.nologin() + } }, // 服务记录 servicerecord() { - uni.navigateTo({ - url: '/pagesC/servicerecord/servicerecord' - }) + if (this.openid) { + uni.navigateTo({ + url: '/pagesC/servicerecord/servicerecord' + }) + } else { + this.nologin() + } + }, // 我的预约 myappointment() { + if (this.openid) { + uni.navigateTo({ + url: '/pagesC/Myappointment/Myappointment' + }) + } else { + this.nologin() + } + }, + gologin() { uni.navigateTo({ - url: '/pagesC/Myappointment/Myappointment' + url: '/pages/login/login' }) }, login() { @@ -153,4 +204,4 @@ \ No newline at end of file + diff --git a/pages/myinformation/myinformation.vue b/pages/myinformation/myinformation.vue index 38f9bd4..0ba8dd2 100644 --- a/pages/myinformation/myinformation.vue +++ b/pages/myinformation/myinformation.vue @@ -90,7 +90,7 @@ 常用功能 - + 健康档案 @@ -305,6 +305,12 @@ this.gologin(); } }, + //健康档案 + goHealthrecords() { + uni.navigateTo({ + url: '/pagesC/Healthrecords/Healthrecords' + }) + }, //全部订单 goorder(index, item) { console.log(index, item) @@ -380,9 +386,9 @@ } }, // 专家咨询订单 - expertOrder(){ + expertOrder() { uni.navigateTo({ - url:"/pagesB/ExpertlookOrder/ExpertlookOrder" + url: "/pagesB/ExpertlookOrder/ExpertlookOrder" }) } } From ac3859727ed3c230ae1c850720daccf64b7044c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Mon, 9 Oct 2023 13:30:00 +0800 Subject: [PATCH 2/5] =?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/pagesC/seekadvicefrom.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 api/pagesC/seekadvicefrom.js diff --git a/api/pagesC/seekadvicefrom.js b/api/pagesC/seekadvicefrom.js new file mode 100644 index 0000000..e69de29 From 190bdc13705d50c66988d85ccf27fcef4fe90c27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Mon, 9 Oct 2023 13:47:07 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 32 ++++++++++++------- .../imagetextConsultation.vue | 8 +++++ pagesC/seekadvicefrom/seekadvicefrom.vue | 25 +++++++++------ 3 files changed, 45 insertions(+), 20 deletions(-) diff --git a/pages.json b/pages.json index 65698b9..0c45fe6 100644 --- a/pages.json +++ b/pages.json @@ -91,6 +91,18 @@ "navigationBarTitleText": "院内陪护", "enablePullDownRefresh": false } + }, { + "path": "imagetextConsultation/imagetextConsultation", + "style": { + "navigationBarTitleText": "图文问诊", + "enablePullDownRefresh": false + } + }, { + "path": "createnewconsultation/createnewconsultation", + "style": { + "navigationBarTitleText": "新建图文问诊", + "enablePullDownRefresh": false + } }, { "path": "appointmenttime/appointmenttime", "style": { @@ -466,17 +478,15 @@ "navigationBarTitleText": "体征检测", "enablePullDownRefresh": false } - } - ,{ - "path" : "seekadvicefrom/seekadvicefrom", - "style" : - { - "navigationBarTitleText": "咨询医生", - "enablePullDownRefresh": false - } + }, { + "path": "seekadvicefrom/seekadvicefrom", + "style": { + "navigationBarTitleText": "咨询医生", + "enablePullDownRefresh": false + } - } - ] + } + ] }], "globalStyle": { "navigationBarTextStyle": "white", @@ -525,4 +535,4 @@ // } ] } -} +} \ No newline at end of file diff --git a/pagesB/imagetextConsultation/imagetextConsultation.vue b/pagesB/imagetextConsultation/imagetextConsultation.vue index b606e50..c6c2b99 100644 --- a/pagesB/imagetextConsultation/imagetextConsultation.vue +++ b/pagesB/imagetextConsultation/imagetextConsultation.vue @@ -25,6 +25,9 @@ @@ -147,6 +273,14 @@ border-radius: 5rpx; padding-bottom: 50rpx; + .textarea { + font-size: 18rpx; + font-weight: 400; + color: #8E8E8E; + line-height: 42rpx; + padding: 30rpx 0 0 40rpx; + } + .text { font-size: 30rpx; font-weight: 400; @@ -154,6 +288,10 @@ padding: 30rpx 0 0 40rpx; } + ::v-deep .u-upload { + padding: 30rpx 30rpx 0 30rpx; + } + .input { width: 90%; height: 80rpx; @@ -186,6 +324,15 @@ color: #8E8E8E !important; } + .inputtext { + padding-left: 12rpx; + color: black; + font-size: 26rpx; + width: 90%; + height: 80rpx; + line-height: 80rpx; + } + .uinput { color: black; font-size: 26rpx; diff --git a/pagesB/imagetextConsultation/imagetextConsultation.vue b/pagesB/imagetextConsultation/imagetextConsultation.vue index c6c2b99..bc9218f 100644 --- a/pagesB/imagetextConsultation/imagetextConsultation.vue +++ b/pagesB/imagetextConsultation/imagetextConsultation.vue @@ -3,12 +3,12 @@ + :class="formdata.status==item.status?'Selectedtext':''" @tap='selecttitltext(item)'> {{item.text}} - + 2023-12-12 12:12 @@ -27,32 +27,48 @@ diff --git a/pagesB/information/information.vue b/pagesB/information/information.vue index a7b6ea5..26ecf1d 100644 --- a/pagesB/information/information.vue +++ b/pagesB/information/information.vue @@ -397,4 +397,4 @@ + \ No newline at end of file diff --git a/pagesC/seekadvicefrom/seekadvicefrom.vue b/pagesC/seekadvicefrom/seekadvicefrom.vue index 640741b..84c69ba 100644 --- a/pagesC/seekadvicefrom/seekadvicefrom.vue +++ b/pagesC/seekadvicefrom/seekadvicefrom.vue @@ -76,7 +76,7 @@ sendMessage, getChatHistory, markRead - } from '@/api/pagesC/seekadvicefrom.js'; + } from '@/api/pagesC/seekadvicefrom/seekadvicefrom.js'; export default { data() { return { From 31887d0eee38b48aad26f8ed756bbe7c0644cf9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Tue, 10 Oct 2023 10:24:50 +0800 Subject: [PATCH 5/5] =?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/pagesC/seekadvicefrom/seekadvicefrom.js | 10 +- .../imagetextConsultation.vue | 58 ++++++- pagesB/modify/modify.vue | 2 +- pagesC/seekadvicefrom/seekadvicefrom.vue | 159 +++++++++--------- static/pagesB/userl.png | Bin 10296 -> 0 bytes 5 files changed, 141 insertions(+), 88 deletions(-) delete mode 100644 static/pagesB/userl.png diff --git a/api/pagesC/seekadvicefrom/seekadvicefrom.js b/api/pagesC/seekadvicefrom/seekadvicefrom.js index d03a092..a6ed7df 100644 --- a/api/pagesC/seekadvicefrom/seekadvicefrom.js +++ b/api/pagesC/seekadvicefrom/seekadvicefrom.js @@ -3,7 +3,7 @@ import request from "@/api/request.js" // 发送即使消息 export function sendMessage(data) { return request({ - url: `/jn/fm/message/send`, + url: `/nurseApplet/chatRecord/sendMessage`, method: 'post', data: data }) @@ -11,9 +11,9 @@ export function sendMessage(data) { // 查询聊天记录 -export function getChatHistory(data) { +export function getChatRecord(data) { return request({ - url: `/jn/fm/message/getChatList`, + url: `/nurseApplet/chatRecord/getChatRecord`, method: 'get', data: data }) @@ -22,8 +22,8 @@ export function getChatHistory(data) { // 标记为已读 export function markRead(data) { return request({ - url: `/jn/fm/message/markRead`, - method: 'get', + url: `/nurseApplet/chatRecord/updateReadStatus`, + method: 'PUT', data: data }) } \ No newline at end of file diff --git a/pagesB/imagetextConsultation/imagetextConsultation.vue b/pagesB/imagetextConsultation/imagetextConsultation.vue index bc9218f..3e98e15 100644 --- a/pagesB/imagetextConsultation/imagetextConsultation.vue +++ b/pagesB/imagetextConsultation/imagetextConsultation.vue @@ -4,20 +4,28 @@ - {{item.text}} + + + {{item.text}} + - + - 2023-12-12 12:12 + {{item.createTime?item.createTime:''}} - 张三 + {{item.doctorName?item.doctorName:''}} - 你好,请问今天下午方便吗 + {{item.problemDescription?item.problemDescription:''}} + + + {{item.messageCount}} @@ -76,6 +84,12 @@ url: "/pagesB/createnewconsultation/createnewconsultation" }) }, + //前往聊天 + goseekadvicefrom(item) { + uni.navigateTo({ + url: `/pagesC/seekadvicefrom/seekadvicefrom?item=${JSON.stringify(item)}` + }) + }, }, onReachBottom() { //下滑加载 if (this.listinfo.length >= this.listtotal) {} else { @@ -89,7 +103,7 @@ }) } }, - onPullDownRefresh() { //下拉刷新 + onPullDownRefresh() { //上拉刷新 this.formdata.pageNum = 1; this.info(); setTimeout(function() { @@ -123,6 +137,21 @@ background: #F6F6F6; border-radius: 5rpx; + .messageCount { + position: absolute; + top: 50%; + right: 5%; + width: 33rpx; + height: 33rpx; + background: #F44B2F; + border-radius: 50%; + font-size: 24rpx; + font-weight: 400; + color: #FFFFFF; + line-height: 33rpx; + text-align: center; + } + .text { position: absolute; left: 190rpx; @@ -187,6 +216,23 @@ border-radius: 5rpx; width: 25%; color: #26A888; + position: relative; + + .topright { + width: 33rpx; + height: 33rpx; + background: #FFA115; + border-radius: 50%; + text-align: center; + line-height: 33rpx; + font-size: 24rpx; + font-weight: 400; + color: #FFFFFF; + position: absolute; + right: 0; + top: 0; + transform: translate(50%, -50%); + } } .Selectedtext { diff --git a/pagesB/modify/modify.vue b/pagesB/modify/modify.vue index 4336d38..34bbcf9 100644 --- a/pagesB/modify/modify.vue +++ b/pagesB/modify/modify.vue @@ -3,7 +3,7 @@ - + 点击编辑头像 diff --git a/pagesC/seekadvicefrom/seekadvicefrom.vue b/pagesC/seekadvicefrom/seekadvicefrom.vue index 84c69ba..7581de0 100644 --- a/pagesC/seekadvicefrom/seekadvicefrom.vue +++ b/pagesC/seekadvicefrom/seekadvicefrom.vue @@ -5,25 +5,28 @@ {{currentItem.senderName}} --> - - - - - {{item.content}} - - - - - - {{item.senderName}} + + + + + {{item.content}} + - - + + - - + + @@ -34,7 +37,7 @@ v-model="formData.content" :hold-keyboard="true" :confirm-type="'send'" :confirm-hold="true" placeholder-style="color:#DDDDDD;" :cursor-spacing="10" /> - + @@ -74,23 +77,20 @@