Commit a76be23f by liudx

修改首页白边

parent f574b783
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<style lang="less"> <style lang="less">
#app { #app {
height: 100%;
font-family: Avenir, Helvetica, Arial, sans-serif; font-family: Avenir, Helvetica, Arial, sans-serif;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
...@@ -26,12 +27,7 @@ ...@@ -26,12 +27,7 @@
font-style: normal; font-style: normal;
} }
html,
body,
#app {
// height: 100%;
// min-height:1020px;
}
::-webkit-scrollbar { ::-webkit-scrollbar {
width: 10px; width: 10px;
} }
......
...@@ -242,7 +242,6 @@ ...@@ -242,7 +242,6 @@
:description="'暂无数据'" :description="'暂无数据'"
/> />
</div> </div>
<br /> <br />
<a-pagination <a-pagination
v-if="(!search_word)" v-if="(!search_word)"
...@@ -687,6 +686,9 @@ export default { ...@@ -687,6 +686,9 @@ export default {
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.home{
height: auto !important;
}
.header_con { .header_con {
position: absolute; position: absolute;
top: 0; top: 0;
......
<template> <template>
<div class="home"> <div class="home" :style="[(current=='专利'||current=='企业')?'height:auto':'height:100%']">
<!-- 标题栏 --> <!-- 标题栏 -->
<HeaderCon></HeaderCon> <HeaderCon></HeaderCon>
...@@ -88,7 +88,7 @@ export default { ...@@ -88,7 +88,7 @@ export default {
}, },
methods: { methods: {
changepage(name) { changepage(name) {
// console.log(name)
switch (name) { switch (name) {
case "企业": case "企业":
this.$router.push({ this.$router.push({
...@@ -130,7 +130,6 @@ export default { ...@@ -130,7 +130,6 @@ export default {
watch: { watch: {
$route() { $route() {
let path = this.$route.path; let path = this.$route.path;
console.log(path);
switch (path) { switch (path) {
case "/company": case "/company":
localStorage.setItem("current", "企业"); localStorage.setItem("current", "企业");
...@@ -177,8 +176,7 @@ export default { ...@@ -177,8 +176,7 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.home { .home {
height: calc(100%); height: 100%;
min-height: 960px;
width: calc(100%); width: calc(100%);
position: relative; position: relative;
......
...@@ -190,8 +190,9 @@ export default { ...@@ -190,8 +190,9 @@ export default {
height: 60px; height: 60px;
} }
.login { .login {
height: 100%;
background-color: #fafbfe; background-color: #fafbfe;
min-height: 900px; // min-height: 900px;
background-image: url("../../static/login/img-bg.png"); background-image: url("../../static/login/img-bg.png");
background-size: 100% 100%; background-size: 100% 100%;
header { header {
......
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