Merge branch '2.x' into dev

2020-12-01 10:12:54 +08:00
parent d0c4c26d75 b57f7e9d98
commit 28afc8a521
48 changed files with 259 additions and 178 deletions
@@ -119,8 +119,6 @@
 </template>

 <script>
-import { GREEN } from '../../utils/constant';
-
 export default {
  i18n: {
    'zh-CN': {
@@ -233,7 +231,7 @@ export default {
          this.showConfirm = false;
          break;
        case 'customColor':
-          this.color = GREEN;
+          this.color = '#1989fa';
          break;
        case 'customConfirm':
          this.confirmText = this.t('confirmText');