resolve conflicts

2018-09-03 18:57:56 +08:00 · 2018-09-03 18:57:56 +08:00 · c4996e7cb8
parent a626fd3a09 f06b833c53
commit c4996e7cb8
1 changed files with 0 additions and 2 deletions
--- a/components/date-picker/index.vue
+++ b/components/date-picker/index.vue
@ -141,7 +141,6 @@ export default {
      oldColumnData: null,
      columnDataDefault: [],
      columnDataGenerator: [],
-      disabledHalfDay: [],
    }
  },

@ -210,7 +209,6 @@ export default {
      this.columnData = []
      this.columnDataDefault = []
      this.columnDataGenerator = []
-      this.disabledHalfDay = []
    },
    $_initColumnData (columnIndex, defaultDate = [], isSetColumn = true) {
      const columnData = this.columnData