diff --git a/pages.json b/pages.json index fd964f8..ce84e86 100644 --- a/pages.json +++ b/pages.json @@ -311,6 +311,42 @@ } }, { + "path": "myAppointment/myAppointment", + "style": { + "navigationBarTitleText": "我的预约", + "navigationStyle": "custom", + "enablePullDownRefresh": false, + "backgroundTextStyle": "dark" + } + }, + { + "path": "myAppointment/detail/detail", + "style": { + "navigationBarTitleText": "预约详情", + "navigationStyle": "custom", + "enablePullDownRefresh": false, + "backgroundTextStyle": "dark" + } + }, + { + "path": "myOrder/detail/detail", + "style": { + "navigationBarTitleText": "订单详情", + "navigationStyle": "custom", + "enablePullDownRefresh": false, + "backgroundTextStyle": "dark" + } + }, + { + "path": "myOrder/myOrder", + "style": { + "navigationBarTitleText": "我的订单", + "navigationStyle": "custom", + "enablePullDownRefresh": false, + "backgroundTextStyle": "dark" + } + }, + { "path": "carLearProgress/carLearProgress", "style": { "navigationBarTitleText": "学车进度", diff --git a/pages/mineEntry/carLearnHours/carLearnHours.vue b/pages/mineEntry/carLearnHours/carLearnHours.vue index 7debaea..780b493 100644 --- a/pages/mineEntry/carLearnHours/carLearnHours.vue +++ b/pages/mineEntry/carLearnHours/carLearnHours.vue @@ -2,24 +2,24 @@ - - 模拟器 + + {{ item.text }} 总学时 - 100分钟 + {{ item.total }}分钟 已完成 - 90分钟 + {{ item.time }}分钟 - + - + @@ -28,42 +28,54 @@ \ No newline at end of file diff --git a/pages/mineEntry/myAppointment/comp/imitate.vue b/pages/mineEntry/myAppointment/comp/imitate.vue new file mode 100644 index 0000000..65552ab --- /dev/null +++ b/pages/mineEntry/myAppointment/comp/imitate.vue @@ -0,0 +1,51 @@ + + + + + \ No newline at end of file diff --git a/pages/mineEntry/myAppointment/comp/opera.vue b/pages/mineEntry/myAppointment/comp/opera.vue new file mode 100644 index 0000000..9232713 --- /dev/null +++ b/pages/mineEntry/myAppointment/comp/opera.vue @@ -0,0 +1,54 @@ + + + + + \ No newline at end of file diff --git a/pages/mineEntry/myAppointment/detail/detail.vue b/pages/mineEntry/myAppointment/detail/detail.vue new file mode 100644 index 0000000..5b70fe4 --- /dev/null +++ b/pages/mineEntry/myAppointment/detail/detail.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/pages/mineEntry/myAppointment/detail/examin.vue b/pages/mineEntry/myAppointment/detail/examin.vue new file mode 100644 index 0000000..1a1e947 --- /dev/null +++ b/pages/mineEntry/myAppointment/detail/examin.vue @@ -0,0 +1,49 @@ + + + + + \ No newline at end of file diff --git a/pages/mineEntry/myAppointment/detail/imitate.vue b/pages/mineEntry/myAppointment/detail/imitate.vue new file mode 100644 index 0000000..215d20e --- /dev/null +++ b/pages/mineEntry/myAppointment/detail/imitate.vue @@ -0,0 +1,51 @@ + + + + + \ No newline at end of file diff --git a/pages/mineEntry/myAppointment/detail/opera.vue b/pages/mineEntry/myAppointment/detail/opera.vue new file mode 100644 index 0000000..ce3c07e --- /dev/null +++ b/pages/mineEntry/myAppointment/detail/opera.vue @@ -0,0 +1,51 @@ + + + + + \ No newline at end of file diff --git a/pages/mineEntry/myAppointment/myAppointment.vue b/pages/mineEntry/myAppointment/myAppointment.vue new file mode 100644 index 0000000..5ad3505 --- /dev/null +++ b/pages/mineEntry/myAppointment/myAppointment.vue @@ -0,0 +1,133 @@ + + + + + \ No newline at end of file diff --git a/pages/mineEntry/myOrder/comp/comp.scss b/pages/mineEntry/myOrder/comp/comp.scss new file mode 100644 index 0000000..af55205 --- /dev/null +++ b/pages/mineEntry/myOrder/comp/comp.scss @@ -0,0 +1,109 @@ +.consultItem { + width: 100%; + + .top_row { + display: flex; + width: 100%; + height: 116rpx; + border-bottom: 2rpx dashed #E8E9EC; + justify-content: space-between; + align-items: center; + + .tag { + // width: 176rpx; + height: 60rpx; + background: rgba(250, 149, 25, 0.1); + border-radius: 8rpx; + text-align: center; + font-size: 28rpx; + color: #FA7919; + margin-right: 24rpx; + padding: 10rpx 18rpx; + } + + .schoolName { + font-size: 28rpx; + color: #333; + margin-left: 20rpx; + } + + .status { + display: flex; + align-items: center; + + .text { + font-size: 28rpx; + color: $themC; + } + } + } + + .target { + border-bottom: 2rpx dashed #E8E9EC; + } + + .row { + display: flex; + justify-content: space-between; + padding: 24rpx 0; + + .leftLab { + display: flex; + align-items: center; + + .icon { + width: 30rpx; + height: 30rpx; + } + + .lab { + margin-left: 10rpx; + font-size: 28rpx; + color: #ADADAD; + } + } + + .name { + font-size: 28rpx; + color: #333; + } + } + + .border_bottom { + border-top: 2rpx dashed #E8E9EC; + padding: 10rpx 10rpx 16rpx 0; + + .dateBox { + .date { + font-size: 28rpx; + color: #ADADAD; + margin-bottom: 16rpx; + } + } + + .btnBg { + width: 212rpx; + margin: 30rpx auto; + + } + } + } + + .rows { + display: flex; + justify-content: space-between; + padding: 16rpx 0; + font-size: 28rpx; + color: #ADADAD; + .label { + &.hui { + color: #686B73; + } + } + .value { + &.blue { + color: $themC; + font-weight: 500; + } + } + } \ No newline at end of file diff --git a/pages/mineEntry/myOrder/comp/opera.vue b/pages/mineEntry/myOrder/comp/opera.vue new file mode 100644 index 0000000..6c4f69f --- /dev/null +++ b/pages/mineEntry/myOrder/comp/opera.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/pages/mineEntry/myOrder/detail/comp/refundInfo.vue b/pages/mineEntry/myOrder/detail/comp/refundInfo.vue new file mode 100644 index 0000000..2fa2112 --- /dev/null +++ b/pages/mineEntry/myOrder/detail/comp/refundInfo.vue @@ -0,0 +1,103 @@ + + + + + \ No newline at end of file diff --git a/pages/mineEntry/myOrder/detail/detail.vue b/pages/mineEntry/myOrder/detail/detail.vue new file mode 100644 index 0000000..5a1fe88 --- /dev/null +++ b/pages/mineEntry/myOrder/detail/detail.vue @@ -0,0 +1,148 @@ + + + + + \ No newline at end of file diff --git a/pages/mineEntry/myOrder/myOrder.vue b/pages/mineEntry/myOrder/myOrder.vue new file mode 100644 index 0000000..787d919 --- /dev/null +++ b/pages/mineEntry/myOrder/myOrder.vue @@ -0,0 +1,118 @@ + + + + + \ No newline at end of file diff --git a/pages/mineEntry/schoolTransfer/schoolTransfer.vue b/pages/mineEntry/schoolTransfer/schoolTransfer.vue new file mode 100644 index 0000000..ca99fb0 --- /dev/null +++ b/pages/mineEntry/schoolTransfer/schoolTransfer.vue @@ -0,0 +1,141 @@ + + + + + \ No newline at end of file diff --git a/pages/tabbar/mine/index.vue b/pages/tabbar/mine/index.vue index 4ea3775..20494df 100644 --- a/pages/tabbar/mine/index.vue +++ b/pages/tabbar/mine/index.vue @@ -72,10 +72,12 @@ { text: '我的预约', icon: require('../../../static/images/userCenter/ic_yuyue.png'), + url: '/pages/mineEntry/myAppointment/myAppointment' }, { text: '我的订单', icon: require('../../../static/images/userCenter/ic_dingdan.png'), + url: '/pages/mineEntry/myOrder/myOrder' }, { text: '学车数据', diff --git a/static/images/bigImg/carlearTimeBg.png b/static/images/bigImg/carlearTimeBg.png new file mode 100644 index 0000000..ed574a4 Binary files /dev/null and b/static/images/bigImg/carlearTimeBg.png differ diff --git a/static/images/userCenter/btn_yinhangkax.png b/static/images/userCenter/btn_yinhangkax.png new file mode 100644 index 0000000..741efa6 Binary files /dev/null and b/static/images/userCenter/btn_yinhangkax.png differ diff --git a/static/images/userCenter/warn.png b/static/images/userCenter/warn.png new file mode 100644 index 0000000..02c84c7 Binary files /dev/null and b/static/images/userCenter/warn.png differ