Merge branch 'ISV' of http://gitlab.roboming.com/Simon/mingPay-web into ISV

src/components/pages/rightsManagement/addOrRights.vue

@@ -214,6 +214,9 @@ export default {
 </script>
 
 <style lang="less">
+  .addOrRights {
+     scrollbar-width: none; /* Firefox */
+  }
   .title{
     font-weight: bolder;
     line-height: 22px;
@@ -247,9 +250,10 @@ export default {
     color: rgba(0,0,0,0.85);
   }
   .permissonTitle {
+    margin-top: 20px;
     padding: 22px 20px;
-    background: #FAFAFA;
-    border: 1px solid #F8F8F8;
+    background: #F2F2F2 !important;
+    border: 1px solid #dedede !important;
     border-radius: 4px 4px 0px 0px;
   }
   .confirm {
@@ -275,11 +279,12 @@ export default {
   }
   .box2>div{
     display: flex;
-    border: 1px solid #f8f8f8;
+    border: 1px solid #dedede !important;
+    margin-top: -1px;
   }
   .box2-2{
     flex: 4;
-    border-right: 1px solid #f8f8f8;
+    border-right: 1px solid #dedede !important;
     display: flex;
     align-items: center;
     padding-left: 20px;

src/components/pages/rightsManagement/rightsManagement.vue

@@ -217,7 +217,7 @@ export default {
     margin-top: 20px;
   }
   .addRole {
-    margin-top: 25px;
+    margin-top: 10px;
     margin-bottom: 20px;
   }
   .delete {