修改样式

login/src/views/Login/index.vue

@@ -17,10 +17,10 @@
       v-show="!isSelectTenant"
     >
       <div class="ms-main">
-        <div class="login-topImg paTop10"><img
+        <!-- <div class="login-topImg paTop10"><img
             src="@assets/img/loginPop/img1.png"
             alt=""
-          /></div>
+          /></div> -->
         <el-tabs
           v-model="activeName"
           @tab-click="handleClick"
@@ -145,10 +145,10 @@
             </el-form>
           </el-tab-pane>
         </el-tabs>
-        <div class="login-buttonImg paTop10"><img
+        <!-- <div class="login-buttonImg paTop10"><img
             src="@assets/img/loginPop/img2.png"
             alt=""
-          /></div>
+          /></div> -->
       </div>
     </div>
     <select-tenant

login/src/views/Login/style.scss

@@ -1,345 +1,365 @@
 $base_fontSize: 100;
 @function rem($px) {
-  @return $px / $base_fontSize * 1rem;
+    @return $px / $base_fontSize * 1rem;
 }
 
 /deep/.el-input__inner {
-  font-family: Microsoft YaHei;
-  height: rem(48);
-  line-height: rem(10);
-  border-radius: rem(6);
-  background: #1d212a;
-  border: 1px solid rgba(255, 255, 255, 0.3);
-  color: #ffffff;
-  font-size: rem(16);
-  font-weight: 400;
-  &:focus {
-    border: 1px solid #0eaeff;
+    font-family: Microsoft YaHei;
+    height: rem(48);
+    line-height: rem(10);
     border-radius: rem(6);
-  }
-  // opacity: 0.3;
+    background: #1d212a;
+    border: 1px solid rgba(255, 255, 255, 0.3);
+    color: #ffffff;
+    font-size: rem(16);
+    font-weight: 400;
+    &:focus {
+        // border: 1px solid #0eaeff;
+        border: 1px solid #0be5f0;
+        border-radius: rem(6);
+    }
+    // opacity: 0.3;
 }
 /deep/.el-form-item {
-  margin-bottom: rem(30);
+    margin-bottom: rem(30);
 }
 
 /deep/.el-tabs {
-  width: 100%;
-  .el-tabs__header {
-    margin: 0;
-  }
-  .el-tabs__content {
-    .el-form .form-item {
-    }
-  }
-  .el-tabs__nav-wrap::after {
-    display: none;
-  }
-  .el-tabs__nav {
     width: 100%;
-    .el-tabs__bar {
-      height: 0;
+    .el-tabs__header {
+        margin: 0;
     }
-    .el-tabs__active-bar {
-      background-color: transparent;
-      // background: url(../../assets/img/line_selected.png) no-repeat;
-      // height: rem(2);
-      // background: #0EAEFF;
-      // width: rem(48) !important;
-      // left: 25%;
-      // transform: translateX(-50%) !important;
-      // background-position: center;
+    .el-tabs__content {
+        .el-form .form-item {
+        }
     }
-    .el-tabs__item {
-      width: 50%;
-      color: #ffffff33;
-      text-align: center;
-      padding: 0;
+    .el-tabs__nav-wrap::after {
+        display: none;
     }
-    .el-tabs__item.is-active {
-      color: #ffffff;
-      &::after {
-        display: block;
-        content: "";
-        position: absolute;
-        width: rem(48);
-        left: 50%;
-        transform: translateX(-50%);
-        height: rem(2);
-        background: #0eaeff;
-        bottom: 0;
-      }
+    .el-tabs__nav {
+        width: 100%;
+        .el-tabs__bar {
+            height: 0;
+        }
+        .el-tabs__active-bar {
+            background-color: transparent;
+            // background: url(../../assets/img/line_selected.png) no-repeat;
+            // height: rem(2);
+            // background: #0EAEFF;
+            // width: rem(48) !important;
+            // left: 25%;
+            // transform: translateX(-50%) !important;
+            // background-position: center;
+        }
+        .el-tabs__item {
+            width: 50%;
+            color: #ffffff33;
+            text-align: center;
+            padding: 0;
+        }
+        .el-tabs__item.is-active {
+            color: #ffffff;
+            &::after {
+                display: block;
+                content: '';
+                position: absolute;
+                width: rem(48);
+                left: 50%;
+                transform: translateX(-50%);
+                height: rem(2);
+                // background: #0eaeff;
+                background: #0be5f0;
+                bottom: 0;
+            }
+        }
     }
-  }
 }
 
 /deep/ .right-tabbox-newnotice /deep/.el-tabs__nav-wrap::after {
-  position: static !important;
+    position: static !important;
 }
 
 // 改版
 // 动画
 
 @-webkit-keyframes lightfadeout {
-  0% {
-    opacity: 0;
-  }
-  100% {
-    opacity: 1;
-  }
+    0% {
+        opacity: 0;
+    }
+    100% {
+        opacity: 1;
+    }
 }
 @keyframes lightfadeout {
-  0% {
-    opacity: 0;
-  }
-  100% {
-    opacity: 1;
-  }
+    0% {
+        opacity: 0;
+    }
+    100% {
+        opacity: 1;
+    }
 }
 @-webkit-keyframes lightfadeoutleave {
-  0% {
-    opacity: 1;
-  }
-  100% {
-    opacity: 0;
-  }
+    0% {
+        opacity: 1;
+    }
+    100% {
+        opacity: 0;
+    }
 }
 @keyframes lightfadeoutleave {
-  0% {
-    opacity: 1;
-  }
-  100% {
-    opacity: 0;
-  }
+    0% {
+        opacity: 1;
+    }
+    100% {
+        opacity: 0;
+    }
 }
 
 .login-wrap .logo {
-  position: absolute;
-  top: rem(120);
-  left: rem(130);
-  margin: 0;
-  opacity: 0;
-  animation-name: lightfadeout;
-  animation-duration: 0.267s;
-  animation-timing-function: linear;
-  animation-delay: 1.267s;
-  animation-iteration-count: 1;
-  animation-fill-mode: forwards;
+    position: absolute;
+    top: rem(120);
+    left: rem(130);
+    margin: 0;
+    opacity: 0;
+    animation-name: lightfadeout;
+    animation-duration: 0.267s;
+    animation-timing-function: linear;
+    animation-delay: 1.267s;
+    animation-iteration-count: 1;
+    animation-fill-mode: forwards;
 }
 .login-wrap .logo > img {
-  width: rem(150);
-  height: rem(40);
+    width: rem(150);
+    height: rem(40);
 }
 .login-wrap .logoleave {
-  opacity: 1;
-  animation-name: lightfadeoutleave;
-  animation-duration: 0.267s;
-  animation-timing-function: linear;
-  animation-delay: 0.3s;
-  animation-iteration-count: 1;
-  animation-fill-mode: forwards;
+    opacity: 1;
+    animation-name: lightfadeoutleave;
+    animation-duration: 0.267s;
+    animation-timing-function: linear;
+    animation-delay: 0.3s;
+    animation-iteration-count: 1;
+    animation-fill-mode: forwards;
 }
 .ms-login1 {
-  opacity: 0;
-  animation-name: lightfadeout;
-  animation-duration: 0.5s;
-  animation-timing-function: linear;
-  animation-delay: 0.5s;
-  animation-iteration-count: 1;
-  animation-fill-mode: forwards;
+    opacity: 0;
+    animation-name: lightfadeout;
+    animation-duration: 0.5s;
+    animation-timing-function: linear;
+    animation-delay: 0.5s;
+    animation-iteration-count: 1;
+    animation-fill-mode: forwards;
 }
 .ms-login1leave {
-  opacity: 1;
-  animation-name: lightfadeoutleave;
-  animation-duration: 0.5s;
-  animation-timing-function: linear;
-  animation-delay: 0.5s;
-  animation-iteration-count: 1;
-  animation-fill-mode: forwards;
+    opacity: 1;
+    animation-name: lightfadeoutleave;
+    animation-duration: 0.5s;
+    animation-timing-function: linear;
+    animation-delay: 0.5s;
+    animation-iteration-count: 1;
+    animation-fill-mode: forwards;
 }
 
 /deep/.el-input__inner {
-  &::placeholder {
-    font-size: rem(16);
-    font-family: Microsoft YaHei;
-    font-weight: 400;
-    color: #ffffff33;
-  }
+    &::placeholder {
+        font-size: rem(16);
+        font-family: Microsoft YaHei;
+        font-weight: 400;
+        color: #ffffff33;
+    }
 }
 
 .prefix-img {
-  height: rem(18);
-  position: absolute;
-  top: rem(15);
-  padding: 0 rem(10) 0 rem(14);
+    height: rem(18);
+    position: absolute;
+    top: rem(15);
+    padding: 0 rem(10) 0 rem(14);
 }
 .center-middle {
-  width: rem(1660);
-  height: rem(430);
-  position: absolute;
-  top: 23%;
-  left: 50%;
-  transform: translate(-50%, -50%);
+    width: rem(1660);
+    height: rem(430);
+    position: absolute;
+    top: 23%;
+    left: 50%;
+    transform: translate(-50%, -50%);
 }
 
 .suffix-img {
-  position: absolute;
-  top: rem(15);
-  right: 0;
-  padding: 0 rem(10) 0 rem(14);
+    position: absolute;
+    top: rem(15);
+    right: 0;
+    padding: 0 rem(10) 0 rem(14);
 }
 /deep/.el-input--prefix .el-input__inner {
-  padding-left: rem(44);
+    padding-left: rem(44);
 }
 .login-wrap .ms-main .form-item .codeImg-item {
-  width: rem(110);
-  height: rem(34);
-  background: #97a3c1;
-  opacity: 0.8;
-  border-radius: rem(4);
+    width: rem(110);
+    height: rem(34);
+    background: #97a3c1;
+    opacity: 0.8;
+    border-radius: rem(4);
 }
 .login-wrap .ms-main .form-item .sms-code {
-  border-left: 1px solid rgba(38, 133, 242, 0.3);
-  padding-left: rem(26);
-  font-size: rem(16);
-  font-family: Microsoft YaHei;
-  font-weight: 400;
-  color: rgba(14, 174, 255, 1);
+    border-left: 1px solid rgba(38, 133, 242, 0.3);
+    padding-left: rem(26);
+    font-size: rem(16);
+    font-family: Microsoft YaHei;
+    font-weight: 400;
+    // color: rgba(14, 174, 255, 1);
+    color: #0be5f0;
 }
 .login-wrap .ms-main .form-item .sms-code-notime {
-  width: rem(110);
-  padding-left: rem(10);
+    width: rem(110);
+    padding-left: rem(10);
 }
 .login-wrap .ms-main .form-item .sms-code-istime {
-  font-size: rem(16);
-  font-family: Microsoft YaHei;
-  font-weight: 400;
-  color: rgba(255, 255, 255, 0.4);
+    font-size: rem(16);
+    font-family: Microsoft YaHei;
+    font-weight: 400;
+    color: rgba(255, 255, 255, 0.4);
 }
 .login-wrap .ms-main .btn {
-  border: none;
+    border: none;
 }
 
 .define-el-select {
-  /deep/ .el-input__suffix {
-    display: none;
-  }
+    /deep/ .el-input__suffix {
+        display: none;
+    }
 }
 .login-wrap .ms-main .form-item .btn-select {
-  padding: 0 rem(10) 0 rem(20);
-  pointer-events: none;
-  img {
-    width: rem(18);
-    height: rem(18);
-  }
+    padding: 0 rem(10) 0 rem(20);
+    pointer-events: none;
+    img {
+        width: rem(18);
+        height: rem(18);
+    }
 }
 
 .login-wrap {
-  min-width: rem(1280);
-  width: 100%;
-  height: 100%;
-  background: url(../../assets/img/loginPop/bg.png) center no-repeat;
-  background-size: cover;
-  overflow: hidden;
-  position: relative;
-  .ms-login {
-    position: absolute;
-    top: 50%;
-    right: rem(215);
-    transform: translateY(-50%);
-  }
-  .login-title {
-    position: absolute;
-    top: rem(226);
-    left: rem(130);
-    color: white;
-    font-family: PingFangSC-Semibold;
-    .title-name {
-      font-size: rem(60);
-    }
-    .title-lang {
-      font-size: rem(17.5);
-      display: inline-block;
-      margin-left: rem(30);
-      transform: scale(1.15, 0.8);
-      -ms-transform: scale(1.15, 0.8);
-      -webkit-transform: scale(1.15, 0.8);
-      -moz-transform: scale(1.15, 0.8);
-      -o-transform: scale(1.15, 0.8);
-    }
-  }
-  .ms-main {
-    width: rem(400);
-    border: 1px solid rgba(240, 238, 241, 0.2);
-    border-radius: rem(10);
-    opacity: 0.8;
-    height: rem(468);
-    background: linear-gradient(0deg, #101327 0%, #29314c 100%);
-    box-shadow: 0px rem(10) rem(80) 0px rgba(0, 0, 0, 0.15);
-    .login-topImg,
-    .login-buttonImg {
-      width: rem(378);
-      text-align: center;
-      img {
-        width: 100%;
-      }
-    }
-    .login-buttonImg {
-      position: absolute;
-      bottom: 0;
-    }
-    .login-body {
-      padding: rem(15) rem(30) 0 rem(30);
-      .tips {
-        color: #f25050;
-        font-size: rem(14);
-        display: inline-block;
-        margin-bottom: rem(10);
-      }
-      .btn {
-        width: 100%;
-        background: linear-gradient(-90deg, #0098ef 0%, #0eaeff 100%);
-        border-radius: rem(6);
-        height: rem(48);
-        font-size: rem(20);
-        font-family: Microsoft YaHei;
-        font-weight: 400;
-        color: #ffffff;
-      }
-      .remember {
-        margin-bottom: rem(30);
-      }
-    }
-    .form-item {
-      margin: rem(24) 0;
-      height: rem(48);
-      display: flex;
-      align-items: center;
-      position: relative;
-      .codeImg {
+    min-width: rem(1280);
+    width: 100%;
+    height: 100%;
+    // background: url(../../assets/img/loginPop/bg.png) center no-repeat;
+    background: url(../../assets/img/loginPop/bg_denglu.png) center no-repeat;
+    background-size: cover;
+    overflow: hidden;
+    position: relative;
+    .ms-login {
         position: absolute;
-        right: rem(10);
-      }
-      .code {
-        border-left: 1px solid #2887f2;
-        height: rem(20);
-        line-height: 0px;
-        padding-left: rem(10);
-      }
-      .el-select {
-        width: 100%;
-      }
-      .icon {
+        top: 50%;
+        right: rem(215);
+        transform: translateY(-50%);
+    }
+    .login-title {
         position: absolute;
-        top: rem(18);
-        left: rem(6);
-      }
+        top: rem(226);
+        left: rem(130);
+        color: white;
+        font-family: PingFangSC-Semibold;
+        .title-name {
+            font-size: rem(60);
+        }
+        .title-lang {
+            font-size: rem(17.5);
+            display: inline-block;
+            margin-left: rem(30);
+            transform: scale(1.15, 0.8);
+            -ms-transform: scale(1.15, 0.8);
+            -webkit-transform: scale(1.15, 0.8);
+            -moz-transform: scale(1.15, 0.8);
+            -o-transform: scale(1.15, 0.8);
+        }
+    }
+    .ms-main {
+        width: rem(400);
+        border: 1px solid rgba(240, 238, 241, 0.2);
+        border-radius: rem(10);
+        opacity: 0.8;
+        height: rem(400);
+        background: linear-gradient(0deg, #101327 0%, #29314c 100%);
+        box-shadow: 0px rem(10) rem(80) 0px rgba(0, 0, 0, 0.15);
+        .login-topImg,
+        .login-buttonImg {
+            width: rem(378);
+            text-align: center;
+            img {
+                width: 100%;
+            }
+        }
+        .login-buttonImg {
+            position: absolute;
+            bottom: 0;
+        }
+        .login-body {
+            padding: rem(15) rem(30) 0 rem(30);
+            .tips {
+                color: #f25050;
+                font-size: rem(14);
+                display: inline-block;
+                margin-bottom: rem(10);
+            }
+            .btn {
+                width: 100%;
+                // background: linear-gradient(-90deg, #0098ef 0%, #0eaeff 100%);
+                background: linear-gradient(-90deg, #0be5f0 0%, #0be5f0 100%);
+                border-radius: rem(6);
+                height: rem(48);
+                font-size: rem(20);
+                font-family: Microsoft YaHei;
+                font-weight: 400;
+                color: #ffffff;
+            }
+            .remember {
+                margin-bottom: rem(30);
+            }
+        }
+        .form-item {
+            margin: rem(24) 0;
+            height: rem(48);
+            display: flex;
+            align-items: center;
+            position: relative;
+            .codeImg {
+                position: absolute;
+                right: rem(10);
+            }
+            .code {
+                // border-left: 1px solid #2887f2;
+                border-left: 1px solid #0be5f0;
+                height: rem(20);
+                line-height: 0px;
+                padding-left: rem(10);
+            }
+            .el-select {
+                width: 100%;
+            }
+            .icon {
+                position: absolute;
+                top: rem(18);
+                left: rem(6);
+            }
+        }
     }
-  }
 }
 .paTop10 {
-  padding-top: rem(10);
+    padding-top: rem(10);
 }
 .mgTop16 {
-  margin-top: rem(16);
+    margin-top: rem(16);
+}
+
+/deep/.el-checkbox__input.is-checked .el-checkbox__inner,
+.myRedCheckBox .el-checkbox__input.is-indeterminate .el-checkbox__inner {
+    border-color: #0be5f0 !important;
+    background-color: #0be5f0 !important;
+}
+
+/deep/.el-checkbox__inner:hover {
+    background-color: #0be5f0 !important;
+    border-color: #0be5f0 !important;
+}
+/deep/.el-checkbox__label {
+    color: #0be5f0 !important;
 }

login/src/views/NewNav/index.vue

@@ -34,7 +34,7 @@
             @click="goPage(item.linkPath, item.isOwner, item.id, item.appId)"
             :class="[item.isOwner ? '' : 'unOwner', 'item']"
           >
-            <span class="left-label"></span>
+            <!-- <span class="left-label"></span> -->
             <div class="item-cenText">
               <img
                 class="img"
@@ -51,7 +51,7 @@
                 <div class="subtitle">{{ item.englishName }}</div>
               </div>
             </div>
-            <div class="right-img"></div>
+            <!-- <div class="right-img"></div> -->
           </div>
         </template>
       </div>

login/src/views/NewNav/style.scss

@@ -1,275 +1,288 @@
 $base_fontSize: 100;
 @function rem($px) {
-  @return $px / $base_fontSize * 1rem;
+    @return $px / $base_fontSize * 1rem;
 }
 .nav-wrap {
-  width: 100%;
-  height: 100%;
-  background: linear-gradient(0deg, #000000 0%, #132037 100%);
-  overflow: hidden;
-  position: relative;
-  .top {
+    width: 100%;
+    height: 100%;
+    // background: linear-gradient(0deg, #000000 0%, #132037 100%);
+    // #020712
+    background: linear-gradient(0deg, #020712 0%, #020712 100%);
+    overflow: hidden;
     position: relative;
-    z-index: 101;
-    padding-top: rem(67);
-    .lfet-right {
-      padding: 0 rem(100) 0 rem(100);
-      display: flex;
-      justify-content: space-between;
-      text-align: center;
-      position: relative;
-      top: rem(-25);
-      .tenantName {
-        color: RGBA(254, 254, 254, 1);
-        padding: 0 rem(20);
-        height: rem(49);
-        line-height: rem(49);
-        font-size: rem(20);
-        box-sizing: border-box;
-        border: 1px solid RGBA(71, 81, 98, 1);
-        border-radius: rem(10);
-        margin-right: rem(20);
-        cursor: pointer;
-      }
+    .top {
+        position: relative;
+        z-index: 101;
+        padding-top: rem(67);
+        .lfet-right {
+            padding: 0 rem(100) 0 rem(100);
+            display: flex;
+            justify-content: space-between;
+            text-align: center;
+            position: relative;
+            top: rem(-50);
+            .tenantName {
+                color: RGBA(254, 254, 254, 1);
+                padding: 0 rem(20);
+                height: rem(49);
+                line-height: rem(49);
+                font-size: rem(20);
+                box-sizing: border-box;
+                border: 1px solid RGBA(71, 81, 98, 1);
+                border-radius: rem(10);
+                margin-right: rem(20);
+                cursor: pointer;
+            }
+        }
     }
-  }
-  .logo {
-    width: rem(120);
-    height: rem(36);
-    background: url(../../assets/img/nav/logo.png);
-    background-size: 100% 100%;
-    z-index: 11;
-  }
-  .logout {
-    width: rem(49);
-    height: rem(49);
-    background: url(../../assets/img/btn_switch.png);
-    background-size: 100% 100%;
-    z-index: 11;
-  }
-
-  .top_png {
-    width: 100%;
-    width: rem(1458);
-    margin: auto;
-    height: rem(58);
-    // transform: translateX(-50%);
-    animation-name: opacityAni;
-    background: url(../../assets/img/nav/img_toubu.png);
-    background-size: cover;
-    opacity: 0;
-    animation-delay: 0.668s;
-    animation-duration: 0.834s;
-    animation-fill-mode: forwards;
-    p {
-      font-size: rem(24);
-      font-family: PingFang SC;
-      font-weight: 600;
-      color: #ffffff;
-      background: linear-gradient(1deg, #a8c4f5 0%, #ffffff 100%);
-      -webkit-background-clip: text;
-      -webkit-text-fill-color: transparent;
-      position: relative;
-      top: rem(-10);
-      text-align: center;
+    .logo {
+        width: rem(120);
+        height: rem(36);
+        background: url(../../assets/img/nav/logo.png);
+        background-size: 100% 100%;
+        z-index: 11;
     }
-  }
-  .bottom_png {
-    position: absolute;
-    z-index: 100;
-    bottom: 0;
-    width: 100%;
-    height: rem(83);
-    // height: 4.3vw;
-    background: #010305;
-    & > span {
-      display: block;
-      width: 100%;
-      height: rem(83);
-      // height: 4.3vw;
-      animation-name: opacityAni;
-      background: url(../../assets/img/nav/img_dibu.png);
-      background-size: cover;
-      opacity: 0;
-      animation-delay: 0.668s;
-      animation-duration: 0.834s;
-      animation-fill-mode: forwards;
+    .logout {
+        width: rem(49);
+        height: rem(49);
+        background: url(../../assets/img/btn_switch.png);
+        background-size: 100% 100%;
+        z-index: 11;
     }
-  }
-  .bg-earth {
-    position: absolute;
-    width: rem(1500);
-    height: rem(600);
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    overflow-y: auto;
 
-    &::-webkit-scrollbar {
-      display: none;
-    }
-  }
-  .nav-title {
-    position: absolute;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    flex-direction: column;
-    width: rem(381);
-    height: rem(153);
-    img {
-      width: rem(150);
-      height: rem(40);
-    }
-    .dot_icon {
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      flex-direction: row;
-      margin-top: rem(10);
-      p {
-        font-size: rem(36);
-        font-weight: 600;
-        font-family: PingFang SC;
-        color: #ffffff;
-        text-align: center;
-      }
-      .icon-blue-rect {
-        display: inline-block;
-        margin: 0 rem(10);
-        width: rem(6);
-        height: rem(6);
-        background: linear-gradient(-80deg, #2a68e6 0%, #2887f2 100%);
-        border-radius: rem(6);
-        vertical-align: super;
-      }
-    }
-  }
-  .nav-content {
-    display: grid;
-    // 左右距离30 一列3等分
-    row-gap: rem(30);
-    column-gap: rem(30);
-    grid-template-columns: repeat(3, minmax(0, 1fr));
-    .item {
-      width: rem(480);
-      height: rem(180);
-      background: RGBA(32, 40, 57, 1);
-      border-radius: rem(10);
-      border: 1px solid transparent;
-      position: relative;
-      cursor: pointer;
-      display: flex;
-      justify-content: space-between;
-      &:hover {
-        border-color: #ffffff;
-        .left-label {
-          opacity: 1;
-        }
-        .item-cenText .contents {
-          opacity: 1;
-          .subtitle {
-            color: #0eaeff;
-          }
-        }
-        .right-img {
-          opacity: 0.7;
+    .top_png {
+        width: 100%;
+        width: rem(1200);
+        margin: auto;
+        height: rem(58);
+        // transform: translateX(-50%);
+        animation-name: opacityAni;
+        background: url(../../assets/img/nav/bg_top.png) center no-repeat;
+
+        background-size: cover;
+        opacity: 0;
+        animation-delay: 0.668s;
+        animation-duration: 0.834s;
+        animation-fill-mode: forwards;
+        p {
+            font-size: rem(24);
+            font-family: PingFang SC;
+            font-weight: 600;
+            color: #ffffff;
+            background: linear-gradient(1deg, #a8c4f5 0%, #ffffff 100%);
+            -webkit-background-clip: text;
+            -webkit-text-fill-color: transparent;
+            position: relative;
+            top: rem(12);
+            text-align: center;
         }
-        .img {
-          display: none;
+    }
+    .bottom_png {
+        position: absolute;
+        z-index: 100;
+        bottom: 0;
+        width: 100%;
+        height: rem(83);
+        // height: 4.3vw;
+        // background: #010305;
+        & > span {
+            display: block;
+            width: 100%;
+            height: rem(1);
+            // height: 4.3vw;
+            animation-name: opacityAni;
+            // border: 1px solid #3e414a;
+            background: url(../../assets/img/nav/bg_bottom.png);
+            background-size: cover;
+            opacity: 0;
+            animation-delay: 0.668s;
+            animation-duration: 0.834s;
+            animation-fill-mode: forwards;
         }
-        .imghover {
-          display: block;
+    }
+    .bg-earth {
+        position: absolute;
+        width: rem(1500);
+        height: rem(600);
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+        overflow-y: auto;
+
+        &::-webkit-scrollbar {
+            display: none;
         }
-      }
-      .imghover {
-        display: none;
-      }
-      .item-cenText {
-        margin: rem(43) 0 0 rem(56);
+    }
+    .nav-title {
+        position: absolute;
         display: flex;
-        .img,
-        .imghover {
-          width: rem(82);
-          height: rem(92);
+        justify-content: center;
+        align-items: center;
+        flex-direction: column;
+        width: rem(381);
+        height: rem(153);
+        img {
+            width: rem(150);
+            height: rem(40);
         }
-        .contents {
-          margin-left: rem(48);
-          font-size: rem(24);
-          font-family: Microsoft YaHei;
-          font-weight: bold;
-          color: #ffffff;
-          opacity: 0.8;
-          .subtitle {
-            font-size: rem(12);
+        .dot_icon {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            flex-direction: row;
             margin-top: rem(10);
-            color: #748ba8;
-            white-space: nowrap;
-          }
+            p {
+                font-size: rem(36);
+                font-weight: 600;
+                font-family: PingFang SC;
+                color: #ffffff;
+                text-align: center;
+            }
+            .icon-blue-rect {
+                display: inline-block;
+                margin: 0 rem(10);
+                width: rem(6);
+                height: rem(6);
+                background: linear-gradient(-80deg, #2a68e6 0%, #2887f2 100%);
+                border-radius: rem(6);
+                vertical-align: super;
+            }
         }
-      }
-      .right-img {
-        background: url("../../assets/img/nav/img6.png") no-repeat;
-        background-size: cover;
-        width: rem(90);
-        height: rem(180);
-        opacity: 0.2;
-      }
-
-      .left-label {
-        width: rem(6);
-        height: rem(50);
-        background: #ffffff;
-        opacity: 0.3;
-        border-radius: 0px rem(4) rem(4) 0px;
-        position: absolute;
-        left: 0;
-        top: 50%;
-        transform: translateY(-50%);
-      }
     }
-    .item.unOwner {
-      opacity: 0.3;
-      cursor: no-drop;
-      animation-name: opacityAni2;
-      &:hover {
-        border-color: transparent;
-        .left-label {
-          opacity: 0.3;
-        }
-        .item-cenText .contents {
-          opacity: 0.8;
-          .subtitle {
-            color: #748ba8;
-          }
-        }
-        .right-img {
-          opacity: 0.2;
-        }
-        .img {
-          display: block;
+    .nav-content {
+        display: grid;
+        // 左右距离30 一列3等分
+        row-gap: rem(30);
+        column-gap: rem(30);
+        grid-template-columns: repeat(5, minmax(0, 1fr));
+        .item {
+            // width: rem(480);
+            // height: rem(180);
+            width: rem(276);
+            height: rem(280);
+            background: RGBA(32, 40, 57, 1);
+            border-radius: rem(10);
+            border: 1px solid transparent;
+            position: relative;
+            cursor: pointer;
+            display: flex;
+            justify-content: space-between;
+            &:hover {
+                border-color: #ffffff;
+                .left-label {
+                    opacity: 1;
+                }
+                .item-cenText .contents {
+                    opacity: 1;
+                    .subtitle {
+                        color: #0eaeff;
+                    }
+                }
+                .right-img {
+                    opacity: 0.7;
+                }
+                .img {
+                    display: none;
+                }
+                .imghover {
+                    display: block;
+                }
+            }
+            .imghover {
+                display: none;
+            }
+            .item-cenText {
+                // margin: rem(43) 0 0 rem(56);
+                margin: rem(54) 0 0 rem(96);
+                display: flex;
+                .img,
+                .imghover {
+                    width: rem(82);
+                    height: rem(92);
+                }
+                .contents {
+                    // margin-left: rem(48);
+                    width: rem(300);
+                    font-size: rem(24);
+                    font-family: Microsoft YaHei;
+                    font-weight: bold;
+                    color: #ffffff;
+                    opacity: 0.8;
+                    position: absolute;
+                    left: 50%;
+                    top: 70%;
+                    transform: translate(-50%, -50%);
+                    text-align: center;
+                    .subtitle {
+                        font-size: rem(12);
+                        margin-top: rem(10);
+                        color: #748ba8;
+                        white-space: nowrap;
+                    }
+                }
+            }
+            .right-img {
+                background: url('../../assets/img/nav/img6.png') no-repeat;
+                background-size: cover;
+                width: rem(90);
+                height: rem(180);
+                opacity: 0.2;
+            }
+
+            .left-label {
+                width: rem(6);
+                height: rem(50);
+                background: #ffffff;
+                opacity: 0.3;
+                border-radius: 0px rem(4) rem(4) 0px;
+                position: absolute;
+                left: 0;
+                top: 50%;
+                transform: translateY(-50%);
+            }
         }
-        .imghover {
-          display: none;
+        .item.unOwner {
+            opacity: 0.3;
+            cursor: no-drop;
+            animation-name: opacityAni2;
+            &:hover {
+                border-color: transparent;
+                .left-label {
+                    opacity: 0.3;
+                }
+                .item-cenText .contents {
+                    opacity: 0.8;
+                    .subtitle {
+                        color: #748ba8;
+                    }
+                }
+                .right-img {
+                    opacity: 0.2;
+                }
+                .img {
+                    display: block;
+                }
+                .imghover {
+                    display: none;
+                }
+            }
         }
-      }
     }
-  }
 }
 @keyframes opacityAni {
-  0% {
-      opacity: 0;
-  }
-  100% {
-      opacity: 1;
-  }
+    0% {
+        opacity: 0;
+    }
+    100% {
+        opacity: 1;
+    }
 }
 
 @keyframes opacityAni2 {
-  0% {
-      opacity: 0;
-  }
-  100% {
-      opacity: 0.3;
-  }
-}
+    0% {
+        opacity: 0;
+    }
+    100% {
+        opacity: 0.3;
+    }
+}

operationSupport/src/views/payService/landlordBill/index.vue

@@ -217,13 +217,27 @@
               class="item"
               effect="light"
               placement="bottom"
-              content="修改金额"
+              content="修改账单金额"
             >
               <i
                 class="zoniot_font zoniot-icon-koufeijilu"
                 @click="editAmount(scope.row)"
               ></i>
             </el-tooltip>
+
+            <el-tooltip
+              v-show="chargeStatus == 1"
+              class="item"
+              effect="light"
+              placement="bottom"
+              content="修改应收金额"
+            >
+              <i
+                class="zoniot_font zoniot-icon-koufeijilu"
+                @click="receivableAmount(scope.row)"
+              ></i>
+            </el-tooltip>
+
             <el-tooltip
               v-show="chargeStatus == 1"
               class="item"
@@ -512,6 +526,25 @@ export default {
         this.mixins_search();
       });
     },
+    // 修改应收金额
+    receivableAmount () {
+      new Promise((resolve) => {
+        this.$store.dispatch('addPopup', {
+          url: '/payService/landlordBill/stePage/receivable.vue',
+          width: '830px',
+          height: '500px',
+          props: {
+            callback: resolve
+          },
+          showConfirmButton: true,
+          showCancelButton: true,
+          hideStar: true,
+          title: '修改应收金额'
+        });
+      }).then(() => {
+        this.mixins_search();
+      });
+    },
     deluserbyidFn (id) {
       const h = this.$createElement;
       this.$msgBox(`删除账单`, '删除后将无法恢复，请问是否继续?')

operationSupport/src/views/payService/landlordBill/stePage/Addreceivable.vue

@@ -0,0 +1,87 @@
+<template>
+  <div>
+    <el-form
+      :model="ruleForm"
+      :rules="rules"
+      ref="ruleForm"
+      label-width="150px"
+      class="demo-ruleForm"
+    >
+      <el-form-item label="原收金额（元）">
+        <el-input
+          v-model="ruleForm.amountReceived"
+          disabled
+        ></el-input>
+      </el-form-item>
+      <el-form-item
+        label="申请应收金额（元）"
+        prop="applicationAmount"
+      >
+        <el-input
+          v-model="ruleForm.applicationAmount"
+          type="number"
+          class="input_number"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="申请原因">
+        <el-input
+          v-model="ruleForm.reason"
+          type="textarea"
+        ></el-input>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+
+
+<script>
+export default {
+  props: ['params'],
+  data () {
+    return {
+      ruleForm: {
+        amountReceived: '200',
+        applicationAmount: '',
+        reason: ''
+      },
+      rules: {
+        applicationAmount: [
+          { required: true, message: '请输入申请应收金额（元）', trigger: 'blur' },
+        ]
+      }
+    }
+  },
+  methods: {
+    submit () {
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          this.$emit('close');
+          this.params.callback();
+        } else {
+          return;
+        }
+      })
+    }
+  },
+  created () {
+
+  }
+}
+
+
+
+</script>
+
+
+
+
+<style lang="scss" scoped>
+/deep/.input_number input::-webkit-outer-spin-button,
+/deep/.input_number input::-webkit-inner-spin-button {
+    -webkit-appearance: none;
+}
+/deep/.input_number input[type='number'] {
+    -moz-appearance: textfield;
+}
+</style>

operationSupport/src/views/payService/landlordBill/stePage/receivable.vue

@@ -0,0 +1,200 @@
+<template>
+  <div>
+    <el-row>
+      <el-col :span="12">
+        <h3>景乐新村南区3栋（张三）</h3>
+      </el-col>
+
+      <el-col :span="12">
+
+        <div class="search-icon btn_right">
+          <el-tooltip
+            class="item"
+            effect="light"
+            placement="bottom"
+            content="导出"
+          >
+
+            <i
+              class="zoniot_font zoniot-icon-tianjia i_size "
+              @click="addreceivable"
+            ></i>
+          </el-tooltip>
+        </div>
+      </el-col>
+      <el-col
+        :span="24"
+        class="span_margin"
+      >
+        <span>{{YearTime}}年{{MonTime}}月物业费账单</span>
+      </el-col>
+
+      <el-col :span="24">
+        <template>
+
+          <el-table
+            :data="tableData"
+            border
+            :height="tableData.length > 7 ? 280 : null"
+          >
+            <el-table-column
+              type="index"
+              label="NO"
+              :index="indexMethod"
+            >
+            </el-table-column>
+            <el-table-column
+              label="原应收金额（元）"
+              width="120"
+              prop="name"
+            >
+            </el-table-column>
+            <el-table-column
+              label="申请应收金额（元）"
+              width="130"
+              prop="name"
+            >
+            </el-table-column>
+            <el-table-column
+              label="申请原因"
+              prop="name"
+            >
+            </el-table-column>
+            <el-table-column
+              label="申请人"
+              prop="name"
+            >
+            </el-table-column>
+            <el-table-column
+              label="审核状态"
+              prop="name"
+            >
+            </el-table-column>
+            <el-table-column
+              label="审核信息"
+              prop="name"
+            >
+            </el-table-column>
+            <el-table-column
+              label="审核人"
+              prop="name"
+            >
+            </el-table-column>
+          </el-table>
+        </template>
+
+      </el-col>
+
+    </el-row>
+  </div>
+
+</template>
+
+
+
+
+<script>
+export default {
+  data () {
+    return {
+      YearTime: '',
+      MonTime: '',
+      tableData: [
+        {
+          name: '1',
+        }, {
+          name: '2'
+        },
+        {
+          name: '3'
+        },
+        ,
+        {
+          name: '3'
+        }
+        ,
+        {
+          name: '4'
+        },
+        {
+          name: '5'
+        },
+        // {
+        //   name: '6'
+        // }
+      ]
+    }
+  },
+  methods: {
+    indexMethod (index) {
+      return index + 1;
+    },
+    timeCode () {
+      var time = new Date();
+      this.YearTime = time.getFullYear();
+      this.MonTime = time.getMonth() + 1;
+    },
+    addreceivable () {
+      // alert('11')
+      new Promise((resolve) => {
+        this.$store.dispatch('addPopup', {
+          url: '/payService/landlordBill/stePage/Addreceivable.vue',
+          width: '560px',
+          height: '310px',
+          props: {
+            callback: resolve
+          },
+          // showConfirmButton: true,
+          // showCancelButton: true,
+          // hideStar: true,
+          title: '修改应收金额'
+        });
+      }).then(() => {
+        debugger
+      });
+    }
+  },
+  created () {
+    this.timeCode();
+  }
+}
+
+
+</script>
+
+
+
+<style lang="scss" scoped>
+.body_padding {
+    padding: 20px;
+}
+.btn_right {
+    display: flex;
+    flex-direction: row-reverse;
+}
+.i_size {
+    font-size: 30px;
+}
+.span_margin {
+    margin: 20px;
+}
+
+// 滚动条的宽度
+/deep/ .el-table__body-wrapper::-webkit-scrollbar {
+    width: 10px; /*高宽分别对应横竖滚动条的尺寸*/
+    height: 1px;
+}
+// 滚动条的滑块
+/deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
+    /*滚动条里面小方块*/
+    border-radius: 10px;
+    // -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+    background: #c6c4c4a9;
+}
+/deep/ .el-table__body-wrapper::-webkit-scrollbar-track {
+    /*滚动条里面轨道*/
+    // -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+    border-radius: 10px;
+    background: #f4f7f9a8;
+}
+</style>

operationSupport/src/views/propertyManagement/common/detailView.vue

@@ -31,7 +31,6 @@ export default {
       return this.params.successImageLists;
     },
     houseData () {
-
       return this.params.houseData;
     },
     peopleData () {
@@ -54,6 +53,7 @@ export default {
       return this.params.userType;
     }
   },
-  created () { }
+  created () {
+  }
 };
 </script>

operationSupport/src/views/propertyManagement/common/previeInform.vue

@@ -394,7 +394,6 @@ export default {
       return node.checked || node.indeterminate;
     },
     filterNode (value, data, node) {
-      console.log('none', node)
       if (node.checked || (node.indeterminate && data.children == null)) {
 
         this.houseDataNamesPeople.push(data.label);

operationSupport/src/views/propertyManagement/inform.vue

@@ -274,7 +274,6 @@ export default {
     clickDatail (row) {
       this.$http.get('/czc-community/notice/find/' + row.id).then(({ data, status, msg }) => {
         if (status == 0) {
-
           let treeData = JSON.parse(data.treeData);
           let treeDataHome = JSON.parse(treeData[0]);
           let treeDataPeople = JSON.parse(treeData[1]);
@@ -305,6 +304,7 @@ export default {
                 houseDataPeopleIdLandlady: treeDataLandlady,
                 userType: userType,
                 showrightPhone: true,
+                id: row.id,
                 callback: resolve
               },
               title: data.type == 0 ? '物业通知详情' : '社区活动详情',

smart/src/views/parkingManagement/index.vue

@@ -131,7 +131,7 @@ export default {
           props: {
             id: row.parkId,
             garageName: row.garageName,
-            // callback: resolve
+            callback: resolve
           },
           // showConfirmButton: true,
           // showCancelButton: true,

smart/src/views/parkingManagement/setpPage/card.vue

@@ -67,6 +67,7 @@ export default {
             if (status == 0) {
               this.$message.success('成功');
               this.$emit('close');
+              this.params.callback();
             } else {
               this.$message.success('失败');
             }

smart/src/views/vehicleAudit/detalis.vue

@@ -36,7 +36,55 @@
       </div>
 
     </el-form>
-    <div v-show="modular == 1 ? false : true"></div>
+    <div v-show="modular == 1 ? false : true">
+      <el-row>
+        <el-col :span="15">
+          <el-row>
+            <el-col :span="24">
+              <h3>景乐村南区1栋201-张三</h3>
+            </el-col>
+            <el-col
+              :span="24"
+              class="span_margin"
+            >
+              <span>物业缴费情况：</span>
+              <span>未缴清物业费，无法办理月卡</span>
+            </el-col>
+            <el-col :span="24">
+              <span>审核结果：</span>
+              <span class="span_color">不通过</span>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="9">
+          <template v-for="(item, index) in businessRecordList">
+            <div
+              class="steps"
+              :key="index"
+            >
+              <div class="steps-left">
+                <img
+                  src="@assets/img/point_yiwancheng@2x.png"
+                  alt
+                />
+                <div
+                  class="steps-left-line"
+                  v-if="index !== businessRecordList.length - 1"
+                ></div>
+              </div>
+
+              <div class="steps-right">
+                <div class="steps-right-title">
+                  <span>{{ item.name }}</span>
+                </div>
+              </div>
+
+            </div>
+          </template>
+        </el-col>
+      </el-row>
+
+    </div>
   </div>
 </template>
 
@@ -53,6 +101,14 @@ export default {
         desc: '',
         modular: '1'
       },
+      businessRecordList: [
+        {
+          name: '车主信息'
+        },
+        {
+          name: '物业缴费情况'
+        }
+      ],
       rules: {
         resource: [
           { required: true, message: '请选择审核方式', trigger: 'change' }
@@ -82,4 +138,56 @@ export default {
   }
 }
 
-</script>
+</script>
+
+
+<style lang="less" scoped>
+.span_color {
+    color: red;
+}
+.span_margin {
+    margin: 20px 0;
+}
+
+.steps {
+    display: flex;
+    margin-left: 20px;
+    img {
+        width: 20px;
+        vertical-align: -webkit-baseline-middle;
+    }
+    .steps-left {
+        margin-right: 10px;
+        .steps-left-line {
+            width: 2px;
+            // height: calc(100% - 40px);
+            height: 50px;
+            margin: 10px auto;
+            background-color: #0eaeff !important;
+            // background-color: $mainBgColor;
+        }
+    }
+    .steps-right {
+        width: 100%;
+        line-height: 30px;
+        // margin-bottom: 10px;
+        .steps-right-title {
+            font-weight: 600;
+            display: flex;
+            justify-content: space-between;
+            .status {
+                color: #0eaeff !important;
+                font-weight: 400;
+            }
+        }
+        .steps-right-content {
+            font-size: 12px;
+            color: #303133;
+            display: flex;
+            span:first-child {
+                margin-right: 10px;
+            }
+        }
+    }
+}
+</style>