xuqiang 4 năm trước cách đây
mục cha
commit
9273b844bb

BIN
src/main/vue/src/assets/icon_nav_xuanzhemendian@3x.png


+ 2 - 2
src/main/vue/src/components/operation/RoomInfo.vue

@@ -285,7 +285,7 @@ export default {
     &:hover {
     &:hover {
         // width: 110px;
         // width: 110px;
         // height: 108px;
         // height: 108px;
-        background: rgba(93, 125, 255, 0.3);
+        // background: rgba(93, 125, 255, 0.3);
         box-shadow: 0px 2px 6px 0px rgba(255, 255, 255, 0.4);
         box-shadow: 0px 2px 6px 0px rgba(255, 255, 255, 0.4);
         border-radius: 4px;
         border-radius: 4px;
         border: 2px solid #ffffff;
         border: 2px solid #ffffff;
@@ -293,7 +293,7 @@ export default {
 
 
     &.active {
     &.active {
         .room-top {
         .room-top {
-            background: rgba(93, 125, 255, 0.3);
+            // background: rgba(93, 125, 255, 0.3);
         }
         }
         box-shadow: 0px 2px 6px 0px rgba(255, 255, 255, 0.4);
         box-shadow: 0px 2px 6px 0px rgba(255, 255, 255, 0.4);
         border-radius: 4px;
         border-radius: 4px;

+ 1 - 0
src/main/vue/src/styles/app.less

@@ -393,6 +393,7 @@ li {
     }
     }
      .el-radio-button__inner {
      .el-radio-button__inner {
          background-color: transparent;
          background-color: transparent;
+         color: #aaacad;
          width: 110px;
          width: 110px;
          height: 36px;
          height: 36px;
          line-height: 18px;
          line-height: 18px;

+ 9 - 7
src/main/vue/src/views/Admin.vue

@@ -33,7 +33,7 @@
                 :disabled="$store.state.fetchingData"
                 :disabled="$store.state.fetchingData"
                 filterable
                 filterable
             >
             >
-                <img slot="prefix" src="../assets/icon_nav_xuanzhemendian.png" class="store-img" alt="" />
+                <img slot="prefix" src="../assets/icon_nav_xuanzhemendian@3x.png" class="store-img" alt="" />
                 <el-option
                 <el-option
                     :label="item.storeName"
                     :label="item.storeName"
                     :value="item.id"
                     :value="item.id"
@@ -571,12 +571,13 @@ export default {
 
 
 .header {
 .header {
     color: #fff;
     color: #fff;
-    background: #242744;
+    // background: #242744;
+    background: #171c3a;
     display: flex;
     display: flex;
     align-items: center;
     align-items: center;
     padding-left: 0;
     padding-left: 0;
-    border-bottom: 1px solid #2b2e3e;
-    padding: 10px;
+    // border-bottom: 1px solid #2b2e3e;
+    padding: 10px 10px 10px 0;
     box-sizing: border-box;
     box-sizing: border-box;
     height: 90px;
     height: 90px;
     .header-btn {
     .header-btn {
@@ -621,10 +622,11 @@ export default {
 .logo-content {
 .logo-content {
     // padding: 20px;
     // padding: 20px;
     // min-width: 220px;
     // min-width: 220px;
-    // padding: 20px 13px;
+    background: #242744;
+    padding: 22px;
     .logo-text {
     .logo-text {
-        width: 182px;
-        height: 54px;
+        width: 156px;
+        height: 46px;
         display: block;
         display: block;
     }
     }
 }
 }

+ 1 - 0
src/main/vue/src/views/Operation/RoomStatus.vue

@@ -1268,6 +1268,7 @@ export default {
         color: #606266;
         color: #606266;
         .contract-name {
         .contract-name {
             flex-grow: 1;
             flex-grow: 1;
+            color: #aaacad;
             text-align: center;
             text-align: center;
             overflow: hidden;
             overflow: hidden;
             text-overflow: ellipsis;
             text-overflow: ellipsis;