diff --git a/pages.json b/pages.json index 788933e..bad5b55 100644 --- a/pages.json +++ b/pages.json @@ -393,13 +393,22 @@ } }, { - "path": "servicerecord/servicerecord", - "style": { - "navigationBarTitleText": "服务记录", - "enablePullDownRefresh": false + "path": "servicerecord/servicerecord", + "style": { + "navigationBarTitleText": "服务记录", + "enablePullDownRefresh": false + } } - } - ] + ,{ + "path" : "Myappointment/Myappointment", + "style" : + { + "navigationBarTitleText": "我的预约", + "enablePullDownRefresh": false + } + + } + ] }], "globalStyle": { "navigationBarTextStyle": "white", diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue index 14abb4e..e8d74f6 100644 --- a/pages/homepage/homepage.vue +++ b/pages/homepage/homepage.vue @@ -33,13 +33,13 @@ - + 我的预约 - + 服务记录 @@ -98,6 +98,18 @@ url: '/pagesC/ServiceAppointment/ServiceAppointment' }) }, + // 服务记录 + servicerecord(){ + uni.navigateTo({ + url: '/pagesC/servicerecord/servicerecord' + }) + }, + // 我的预约 + myappointment(){ + uni.navigateTo({ + url:'/pagesC/Myappointment/Myappointment' + }) + }, login() { const _this = this uni.login({ @@ -124,4 +136,4 @@ \ No newline at end of file + diff --git a/pagesB/site/site.vue b/pagesB/site/site.vue index 7a9ca68..34c26c1 100644 --- a/pagesB/site/site.vue +++ b/pagesB/site/site.vue @@ -24,7 +24,7 @@ 周边医养机构 - + @@ -319,4 +319,4 @@ \ No newline at end of file + diff --git a/pagesC/Myappointment/Myappointment.scss b/pagesC/Myappointment/Myappointment.scss new file mode 100644 index 0000000..fe6a70a --- /dev/null +++ b/pagesC/Myappointment/Myappointment.scss @@ -0,0 +1,127 @@ +.app{ + height: 100vh; + background-color: #F7F5F5; + padding-top: 20rpx; + overflow: scroll; + ::v-deep .u-tabs-scroll-flex { + background: #F7F5F5; + width: 60%; + } + + ::v-deep .u-scroll-view { + background: #F7F5F5 !important; + + } + .record { + width: 95%; + height: 332rpx; + background: #FFFFFF; + box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03); + border-radius: 5rpx; + margin: 0 auto; + position: relative; + font-family: Source Han Sans CN; + margin-bottom: 15rpx; + + .top { + position: absolute; + background: red; + width: 90%; + left: 5%; + top: 7%; + span:nth-child(1) { + font-size: 32rpx; + font-weight: 600; + color: #000000; + position: absolute; + } + span:nth-child(2) { + font-weight: 500; + font-size: 28rpx; + font-weight: 600; + color: #26A888; + position: absolute; + right: 0%; + } + + } + + .recorddata { + width: 95%; + position: relative; + top: 26%; + left: 50%; + transform: translateX(-50%); + border-bottom: 1rpx solid #E6E6E6; + padding-left: 3%; + + .recordbottom { + margin-bottom: 30rpx !important; + } + + .recorditem { + width: 100%; + font-size: 28rpx; + font-family: Source Han Sans CN; + font-weight: 400; + color: #868585; + margin-bottom: 34rpx; + + span { + margin-left: 20rpx; + } + } + } + + .evaluate { + .evaluatedata { + position: absolute; + width: 169rpx; + height: 61rpx; + background: #26A888; + border-radius: 5rpx; + text-align: center; + font-size: 28rpx; + font-weight: 400; + color: #FFFFFF; + line-height: 61rpx; + bottom: 8%; + right: 4%; + } + span:nth-child(1) { + display: inline-block; + position: absolute; + height: 22rpx; + font-size: 28rpx; + font-weight: 400; + color: #868585; + left: 5%; + bottom: 16%; + } + + span:nth-child(2) { + display: inline-block; + position: absolute; + height: 22rpx; + font-size: 28rpx; + font-weight: 400; + color: #868585; + left: 25%; + bottom: 16%; + } + + span:nth-child(3) { + display: inline-block; + position: absolute; + left: 49%; + bottom: 11%; + font-size: 28rpx; + font-weight: 400; + color: #868585; + // left: 25%; + } + } + } + + + } \ No newline at end of file diff --git a/pagesC/Myappointment/Myappointment.vue b/pagesC/Myappointment/Myappointment.vue new file mode 100644 index 0000000..d007f27 --- /dev/null +++ b/pagesC/Myappointment/Myappointment.vue @@ -0,0 +1,88 @@ + + + + + diff --git a/pagesC/ServiceAppointment/ServiceAppointment.scss b/pagesC/ServiceAppointment/ServiceAppointment.scss new file mode 100644 index 0000000..ad88fb6 --- /dev/null +++ b/pagesC/ServiceAppointment/ServiceAppointment.scss @@ -0,0 +1,108 @@ +.app { + height: 100vh; + background-color: #F7F5F5; + padding: 30rpx 0 0 0; + overflow: scroll; + + ::v-deep .u-navbar-placeholder { + background-color: #F7F5F5; + z-index: 999; + } + + .u-navbar { + display: block; + // height: 200rpx; + + image { + margin: 0 4% 0 4%; + width: 20rpx; + height: 30rpx; + } + + .title { + width: 31%; + font-size: 34rpx; + font-weight: 500; + color: #FFFFFF; + } + + .inputs { + position: relative; + // margin-left: 4%; + box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03); + width: 60%; + height: 65rpx; + border-radius: 31rpx; + z-index: 999; + background: #65c0a9; + color: #FFFFFF; + + .placeholder { + color: #FFFFFF; + } + + .input { + margin: 0 auto; + position: absolute; + height: 65rpx; + // top: 8%; + left: 18%; + width: 80%; + font-size: 26rpx; + color: #FFFFFF; + } + + .icon { + background: url(@/static/pagesB/sousuo.png) no-repeat; + width: 30rpx; + height: 28rpx; + background-size: cover; + position: absolute; + top: 28%; + left: 4%; + } + } + } + + .content { + position: relative; + width: 95%; + height: 183rpx; + background: #FFFFFF; + box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03); + border-radius: 5rpx; + margin: 15rpx auto; + + .servename { + padding: 0 50rpx 0 50rpx; + font-size: 28rpx; + font-family: Source Han Sans CN; + font-weight: 400; + color: #868585; + line-height: 38rpx; + } + + .appoint { + position: absolute; + right: 5%; + top: 50%; + transform: translateY(-50%); + width: 169rpx; + height: 61rpx; + background: #26A888; + border-radius: 5rpx; + line-height: 61rpx; + text-align: center; + color: #fff; + } + + .big { + padding: 35rpx 50rpx 30rpx 50rpx; + font-size: 32rpx; + font-family: Source Han Sans CN; + font-weight: 500; + color: #000000; + line-height: 38rpx; + } + } + } \ No newline at end of file diff --git a/pagesC/ServiceAppointment/ServiceAppointment.vue b/pagesC/ServiceAppointment/ServiceAppointment.vue index ec704e3..3fa8ee2 100644 --- a/pagesC/ServiceAppointment/ServiceAppointment.vue +++ b/pagesC/ServiceAppointment/ServiceAppointment.vue @@ -62,112 +62,5 @@ diff --git a/pagesC/servicerecord/servicerecord.scss b/pagesC/servicerecord/servicerecord.scss index 7ee3d5f..17eb6b5 100644 --- a/pagesC/servicerecord/servicerecord.scss +++ b/pagesC/servicerecord/servicerecord.scss @@ -53,7 +53,7 @@ span:nth-child(3) { font-weight: 500; font-size: 28rpx; - font-weight: 500; + font-weight: 600; color: #26A888; position: absolute; // left: 18%;