Merge branch 'master' of http://gogs.langye.net:3000/langye/yikangyang-web

src/layout/components/Sidebar/Logo.vue

@@ -7,7 +7,7 @@
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
         <!--          <img src="../../../assets/logo-mini.png?v=1" class="sidebar-logo">-->
-        <img src="../../../assets/logo.png?v=2" class="sidebar-name-logo" />
+        <img src="../../../assets/logo.png?v=2" class="sidebar-name-logo">
       </router-link>
     </transition>
   </div>
@@ -36,7 +36,8 @@
     transition: opacity 1.5s;
   }
   .sidebar-name-logo {
-    height: 76%;
+    width: 90%;
+    margin: auto;
     object-fit: contain;
   }
 
@@ -50,7 +51,6 @@
     width: 100%;
     height: 50px;
     line-height: 50px;
-    background: $primaryColor;
     text-align: center;
     overflow: hidden;
 

src/main.js

@@ -13,13 +13,13 @@ import App from './App'
 import store from './store'
 import router from './router'
 
-import ViewUI from 'view-design';
-import './styles/viewui-mine.less';
-import base from "./utils/common"
-Vue.use(ViewUI);
-import moment from "moment"
-Vue.prototype.$moment = moment;
-Vue.prototype.base = base;
+import ViewUI from 'view-design'
+import './styles/viewui-mine.less'
+import base from './utils/common'
+Vue.use(ViewUI)
+import moment from 'moment'
+Vue.prototype.$moment = moment
+Vue.prototype.base = base
 import '@/icons' // icon
 import '@/permission' // permission control
 
@@ -41,16 +41,15 @@ Vue.use(VueParticles)
 // Vue.use(ElementUI, { locale })
 // 如果想要中文版 element-ui，按如下方式声明
 Vue.use(ElementUI)
-import Message from 'element-ui/lib/message';
-
+import Message from 'element-ui/lib/message'
 
 Vue.config.productionTip = false
 
-import avue from '@smallwei/avue';
-import '@smallwei/avue/lib/index.css';
+import avue from '@smallwei/avue'
+import '@smallwei/avue/lib/index.css'
 Vue.use(avue)
 import AvueMap from 'avue-plugin-map'
-Vue.use(AvueMap);
+Vue.use(AvueMap)
 
 import VxeUI from 'vxe-pc-ui'
 import 'vxe-pc-ui/lib/style.css'
@@ -71,7 +70,7 @@ Vue.directive('loadMore', {
   bind(el, binding) {
     const selectWrap = el.querySelector('.el-scrollbar__wrap')
     selectWrap.addEventListener('scroll', function() {
-      let sign = 0
+      const sign = 0
       const scrollDistance = this.scrollHeight - this.scrollTop - this.clientHeight
       if (scrollDistance <= sign) {
         binding.value()
@@ -80,7 +79,7 @@ Vue.directive('loadMore', {
   }
 })
 
-import LxHeader from "@/components/LxHeader"
+import LxHeader from '@/components/LxHeader'
 Vue.component('lx-header', LxHeader)
 import XyTable from '@/components/XyTable'
 Vue.component('xy-table', XyTable)
@@ -88,17 +87,17 @@ import XyDialog from '@/components/XyDialog'
 Vue.component('xy-dialog', XyDialog)
 import XySelectors from '@/components/XySelectors'
 Vue.component('xy-selectors', XySelectors)
-import draggable from 'vuedraggable';
+import draggable from 'vuedraggable'
 Vue.component('draggable', draggable)
 import tinymce from '@/components/XyTinymce'
 Vue.component('my-tinymce', tinymce)
-import myMap from "@/components/XyMap"
+import myMap from '@/components/XyMap'
 Vue.component('my-map', myMap)
 import afTableColumn from 'af-table-column'
 Vue.component('af-table-column', afTableColumn)
 
 Vue.prototype.$integrateData = (target, value) => {
-  for(let i in target){
+  for (const i in target) {
     if (target.hasOwnProperty(i) && value.hasOwnProperty(i)) {
       target[i] = value[i]
     }