diff --git a/App.vue b/App.vue index 2211627..be961be 100644 --- a/App.vue +++ b/App.vue @@ -2,7 +2,7 @@ export default { onLaunch: function() { console.log('App Launch') - // uni.hideTabBar(); + uni.hideTabBar(); }, onShow: function() { console.log('App Show') diff --git a/components/UserTab/UserTab.vue b/components/UserTab/UserTab.vue index 8554ae9..f1097d4 100644 --- a/components/UserTab/UserTab.vue +++ b/components/UserTab/UserTab.vue @@ -93,8 +93,8 @@ { "pagePath": "/pages/tabbar/examSimulation/index", "text": "预约记录", - "iconPath": "../../static/images/tabbar/xy.png", - "selectedIconPath": "../../static/images/tabbar/xyActive.png" + "iconPath": "../../static/images/tabbar/kc.png", + "selectedIconPath": "../../static/images/tabbar/kcActive.png" }, { "pagePath": "/pages/tabbar/mine/index", diff --git a/components/timeScreen/timeScreen.vue b/components/timeScreen/timeScreen.vue new file mode 100644 index 0000000..3bae95f --- /dev/null +++ b/components/timeScreen/timeScreen.vue @@ -0,0 +1,125 @@ + + + + + \ No newline at end of file diff --git a/pages.json b/pages.json index 386116a..d22bbe2 100644 --- a/pages.json +++ b/pages.json @@ -47,29 +47,7 @@ } ], "subPackages": [ - { - "root": "pages/userCenter", - "pages": [ - { - "path": "login/login", - "style": { - "navigationBarTitleText": "登录", - "navigationStyle": "custom", - "enablePullDownRefresh": false, - "backgroundTextStyle": "dark" - } - }, - { - "path": "login/loginByPhone", - "style": { - "navigationBarTitleText": "手机号登录", - "navigationStyle": "custom", - "enablePullDownRefresh": false, - "backgroundTextStyle": "dark" - } - } - ] - }, + { "root": "pages/indexEntry", "pages": [ @@ -207,6 +185,33 @@ "root": "pages/userCenter", "pages": [ { + "path": "login/login", + "style": { + "navigationBarTitleText": "登录", + "navigationStyle": "custom", + "enablePullDownRefresh": false, + "backgroundTextStyle": "dark" + } + }, + { + "path": "login/loginByPhone", + "style": { + "navigationBarTitleText": "手机号登录", + "navigationStyle": "custom", + "enablePullDownRefresh": false, + "backgroundTextStyle": "dark" + } + }, + { + "path": "forgetPwd/forgetPwd", + "style": { + "navigationBarTitleText": "修改密码", + "navigationStyle": "custom", + "enablePullDownRefresh": false, + "backgroundTextStyle": "dark" + } + }, + { "path": "personaInfo/personaInfo", "style": { "navigationBarTitleText": "", diff --git a/pages/recordEntry/examine/examineRecord/examineRecord.vue b/pages/recordEntry/examine/examineRecord/examineRecord.vue index ced4ac1..9218166 100644 --- a/pages/recordEntry/examine/examineRecord/examineRecord.vue +++ b/pages/recordEntry/examine/examineRecord/examineRecord.vue @@ -16,7 +16,15 @@ {{ item.text }} - 12条记录 + + 12条记录 + + 筛选 + + + + + @@ -63,12 +71,29 @@ background: #1989FA; padding-bottom: 20rpx; } - .total { - font-size: 24rpx; - color: #686B73; - text-align: right; - line-height: 70rpx; + .total_row { + display: flex; + justify-content: space-between; + height: 82rpx; + align-items: center; + .total { + font-size: 24rpx; + color: #686B73; + text-align: right; + line-height: 82rpx; + } + .screen { + display: flex;align-items: center; + color: $themC; + margin-left: 8rpx; + font-size: 28rpx; + .icon { + width: 24rpx; + height: 24rpx; + } + } } + .card { padding: 0 20rpx; } @@ -87,6 +112,7 @@ text-align: center; line-height: 72rpx; color: #ADADAD; + font-size: 28rpx; &.active { background: rgba(25,137,250,0.1); border-radius: 16rpx; diff --git a/pages/tabbar/examSimulation/comp/coach.vue b/pages/tabbar/examSimulation/comp/coach.vue new file mode 100644 index 0000000..05d6de0 --- /dev/null +++ b/pages/tabbar/examSimulation/comp/coach.vue @@ -0,0 +1,188 @@ + + + + + \ No newline at end of file diff --git a/pages/tabbar/examSimulation/comp/examSimulation.vue b/pages/tabbar/examSimulation/comp/examSimulation.vue new file mode 100644 index 0000000..9218166 --- /dev/null +++ b/pages/tabbar/examSimulation/comp/examSimulation.vue @@ -0,0 +1,153 @@ + + + + + \ No newline at end of file diff --git a/pages/tabbar/examSimulation/index.vue b/pages/tabbar/examSimulation/index.vue index 05d6de0..1e568d8 100644 --- a/pages/tabbar/examSimulation/index.vue +++ b/pages/tabbar/examSimulation/index.vue @@ -1,188 +1,23 @@ \ No newline at end of file diff --git a/pages/userCenter/forgetPwd/forgetPwd.vue b/pages/userCenter/forgetPwd/forgetPwd.vue new file mode 100644 index 0000000..b809a46 --- /dev/null +++ b/pages/userCenter/forgetPwd/forgetPwd.vue @@ -0,0 +1,98 @@ + + + + + \ No newline at end of file diff --git a/pages/userCenter/login/login.vue b/pages/userCenter/login/login.vue index 2667488..8f2bb70 100644 --- a/pages/userCenter/login/login.vue +++ b/pages/userCenter/login/login.vue @@ -1,167 +1,194 @@ \ No newline at end of file diff --git a/pages/userCenter/login/loginByPhone.vue b/pages/userCenter/login/loginByPhone.vue index 021041c..8f2bb70 100644 --- a/pages/userCenter/login/loginByPhone.vue +++ b/pages/userCenter/login/loginByPhone.vue @@ -5,35 +5,30 @@ - 短信验证码登录 + + + - - + - 86 - - - - - + - + - {{codeText}} + 忘记密码 登 录 - + @@ -57,7 +52,7 @@ return uni.$u.test.mobile(this.FormData.phone) }, btnHighlight() { - return this.isPhone&&uni.$u.test.code(this.FormData.code, 4) + return this.isPhone&&this.FormData.password } }, methods: { @@ -102,7 +97,7 @@ val = 3 } this.$store.commit('upDateIdentity', val) - uni.switchTab({ + uni.reLaunch({ url: '/pages/tabbar/statistics/index' }) } @@ -125,11 +120,9 @@ } .title { - font-size: 48rpx; - color: #333; - padding: 92rpx 0; - text-align: center; - font-weight: 600; + width: 658rpx; + height: 94rpx; + margin: 130rpx auto 114rpx auto; } .form { @@ -162,7 +155,12 @@ } } } - + .forgetTps { + font-size: 28rpx; + color: $themC; + margin-top: -20rpx; + text-align: right; + } .loginBtn { width: 100%; height: 112rpx; diff --git a/pages/userCenter/personaInfo/personaInfo.vue b/pages/userCenter/personaInfo/personaInfo.vue index dafc758..58afcca 100644 --- a/pages/userCenter/personaInfo/personaInfo.vue +++ b/pages/userCenter/personaInfo/personaInfo.vue @@ -37,7 +37,7 @@ 退出登录 - 修改密码 + 修改密码 diff --git a/static/images/coach/screen.png b/static/images/coach/screen.png new file mode 100644 index 0000000..ff0692c Binary files /dev/null and b/static/images/coach/screen.png differ