Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem

# Conflicts:
#	fuintAdmin/.env.development

fuintAdmin/.env.development

@@ -13,4 +13,5 @@ VUE_APP_PUBLIC_PATH = '/'
 # 后端接口地址
 VUE_APP_SERVER_URL = 'http://localhost:8081/'
 
+
 # http://192.168.0.121:8080/

fuintAdmin/src/assets/styles/variables.scss

@@ -9,17 +9,17 @@ $yellow:#FEC171;
 $panGreen: #30B08F;
 
 // 默认菜单主题风格
-$base-menu-color:#ffffff;// 菜单全部字体颜色
-$base-menu-color-active:#ffffff;// 父级菜单激活的字体颜色
-$base-menu-background:#5a91ff;
-$base-logo-title-color: #ffffff;
+$base-menu-color:#144a6e;// 菜单全部字体颜色
+$base-menu-color-active:#144a6e;// 父级菜单激活的字体颜色
+$base-menu-background:#fff;
+$base-logo-title-color: #144a6e;
 
 $base-menu-light-color:#ffffff;
 $base-menu-light-background:#ffffff;
 $base-logo-light-title-color: #1a5982;
 
-$base-sub-menu-background: #4e77cc;//展开的背景色
-$base-sub-menu-hover:#001528;
+$base-sub-menu-background: #c6c6c6;//展开的背景色
+$base-sub-menu-hover: #adadad;
 
 $base-sidebar-width: 200px;
 

fuintAdmin/src/layout/components/Navbar.vue

@@ -147,7 +147,7 @@ export default {
   overflow: hidden;
   position: relative;
   background: #144a6e;
-  background-image: url("../../assets/images/kkx.png") ;
+  //background-image: url("../../assets/images/kkx.png") ;
   background-size: 100% 100%;
   background-size: cover;
   background-repeat: no-repeat;

fuintAdmin/src/layout/components/Sidebar/Logo.vue

@@ -2,12 +2,12 @@
   <div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-        <img :src="logo" class="sidebar-logo" />
+<!--        <img :src="logo" class="sidebar-logo" />-->
         <h1  class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
 <!--        <h1 v-else class="sidebar-title" style="color: #00ff80"  >{{ title }} </h1>-->
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo" />
+<!--        <img v-if="logo" :src="logo" class="sidebar-logo" />-->
         <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
       </router-link>
     </transition>

fuintAdmin/src/layout/components/Sidebar/index.vue

@@ -7,14 +7,15 @@
     </div>
     <el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper">
       <el-menu
+
         :default-active="activeMenu"
-                :collapse="false"
+        :collapse="isCollapse"
         :background-color="settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground"
-                text-color="#ffffff"
+        :text-color="settings.sideTheme === 'theme-dark' ? variables.menuColor : variables.menuLightColor"
         :unique-opened="true"
-                active-text-color="#44DABF"
+        :active-text-color="settings.theme"
         :collapse-transition="false"
-                mode="vertical"
+        mode="horizontal "
         style="margin-bottom: 80px;"
       >
         <sidebar-item
@@ -67,12 +68,11 @@ export default {
       return '';
     },
     role() {
-          console.log()
       if (this.$store.getters.storeName && this.$store.getters.storeId) {
-
-              return this.$store.getters.storeName;
-          }else {
-            return "";
+        return '店铺管理员';
+      }
+      if (this.$store.getters.merchantName && this.$store.getters.merchantId) {
+        return '商户管理员';
       }
     }
   }
@@ -80,14 +80,17 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  .store-info {
-    height: 42px;
+.store-info {
+
   padding-top: 2px;
   text-align: center;
-    background: #00acac;
+  background: #3f5050;
   overflow: hidden;
   border: 1px #ffffff solid;
   border-radius: 2px;
+  box-sizing: border-box;
+  padding: 5px 0px;
+  border-radius: 8px;
   margin: 0px 6px 10px 6px;
   cursor: pointer;
   .name {
@@ -102,5 +105,5 @@ export default {
     margin-top: 3px;
     color: #ffffff;
   }
-  }
+}
 </style>