diff --git a/webintroduce/src/App.vue b/webintroduce/src/App.vue
index 49c1825..9cfdcb4 100644
--- a/webintroduce/src/App.vue
+++ b/webintroduce/src/App.vue
@@ -1,10 +1,11 @@
@@ -21,7 +22,8 @@ export default {
data() {
return {
footerShow: true,
- headerShow: true
+ headerShow: true,
+ transitionName: 'transitionLeft'
}
},
watch: {
@@ -32,6 +34,9 @@ export default {
}else {
this.headerShow = this.footerShow = true
}
+ const barArr = ['home','/solution','/enterprise']
+ const compare = barArr.indexOf(to.path) > barArr.indexOf(from.path)
+ this.transitionName = compare ? 'transitionLeft' : 'transitionRight'
}
}
}
@@ -51,4 +56,17 @@ export default {
.main-wrap{
flex: 1;
}
+ .transitionBody{
+ transition: all .4s ease-out;
+ }
+ .transitionLeft-enter,
+ .transitionRight-leave-active {
+ transform: translate(100%, 0);
+ -webkit-transform: translate(100%, 0);
+ }
+ .transitionLeft-leave-active,
+ .transitionRight-enter {
+ transform: translate(-100%, 0);
+ -webkit-transform: translate(-100%, 0);
+ }
diff --git a/webintroduce/src/assets/css/reset.css b/webintroduce/src/assets/css/reset.css
index 2801608..69cca07 100644
--- a/webintroduce/src/assets/css/reset.css
+++ b/webintroduce/src/assets/css/reset.css
@@ -48,7 +48,7 @@ body {
/*}*/
html, body{
- height: 100%;width: 100%;
+ width: 100%;
font-family: "Microsoft YaHei";
color: #fff;
user-select: none;
@@ -58,8 +58,6 @@ html, body{
-moz-user-select: none;
}
body{
-
- overflow: hidden;
font-size: 14px;
/*默认颜色*/
}
diff --git a/webintroduce/src/main.js b/webintroduce/src/main.js
index ce47a79..05e69f5 100644
--- a/webintroduce/src/main.js
+++ b/webintroduce/src/main.js
@@ -9,28 +9,33 @@ Vue.config.productionTip = false
router.beforeEach((to, from, next) =>{
- if(to.matched.some(record => record.meta.requiresAuth)){
- if(Cookies.get('username')){
- document.title = to.meta.title
- next()
- }else{
- next({
- path:'/login',
- query: { redirect: to.fullPath }
- })
- document.title = '登录'
- }
-
-
- }else {
- document.title = to.meta.title
- next()
- }
-
+ // if(to.matched.some(record => record.meta.requiresAuth)){
+ // if(Cookies.get('username')){
+ // document.title = to.meta.title
+ // next()
+ // }else{
+ // alert()
+ // next({
+ // path:'/login',
+ // query: { redirect: to.fullPath }
+ // })
+ // document.title = '登录'
+ // }
+ //
+ //
+ // }else {
+ // document.title = to.meta.title
+ // next()
+ // }
+ document.title = to.meta.title
+ next()
// console.log(to)
//
// next()
})
+router.afterEach((to,from,next) => {
+ window.scrollTo(0,0)
+})
/* eslint-disable no-new */
new Vue({
diff --git a/webintroduce/src/views/enterprise.vue b/webintroduce/src/views/enterprise.vue
index 64d23ed..c4c0e57 100644
--- a/webintroduce/src/views/enterprise.vue
+++ b/webintroduce/src/views/enterprise.vue
@@ -1,5 +1,8 @@
- 企业介绍
+