Commit 5ba78711 by Tang

feat: 使用scope样式错乱的问题

parent 048b7219
...@@ -9,7 +9,7 @@ import './plugins/element.js' ...@@ -9,7 +9,7 @@ import './plugins/element.js'
import './plugins/qrcode.js' import './plugins/qrcode.js'
import "./assets/css/main.scss" import "./assets/css/main.scss"
import "./assets/css/layout.scss" import "./assets/css/layout.scss"
// import "./assets/css/element-variables.scss" import "./assets/css/element-variables.scss"
// 公共样式、布局样式 // 公共样式、布局样式
// 主题色调修改在assets/_style.scss 修改里面的变量即可 // 主题色调修改在assets/_style.scss 修改里面的变量即可
......
...@@ -12,6 +12,10 @@ VueRouter.prototype.push = function push(to) { ...@@ -12,6 +12,10 @@ VueRouter.prototype.push = function push(to) {
const routes = [ const routes = [
{ {
path: "/",
redirect: "/login"
},
{
path: "/Home", path: "/Home",
name: "Home", name: "Home",
component: main, component: main,
...@@ -77,19 +81,6 @@ const routes = [ ...@@ -77,19 +81,6 @@ const routes = [
} }
] ]
}, },
// {
// path: "/",
// redirect: "/login"
// },
{
path: "*",
redirect: "/404"
},
{
path: "/404",
name: "404",
component: () => import("@/views/User/404")
},
{ {
path: "/login", path: "/login",
name: "login", name: "login",
...@@ -105,6 +96,15 @@ const routes = [ ...@@ -105,6 +96,15 @@ const routes = [
name: "reset-pass", name: "reset-pass",
component: () => import("@/views/User/index"), component: () => import("@/views/User/index"),
}, },
{
path: "/404",
name: "404",
component: () => import("@/views/User/404")
},
{
path: "*",
redirect: "/404"
},
] ]
const router = new VueRouter({ const router = new VueRouter({
......
...@@ -18,7 +18,7 @@ export default { ...@@ -18,7 +18,7 @@ export default {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss">
.entry-card { .entry-card {
display: inline-block; display: inline-block;
background: #FFFFFF; background: #FFFFFF;
...@@ -32,6 +32,7 @@ export default { ...@@ -32,6 +32,7 @@ export default {
font-size: 22px; font-size: 22px;
font-weight: 500; font-weight: 500;
color: $theme-color1; color: $theme-color1;
padding: 0;
line-height: 24px; line-height: 24px;
text-align: center; text-align: center;
margin-bottom: 50px; margin-bottom: 50px;
......
...@@ -49,7 +49,7 @@ export default { ...@@ -49,7 +49,7 @@ export default {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss">
.gs-entry { .gs-entry {
display: flex; display: flex;
min-height: 100%; min-height: 100%;
...@@ -100,9 +100,9 @@ export default { ...@@ -100,9 +100,9 @@ export default {
} }
} }
} }
}
::v-deep .el-tabs {
.el-tabs {
.el-tabs__item { .el-tabs__item {
color: rgba(0, 0, 0, 0.4); color: rgba(0, 0, 0, 0.4);
...@@ -115,6 +115,7 @@ export default { ...@@ -115,6 +115,7 @@ export default {
.el-tabs__content { .el-tabs__content {
padding-top: 19px; padding-top: 19px;
} }
}
} }
@media (max-width: 767px) { @media (max-width: 767px) {
......
...@@ -121,11 +121,11 @@ export default { ...@@ -121,11 +121,11 @@ export default {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss">
.login { .login {
width: 360px; width: 360px;
::v-deep .el-form { .el-form {
.validate-append .el-input-group__append { .validate-append .el-input-group__append {
padding: 0; padding: 0;
......
...@@ -176,13 +176,13 @@ export default { ...@@ -176,13 +176,13 @@ export default {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss">
.register { .register {
width: 520px; width: 520px;
margin-right: 60px; margin-right: 60px;
margin-left: 40px; margin-left: 40px;
::v-deep .el-form { .el-form {
.el-input-group__append { .el-input-group__append {
border-color: transparent; border-color: transparent;
border: none; border: none;
......
...@@ -158,11 +158,11 @@ export default { ...@@ -158,11 +158,11 @@ export default {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss">
.reset-pass { .reset-pass {
width: 360px; width: 360px;
::v-deep .el-form { .el-form {
.el-input-group__append { .el-input-group__append {
border-color: transparent; border-color: transparent;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment