From a30c101bc39b77ef1a1eae1313c2378710d88d8a Mon Sep 17 00:00:00 2001 From: xy <271556543@qq.com> Date: Fri, 24 Feb 2023 17:21:34 +0800 Subject: [PATCH] 2023-2-24 --- pages/detailNursing/detailNursing.vue | 3 +- pages/home/home.vue | 300 +++++++++++++++++++++++++- pages/list/list.vue | 6 +- 3 files changed, 301 insertions(+), 8 deletions(-) diff --git a/pages/detailNursing/detailNursing.vue b/pages/detailNursing/detailNursing.vue index 60a7ab3..b1dfe67 100644 --- a/pages/detailNursing/detailNursing.vue +++ b/pages/detailNursing/detailNursing.vue @@ -259,7 +259,8 @@ longitude: this.location.lng }, success: (res) => { - this.location.address = res.result.address + console.log('mapjs',res); + this.location.address = res.result.address + res.result.formatted_addresses.recommend this.form.address = this.location.address resolve(res) }, diff --git a/pages/home/home.vue b/pages/home/home.vue index beaa66a..32613ac 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -155,6 +155,69 @@ {{detailNotice.title}} {{detailNotice.content}} + + + + + + + {{item.start_time}} + + + + 进行中 + 待护理 + 已完成 + + + + + + + + + + + + + {{item.customer.sex || '无'}} + + + + + + + 去那里 + + + + + + + + + + + + + + @@ -200,6 +263,8 @@ infoList: [], isShowNotice: false, detailNotice: {}, + isShowIng:false, + nursingList:[], } }, methods: { @@ -238,7 +303,32 @@ async getRemind() { let res = await this.$u.api.noticeList() this.infoList = res.data - } + }, + async getIngList() { + let res = await this.$u.api.nurseList({ + page:1, + page_size:999, + status:1 + }) + this.nursingList = res.data + }, + toThere(item) { + this.$u.throttle(() => { + uni.openLocation({ + latitude: Number(item.customer.lat), + longitude: Number(item.customer.lng), + name: item.customer.address + }) + }) + }, + //跳转详情 + toDetail(item) { + uni.$u.throttle(() => { + uni.navigateTo({ + url: `/pages/detailNursing/detailNursing?id=${item.id}` + }) + }) + }, }, computed: { dateFormat() { @@ -249,9 +339,13 @@ } } }, - onShow() { - this.getStatistic() - this.getRemind() + async onShow() { + await this.getStatistic() + await this.getRemind() + if(this.status.ing > 0){ + await this.getIngList() + this.isShowIng = true + } }, created() { const res = uni.getSystemInfoSync() @@ -707,4 +801,202 @@ padding: 0 10rpx; } + + .nursing-list { + + margin-top: 88rpx; + + .list-item { + width: 710rpx; + background: #FFFFFF; + filter: drop-shadow(0 0 10px rgba(219, 218, 218, 0.5)); + + margin: 0 20rpx 26rpx 22rpx; + + .top { + display: flex; + justify-content: space-between; + align-items: center; + + padding: 22rpx 0; + + .time { + height: 40rpx; + font-size: 40rpx; + font-family: PingFang-SC-Medium, PingFang-SC; + font-weight: 500; + color: #36596A; + line-height: 40rpx; + + padding-left: 20rpx; + } + + .status { + display: flex; + align-items: center; + + .status-icon { + + margin-right: 10rpx; + } + + .status-text { + width: 84rpx; + height: 40rpx; + font-size: 28rpx; + font-family: PingFang-SC-Medium, PingFang-SC; + font-weight: 500; + color: #36596A; + line-height: 40rpx; + + margin-right: 20rpx; + } + } + } + + .line { + width: 670rpx; + height: 2rpx; + border: 2rpx solid #EEEFF5; + + margin: 0 auto; + } + + .center { + display: flex; + justify-content: space-between; + + padding-top: 24rpx; + + .avatar { + + padding-top: 4rpx; + padding-left: 20rpx; + } + + .user-info-pop { + flex: 1; + + padding-left: 24rpx; + + .name { + width: 270rpx; + height: 48rpx; + font-size: 32rpx; + font-family: PingFang-SC-Medium, PingFang-SC; + font-weight: 500; + color: #333333; + } + + .tel { + height: 40rpx; + font-size: 28rpx; + font-family: PingFang-SC-Medium, PingFang-SC; + font-weight: 500; + color: #36596A; + line-height: 40rpx; + display: flex; + + margin-top: 18rpx; + + .text { + + margin-left: 10rpx; + } + } + + .address { + font-size: 28rpx; + font-family: PingFang-SC-Medium, PingFang-SC; + font-weight: 500; + color: #36596A; + line-height: 40rpx; + display: flex; + + margin-top: 14rpx; + + .text { + + margin-left: 10rpx; + } + } + } + + .sex { + width: 40rpx; + height: 40rpx; + background: #FDECEC; + opacity: 0.5; + display: flex; + justify-content: center; + align-items: center; + + margin-right: 20rpx; + + .sex-text { + width: 28rpx; + height: 34rpx; + font-size: 28rpx; + font-family: PingFang-SC-Medium, PingFang-SC; + font-weight: 500; + color: #36596A; + line-height: 34rpx; + } + } + } + + .bottom { + display: flex; + justify-content: flex-end; + align-items: center; + + margin-top: 16rpx; + padding-bottom: 26rpx; + + .distance { + align-items: center; + display: flex; + + .distance-icon { + + padding-left: 20rpx; + } + + .distance-text { + height: 34rpx; + font-size: 24rpx; + font-family: PingFang-SC-Medium, PingFang-SC; + font-weight: 500; + color: #A7AFBC; + line-height: 34rpx; + + padding-left: 20rpx; + } + } + + .to-there { + display: flex; + align-items: center; + + margin-right: 20rpx; + + .to-there-text { + height: 34rpx; + font-size: 24rpx; + font-family: PingFang-SC-Medium, PingFang-SC; + font-weight: 500; + color: #A7AFBC; + line-height: 34rpx; + + margin-right: 14rpx; + } + + .to-there-icon { + + margin-left: 3rpx; + } + } + } + } + } diff --git a/pages/list/list.vue b/pages/list/list.vue index 055cbc5..fe09d89 100644 --- a/pages/list/list.vue +++ b/pages/list/list.vue @@ -6,7 +6,7 @@ - @@ -68,7 +68,7 @@ - {{item.customer.sex}} + {{item.customer.sex || '无'}} @@ -369,7 +369,7 @@ .time { height: 40rpx; - font-size: 28rpx; + font-size: 40rpx; font-family: PingFang-SC-Medium, PingFang-SC; font-weight: 500; color: #36596A;