Merge branch 'master' of http://git.shengws.com/zhangbj/scrm-vue

src/scrm_pages/members/cards.vue

@@ -2,7 +2,7 @@
   <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs='crumbs'></bread-crumb>
-      <el-col :span="5" style="text-align: right;">
+      <el-col :span="16" style="text-align: right;">
         <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" @click="openCreate">添加会员卡</el-button>
         <el-button  type="primary" size="small" icon="el-icon-setting" @click="openRight">会员权益配置</el-button>
       </el-col>

src/styles/index.scss

@@ -1,16 +1,17 @@
-@import './variables.scss';
-@import './mixin.scss';
-@import './transition.scss';
-@import './element-ui.scss';
-@import './sidebar.scss';
-@import './btn.scss';
-@import './reset.scss';
+@import "./variables.scss";
+@import "./mixin.scss";
+@import "./transition.scss";
+@import "./element-ui.scss";
+@import "./sidebar.scss";
+@import "./btn.scss";
+@import "./reset.scss";
 body {
   height: 100%;
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;
   text-rendering: optimizeLegibility;
-  font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+  font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB,
+    Microsoft YaHei, Arial, sans-serif;
 }
 
 ul {
@@ -122,12 +123,12 @@ code {
 }
 
 .warn-content {
-  background: rgba(66, 185, 131, .1);
+  background: rgba(66, 185, 131, 0.1);
   border-radius: 2px;
   padding: 16px;
   padding: 1rem;
   line-height: 1.6rem;
-  word-spacing: .05rem;
+  word-spacing: 0.05rem;
   a {
     color: #42b983;
     font-weight: 600;
@@ -152,7 +153,7 @@ code {
 }
 
 .text-center {
-  text-align: center
+  text-align: center;
 }
 
 .sub-navbar {
@@ -163,7 +164,13 @@ code {
   text-align: right;
   padding-right: 20px;
   transition: 600ms ease position;
-  background: linear-gradient(90deg, rgba(32, 182, 249, 1) 0%, rgba(32, 182, 249, 1) 0%, rgba(33, 120, 241, 1) 100%, rgba(33, 120, 241, 1) 100%);
+  background: linear-gradient(
+    90deg,
+    rgba(32, 182, 249, 1) 0%,
+    rgba(32, 182, 249, 1) 0%,
+    rgba(33, 120, 241, 1) 100%,
+    rgba(33, 120, 241, 1) 100%
+  );
   .subtitle {
     font-size: 20px;
     color: #fff;
@@ -218,7 +225,7 @@ code {
     font-weight: 700;
     &::before,
     &::after {
-      content: '';
+      content: "";
       display: block;
       position: absolute;
       top: 23px;
@@ -350,15 +357,15 @@ code {
   .cell.clearfix {
     margin: 0px 0 12px 0;
     display: flex;
-    align-items:center;
+    align-items: center;
     justify-content: flex-start;
     box-sizing: border-box;
     color: #333;
-    .el-button--primary{
+    .el-button--primary {
       margin-left: 6px;
     }
     .title {
-      width: 80px;
+      min-width: 80px;
       display: inline-block;
       font-weight: normal;
       color: #909399;
@@ -425,7 +432,7 @@ code {
 .dataTitle {
   color: #303133;
   font-size: 14px;
-  border-bottom: 2px #E4E7ED solid;
+  border-bottom: 2px #e4e7ed solid;
   height: 36px;
   line-height: 36px;
   margin: 0 0 25px 0;
@@ -441,26 +448,25 @@ code {
   }
 }
 
-
-.el-dialog__wrapper{
+.el-dialog__wrapper {
   // z-index: 2012 !important;
 }
 
-.el-dialog{
+.el-dialog {
   left: 50% !important;
   position: fixed !important;
   top: 50% !important;
-  transform: translate(-50%,-50%) !important;
+  transform: translate(-50%, -50%) !important;
   margin-top: 0 !important;
 }
 
-.el-dialog__wrapper{
+.el-dialog__wrapper {
   // z-index: 9999!important;
 }
-.el-message{
-  z-index: 99999!important;
+.el-message {
+  z-index: 99999 !important;
 }
-.el-select-dropdown{
+.el-select-dropdown {
   // z-index: 2003!important;
 }
 // .patient-app-container {
@@ -473,16 +479,16 @@ code {
   margin-right: 0;
   background: #fff;
 }
-.patient-name{
+.patient-name {
   color: #606266;
   font-size: 14px;
   padding: 15px 0 15px 0;
   display: block;
-  border-bottom: 1px #E4E7ED solid;
+  border-bottom: 1px #e4e7ed solid;
   margin: 0 18px;
   flex: 1;
 }
-.el-button+.el-button{
+.el-button + .el-button {
   // margin-left: 0;
 }
 // 病人管理-病程管理
@@ -491,12 +497,12 @@ code {
   color: gray;
   margin-right: 6px;
 }
-.Total{
- margin:0 0 10px 0;
- float: right;
+.Total {
+  margin: 0 0 10px 0;
+  float: right;
 }
-.cellLine{
-  color: #C0C4CC;
+.cellLine {
+  color: #c0c4cc;
   padding: 0 3px;
 }
 
@@ -542,4 +548,4 @@ code {
       }
     }
   }
-}
+}