zzc-design-mobile
Advanced tools
Comparing version 3.9.1 to 3.9.2
@@ -157,7 +157,17 @@ 'use strict'; | ||
var _props = this.props, | ||
calendarTips = _props.calendarTips, | ||
mode = _props.mode; | ||
mode = _props.mode, | ||
currEndTime = _props.currEndTime, | ||
currStartTime = _props.currStartTime, | ||
defaultCalendarTips = _props.defaultCalendarTips; | ||
var className = mode == 'day' ? 'calendar-tips-box mode-day' : 'calendar-tips-box'; | ||
if (calendarTips != null && calendarTips != '') { | ||
// if ( calendarTips != null && calendarTips != '' ) { | ||
// return ( | ||
// <div className={className}> | ||
// <Icon type='info_outline' /> | ||
// <p>{calendarTips}</p> | ||
// </div> | ||
// ); | ||
// } | ||
if (defaultCalendarTips && currEndTime && currStartTime && currEndTime.t - currStartTime.t < 86400000) { | ||
return _react2.default.createElement( | ||
@@ -170,14 +180,6 @@ 'div', | ||
null, | ||
calendarTips | ||
defaultCalendarTips | ||
) | ||
); | ||
} | ||
// else if ( defaultCalendarTips != null && defaultCalendarTips != '' ) { | ||
// return ( | ||
// <div className={className}> | ||
// <Icon type='info_outline' /> | ||
// <p>{defaultCalendarTips}</p> | ||
// </div> | ||
// ); | ||
// } | ||
return null; | ||
@@ -198,3 +200,2 @@ } | ||
dayCalculator = _props2.dayCalculator, | ||
defaultCalendarTips = _props2.defaultCalendarTips, | ||
pickupCityLocalTimeStr = _props2.pickupCityLocalTimeStr; | ||
@@ -245,8 +246,2 @@ | ||
currEndTime ? (0, _moment2.default)(currEndTime.t).format((0, _moment2.default)().isSame(currEndTime.t, 'year') ? formatText : formatTextWithYear) + allDaysText : '未设置' | ||
), | ||
defaultCalendarTips && currEndTime && currStartTime && currEndTime.t - currStartTime.t < 86400000 && _react2.default.createElement( | ||
'div', | ||
{ className: 'extra-text' }, | ||
_react2.default.createElement(_Icon2.default, { type: 'info_outline', className: 'icon' }), | ||
defaultCalendarTips | ||
) | ||
@@ -253,0 +248,0 @@ ), |
{ | ||
"name": "zzc-design-mobile", | ||
"name_cn": "租租车主流程UI规范", | ||
"version": "3.9.1", | ||
"version": "3.9.2", | ||
"description": "", | ||
@@ -6,0 +6,0 @@ "main": "./lib/index.js", |
Sorry, the diff of this file is not supported yet
905487
22048