diff --git a/pages.json b/pages.json index 5318295..bb0d979 100644 --- a/pages.json +++ b/pages.json @@ -98,7 +98,19 @@ "path": "comment/commentWrite" }, { - "path": "service/index" + "path": "applyService/index" + }, + { + "path": "checkup/checkupRecords" + }, + { + "path": "checkup/checkupBook/apply" + }, + { + "path": "checkup/checkupBook/detail" + }, + { + "path": "checkup/checkupReport/index" }, diff --git a/pages/index/center.vue b/pages/index/center.vue index 4da99af..d9d485c 100644 --- a/pages/index/center.vue +++ b/pages/index/center.vue @@ -27,7 +27,7 @@ - + {{ item.label }} @@ -39,8 +39,7 @@ - - + {{ item.label }} @@ -60,6 +59,8 @@ diff --git a/pages_order/service/index.vue b/pages_order/applyService/index.vue similarity index 100% rename from pages_order/service/index.vue rename to pages_order/applyService/index.vue diff --git a/pages_order/service/productCard.vue b/pages_order/applyService/productCard.vue similarity index 100% rename from pages_order/service/productCard.vue rename to pages_order/applyService/productCard.vue diff --git a/pages_order/service/serviceSelectPopup.vue b/pages_order/applyService/serviceSelectPopup.vue similarity index 98% rename from pages_order/service/serviceSelectPopup.vue rename to pages_order/applyService/serviceSelectPopup.vue index 3d56107..376c93f 100644 --- a/pages_order/service/serviceSelectPopup.vue +++ b/pages_order/applyService/serviceSelectPopup.vue @@ -140,7 +140,7 @@ // todo: submit this.$store.commit('setApplyServiceProduct', productList) - this.$utils.navigateTo(`/pages_order/service/index?id=${this.id}&type=${type}`) + this.$utils.navigateTo(`/pages_order/applyService/index?id=${this.id}&type=${type}`) this.close() diff --git a/pages_order/checkup/checkupBook/apply.vue b/pages_order/checkup/checkupBook/apply.vue new file mode 100644 index 0000000..a35c186 --- /dev/null +++ b/pages_order/checkup/checkupBook/apply.vue @@ -0,0 +1,533 @@ + + + + + \ No newline at end of file diff --git a/pages_order/checkup/checkupBook/detail.vue b/pages_order/checkup/checkupBook/detail.vue new file mode 100644 index 0000000..63444f2 --- /dev/null +++ b/pages_order/checkup/checkupBook/detail.vue @@ -0,0 +1,286 @@ + + + + + \ No newline at end of file diff --git a/pages_order/checkup/checkupBook/style.scss b/pages_order/checkup/checkupBook/style.scss new file mode 100644 index 0000000..1a527ed --- /dev/null +++ b/pages_order/checkup/checkupBook/style.scss @@ -0,0 +1,126 @@ + +.page__view { + width: 100vw; + min-height: 100vh; + background-color: $uni-bg-color; + position: relative; + + /deep/ .nav-bar__view { + position: fixed; + top: 0; + left: 0; + } +} + +.main { + padding: calc(var(--status-bar-height) + 144rpx) 32rpx 224rpx 32rpx; +} + +.card { + padding: 32rpx; + background: #FAFAFF; + border: 2rpx solid #FFFFFF; + border-radius: 32rpx; + + & + & { + margin-top: 40rpx; + } + + &-header { + font-family: PingFang SC; + font-weight: 500; + font-size: 36rpx; + line-height: 1.4; + color: #252545; + margin-bottom: 32rpx; + } +} + +.row { + justify-content: space-between; + font-family: PingFang SC; + font-weight: 400; + line-height: 1.4; + column-gap: 24rpx; + + & + & { + margin-top: 32rpx; + } + + &-label { + flex: none; + font-size: 26rpx; + color: #8B8B8B; + } + + &-content { + font-size: 32rpx; + color: #181818; + } +} + +.form { + padding: 8rpx 0 0 0; + + &-item { + border-bottom: 2rpx solid #EEEEEE; + + &:last-child { + border: none; + } + + & + & { + margin-top: 40rpx; + } + + &-label { + font-family: PingFang SC; + font-weight: 400; + font-size: 26rpx; + line-height: 1.4; + color: #181818; + } + + &-content { + margin-top: 14rpx; + padding: 6rpx 0; + + .text { + padding: 2rpx 0; + font-family: PingFang SC; + font-weight: 400; + font-size: 32rpx; + line-height: 1.4; + + &.placeholder { + color: #C6C6C6; + } + } + } + } +} + +.bottom { + position: fixed; + left: 0; + bottom: 0; + + width: 100vw; + height: 200rpx; + padding: 24rpx 40rpx; + background: #FFFFFF; + box-sizing: border-box; + + .btn { + width: 100%; + padding: 16rpx 0; + box-sizing: border-box; + font-family: PingFang SC; + font-weight: 500; + font-size: 36rpx; + line-height: 1; + color: #FFFFFF; + background-image: linear-gradient(to right, #4B348F, #845CFA); + border-radius: 41rpx; + } +} diff --git a/pages_order/checkup/checkupCard.vue b/pages_order/checkup/checkupCard.vue new file mode 100644 index 0000000..7765501 --- /dev/null +++ b/pages_order/checkup/checkupCard.vue @@ -0,0 +1,241 @@ + + + + + \ No newline at end of file diff --git a/pages_order/checkup/checkupRecords.vue b/pages_order/checkup/checkupRecords.vue new file mode 100644 index 0000000..05b45d5 --- /dev/null +++ b/pages_order/checkup/checkupRecords.vue @@ -0,0 +1,196 @@ + + + + + \ No newline at end of file diff --git a/pages_order/checkup/checkupReport/index.vue b/pages_order/checkup/checkupReport/index.vue new file mode 100644 index 0000000..6821539 --- /dev/null +++ b/pages_order/checkup/checkupReport/index.vue @@ -0,0 +1,331 @@ + + + + + \ No newline at end of file diff --git a/pages_order/checkup/checkupReport/progressCircleLine.vue b/pages_order/checkup/checkupReport/progressCircleLine.vue new file mode 100644 index 0000000..74e0646 --- /dev/null +++ b/pages_order/checkup/checkupReport/progressCircleLine.vue @@ -0,0 +1,336 @@ + + + + + \ No newline at end of file diff --git a/pages_order/checkup/checkupReport/progressLine.vue b/pages_order/checkup/checkupReport/progressLine.vue new file mode 100644 index 0000000..ff94a42 --- /dev/null +++ b/pages_order/checkup/checkupReport/progressLine.vue @@ -0,0 +1,86 @@ + + + + + \ No newline at end of file diff --git a/pages_order/checkup/checkupReport/reportAbnormalView.vue b/pages_order/checkup/checkupReport/reportAbnormalView.vue new file mode 100644 index 0000000..b99f9c8 --- /dev/null +++ b/pages_order/checkup/checkupReport/reportAbnormalView.vue @@ -0,0 +1,80 @@ + + + + + \ No newline at end of file diff --git a/pages_order/checkup/checkupReport/reportCommonView.vue b/pages_order/checkup/checkupReport/reportCommonView.vue new file mode 100644 index 0000000..5b6975d --- /dev/null +++ b/pages_order/checkup/checkupReport/reportCommonView.vue @@ -0,0 +1,239 @@ + + + + + \ No newline at end of file diff --git a/pages_order/checkup/checkupReport/reportMainIndexView.vue b/pages_order/checkup/checkupReport/reportMainIndexView.vue new file mode 100644 index 0000000..4876224 --- /dev/null +++ b/pages_order/checkup/checkupReport/reportMainIndexView.vue @@ -0,0 +1,86 @@ + + + + + \ No newline at end of file diff --git a/pages_order/checkup/checkupReport/reportSummaryView.vue b/pages_order/checkup/checkupReport/reportSummaryView.vue new file mode 100644 index 0000000..9e1458d --- /dev/null +++ b/pages_order/checkup/checkupReport/reportSummaryView.vue @@ -0,0 +1,241 @@ + + + + + \ No newline at end of file diff --git a/pages_order/checkup/checkupReport/style.scss b/pages_order/checkup/checkupReport/style.scss new file mode 100644 index 0000000..8caca51 --- /dev/null +++ b/pages_order/checkup/checkupReport/style.scss @@ -0,0 +1,17 @@ + + + .tag { + padding: 6rpx 16rpx; + font-family: PingFang SC; + font-weight: 400; + font-size: 20rpx; + line-height: 1.4; + color: #FFFFFF; + background-image: linear-gradient(90deg, #4B348F, #845CFA); + border-top-left-radius: 24rpx; + border-bottom-right-radius: 24rpx; + + &.is-error { + background-image: linear-gradient(90deg, #8F3434, #FA5C5C); + } + } diff --git a/pages_order/checkup/checkupServicePopup.vue b/pages_order/checkup/checkupServicePopup.vue new file mode 100644 index 0000000..ed5477a --- /dev/null +++ b/pages_order/checkup/checkupServicePopup.vue @@ -0,0 +1,67 @@ + + + + + \ No newline at end of file diff --git a/pages_order/checkup/checkupTrackingNoPopup.vue b/pages_order/checkup/checkupTrackingNoPopup.vue new file mode 100644 index 0000000..4bafd90 --- /dev/null +++ b/pages_order/checkup/checkupTrackingNoPopup.vue @@ -0,0 +1,184 @@ + + + + + \ No newline at end of file diff --git a/pages_order/order/orderDetail/index.vue b/pages_order/order/orderDetail/index.vue index 391278b..f1334e3 100644 --- a/pages_order/order/orderDetail/index.vue +++ b/pages_order/order/orderDetail/index.vue @@ -113,6 +113,7 @@ +