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

fuintAdmin/src/assets/styles/btn.scss

@@ -97,3 +97,15 @@
   font-size: 14px;
   border-radius: 4px;
 }
+.el-button--warning{
+  background:  linear-gradient( 90deg, #409EFF 0%, #409EFF 100%) !important;
+  border: 0px !important;
+}
+.el-button--primary{
+  background:  linear-gradient( 90deg, #FF8646 0%, #FFA360 100%) !important;
+  border: 0px !important;
+}
+.el-button--success{
+  background:  linear-gradient( 90deg, #0DC291 0%, #0DC291 100%) !important;
+  border: 0px !important;
+}

fuintAdmin/src/assets/styles/sidebar.scss

@@ -120,7 +120,7 @@
       }
     }
 
-    .el-menu-item .is-active {
+    .el-menu-item.is-active {
       color: #FF9655 !important;
       //菜单点击上的背景颜色
       background: linear-gradient( 229deg, #FFEFE5 0%, #FFEFE5 100%) !important;

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

@@ -77,8 +77,8 @@
             <img src="@/assets/menu_icon/ren_b.png" v-else style="width: 25px;height: 25px;"/>
           </span>
           <span style="margin-right: 10px;" v-if="item.meta.title=='财务报表'">
-            <img src="@/assets/menu_icon/caiwu.png" v-if="!activeMenu.includes('/financialStatement')" style="width: 25px;height: 25px;"/>
-            <img src="@/assets/menu_icon/caiwu_b.png" v-else style="width: 25px;height: 25px;"/>
+            <img src="@/assets/menu_icon/caiwu1.png" v-if="!activeMenu.includes('/financialStatement')" style="width: 25px;height: 25px;"/>
+            <img src="@/assets/menu_icon/caiwu1_b.png" v-else style="width: 25px;height: 25px;"/>
           </span>
           <span style="margin-right: 10px;" v-if="item.meta.title=='门店管理'">
             <img src="@/assets/menu_icon/shouye.png" v-if="!activeMenu.includes(item.path) && !activeMenu.includes('/staff') && !activeMenu.includes('/feedBack') && !activeMenu.includes('/duty')" style="width: 25px;height: 25px;"/>

fuintAdmin/src/views/login.vue

@@ -2,12 +2,12 @@
   <div class="login">
     <div class="box-center">
       <div class="box-left">
-        <div class="bai-size">百业兴智慧加油站</div>
-        <div class="bact-box">
-          <div class="sanhh">活动营销</div>
-          <div class="sanhh">节省人力</div>
-          <div class="sanhh">精准定位</div>
-        </div>
+<!--        <div class="bai-size">百业兴智慧加油站</div>-->
+<!--        <div class="bact-box">-->
+<!--          <div class="sanhh">活动营销</div>-->
+<!--          <div class="sanhh">节省人力</div>-->
+<!--          <div class="sanhh">精准定位</div>-->
+<!--        </div>-->
       </div>
       <div class="box-right">
         <div class="box-title">
@@ -69,7 +69,7 @@
               :loading="loading"
               size="medium"
               type="primary"
-              style="width:100%;line-height: 24px;font-size: 16px;"
+              style="width:100%;line-height: 24px;font-size: 16px;background: linear-gradient( 90deg, #FF8646 0%, #FFA360 100%); border: none "
               @click.native.prevent="handleLogin"
             >
               <span v-if="!loading">立即登录</span>
@@ -121,7 +121,7 @@
               :loading="loading"
               size="medium"
               type="primary"
-              style="width:100%;line-height: 24px;font-size: 16px;"
+              style="width:100%;line-height: 24px;font-size: 16px;background: linear-gradient( 90deg, #FF8646 0%, #FFA360 100%);border: none"
               @click.native.prevent="posttelcode()"
             >
               <span v-if="!loading">立即登录</span>
@@ -298,9 +298,11 @@ export default {
   height: 100vh;
   width: 100%;
   position: relative;
-  background-image: url("../assets/images/backbbj.png");
+  background: url("../assets/images/loginback.png") no-repeat;
+  background-size:100% 100%;
+  background-attachment:fixed;
   overflow: hidden;
-  background-size: cover;
+
   background-repeat: no-repeat;
   background-position: center;
   .box-center{
@@ -326,7 +328,7 @@ export default {
     width: 50%;
     height: 100%;
     background: #00aaff;
-    background-image: url("../assets/images/box-left.png");
+    background-image: url("../assets/images/loginleft.png");
     background-size: cover;
     background-repeat: no-repeat;
     background-position: center;

fuintAdmin/src/views/oilConfig/oilInventory/order.vue

@@ -8,22 +8,22 @@
         <span>| 盘点详情</span>
       </div>
       <div style="height: 90px; display: flex; justify-content: space-between;">
-        <div style="height: 100%; width: 50%; display: flex; justify-content: space-between;">
+        <div style="height: 100%;  display: flex; justify-content: space-between;">
           <div style="height: 100%; width: 70%;  display: flex; justify-content: space-between;">
             <div class="box">
-              <span>{{numberOfTanks}}</span>
+              <span style="font-size: 24px;color: #0DC291;font-weight: bold">{{numberOfTanks}}</span>
               <span>油罐数量</span>
             </div>
-            <div class="box">
-              <span>{{inventoryVolume}}</span>
+            <div class="box" >
+              <span style="font-size: 24px;color: #3B6ADE;font-weight: bold" >{{inventoryVolume}}</span>
               <span>盘点升数</span>
             </div>
             <div class="box">
-              <span>{{stockDifference}}</span>
+              <span style="font-size: 24px;color: #FF4347;font-weight: bold">{{stockDifference}}</span>
               <span>库存差异(L)</span>
             </div>
             <div class="box">
-              <span>{{profitLossAmount}}</span>
+              <span style="font-size: 24px;color: #FF9655;font-weight: bold">{{profitLossAmount}}</span>
               <span>盈亏总额(元)</span>
             </div>
           </div>
@@ -869,14 +869,16 @@ export default {
   }
   .box {
     height: 100%;
-    width: 50%;
+    width: 212px;
     margin-right: 10px;
-    background-color: rgba(204, 204, 204, 0.3);
+    background: #FFFFFF;
+    border-radius: 10px 10px 10px 10px;
+    border: 1px solid #EEEEEE;
     border-radius: 10px;
     display: flex;
     flex-direction: column;
     justify-content: center;
     align-items: center;
-    text-align: center;
+
   }
 </style>

fuintAdmin/src/views/order/order_Vip.vue

@@ -140,11 +140,10 @@
           <div class="size-hui">
             <div class="nei">现金</div>
             <div class="icon-img">
-              <img src="../../assets/images/cut/组 4666@2x.png" alt="">
+              <img style="width: 20px;height: 20px " src="../../assets/images/cut/组 4666@2x.png" alt="">
             </div>
           </div>
         </div>
-
       </div>
     </el-card>
     <!--    表格-->
@@ -534,9 +533,7 @@ export default {
     align-items: center;
   }
 .box{
-  //box-sizing: border-box;
   padding: 5px;
-  //background: #f9f9f9;
   margin-right: 20px;
   padding-left: 20px;
 
@@ -607,7 +604,7 @@ export default {
   }
 
 .icon-img{
-  //margin-left: 110px;
+
   width: 100%;
   height: 20px;
   margin-right: 5px;

fuintAdmin_zt/src/assets/styles/btn.scss

@@ -97,3 +97,21 @@
   font-size: 14px;
   border-radius: 4px;
 }
+
+.el-button--warning{
+  color: white !important;
+  background:  linear-gradient( 90deg, #409EFF 0%, #409EFF 100%) !important;
+  border: 0px !important;
+}
+.el-button--primary{
+  color: white !important;
+  background:  linear-gradient( 90deg, #FF8646 0%, #FFA360 100%) !important;
+  border: 0px !important;
+}
+.el-button--success{
+  background:  linear-gradient( 90deg, #0DC291 0%, #0DC291 100%) !important;
+  border: 0px !important;
+}
+.el-button--text{
+  color: #FF9655 !important;
+}

fuintAdmin_zt/src/assets/styles/sidebar.scss

@@ -81,13 +81,21 @@
     // menu hover
     .submenu-title-noDropdown,
     .el-submenu__title {
+      height: var(--sidebar-height);
       &:hover {
         background-color: rgba(0, 0, 0, 0.06) !important;
       }
     }
 
     & .theme-dark .is-active > .el-submenu__title {
-      color: $base-menu-color-active !important;
+      color: white !important;
+      background: linear-gradient( 229deg, #FF8646 0%, #FFA360 100%) !important;
+      //border-top-left-radius: 8px !important; /* 左上圆角 */
+      //border-top-right-radius: 8px !important; /* 右上圆角 */
+      border-radius: 8px;
+      i {
+        color: #fff !important;
+      }
     }
 
     & .nest-menu .el-submenu>.el-submenu__title,
@@ -107,15 +115,22 @@
         background-color: $base-sub-menu-hover !important;
       }
     }
+
+    .el-menu-item.is-active {
+      color: #FF9655 !important;
+      //菜单点击上的背景颜色
+      background: linear-gradient( 229deg, #FFEFE5 0%, #FFEFE5 100%) !important;
+    }
+
   }
 
   .hideSidebar {
     .sidebar-container {
-      width: 54px !important;
+      width: 70px !important;
     }
 
     .main-container {
-      margin-left: 54px;
+      margin-left: 70px;
     }
 
     .submenu-title-noDropdown {
@@ -147,8 +162,8 @@
       .el-submenu {
         &>.el-submenu__title {
           &>span {
-            height: 0;
-            width: 0;
+            height: 60px;
+            width: 70px;
             overflow: hidden;
             visibility: hidden;
             display: inline-block;
@@ -199,11 +214,19 @@
     }
   }
 
+  .el-menu-item.is-active {
+    color: white !important;
+    //菜单点击上的背景颜色
+    background: linear-gradient( 229deg, #FF9655 0%, #FF9655 100%) !important;
+  }
+
   .nest-menu .el-submenu>.el-submenu__title,
   .el-menu-item {
+    background-color: #FFFAF6 !important;
     &:hover {
       // you can use $subMenuHover
-      background-color: rgba(0, 0, 0, 0.06) !important;
+      color: #FFA46B !important;
+      background-color: #FFEBDD !important;
     }
   }
 

fuintAdmin_zt/src/assets/styles/variables.scss

@@ -9,7 +9,7 @@ $yellow:#FEC171;
 $panGreen: #30B08F;
 
 // 默认菜单主题风格
-$base-menu-color:#FF9655;// 菜单全部字体颜色
+$base-menu-color:#727171;// 菜单全部字体颜色
 $base-menu-color-active:#FF9655;// 父级菜单激活的字体颜色
 $base-menu-background:#fff;
 $base-logo-title-color: #FF9655;
@@ -18,8 +18,8 @@ $base-menu-light-color:#ffffff;
 $base-menu-light-background:#ffffff;
 $base-logo-light-title-color: #FF9655;
 
-$base-sub-menu-background: #f8f8f8;//展开的背景色
-$base-sub-menu-hover: #adadad;
+$base-sub-menu-background: #FFFAF6;//展开的背景色
+$base-sub-menu-hover: #FFEFE5;
 
 $base-sidebar-width: 200px;
 

fuintAdmin_zt/src/components/Hamburger/index.vue

@@ -1,14 +1,21 @@
 <template>
   <div style="padding: 0 15px;" @click="toggleClick">
-    <svg
-      :class="{'is-active':isActive}"
-      class="hamburger"
-      viewBox="0 0 1024 1024"
-      xmlns="http://www.w3.org/2000/svg"
-      width="64"
-      height="64"
-    >
-      <path d="M408 442h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8zm-8 204c0 4.4 3.6 8 8 8h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56zm504-486H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zm0 632H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zM142.4 642.1L298.7 519a8.84 8.84 0 0 0 0-13.9L142.4 381.9c-5.8-4.6-14.4-.5-14.4 6.9v246.3a8.9 8.9 0 0 0 14.4 7z" />
+<!--    <svg-->
+<!--      :class="{'is-active':isActive}"-->
+<!--      class="hamburger"-->
+<!--      viewBox="0 0 1024 1024"-->
+<!--      xmlns="http://www.w3.org/2000/svg"-->
+<!--      width="64"-->
+<!--      height="64"-->
+<!--    >-->
+<!--      <path d="M408 442h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8zm-8 204c0 4.4 3.6 8 8 8h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56zm504-486H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zm0 632H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zM142.4 642.1L298.7 519a8.84 8.84 0 0 0 0-13.9L142.4 381.9c-5.8-4.6-14.4-.5-14.4 6.9v246.3a8.9 8.9 0 0 0 14.4 7z" />-->
+<!--    </svg>-->
+
+    <svg t="1720083378159" :class="{'is-active':isActive}" class="hamburger" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
+         p-id="4378" width="64" height="64">
+      <path
+        d="M408 442h480a8 8 0 0 0 8-8v-56a8 8 0 0 0-8-8H408a8 8 0 0 0-8 8v56a8 8 0 0 0 8 8z m-8 204a8 8 0 0 0 8 8h480a8 8 0 0 0 8-8v-56a8 8 0 0 0-8-8H408a8 8 0 0 0-8 8v56z m504-486H120a8 8 0 0 0-8 8v56a8 8 0 0 0 8 8h784a8 8 0 0 0 8-8v-56a8 8 0 0 0-8-8z m0 632H120a8 8 0 0 0-8 8v56a8 8 0 0 0 8 8h784a8 8 0 0 0 8-8v-56a8 8 0 0 0-8-8zM142.4 642.1L298.7 519a8.8 8.8 0 0 0 0-13.9L142.4 381.9a8.9 8.9 0 0 0-14.4 6.9v246.3a8.9 8.9 0 0 0 14.4 7z"
+        p-id="4379" fill="#FF8747"></path>
     </svg>
   </div>
 </template>

fuintAdmin_zt/src/layout/components/Navbar.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="navbar">
-<!--    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />-->
+    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
 <!--    <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>-->
 
     <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
@@ -104,8 +104,8 @@ export default {
 .navbar {
   height: 90px;
   overflow: hidden;
-  position: relative;
-  background: #FF9655;
+  //position: relative;
+  background: white;
   //background-image: url("../../assets/images/kkx.png") ;
   background-size: 100% 100%;
   background-size: cover;
@@ -114,7 +114,6 @@ export default {
   box-shadow: 0 1px 4px rgba(0,21,41,.08);
   box-sizing: border-box;
   padding-top:25px ;
-  position: relative;
   .hamburger-container {
     line-height: 46px;
     height: 100%;
@@ -122,17 +121,18 @@ export default {
     cursor: pointer;
     transition: background .3s;
     -webkit-tap-highlight-color:transparent;
+    margin-left: 10px;
 
     &:hover {
       background: rgba(0, 0, 0, .025)
     }
   }
   .title-logo{
-    position: absolute;
-    top: 50%; /* 将元素垂直向上移动容器高度的50% */
-    left: 50%; /* 将元素水平向左移动容器宽度的50% */
-    transform: translate(-50%, -50%); /* 通过移动元素的左上角使其居中 */
-    color: #ffffff;
+    //position: absolute;
+    //top: 50%; /* 将元素垂直向上移动容器高度的50% */
+    //left: 5%; /* 将元素水平向左移动容器宽度的50% */
+    //transform: translate(-50%, -50%); /* 通过移动元素的左上角使其居中 */
+    //color: #ffffff;
     font-size: 24px;
     font-weight: bold;
     display: flex;
@@ -167,7 +167,6 @@ export default {
       padding: 0 8px;
       height: 100%;
       font-size: 18px;
-      color: #ffffff;
       vertical-align: text-bottom;
 
       &.hover-effect {

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

@@ -3,7 +3,10 @@
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
 <!--        <img v-if="logo" :src="logo" class="sidebar-logo" />-->
-        <h1  class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
+        <h1  class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">
+<!--          {{ title }} -->
+          百
+        </h1>
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
 <!--        <img v-if="logo" :src="logo" class="sidebar-logo" />-->

fuintAdmin_zt/src/layout/components/Sidebar/SidebarItem.vue

@@ -2,15 +2,152 @@
   <div v-if="!item.hidden">
     <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
       <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path, onlyOneChild.query)">
-        <el-menu-item :index="resolvePath(onlyOneChild.path)" style="padding-left: 20px;" :class="{'submenu-title-noDropdown':!isNest}">
-          <item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" />
+        <el-menu-item v-if="!isCollapse" :index="resolvePath(onlyOneChild.path)" style="padding-left: 20px;" :class="{'submenu-title-noDropdown':!isNest}">
+<!--          <item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" />-->
+          <span style="margin-left: 30px" v-if="onlyOneChild.meta.title!='系统首页'">{{onlyOneChild.meta.title}}</span>
+          <div v-else style="background-color: white;width: 200px;height: 100%;position: fixed;left: 0px">
+            <img src="@/assets/menu_icon/home.png" v-if="activeMenu!='/index'" style="width: 21px;height: 21px;margin-right: 10px;margin-left: 20px"/>
+            <img src="@/assets/menu_icon/home_c.png" v-else style="width: 21px;height: 21px;margin-right: 10px;margin-left: 16px"/>
+            <span>{{onlyOneChild.meta.title}}</span>
+          </div>
         </el-menu-item>
+        <el-menu-item v-if="isCollapse" :index="resolvePath(onlyOneChild.path)" style="padding-left: 20px;height: 60px" :class="{'submenu-title-noDropdown':!isNest}">
+          <!--          <item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" />-->
+          <span style="margin-left: 30px" v-if="onlyOneChild.meta.title!='系统首页'">{{onlyOneChild.meta.title}}</span>
+          <div v-else style="background-color: white;width: 70px;height: 100%;position: fixed;left: 0px;text-align: center">
+            <img src="@/assets/menu_icon/home.png" v-if="activeMenu!='/index'" style="width: 25px;height: 25px;"/>
+            <img src="@/assets/menu_icon/home_c.png" v-else style="width: 25px;height: 25px;"/>
+            <div style="padding: 0px;line-height: 5px">{{onlyOneChild.meta.title}}</div>
+          </div>
+        </el-menu-item>
+
       </app-link>
     </template>
 
     <el-submenu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body>
       <template slot="title">
-        <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" />
+        <div v-if="!isCollapse" >
+          <!--        <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title"  />-->
+          <span style="margin-right: 10px;" v-if="item.meta.title=='交接班'">
+            <img src="@/assets/menu_icon/ren.png" v-if="!activeMenu.includes('/handover')" style="width: 21px;height: 21px;"/>
+            <img src="@/assets/menu_icon/ren_b.png" v-else style="width: 21px;height: 21px;"/>
+          </span>
+          <span style="margin-right: 10px;" v-if="item.meta.title=='码牌管理'">
+            <img src="@/assets/menu_icon/code.png" v-if="!activeMenu.includes(item.path)" style="width: 25px;height: 25px;"/>
+            <img src="@/assets/menu_icon/code_b.png" v-else style="width: 25px;height: 25px;"/>
+          </span>
+          <span style="margin-right: 10px;" v-if="item.meta.title=='财务报表'">
+            <img src="@/assets/menu_icon/caiwu1.png" v-if="!activeMenu.includes('/financialStatement')" style="width: 25px;height: 25px;"/>
+            <img src="@/assets/menu_icon/caiwu1_b.png" v-else style="width: 25px;height: 25px;"/>
+          </span>
+          <span style="margin-right: 10px;" v-if="item.meta.title=='机构管理'">
+            <img src="@/assets/menu_icon/jigou.png" v-if="!activeMenu.includes('/Site') && !activeMenu.includes('/Service')" style="width: 21px;height: 21px;"/>
+            <img src="@/assets/menu_icon/jigou_b.png" v-else style="width: 21px;height: 21px;"/>
+          </span>
+          <span style="margin-right: 10px;" v-if="item.meta.title=='小程序设置'">
+            <img src="@/assets/menu_icon/apple.png" v-if="!activeMenu.includes('/indexBanner')" style="width: 21px;height: 21px;"/>
+            <img src="@/assets/menu_icon/apple_b.png" v-else style="width: 21px;height: 21px;"/>
+          </span>
+          <span style="margin-right: 10px;" v-if="item.meta.title=='门店管理'">
+            <img src="@/assets/menu_icon/shouye.png" v-if="!activeMenu.includes(item.path) && !activeMenu.includes('/staff') && !activeMenu.includes('/feedBack') && !activeMenu.includes('/duty')" style="width: 21px;height: 21px;"/>
+            <img src="@/assets/menu_icon/shouye_b.png" v-else style="width: 21px;height: 21px;"/>
+          </span>
+          <span style="margin-right: 10px;" v-if="item.meta.title=='会员管理'">
+            <img src="@/assets/menu_icon/user.png" v-if="!activeMenu.includes(item.path) && !activeMenu.includes('/userGrade')" style="width: 21px;height: 21px;"/>
+            <img src="@/assets/menu_icon/user_b.png" v-else style="width: 21px;height: 21px;"/>
+          </span>
+          <span style="margin-right: 10px;" v-if="item.meta.title=='油站管理'">
+            <img src="@/assets/menu_icon/youqiang.png" v-if="!activeMenu.includes(item.path)" style="width: 21px;height: 21px;"/>
+            <img src="@/assets/menu_icon/youqiang_b.png" v-else style="width: 21px;height: 21px;"/>
+          </span>
+          <span style="margin-right: 10px;" v-if="item.meta.title=='便利店'">
+            <img src="@/assets/menu_icon/car.png" v-if="!activeMenu.includes('/convenience')" style="width: 21px;height: 21px;"/>
+            <img src="@/assets/menu_icon/car_b.png" v-else style="width: 21px;height: 21px;"/>
+          </span>
+          <span style="margin-right: 10px;" v-if="item.meta.title=='积分商城'">
+            <img src="@/assets/menu_icon/lihe.png" v-if="!activeMenu.includes('/integral')" style="width: 21px;height: 21px;"/>
+            <img src="@/assets/menu_icon/lihe_b.png" v-else style="width: 21px;height: 21px;"/>
+          </span>
+          <span style="margin-right: 10px;" v-if="item.meta.title=='订单管理'">
+            <img src="@/assets/menu_icon/wendang.png" v-if="!activeMenu.includes(item.path)" style="width: 21px;height: 21px;"/>
+            <img src="@/assets/menu_icon/wendang_b.png" v-else style="width: 21px;height: 21px;"/>
+          </span>
+          <span style="margin-right: 10px;" v-if="item.meta.title=='活动营销'">
+            <img src="@/assets/menu_icon/laba.png" v-if="!activeMenu.includes('/EventMarketing')" style="width: 21px;height: 21px;"/>
+            <img src="@/assets/menu_icon/laba_b.png" v-else style="width: 21px;height: 21px;"/>
+          </span>
+          <span style="margin-right: 10px;" v-if="item.meta.title=='配置管理'">
+            <img src="@/assets/menu_icon/setting.png" v-if="!activeMenu.includes('/setting') && !activeMenu.includes('/power')" style="width: 21px;height: 21px;"/>
+            <img src="@/assets/menu_icon/setting_b.png" v-else style="width: 21px;height: 21px;"/>
+          </span>
+          <span style="margin-right: 10px;" v-if="item.meta.title=='系统管理'">
+            <img src="@/assets/menu_icon/setting.png" v-if="!activeMenu.includes('/system')" style="width: 21px;height: 21px;"/>
+            <img src="@/assets/menu_icon/setting_b.png" v-else style="width: 21px;height: 21px;"/>
+          </span>
+
+          <span>{{item.meta.title}}</span>
+        </div>
+        <div v-if="isCollapse" style="text-align: center;">
+          <!--        <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title"  />-->
+          <span style="margin-right: 10px;" v-if="item.meta.title=='交接班'">
+            <img src="@/assets/menu_icon/ren.png" v-if="!activeMenu.includes('/handover')" style="width: 25px;height: 25px;"/>
+            <img src="@/assets/menu_icon/ren_b.png" v-else style="width: 25px;height: 25px;"/>
+          </span>
+          <span style="margin-right: 10px;" v-if="item.meta.title=='码牌管理'">
+            <img src="@/assets/menu_icon/code.png" v-if="!activeMenu.includes(item.path)" style="width: 25px;height: 25px;"/>
+            <img src="@/assets/menu_icon/code_b.png" v-else style="width: 25px;height: 25px;"/>
+          </span>
+          <span style="margin-right: 10px;" v-if="item.meta.title=='财务报表'">
+            <img src="@/assets/menu_icon/caiwu1.png" v-if="!activeMenu.includes('/financialStatement')" style="width: 25px;height: 25px;"/>
+            <img src="@/assets/menu_icon/caiwu1_b.png" v-else style="width: 25px;height: 25px;"/>
+          </span>
+          <span style="margin-right: 10px;" v-if="item.meta.title=='机构管理'">
+            <img src="@/assets/menu_icon/jigou.png" v-if="!activeMenu.includes('/Site') && !activeMenu.includes('/Service')" style="width: 21px;height: 21px;"/>
+            <img src="@/assets/menu_icon/jigou_b.png" v-else style="width: 21px;height: 21px;"/>
+          </span>
+          <span style="margin-right: 10px;" v-if="item.meta.title=='小程序设置'">
+            <img src="@/assets/menu_icon/apple.png" v-if="!activeMenu.includes('/indexBanner')" style="width: 21px;height: 21px;"/>
+            <img src="@/assets/menu_icon/apple_b.png" v-else style="width: 21px;height: 21px;"/>
+          </span>
+          <span style="margin-right: 10px;" v-if="item.meta.title=='门店管理'">
+            <img src="@/assets/menu_icon/shouye.png" v-if="!activeMenu.includes(item.path) && !activeMenu.includes('/staff') && !activeMenu.includes('/feedBack') && !activeMenu.includes('/duty')" style="width: 25px;height: 25px;"/>
+            <img src="@/assets/menu_icon/shouye_b.png" v-else style="width: 25px;height: 25px;"/>
+          </span>
+          <span style="margin-right: 10px;" v-if="item.meta.title=='会员管理'">
+            <img src="@/assets/menu_icon/user.png" v-if="!activeMenu.includes(item.path) && !activeMenu.includes('/userGrade')" style="width: 25px;height: 25px;"/>
+            <img src="@/assets/menu_icon/user_b.png" v-else style="width: 25px;height: 25px;"/>
+          </span>
+          <span style="margin-right: 10px;" v-if="item.meta.title=='油站管理'">
+            <img src="@/assets/menu_icon/youqiang.png" v-if="!activeMenu.includes(item.path)" style="width: 25px;height: 25px;"/>
+            <img src="@/assets/menu_icon/youqiang_b.png" v-else style="width: 25px;height: 25px;"/>
+          </span>
+          <span style="margin-right: 10px;" v-if="item.meta.title=='便利店'">
+            <img src="@/assets/menu_icon/car.png" v-if="!activeMenu.includes('/convenience')" style="width: 25px;height: 25px;"/>
+            <img src="@/assets/menu_icon/car_b.png" v-else style="width: 25px;height: 25px;"/>
+          </span>
+          <span style="margin-right: 10px;" v-if="item.meta.title=='积分商城'">
+            <img src="@/assets/menu_icon/lihe.png" v-if="!activeMenu.includes('/integral')" style="width: 25px;height: 25px;"/>
+            <img src="@/assets/menu_icon/lihe_b.png" v-else style="width: 25px;height: 25px;"/>
+          </span>
+          <span style="margin-right: 10px;" v-if="item.meta.title=='订单管理'">
+            <img src="@/assets/menu_icon/wendang.png" v-if="!activeMenu.includes(item.path)" style="width: 25px;height: 25px;"/>
+            <img src="@/assets/menu_icon/wendang_b.png" v-else style="width: 25px;height: 25px;"/>
+          </span>
+          <span style="margin-right: 10px;" v-if="item.meta.title=='活动营销'">
+            <img src="@/assets/menu_icon/laba.png" v-if="!activeMenu.includes('/EventMarketing')" style="width: 25px;height: 25px;"/>
+            <img src="@/assets/menu_icon/laba_b.png" v-else style="width: 25px;height: 25px;"/>
+          </span>
+          <span style="margin-right: 10px;" v-if="item.meta.title=='配置管理'">
+            <img src="@/assets/menu_icon/setting.png" v-if="!activeMenu.includes('/setting') && !activeMenu.includes('/power')" style="width: 25px;height: 25px;"/>
+            <img src="@/assets/menu_icon/setting_b.png" v-else style="width: 25px;height: 25px;"/>
+          </span>
+          <span style="margin-right: 10px;" v-if="item.meta.title=='系统管理'">
+            <img src="@/assets/menu_icon/setting.png" v-if="!activeMenu.includes('/system')" style="width: 25px;height: 25px;"/>
+            <img src="@/assets/menu_icon/setting_b.png" v-else style="width: 25px;height: 25px;"/>
+          </span>
+
+          <div style="padding: 0px;line-height: 5px">{{item.meta.title}}</div>
+        </div>
       </template>
       <sidebar-item
         v-for="child in item.children"
@@ -45,9 +182,17 @@ export default {
       type: Boolean,
       default: false
     },
+    isCollapse: {
+      type: Boolean,
+      default: false
+    },
     basePath: {
       type: String,
       default: ''
+    },
+    activeMenu: {
+      type: String,
+      default: ''
     }
   },
   data() {
@@ -83,6 +228,7 @@ export default {
       return false
     },
     resolvePath(routePath, routeQuery) {
+      console.log(routePath)
       if (isExternal(routePath)) {
         return routePath
       }

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

@@ -1,10 +1,10 @@
 <template>
     <div :class="{'has-logo':showLogo}" :style="{ backgroundColor: settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
         <logo v-if="showLogo" :collapse="isCollapse" />
-        <div class="store-info" v-if="storeName">
-            <div class="name">{{ storeName }}</div>
-            <div class="role" v-if="role">（{{ role }}）</div>
-        </div>
+<!--        <div class="store-info" v-if="storeName">-->
+<!--            <div class="name">{{ storeName }}</div>-->
+<!--            <div class="role" v-if="role">（{{ role }}）</div>-->
+<!--        </div>-->
         <el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper">
             <el-menu
 
@@ -15,6 +15,7 @@
                 :unique-opened="true"
                 :active-text-color="settings.theme"
                 :collapse-transition="false"
+                mode="vertical"
                 style="margin-bottom: 80px;"
             >
                 <sidebar-item
@@ -22,6 +23,8 @@
                     :key="route.path  + index"
                     :item="route"
                     :base-path="route.path"
+                    :activeMenu="activeMenu"
+                    :isCollapse="isCollapse"
                 />
             </el-menu>
         </el-scrollbar>
@@ -55,6 +58,11 @@ export default {
             return variables;
         },
         isCollapse() {
+          if (!this.sidebar.opened){
+            document.documentElement.style.setProperty('--sidebar-height', '60px');
+          }else {
+            document.documentElement.style.setProperty('--sidebar-height', '48px');
+          }
             return !this.sidebar.opened;
         },
         storeName() {

fuintCashierWeb/src/assets/styles/btn.scss

@@ -97,3 +97,17 @@
   font-size: 14px;
   border-radius: 4px;
 }
+.el-button--warning{
+  color: white !important;
+  background:  linear-gradient( 90deg, #409EFF 0%, #409EFF 100%) !important;
+  border: 0px !important;
+}
+.el-button--primary{
+  color: white !important;
+  background:  linear-gradient( 90deg, #FF8646 0%, #FFA360 100%) !important;
+  border: 0px !important;
+}
+.el-button--success{
+  background:  linear-gradient( 90deg, #0DC291 0%, #0DC291 100%) !important;
+  border: 0px !important;
+}