Merge branch 'goods-other' into 'master'

fix: modal按钮问题修改

See merge request !23

src/components/Modal.vue

@@ -19,7 +19,7 @@
           {{ content }}
         </slot>
       </div>
-      <div class="panel-foot">
+      <div class="panel-foot" :class="{ split: confirmBtn && cancelBtn }">
         <cr-button size="large" block @click="onConcel" v-if="cancelBtn">
           {{ cancelBtn }}
         </cr-button>
@@ -130,9 +130,11 @@ export default {
     justify-content: space-between;
     align-items: center;
     padding: @padding-lg;
+    &.split {
       .cr-button {
         width: 48%;
       }
     }
+  }
 }
 </style>

src/style/index.less

@@ -23,6 +23,16 @@ a {
     border: 1px solid @button-warning-border-color !important;
     border-radius: @border-radius-md !important;
   }
+  &--default {
+    color: @button-default-color !important;
+    background-color: @button-default-background-color !important;
+    border: 1px solid @button-default-border-color !important;
+    border-radius: @border-radius-md !important;
+  }
+  &--large {
+    height: @button-large-height !important;
+    line-height: @button-large-line-height !important;
+  }
 }
 
 .cr-tag {

src/style/var.less

@@ -80,8 +80,8 @@
 @button-default-line-height: 36px;
 @button-default-font-size: @font-size-12;
 @button-default-color: @text-color;
-@button-default-background-color: @white;
-@button-default-border-color: @gray-2;
+@button-default-background-color: @gray-1;
+@button-default-border-color: @gray-1;
 
 @button-primary-color: @blue;
 @button-primary-background-color: #f4f5ff;