Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web

@@ -59,9 +59,15 @@ export default {
       if (this.btnShow) { //判断按钮的显影来决定是否需要计算高度
         if (this.height == 'auto') {
           this.contentHeight = (this.$refs.contentRef.offsetHeight - 100) + 'px'
+        }else{
+          this.contentHeight = this.height
         }
       } else {
-        this.contentHeight = (parseInt(this.height) - parseInt('100px')) + 'px';
+        if(this.height=='auto'){
+          this.contentHeight = this.$refs.contentRef.offsetHeight
+        }else{
+          this.contentHeight = this.height
+        }
       }
     }, 500)
   },
@@ -139,23 +145,23 @@ export default {
 }
 
 .ls-mask-footer {
-  height: 50px;
-  display: flex;
-  justify-content: center;
-  width: 100%;
-  box-shadow: 0px 0px 2px 0px;
-  border-radius: 0 0 10px 10px;
-  position: absolute;
-  bottom: 0;
-  background: #ffffff;
+    height: 50px;
+    display: flex;
+    justify-content: center;
+    width: 100%;
+    box-shadow: 0px 0px 2px 0px;
+    border-radius: 0 0 10px 10px;
+    position: absolute;
+    bottom: 0;
+    background: #ffffff;
 }
 
 
 /deep/.closeStyle {
   position: absolute;
-  top: 17px;
-  right: 12px;
-  font-size: 20px;
+  top: 13px;
+  right: 26px;
+  font-size: 24px;
   cursor: pointer;
   color: #409EFF;
 }

@@ -202,7 +202,7 @@ export default {
   height: 48px;
   line-height: 48px;
   width: 100%;
-  background: #fff;
+  background: #EDF1F7;
   border-bottom: 1px solid #E4EBF4;
   box-shadow: 0 1px 3px 0 rgba(147, 173, 209, 0.12);
 
@@ -216,6 +216,8 @@ export default {
         top: 8px;
         height: 33px;
         z-index: 1;
+        background: #EDF1F7!important;
+
       }
 
       .pane-mask-left {
@@ -237,14 +239,12 @@ export default {
       cursor: pointer;
       height: 31px;
       line-height: 29px;
-      border: 1px solid #e4ebf4;
       color: #686666;
-      background: #fff;
-      padding: 0 10px 0 10px;
+      background: #D8DFE6;
+      padding: 0 20px 0 20px;
       font-size: 16px;
       margin-top: 5px;
-      border-radius: 4px;
-
+      border-radius: 8px 8px 0 0;
       &:first-of-type {
         margin-left: 15px;
       }
@@ -254,8 +254,8 @@ export default {
       }
 
       &.active {
-        border-color: #0f93f6;
-        color: #4a4a4a;
+        color: #0f93f6;
+        background: #ffffff;
         // &::before {
         //   content: '';
         //   background: #0F93F6;
@@ -267,6 +267,7 @@ export default {
         //   margin-right: 2px;
         // }
       }
+    
     }
   }