Merge branch 'dev' of gitlab.suntrayoa.com:geqilin/zhxf_vue into dev

src/pages/components/cardWarp.vue

@@ -3,11 +3,10 @@
   .card-header(
     :style="{ height, 'line-height': height, background: bgcolor }"
   )
-    span.card-title(:style="{'font-size':size+'px','font-weight':weight}") {{ title }}
-      div(style="margin-left: 20px;color:#3A648A;")
+    div.card-title(:style="{'font-size':size+'px','font-weight':weight}")
+        div {{ title }}
         slot(name="left")
-    span(style='font-size:12px;')
-        slot(name="right")
+        slot(name="right" style='font-size:12px;position:absolute;right:0;')
   .card-content
     slot(name="content")
 </template>
@@ -26,7 +25,7 @@ export default {
     },
     bgcolor: {
       type: String,
-      default: '#f2faff'
+      default: '#b7e4ff'
     },
     size: {
       type: String,
@@ -47,18 +46,17 @@ export default {
 
   .card-header {
     display: flex;
-    justify-content: space-between;
-    padding: 0 10px;
+    // justify-content: space-between;
+    padding: 0 5px;
     border-bottom: 1px solid #ececec;
     .card-title {
       display: flex;
-      justify-content: center;
-      align-items: center;
-      font-size: 15px;
+        width: 100%;
+        position: relative;
     }
   }
   .card-content {
-    margin: 10px;
+    margin: 8px;
   }
 }
 </style>