diff --git a/App.vue b/App.vue index e44e088..eb58fc8 100644 --- a/App.vue +++ b/App.vue @@ -48,4 +48,8 @@ page { background-color: #F4F5F9; } + + .u-navbar { + border-radius: 0 0 40rpx 40rpx; + } diff --git a/pages.json b/pages.json index ad67f88..e89641f 100644 --- a/pages.json +++ b/pages.json @@ -27,6 +27,18 @@ "navigationStyle": "custom" } }, + { + "path": "pages/map/map", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/detailNursing/detailNursing", + "style": { + "navigationStyle": "custom" + } + }, { "path": "pages/login/login", "style": { @@ -53,26 +65,26 @@ "color": "#ABAEBE", "selectedColor": "#1479FF", "list": [{ - "iconPath": "/static/tabbar/首页 copy.png", - "selectedIconPath": "/static/tabbar/首页.png", + "iconPath": "/static/tabbar/home.png", + "selectedIconPath": "/static/tabbar/home-active.png", "pagePath": "pages/home/home", "text": "首页" }, { "iconPath": "/static/tabbar/notification.png", - "selectedIconPath": "/static/tabbar/notification 2.png", + "selectedIconPath": "/static/tabbar/notification-active.png", "pagePath": "pages/todayNursing/todayNursing", "text": "今日护理" }, { - "iconPath": "/static/tabbar/日历@2x.png", - "selectedIconPath": "/static/tabbar/日历2@2x.png", + "iconPath": "/static/tabbar/canlendar.png", + "selectedIconPath": "/static/tabbar/canlendar-active.png", "pagePath": "pages/nursingCalendar/nursingCalendar", "text": "护理日历" }, { - "iconPath": "/static/tabbar/列表@2x.png", - "selectedIconPath": "/static/tabbar/列表 2@2x.png", + "iconPath": "/static/tabbar/list.png", + "selectedIconPath": "/static/tabbar/list-active.png", "pagePath": "pages/list/list", "text": "护理列表" } diff --git a/pages/detailNursing/detailNursing.vue b/pages/detailNursing/detailNursing.vue new file mode 100644 index 0000000..8c26201 --- /dev/null +++ b/pages/detailNursing/detailNursing.vue @@ -0,0 +1,252 @@ + + + + + diff --git a/pages/home/home.vue b/pages/home/home.vue index c27c9f7..ed4db5e 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -26,7 +26,7 @@ + style="background-image: url('../../static/home/swiper-pic.png');background-size: 100% 100%;"> 四世同堂服务管理 @@ -121,21 +121,23 @@ - - - - - - - - {{item.title}} + + + + + - - {{item.time}} + + + {{item.title}} + + + {{item.time}} + - + @@ -168,12 +170,10 @@ }], infoList: [{ title: "学习护理让老年人活动康复的训练", - icon: "/static/logo.png", time: "2022-06-26 12:23:45" }, { title: "学习护理让老年人活动康复的训练", - icon: "/static/logo.png", time: "2022-06-26 12:23:45" } ] @@ -601,7 +601,12 @@ padding: 38rpx 0 20rpx 0; - .info-icon {} + .info-icon { + border-radius: 100%; + background-color: rgba(20, 121, 255, 0.2); + + padding: 20rpx; + } .info-content { diff --git a/pages/list/list.vue b/pages/list/list.vue index cdc72a0..c055268 100644 --- a/pages/list/list.vue +++ b/pages/list/list.vue @@ -1,25 +1,410 @@ \ No newline at end of file + //下拉自定义 + /deep/.u-dropdown__menu { + justify-content: space-evenly !important; + } + + /deep/.u-dropdown__menu__item { + width: 224rpx !important; + flex: none !important; + height: 70rpx; + background: #FFFFFF; + border-radius: 10rpx; + justify-content: space-between !important; + } + + /deep/.u-flex { + flex: 1; + } + + /deep/.u-dropdown__menu__item__text { + flex: 1 !important; + font-size: 32rpx !important; + font-family: PingFang-SC-Medium, PingFang-SC !important; + font-weight: 500 !important; + color: #333333 !important; + text-align: center; + + padding: 12rpx 0rpx !important; + } + + /deep/.u-dropdown__menu__item__arrow { + width: 70rpx !important; + height: 70rpx !important; + background: rgba(20, 121, 255, 0.1) !important; + border-radius: 10rpx !important; + border: 2rpx solid #FFFFFF !important; + display: flex; + justify-content: center; + align-items: center; + } + + .search { + width: 710rpx; + height: 70rpx; + background: #FFFFFF; + border: 2rpx solid #FAFBFC; + display: flex; + align-items: center; + justify-content: space-between; + + margin: 24rpx 24rpx 0 24rpx; + + .input-content { + + margin-left: 30rpx; + } + + .icon { + + + margin-right: 30rpx; + } + } + + .drop-down { + margin-top: 20rpx; + } + + .nursing-list { + + margin-top: 10rpx; + + .list-item { + width: 710rpx; + background: #FFFFFF; + box-shadow: 0rpx 4rpx 10rpx 0rpx 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: 28rpx; + 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 { + + 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: space-between; + 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/login/login.vue b/pages/login/login.vue index e16563e..9612c7c 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -1,5 +1,5 @@ @@ -58,13 +104,21 @@ export default { data() { return { + opsionts: (() => { + let res = [] + for (let i = 0; i < 20; i++) { + res.push(new Date().getFullYear() - i) + } + return res + })(), + isShowCell: false, //时间选择 select: { year: new Date().getFullYear(), month: new Date().getMonth() + 1 }, //当前选择日期 - dateIndex: null, + dateIndex: new Date().getDate(), calendar: '', params: { year: true, @@ -74,10 +128,39 @@ minute: false, second: false }, - show: false, + selectUserList: [{ + name: "王新", + time: "09:00", + status: 2 + }, + { + name: "王新", + time: "09:00", + status: 0 + }, + { + name: "王新", + time: "09:00", + status: 1 + }, + ] } }, methods: { + monthPlus() { + this.$u.throttle(() => { + if (this.select.month < 12) { + this.select.month++ + } + }) + }, + monthMin() { + this.$u.throttle(() => { + if (this.select.month > 1) { + this.select.month-- + } + }) + }, dateClick(date, index1) { if (date.type === 0) { this.dateIndex = date.date @@ -169,20 +252,40 @@ } }, computed: { - + getDay() { + return function(date) { + if (!date) { + return " " + } + let dayList = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'] + return dayList[new Date(date).getDay()] ?? " " + } + }, + formatStatus() { + return function(status) { + switch (status) { + case 0: + return "待护理" + break; + case 1: + return "进行中" + break; + case 2: + return "已完成" + break; + default: + return "未知" + } + } + } }, watch: { - year: { + select: { handler(newVal, oldVal) { this.getCalendar(this.select.year, this.select.month) }, - immediate: false - }, - month: { - handler(newVal, oldVal) { - this.getCalendar(this.select.year, this.select.month) - }, - immediate: true + immediate: true, + deep: true } } } @@ -190,10 +293,6 @@ diff --git a/pages/todayNursing/todayNursing.vue b/pages/todayNursing/todayNursing.vue index e94b9b4..4649e0b 100644 --- a/pages/todayNursing/todayNursing.vue +++ b/pages/todayNursing/todayNursing.vue @@ -5,8 +5,8 @@ 护理地图 - - + + @@ -55,14 +55,14 @@ - + {{item.distance}} 去那里 - + @@ -108,7 +108,14 @@ } }, methods: { - + //跳转护理地图 + toMap() { + uni.$u.throttle(() => { + uni.navigateTo({ + url: "/pages/map/map" + }) + }) + } }, computed: { @@ -117,11 +124,6 @@