fix specs, fix merge conflicts and cleanup

src/components/date-picker/base/date-table.vue

@@ -82,7 +82,7 @@
                         start: isRange && time === minDay,
                         end: isRange && time === maxDay
                     };
-                }).cells.slice(8);
+                }).cells;
             }
         },
         methods: {

src/components/date-picker/base/mixin.js

@@ -1,4 +1,6 @@
 
+import {clearHours} from '../util';
+
 export default {
     props: {
         tableDate: {
@@ -36,7 +38,7 @@ export default {
     methods: {
         handleClick (cell) {
             if (cell.disabled) return;
-            const newDate = cell.date;
+            const newDate = new Date(clearHours(cell.date));
 
             this.$emit('on-pick', newDate);
             this.$emit('on-pick-click');

src/components/date-picker/panel/Date/date-range.vue

@@ -219,7 +219,6 @@
                 };
             },
             prevYear (panel) {
-                console.log(this)
                 const increment = this.currentView === 'year' ? -10 : -1;
                 this.changePanelDate(panel, 'FullYear', increment);
             },

src/components/date-picker/panel/Time/time-range.vue

@@ -132,7 +132,7 @@
 
                 // set dateStart
                 Object.keys(start).forEach(type => {
-                    dateStart[`set${capitalize(type)}`](start[type])
+                    dateStart[`set${capitalize(type)}`](start[type]);
                 });
 
                 // set dateEnd

src/components/date-picker/util.js

@@ -222,7 +222,6 @@ export const TYPE_VALUE_RESOLVER_MAP = {
     },
     multiple: {
         formatter: (value, format) => {
-            console.log(value, format);
             return value.filter(Boolean).map(date => formatDate(date, format)).join(',');
         },
         parser: (text, format) => text.split(',').map(string => parseDate(string.trim(), format))