From 94dd0b2240d9d62ee10da569d660f9d6150f4e33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Wed, 25 Oct 2023 09:12:31 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/Modifyphonenumber/Modifyphonenumber.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pages/Modifyphonenumber/Modifyphonenumber.vue b/pages/Modifyphonenumber/Modifyphonenumber.vue index df1f93f..f19004c 100644 --- a/pages/Modifyphonenumber/Modifyphonenumber.vue +++ b/pages/Modifyphonenumber/Modifyphonenumber.vue @@ -57,7 +57,8 @@ \ No newline at end of file + diff --git a/pages/seekadvicefrom/seekadvicefrom.vue b/pages/seekadvicefrom/seekadvicefrom.vue index c351dc7..b4d9982 100644 --- a/pages/seekadvicefrom/seekadvicefrom.vue +++ b/pages/seekadvicefrom/seekadvicefrom.vue @@ -11,12 +11,12 @@ - {{item.content}} - - + {{item.content}} + + - + {{item.senderName}} {{item.content}} @@ -24,7 +24,7 @@ - + @@ -87,7 +87,7 @@ return { baseurl: '', title: '', - SOCKETURL: 'ws://8.131.93.145:54088/webSocket/', + SOCKETURL: 'ws://192.168.16.212:8088/webSocket/', socketOpen: false, sendInfo: {}, currentItem: '', @@ -154,9 +154,9 @@ this.baseurl = baseurl; // uni.closeSocket() this.currentItem = JSON.parse(options.item) - this.title = this.currentItem.doctorName //导航栏标题 - this.userName = this.currentItem.patientName - this.SOCKETURL = this.SOCKETURL + this.currentItem.patientId + this.title = this.currentItem.patientName //导航栏标题 + this.userName = this.currentItem.doctorName + this.SOCKETURL = this.SOCKETURL + this.currentItem.doctorId this.getPageHistory() this.scoket() }, @@ -192,7 +192,7 @@ Read() { let markReadData = { consultationId: this.currentItem.id, - recipientId: this.currentItem.doctorId, + recipientId: this.currentItem.patientId, } markRead(markReadData) }, @@ -234,16 +234,17 @@ if (this.socketOpen == false) { return } - this.newsList.push({ - senderName: this.userName, - content: this.formData.content + that.newsList.push({ + senderName: that.currentItem.doctorName, + content: that.formData.content, + messageType: 1, }) let obj = { consultationId: that.currentItem.id, - senderId: that.currentItem.patientId, - senderName: that.currentItem.patientName, - recipientId: that.currentItem.doctorId, - recipientName: that.currentItem.doctorName, + recipientId: that.currentItem.patientId, + recipientName: that.currentItem.patientName, + senderId: that.currentItem.doctorId, + senderName: that.currentItem.doctorName, messageType: 1, sendTime: new Date(), content: this.formData.content @@ -382,7 +383,8 @@ res.tempFilePaths.forEach(e => { that.newsList.push({ imgurl: e, - senderName: that.userName, + messageType: 2, + senderName: that.currentItem.doctorName, }) uni.uploadFile({ url: baseurl + @@ -395,10 +397,10 @@ var fileurls = JSON.parse(resp.data) let obj = { consultationId: that.currentItem.id, - senderId: that.currentItem.patientId, - senderName: that.currentItem.patientName, - recipientId: that.currentItem.doctorId, - recipientName: that.currentItem.doctorName, + recipientId: that.currentItem.patientId, + recipientName: that.currentItem.patientName, + senderId: that.currentItem.doctorId, + senderName: that.currentItem.doctorName, messageType: 2, sendTime: new Date(), content: fileurls.fileUrl @@ -462,7 +464,8 @@ console.log("webScoket监听收到的信息", res); that.newsList.push({ senderName: that.currentItem.patientName, - content: JSON.parse(res.data).message + content: JSON.parse(res.data).message, + messageType: JSON.parse(res.data).message }) that.Read() }) @@ -752,4 +755,4 @@ bottom: 38rpx; } } - \ No newline at end of file + From ac6724c4f4e43f9d6e7c3462137613ce203d5b88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Wed, 25 Oct 2023 11:20:45 +0800 Subject: [PATCH 3/4] =?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 | 7 - pages/Completedwork/Completedwork.vue | 197 -------------------------- pages/homepage/homepage.vue | 43 +----- pages/taskDetails/taskDetails.vue | 12 ++ 4 files changed, 16 insertions(+), 243 deletions(-) delete mode 100644 pages/Completedwork/Completedwork.vue diff --git a/pages.json b/pages.json index edb4983..cc9f6f5 100644 --- a/pages.json +++ b/pages.json @@ -16,13 +16,6 @@ "enablePullDownRefresh": false } }, - { - "path": "pages/Completedwork/Completedwork", - "style": { - "navigationBarTitleText": "已完成工单", - "enablePullDownRefresh": false - } - }, { "path": "pages/Changepassword/Changepassword", "style": { diff --git a/pages/Completedwork/Completedwork.vue b/pages/Completedwork/Completedwork.vue deleted file mode 100644 index 58fa2d9..0000000 --- a/pages/Completedwork/Completedwork.vue +++ /dev/null @@ -1,197 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue index d88d85b..1cf8c98 100644 --- a/pages/homepage/homepage.vue +++ b/pages/homepage/homepage.vue @@ -64,11 +64,6 @@ {{item.problemDescription}} - - - {{item.serviceAddress}} - - 待接单 @@ -88,7 +83,7 @@ 接单 + style="background-color:#18CBB3;color: #fff;" v-if="item.orderStatus=='RECEIVED_GOODS'"> 完成 @@ -224,7 +219,7 @@ //详情 gotaskDetails(item) { uni.navigateTo({ - url: `/pages/taskDetails/taskDetails?id=${item.consultationInfoId}` + url: `/pages/taskDetails/taskDetails?id=${item.consultationInfoId}&title=${item.orderStatus}` }) }, //完成 @@ -297,13 +292,7 @@ }) }, tabschange(index) { - console.log(index) this.tabscurrent = index; - if(this.tabscurrent==2){ - uni.navigateTo({ - url:'/pages/Completedwork/Completedwork' - }) - } this.query.orderStatus = this.tabslist[index].value this.optionname = '全部' this.optionindex = 0 @@ -526,7 +515,7 @@ height: 60rpx; text-align: center; line-height: 55rpx; - border-radius: 5rpx; + border-radius: 50rpx; border: 1px solid #18CBB3; position: absolute; } @@ -544,30 +533,6 @@ } } - .address { - position: relative; - - .text { - width: 80%; - } - - - .p { - padding-left: 30rpx; - font-size: 24rpx; - color: #EA706A; - } - - image { - position: absolute; - top: 50%; - left: 0rpx; - transform: translateY(-40%); - width: 25rpx; - height: 25rpx; - } - } - .time { line-height: 60rpx; font-size: 24rpx; @@ -669,4 +634,4 @@ ::v-deep .u-cell-box {} } } - + \ No newline at end of file diff --git a/pages/taskDetails/taskDetails.vue b/pages/taskDetails/taskDetails.vue index 2ee7bb6..74fab0c 100644 --- a/pages/taskDetails/taskDetails.vue +++ b/pages/taskDetails/taskDetails.vue @@ -61,11 +61,23 @@ list: null, baseurl: null, fileUrls: [], + title: '', }; }, onLoad(options) { this.baseurl = baseurl this.info(options.id) + this.title = options.title + if (options.title == 'COMPLETED') { + this.title = '已完成工单' + } else { + this.title = '工单详情' + } + }, + onReady() { //更改导航栏文字 + uni.setNavigationBarTitle({ + title: this.title, + }); }, methods: { previewImage(index) { From 9e5575278f94ccefb46ef40668b175b801725918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Wed, 25 Oct 2023 11:32:27 +0800 Subject: [PATCH 4/4] =?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 | 49 +----------- pages/taskReturn/taskReturn.vue | 136 +++++++++++++------------------- 2 files changed, 57 insertions(+), 128 deletions(-) diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue index 1cf8c98..dc2614e 100644 --- a/pages/homepage/homepage.vue +++ b/pages/homepage/homepage.vue @@ -95,21 +95,6 @@ - - - 退回原因： - - - - - 取消 - - - 退回 - - - + 专家咨询（{{tasklist.patientName}}） - - ￥200 + ￥0 + - 时间：111 - + 时间：{{tasklist.appointmentDate}}{{' '+tasklist.appointmentStartTime}}{{'-'+tasklist.appointmentEndTime}} - - 地点：2032 - + 地点：{{tasklist.address}} @@ -38,14 +32,15 @@ - {{item.name}} + {{item.name}} + :clearable='false' v-if="list[4].checked" /> - + 立即提交 @@ -54,17 +49,15 @@ @@ -155,12 +128,13 @@ ::v-deep .u-checkbox { height: 80rpx !important; } - ::v-deep .u-checkbox__label{ + + ::v-deep .u-checkbox__label { font-size: 24rpx !important; font-family: SourceHanSansSC-Medium, SourceHanSansSC; font-weight: 500 !important; color: #333333 !important; - + } .app { @@ -171,14 +145,14 @@ height: 70rpx; background: #18CBB3; border-radius: 50rpx; - + text-align: center; line-height: 70rpx; color: #fff; position: fixed; - bottom: 60rpx; - left: 50%; - transform: translateX(-50%); + bottom: 60rpx; + left: 50%; + transform: translateX(-50%); } .checkboxs { @@ -196,8 +170,8 @@ margin: 30rpx auto 0; color: #333333; border-radius: 14rpx; - - + + } .top { @@ -209,7 +183,7 @@ .time { line-height: 90rpx; - + font-size: 24rpx; font-family: SourceHanSansSC-Medium, SourceHanSansSC; font-weight: 500; @@ -244,7 +218,7 @@ .text { line-height: 100rpx; padding-left: 34rpx; - + font-size: 32rpx; font-family: SourceHanSansSC-Medium, SourceHanSansSC; font-weight: 500;