diff --git a/components/AQ/AQTabber.vue b/components/AQ/AQTabber.vue index 586909b..73a2837 100644 --- a/components/AQ/AQTabber.vue +++ b/components/AQ/AQTabber.vue @@ -1,7 +1,7 @@ @@ -14,9 +14,9 @@ }, data() { return { - userType:'1',//用户类型|1=教练,2=销售,3=学员 - tabBerIndex:'0', - tabBar: [] + userType:'1',//用户类型|1=教练,2=销售,3=学员 + tabBerIndex:'0', + tabBar: [] }; }, @@ -27,7 +27,7 @@ methods: { async init(){ - uni.setStorageSync('userType','1') + uni.setStorageSync('userType','3') let userType = uni.getStorageSync('userType') this.userType = userType @@ -106,25 +106,25 @@ } ] break; - case "3"://学员 + case "3"://学员 this.tabBar = [ { text: "首页", urlPath:'/pages/student/index/index',//自定义页面跳转路径 - iconPath: "/static/images/tabbar/my.png", - selectedIconPath: "/static/images/tabbar/my.png" + iconPath: "/static/images/tabbar/index.png", + selectedIconPath: "/static/images/tabbar/indexs.png", }, { text: "课表", urlPath:'/pages/student/timetable/index',//自定义页面跳转路径 - iconPath: "/static/images/tabbar/my.png", - selectedIconPath: "/static/images/tabbar/my.png" + iconPath: "/static/images/tabbar/timetable.png", + selectedIconPath: "/static/images/tabbar/timetables.png", }, { text: "我的", urlPath:'/pages/student/my/my',//自定义页面跳转路径 iconPath: "/static/images/tabbar/my.png", - selectedIconPath: "/static/images/tabbar/my.png" + selectedIconPath: "/static/images/tabbar/mys.png", } ] break; diff --git a/pages.json b/pages.json index 6dddd70..53556c3 100644 --- a/pages.json +++ b/pages.json @@ -5,7 +5,7 @@ "style": { "navigationBarTitleText": "首页", "navigationStyle": "default", - "navigationBarBackgroundColor": "#fff", + "navigationBarBackgroundColor": "#29d3b4", "navigationBarTextStyle": "white" } }, @@ -45,10 +45,15 @@ "navigationBarTextStyle": "black" } }, - - - - + { + "path": "pages/student/index/work_details", + "style": { + "navigationBarTitleText": "作业详情", + "navigationStyle": "default", + "navigationBarBackgroundColor": "#fff", + "navigationBarTextStyle": "black" + } + }, { "path": "pages/coach/home/index", "style": { @@ -112,7 +117,6 @@ "navigationBarTextStyle": "white" } } - ], "globalStyle": { "navigationBarTextStyle": "white", diff --git a/pages/student/index/index.vue b/pages/student/index/index.vue index 2310948..4f04d32 100644 --- a/pages/student/index/index.vue +++ b/pages/student/index/index.vue @@ -1,95 +1,133 @@ - \ No newline at end of file diff --git a/pages/student/index/work_details.vue b/pages/student/index/work_details.vue new file mode 100644 index 0000000..8183fd0 --- /dev/null +++ b/pages/student/index/work_details.vue @@ -0,0 +1,22 @@ + + + + + diff --git a/pages/student/login/forgot.vue b/pages/student/login/forgot.vue index 86bbd7b..a5986cc 100644 --- a/pages/student/login/forgot.vue +++ b/pages/student/login/forgot.vue @@ -1,36 +1,38 @@ @@ -39,66 +41,27 @@ export default { data() { return { - password: true, + code: '', user: '', - password1: '' + tset_style: 1, } }, onLoad() { - uni.hideHomeButton() - console.log(uni.getStorageSync('um_id')) + }, methods: { - input(e) { - console.log(e) - }, - change() { - this.password = !this.password - }, - login() { - let item = {}; - item['user'] = this.user - item['password'] = this.password1 - medication.medication_login(item).then(res => { - if (res.status == 200) { - uni.setStorageSync('um_id', res.data.um_id); - uni.setStorageSync('user', res.data); - uni.switchTab({ - - url: '/pages/my/my' - }) - } else { - uni.showToast({ - title: res.msg, - icon: 'none' - }) - } - }); - }, - loginWx() { - uni.login({ - provider: 'weixin', - success: (res) => { - console.log(res) - medication.wechatminilogin({ - code: res.code - }).then(res1 => { - if (res1.status == 200) { - uni.setStorageSync('um_id', res1.data.um_id); - uni.setStorageSync('user', res1.data); - uni.switchTab({ - url: '/pages/my/my' - }) - } else { - uni.showToast({ - title: res.msg, - icon: 'none' - }) - } - }) - } - }); + sendCode() { + //延时为了效果展示 + setTimeout(() => { + //发送短信 + //... + //success方法：短信发送成功后将组件改为倒计时状态 + this.$refs.fui_cdv && this.$refs.fui_cdv.success() + }, 800) }, + nextStep(){ + this.tset_style = 2 + } } } @@ -116,26 +79,18 @@ padding-right: 24rpx; } - .image-container { - margin: auto; - position: relative; - width: 150rpx; - /* 设置与第一张图片相同的宽度 */ - height: 150rpx; - /* 设置与第一张图片相同的高度 */ - } - - .base-image { + .title { + display: flex; + justify-content: space-around; + align-items: center; + height: 100rpx; width: 100%; - height: 100%; + background-color: #fff; + font-size: 26rpx; + border: 4rpx #f5f5f5 solid; } - - .overlay-image { - position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); - width: 100rpx; - height: 100rpx; + + .green-text{ + color: #36d6b9; } \ No newline at end of file diff --git a/static/images/index/dian.png b/static/images/index/dian.png new file mode 100644 index 0000000..7bbab5e Binary files /dev/null and b/static/images/index/dian.png differ diff --git a/static/images/index/score.png b/static/images/index/score.png new file mode 100644 index 0000000..ce0d1a4 Binary files /dev/null and b/static/images/index/score.png differ diff --git a/static/images/tabbar/bai.png b/static/images/tabbar/bai.png deleted file mode 100644 index 65c97db..0000000 Binary files a/static/images/tabbar/bai.png and /dev/null differ diff --git a/static/images/tabbar/home.png b/static/images/tabbar/home.png deleted file mode 100644 index 10d7bbb..0000000 Binary files a/static/images/tabbar/home.png and /dev/null differ diff --git a/static/images/tabbar/home_selected.png b/static/images/tabbar/home_selected.png deleted file mode 100644 index 95bc5cf..0000000 Binary files a/static/images/tabbar/home_selected.png and /dev/null differ diff --git a/static/images/tabbar/index.png b/static/images/tabbar/index.png index 70eb131..f236d73 100644 Binary files a/static/images/tabbar/index.png and b/static/images/tabbar/index.png differ diff --git a/static/images/tabbar/index_selected.png b/static/images/tabbar/index_selected.png deleted file mode 100644 index 62656aa..0000000 Binary files a/static/images/tabbar/index_selected.png and /dev/null differ diff --git a/static/images/tabbar/indexs.png b/static/images/tabbar/indexs.png new file mode 100644 index 0000000..10eae10 Binary files /dev/null and b/static/images/tabbar/indexs.png differ diff --git a/static/images/tabbar/mart.png b/static/images/tabbar/mart.png deleted file mode 100644 index 97cdf9a..0000000 Binary files a/static/images/tabbar/mart.png and /dev/null differ diff --git a/static/images/tabbar/mart_selected.png b/static/images/tabbar/mart_selected.png deleted file mode 100644 index 41b80b9..0000000 Binary files a/static/images/tabbar/mart_selected.png and /dev/null differ diff --git a/static/images/tabbar/my.png b/static/images/tabbar/my.png index 60a5ed5..8d59279 100644 Binary files a/static/images/tabbar/my.png and b/static/images/tabbar/my.png differ diff --git a/static/images/tabbar/my_selected.png b/static/images/tabbar/my_selected.png deleted file mode 100644 index 6ba8f21..0000000 Binary files a/static/images/tabbar/my_selected.png and /dev/null differ diff --git a/static/images/tabbar/mys.png b/static/images/tabbar/mys.png new file mode 100644 index 0000000..b68c932 Binary files /dev/null and b/static/images/tabbar/mys.png differ diff --git a/static/images/tabbar/order.png b/static/images/tabbar/order.png deleted file mode 100644 index 6b60d0b..0000000 Binary files a/static/images/tabbar/order.png and /dev/null differ diff --git a/static/images/tabbar/order_selected.png b/static/images/tabbar/order_selected.png deleted file mode 100644 index bdfc8bf..0000000 Binary files a/static/images/tabbar/order_selected.png and /dev/null differ diff --git a/static/images/tabbar/timetable.png b/static/images/tabbar/timetable.png new file mode 100644 index 0000000..732683b Binary files /dev/null and b/static/images/tabbar/timetable.png differ diff --git a/static/images/tabbar/timetables.png b/static/images/tabbar/timetables.png new file mode 100644 index 0000000..9532a82 Binary files /dev/null and b/static/images/tabbar/timetables.png differ