root
/
mand-mobile
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve conflicts

This commit is contained in:
xuxiaoyan 2018-09-03 18:57:56 +08:00
parent a626fd3a09 f06b833c53
commit c4996e7cb8
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/date-picker/index.vue
View File

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