diff --git a/src/App.vue b/src/App.vue index 2502070..9032a62 100755 --- a/src/App.vue +++ b/src/App.vue @@ -7,7 +7,19 @@ \ No newline at end of file diff --git a/src/index.less b/src/index.less index a4330c7..0441d7c 100755 --- a/src/index.less +++ b/src/index.less @@ -1,14 +1,19 @@ body { background: #F5F5F5 !important; font-size: 12px; + box-sizing: border-box; } @media screen and (min-width: 769px) { + .main-container { + width: 1200px; + margin: 0 auto; + min-height: 500px; + } } @media screen and (min-device-width: 641px) and (max-device-width: 768px) { .main-container { - width: 640px; margin: 0 auto; min-height: 500px; } @@ -16,7 +21,6 @@ body { @media screen and (min-device-width: 401px) and (max-device-width: 640px) { .main-container { - width: 640px; margin: 0 auto; min-height: 500px; } @@ -24,7 +28,6 @@ body { @media only screen and (max-device-width: 400px) { .main-container { - width: 640px; margin: 0 auto; min-height: 500px; } @@ -32,11 +35,7 @@ body { -.main-container { - width: 1200px; - margin: 0 auto; - min-height: 500px; -} + .main-container .breadcrumb{ margin-bottom: 10px; font-size: 12px; @@ -210,16 +209,7 @@ body { background-color: #d3dce6; } -.logo { - font-size: 20px; - font-weight: 900; - position: absolute; - margin-right: 100px; - left: -200px; - top: 0px; - text-align: center; - line-height: 50px; -} + .logo a, .logo a:hover { color: #fff; diff --git a/src/main.js b/src/main.js index 9749e75..47ede75 100755 --- a/src/main.js +++ b/src/main.js @@ -19,6 +19,9 @@ import 'element-ui/lib/theme-chalk/index.css'; import Toast from 'vue2-toast' import Moment from 'moment' import Meta from "vue-meta"; +import global from './common.vue' + + Vue.use(Meta); @@ -28,6 +31,7 @@ Vue.use(Meta); // }) Vue.prototype.$moment = Moment;//赋值使用 Vue.use(Toast) + Vue.prototype.COMMON = global // import ElementUI from 'element-ui' // import { ElementTiptapPlugin } from 'element-tiptap' diff --git a/src/view/km.vue b/src/view/km.vue index fb25cd6..47dc87a 100755 --- a/src/view/km.vue +++ b/src/view/km.vue @@ -207,6 +207,7 @@ export default { changeType(index){ this.activeIndex = index; + this.isShow = false this.getChannelInformationsRequest(this.titleList[index].id) } diff --git a/src/view/main/main.vue b/src/view/main/main.vue index 66491cf..0daf8b6 100755 --- a/src/view/main/main.vue +++ b/src/view/main/main.vue @@ -1,11 +1,21 @@