Merge branch 'develop' into 'test'

Develop

See merge request LAWS/laws-system-front-FOTON!183
This commit is contained in:
王夏晖
2021-10-15 10:54:04 +08:00
+2 -2
View File
@@ -465,7 +465,7 @@
}, },
computed: { computed: {
logo () { logo () {
return this.isCollapse ? require('assets/images/shangqi/img/logo4.png') : require('assets/images/shangqi/img/logo2.png') return this.isCollapse ? require('assets/images/shangqi/img/logo4.png') : require('assets/images/shangqi/img/logo5.png')
}, },
...mapGetters(['getDynamicTotal', 'isCollapse']) ...mapGetters(['getDynamicTotal', 'isCollapse'])
}, },
@@ -511,7 +511,7 @@
text-align: left; text-align: left;
img { img {
width: 115px; width: 115px;
height: 45px; height: 40px;
} }
} }
} }