Merge branch 'develop' into product

app/containers/quickOrder/QuickOrderPage.js

@@ -148,7 +148,7 @@ class EquipConsuPage extends Component {
                         let date = moment(new Date()).add(1, 'd')
                         let date = moment(new Date()).add(1, 'd')
                         date.set('hour', 10) 
                         date.set('hour', 10) 
                         date.set('minute', 0)
                         date.set('minute', 0)
-                        return date
+                        return date.toDate()
                     })(),
                     })(),
                     showDatePicker: true
                     showDatePicker: true
                 },
                 },
@@ -1338,7 +1338,7 @@ class EquipConsuPage extends Component {
         let date = curData.value
         let date = curData.value
         if(date) {
         if(date) {
             listOptionData.map(function (item) {
             listOptionData.map(function (item) {
-                if (item.title === curData.title) {
+                if (item.title === curData.title && isNotBlank(date)) {
                     item.dateValue = formatStrForDate(date)
                     item.dateValue = formatStrForDate(date)
                 }
                 }
             })
             })

app/containers/selfOrder/SelfOrderPage.js

@@ -88,7 +88,7 @@ class SelfOrderPage extends Component {
                         let date = moment(new Date()).add(1, 'd')
                         let date = moment(new Date()).add(1, 'd')
                         date.set('hour', 10) 
                         date.set('hour', 10) 
                         date.set('minute', 0)
                         date.set('minute', 0)
-                        return date
+                        return date.toDate()
                     })(),
                     })(),
                     showDatePicker: true
                     showDatePicker: true
                 },
                 },