diff --git a/.gitignore b/.gitignore index 541a820..6460b79 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,11 @@ .DS_Store node_modules/ /dist/ +dist.zip npm-debug.log* yarn-debug.log* yarn-error.log* - +README.md # Editor directories and files .idea .vscode diff --git a/src/assets/Components/Header.vue b/src/assets/Components/Header.vue index 5e8add6..0ef2b5b 100644 --- a/src/assets/Components/Header.vue +++ b/src/assets/Components/Header.vue @@ -96,6 +96,9 @@ export default { sessionStorage.clear() self.checkLogin() self.$layer.closeAll() + if (self.$route.path == '/') { + self.$router.go(0) + } } }) } diff --git a/src/assets/Components/Menu.vue b/src/assets/Components/Menu.vue index 98ef25a..40741fc 100644 --- a/src/assets/Components/Menu.vue +++ b/src/assets/Components/Menu.vue @@ -1,8 +1,8 @@ @@ -118,6 +171,8 @@ export default { text-overflow ellipsis &:hover color #0d6ec0 + &.full + width 100% .link float right width 380px @@ -131,4 +186,91 @@ export default { img width 100% height 100% + .mid + width 380px + float right + ul + &:after + content '' + display block + clear both + li + width 49.5% + height 234px + border 1px solid #f1f1f1 + box-sizing border-box + text-align center + cursor pointer + margin-bottom 5px + &:nth-child(odd) + float left + &:nth-child(even) + float right + .link-img + margin 0 auto + background url("~@/assets/images/icon_aggregate.png") no-repeat + &.link-img1 + width 100px + height 106px + background-position 0 -112px + margin-top 27px + margin-bottom 18px + &.link-img2 + width 91px + height 70px + background-position -131px 0 + margin-top 43px + margin-bottom 38px + &.link-img3 + width 80px + height 84px + background-position -252px 0 + margin-top 37px + margin-bottom 29px + &.link-img4 + width 79px + height 78px + background-position -362px 0 + margin-top 42px + margin-bottom 28px + &.link-img5 + width 84px + height 83px + background-position -458px 0 + margin-top 45px + margin-bottom 21px + &.link-img6 + width 81px + height 87px + background-position -567px 0 + margin-top 42px + margin-bottom 30px + &.link-img7 + width 90px + height 80px + background-position -678px 0 + margin-top 44px + margin-bottom 25px + &:hover + background linear-gradient(to right, #27b5e9 , #32c9ef) + .link-img1 + background-position 0 0 + .link-img2 + background-position -131px -75px + .link-img3 + background-position -252px -86px + .link-img4 + background-position -362px -87px + .link-img5 + background-position -458px -82px + .link-img6 + background-position -567px -80px + .link-img7 + background-position -678px -85px + h3 + color #fff + h3 + font-size 30px + font-weight 500 + color #1c91f4 diff --git a/src/pages/Index/Index.vue b/src/pages/Index/Index.vue index d3523e1..bae51ad 100644 --- a/src/pages/Index/Index.vue +++ b/src/pages/Index/Index.vue @@ -2,7 +2,7 @@
- +
@@ -32,7 +32,8 @@ export default { policyList: [], ticketList: [], resultList: [], - certificateList: [] + certificateList: [], + token: window.sessionStorage.getItem('token'), } }, methods: { diff --git a/src/pages/PersonCenter/PersonCenter.vue b/src/pages/PersonCenter/PersonCenter.vue index 8df5cd1..7d596a7 100644 --- a/src/pages/PersonCenter/PersonCenter.vue +++ b/src/pages/PersonCenter/PersonCenter.vue @@ -148,8 +148,6 @@ - - @@ -1226,6 +1224,7 @@ export default { getWorkType: function (lv, e) { var self = this var workTypeParentId = 0 + var cur self.isLoading = true if (lv == 0) { workTypeParentId = self.workSelectedType @@ -1235,8 +1234,10 @@ export default { self.workTypeLv2 = [] } else if (lv == 1) { workTypeParentId = self.workSelectedTypeLv1 - var cur = e.target.selectedIndex - 1 - self.promiseText = self.workTypeLv1[cur].workTypeWrittenDocument + cur = e.target.selectedIndex - 1 + if (cur >= 0) { + self.promiseText = self.workTypeLv1[cur].workTypeWrittenDocument + } self.workSelectedTypeLv2 = 0 self.workTypeLv2 = [] } @@ -1253,7 +1254,9 @@ export default { } else if (lv == 0) { self.workTypeLv1 = res.data } else if (lv == 1) { - self.workTypeLv2 = res.data + if (cur >= 0) { + self.workTypeLv2 = res.data + } } self.isLoading = false }) diff --git a/src/pages/Register/Register.vue b/src/pages/Register/Register.vue index ac667b7..a778781 100644 --- a/src/pages/Register/Register.vue +++ b/src/pages/Register/Register.vue @@ -14,6 +14,9 @@ +
+ +
@@ -34,15 +37,18 @@ export default { username: '', password: '', passwordSame: '' - } + }, + isLoading: false } }, methods: { submitRegister: function () { var self = this + self.isLoading = true axios.post(self.url + 'app/register/default', self.registerInfo).then(function (res) { console.log(res) if (res.status == '200') { + self.isLoading = false self.$layer.msg('注册成功') setTimeout(function () { self.$router.push('/login') @@ -59,6 +65,15 @@ export default {