diff --git a/components/appointItem-student/appointItem-student.vue b/components/appointItem-student/appointItem-student.vue new file mode 100644 index 0000000..c0f988f --- /dev/null +++ b/components/appointItem-student/appointItem-student.vue @@ -0,0 +1,106 @@ + + + + + \ No newline at end of file diff --git a/components/cardNav/cardNav.vue b/components/cardNav/cardNav.vue new file mode 100644 index 0000000..a24a15f --- /dev/null +++ b/components/cardNav/cardNav.vue @@ -0,0 +1,39 @@ + + + + + \ No newline at end of file diff --git a/components/scrollNav/scrollNav.vue b/components/scrollNav/scrollNav.vue new file mode 100644 index 0000000..abe94fa --- /dev/null +++ b/components/scrollNav/scrollNav.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/components/user-info/user-info.vue b/components/user-info/user-info.vue new file mode 100644 index 0000000..01d517a --- /dev/null +++ b/components/user-info/user-info.vue @@ -0,0 +1,86 @@ + + + + + \ No newline at end of file diff --git a/pages.json b/pages.json index e471985..75421d2 100644 --- a/pages.json +++ b/pages.json @@ -27,7 +27,15 @@ "backgroundTextStyle": "dark" } }, - + { + "path": "pages/tabbar/student/index", + "style": { + "navigationBarTitleText": "学员", + "navigationStyle": "custom", + "enablePullDownRefresh": true, + "backgroundTextStyle": "dark" + } + }, { "path": "pages/tabbar/mine/index", "style": { @@ -68,7 +76,7 @@ { "path": "settlement/settlement", "style": { - "navigationBarTitleText": "", + "navigationBarTitleText": "结算明细列表", "navigationStyle": "custom", "enablePullDownRefresh": false, "backgroundTextStyle": "dark" @@ -77,7 +85,7 @@ { "path": "settlement/detail/detail", "style": { - "navigationBarTitleText": "", + "navigationBarTitleText": "结算明细详情", "navigationStyle": "custom", "enablePullDownRefresh": false, "backgroundTextStyle": "dark" @@ -91,7 +99,16 @@ { "path": "examine/examineRecord/examineRecord", "style": { - "navigationBarTitleText": "", + "navigationBarTitleText": "考场记录", + "navigationStyle": "custom", + "enablePullDownRefresh": false, + "backgroundTextStyle": "dark" + } + }, + { + "path": "examine/examineRecord/detail/detail", + "style": { + "navigationBarTitleText": "考场训练详情", "navigationStyle": "custom", "enablePullDownRefresh": false, "backgroundTextStyle": "dark" @@ -100,12 +117,31 @@ { "path": "operate/detail/detail", "style": { - "navigationBarTitleText": "", + "navigationBarTitleText": "实操详情", + "navigationStyle": "custom", + "enablePullDownRefresh": false, + "backgroundTextStyle": "dark" + } + }, + { + "path": "student/studentDetail/studentDetail", + "style": { + "navigationBarTitleText": "学员详情", + "navigationStyle": "custom", + "enablePullDownRefresh": false, + "backgroundTextStyle": "dark" + } + }, + { + "path": "student/addStudent/addStudent", + "style": { + "navigationBarTitleText": "添加学员", "navigationStyle": "custom", "enablePullDownRefresh": false, "backgroundTextStyle": "dark" } } + ] }, { @@ -121,7 +157,52 @@ } } ] + }, + { + "root": "pages/userCenter", + "pages": [ + { + "path": "personaInfo/personaInfo", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom", + "enablePullDownRefresh": false, + "backgroundTextStyle": "dark" + } + } + ] + }, + { + "root": "pages/userCenter", + "pages": [ + { + "path": "scanCode/scanCode", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom", + "enablePullDownRefresh": false, + "backgroundTextStyle": "dark" + } + } + ] + }, + { + "root": "pages/userCenter", + "pages": [ + { + "path": "studentComment/studentComment", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom", + "enablePullDownRefresh": false, + "backgroundTextStyle": "dark" + } + } + ] } + + + ], "globalStyle": { "navigationBarTextStyle": "black", @@ -153,6 +234,12 @@ "selectedIconPath": "static/images/tabbar/scActive.png" }, { + "pagePath": "pages/tabbar/student/index", + "text": "学员", + "iconPath": "static/images/tabbar/xy.png", + "selectedIconPath": "static/images/tabbar/xyActive.png" + }, + { "pagePath": "pages/tabbar/mine/index", "text": "我的", "iconPath": "static/images/tabbar/wd.png", diff --git a/pages/recordEntry/examine/examineRecord/examineRecord.vue b/pages/recordEntry/examine/examineRecord/examineRecord.vue index 2850f57..ced4ac1 100644 --- a/pages/recordEntry/examine/examineRecord/examineRecord.vue +++ b/pages/recordEntry/examine/examineRecord/examineRecord.vue @@ -13,11 +13,11 @@ - {{ item.text }} + {{ item.text }} 12条记录 - + @@ -30,6 +30,7 @@ data() { return { currentTab: 1, + currentNav: 1, tabsList: [ {id: 1, text: '全部'}, {id: 2, text: '科目二'}, @@ -41,6 +42,13 @@ changeTab(num) { console.log(num) this.currentTab = num + }, + changeNav(item) { + this.currentNav = item.id + }, + goPage() { + console.log('------------') + this.$goPage('/pages/recordEntry/examine/examineRecord/detail/detail') } } } diff --git a/pages/recordEntry/student/addStudent/addStudent.vue b/pages/recordEntry/student/addStudent/addStudent.vue new file mode 100644 index 0000000..0e4f99e --- /dev/null +++ b/pages/recordEntry/student/addStudent/addStudent.vue @@ -0,0 +1,82 @@ + + + + + \ No newline at end of file diff --git a/pages/recordEntry/student/studentDetail/comp/comp.scss b/pages/recordEntry/student/studentDetail/comp/comp.scss new file mode 100644 index 0000000..6f3e03e --- /dev/null +++ b/pages/recordEntry/student/studentDetail/comp/comp.scss @@ -0,0 +1,109 @@ + + + + .h1 { + font-size: 32rpx; + color: #333; + font-weight: 500; + position: relative; + padding: 0 0 0 32rpx; + line-height: 108rpx; + height: 108rpx; + &::before { + position: absolute; + content: ''; + width: 8rpx; + height: 32rpx; + background: #1F6EFA; + border-radius: 4rpx; + top: 50%; + left: 0; + transform: translateY(-50%); + } + } + + .card { + background: #FFFFFF; + border-radius: 16rpx; + padding: 28rpx 32rpx; + margin-bottom: 20rpx; + &.mb0 { + margin-bottom: 0; + } + .flex-b { + align-items: center; + + .lab { + font-size: 28rpx; + color: #333; + } + + .btn { + width: 144rpx; + height: 56rpx; + background: #1989FA; + border-radius: 8rpx; + font-size: 28rpx; + color: #fff; + text-align: center; + line-height: 56rpx; + &.disable { + opacity: 0.3; + } + } + } + .date { + font-size: 28rpx; + color: #333; + } + } + + .learnStatus { + .more { + display: flex; + align-items: center; + .txt { + font-size: 24rpx; + color: #686B73; + } + + .moreIcon { + + } + } + .bg { + background: rgba(25,137,250,0.1); + border-radius: 16rpx; + margin-top: 22rpx; + padding: 20rpx 20rpx 0 20rpx; + .row { + padding-bottom: 20rpx; + display: flex; + justify-content: space-between; + width: 100%; + align-items: center; + &.oneBtn { + justify-content: center; + } + } + .text { + color: $themC; + font-size: 28rpx; + } + } + } + + .tpsLine { + font-size: 24rpx; + color: #ADADAD; + border-top: 1px solid #E8E9EC; + margin-top: 20rpx; + padding-top: 18rpx; + } + .cancel { + font-size: 28rpx; + font-weight: 400; + color: #ADADAD; + margin-top: 22rpx; + text-decoration: underline; + } \ No newline at end of file diff --git a/pages/recordEntry/student/studentDetail/comp/info.vue b/pages/recordEntry/student/studentDetail/comp/info.vue new file mode 100644 index 0000000..52b9eaf --- /dev/null +++ b/pages/recordEntry/student/studentDetail/comp/info.vue @@ -0,0 +1,102 @@ + + + + + \ No newline at end of file diff --git a/pages/recordEntry/student/studentDetail/comp/list.vue b/pages/recordEntry/student/studentDetail/comp/list.vue new file mode 100644 index 0000000..fbd6bd0 --- /dev/null +++ b/pages/recordEntry/student/studentDetail/comp/list.vue @@ -0,0 +1,37 @@ + + + + + \ No newline at end of file diff --git a/pages/recordEntry/student/studentDetail/studentDetail.vue b/pages/recordEntry/student/studentDetail/studentDetail.vue new file mode 100644 index 0000000..6844e05 --- /dev/null +++ b/pages/recordEntry/student/studentDetail/studentDetail.vue @@ -0,0 +1,88 @@ + + + + + \ No newline at end of file diff --git a/pages/tabbar/mine/index.vue b/pages/tabbar/mine/index.vue index 05d501f..ef3c1c7 100644 --- a/pages/tabbar/mine/index.vue +++ b/pages/tabbar/mine/index.vue @@ -1,6 +1,22 @@ @@ -9,6 +25,15 @@ export default { data() { return { + tabData: [ + {text: '待结算记录', icon: require('../../../static/images/coach/ic_daijiesuan.png'), id: 1}, + {text: '指标充值记录', icon: require('../../../static/images/coach/ic_zhibiao.png'), id: 2}, + {text: '我的车辆', icon: require('../../../static/images/coach/ic_cheliang.png'), id: 3}, + {text: '考场信息', icon: require('../../../static/images/coach/ic_changdi.png'), id: 4}, + {text: '学员评价', icon: require('../../../static/images/coach/ic_pingjia.png'), id: 5, url: '/pages/userCenter/studentComment/studentComment'}, + {text: '教学数据', icon: require('../../../static/images/coach/ic_shuju.png'), id: 6}, + {text: '学员退款', icon: require('../../../static/images/coach/ic_tuikuan.png'), id: 7}, + ] } }, onLoad() { @@ -24,8 +49,44 @@ diff --git a/pages/tabbar/student/index.vue b/pages/tabbar/student/index.vue new file mode 100644 index 0000000..f709ff8 --- /dev/null +++ b/pages/tabbar/student/index.vue @@ -0,0 +1,149 @@ + + + + + \ No newline at end of file diff --git a/pages/userCenter/personaInfo/personaInfo.vue b/pages/userCenter/personaInfo/personaInfo.vue new file mode 100644 index 0000000..dafc758 --- /dev/null +++ b/pages/userCenter/personaInfo/personaInfo.vue @@ -0,0 +1,91 @@ + + + + + \ No newline at end of file diff --git a/pages/userCenter/scanCode/scanCode.vue b/pages/userCenter/scanCode/scanCode.vue new file mode 100644 index 0000000..bb57272 --- /dev/null +++ b/pages/userCenter/scanCode/scanCode.vue @@ -0,0 +1,30 @@ + + + + + \ No newline at end of file diff --git a/pages/userCenter/studentComment/studentComment.vue b/pages/userCenter/studentComment/studentComment.vue new file mode 100644 index 0000000..4d71eba --- /dev/null +++ b/pages/userCenter/studentComment/studentComment.vue @@ -0,0 +1,31 @@ + + + + + \ No newline at end of file diff --git a/static/images/coach/avatar.png b/static/images/coach/avatar.png new file mode 100644 index 0000000..b8ddd8e Binary files /dev/null and b/static/images/coach/avatar.png differ diff --git a/static/images/coach/ic_changdi.png b/static/images/coach/ic_changdi.png new file mode 100644 index 0000000..658e3a6 Binary files /dev/null and b/static/images/coach/ic_changdi.png differ diff --git a/static/images/coach/ic_cheliang.png b/static/images/coach/ic_cheliang.png new file mode 100644 index 0000000..96508c0 Binary files /dev/null and b/static/images/coach/ic_cheliang.png differ diff --git a/static/images/coach/ic_daijiesuan.png b/static/images/coach/ic_daijiesuan.png new file mode 100644 index 0000000..c3c7512 Binary files /dev/null and b/static/images/coach/ic_daijiesuan.png differ diff --git a/static/images/coach/ic_erweima.png b/static/images/coach/ic_erweima.png new file mode 100644 index 0000000..fa993a1 Binary files /dev/null and b/static/images/coach/ic_erweima.png differ diff --git a/static/images/coach/ic_gengduo.png b/static/images/coach/ic_gengduo.png new file mode 100644 index 0000000..db353cd Binary files /dev/null and b/static/images/coach/ic_gengduo.png differ diff --git a/static/images/coach/ic_pingjia.png b/static/images/coach/ic_pingjia.png new file mode 100644 index 0000000..c3143c3 Binary files /dev/null and b/static/images/coach/ic_pingjia.png differ diff --git a/static/images/coach/ic_shicao_nor.png b/static/images/coach/ic_shicao_nor.png new file mode 100644 index 0000000..563d1b5 Binary files /dev/null and b/static/images/coach/ic_shicao_nor.png differ diff --git a/static/images/coach/ic_shuju.png b/static/images/coach/ic_shuju.png new file mode 100644 index 0000000..6e1fa2d Binary files /dev/null and b/static/images/coach/ic_shuju.png differ diff --git a/static/images/coach/ic_tuikuan.png b/static/images/coach/ic_tuikuan.png new file mode 100644 index 0000000..ef4fbf0 Binary files /dev/null and b/static/images/coach/ic_tuikuan.png differ diff --git a/static/images/coach/ic_zhibiao.png b/static/images/coach/ic_zhibiao.png new file mode 100644 index 0000000..7d1a722 Binary files /dev/null and b/static/images/coach/ic_zhibiao.png differ diff --git a/static/images/index/ic_jiaxiao_cli.png b/static/images/index/ic_jiaxiao_cli.png new file mode 100644 index 0000000..aad7224 Binary files /dev/null and b/static/images/index/ic_jiaxiao_cli.png differ