|
|
@@ -127,7 +127,7 @@ class PublicContent extends Component {
|
|
|
let rangeEndMinuteVal = dayjs(this.props.dtails.releaseEnds).format("YYYY-MM-DD HH:mm:ss")
|
|
|
let assistTypeName = ''
|
|
|
let assistContentTypeName = ''
|
|
|
- if (this.props.dtails.type == 5) {
|
|
|
+ if ([5, 6].indexOf(this.props.dtails.type) > -1) {
|
|
|
rangeStartMinuteVal = dayjs(this.props.dtails.releaseStarts).format("YYYY-MM-DD")
|
|
|
rangeEndMinuteVal = dayjs(this.props.dtails.releaseEnds).format("YYYY-MM-DD")
|
|
|
|
|
|
@@ -333,10 +333,11 @@ class PublicContent extends Component {
|
|
|
datas = { ...datas, ...{ reason: this.props.reason, objectType, } };
|
|
|
}
|
|
|
|
|
|
- if(this.props.dtails.type == 5) {
|
|
|
+ if([5, 6].indexOf(this.props.dtails.type) > -1) {
|
|
|
datas.assistType = this.state.assistType
|
|
|
datas.assistContentType = this.state.assistContentType
|
|
|
datas.assistContent = this.state.assistContent
|
|
|
+ datas.duration = 0
|
|
|
}
|
|
|
|
|
|
for (let key in datas) {
|
|
|
@@ -527,10 +528,22 @@ class PublicContent extends Component {
|
|
|
|
|
|
onSetPickerTime(val) {
|
|
|
let data = val.detail;
|
|
|
- this.setState({
|
|
|
- rangeStartMinuteVal: data.selectStartTime,
|
|
|
- rangeEndMinuteVal: data.selectEndTime,
|
|
|
- });
|
|
|
+
|
|
|
+ if([5, 6].indexOf(this.props.dtails.type) > -1) {
|
|
|
+ data.selectStartTime = dayjs(data.selectStartTime).format('YYYY-MM-DD 08:30:00')
|
|
|
+ data.selectEndTime = dayjs(data.selectEndTime).format('YYYY-MM-DD 17:30:00')
|
|
|
+ data.startTime = dayjs(data.startTime).format('YYYY-MM-DD 08:30:00')
|
|
|
+ data.endTime = dayjs(data.endTime).format('YYYY-MM-DD 17:30:00')
|
|
|
+ }
|
|
|
+
|
|
|
+ let rangeStartMinuteVal = data.selectStartTime;
|
|
|
+ let rangeEndMinuteVal = data.selectEndTime;
|
|
|
+
|
|
|
+ if ([5, 6].indexOf(this.props.dtails.type) > -1) {
|
|
|
+ rangeStartMinuteVal = dayjs(data.selectStartTime).format('YYYY-MM-DD');
|
|
|
+ rangeEndMinuteVal = dayjs(data.selectEndTime).format('YYYY-MM-DD');
|
|
|
+ }
|
|
|
+ this.setState({ rangeStartMinuteVal, rangeEndMinuteVal });
|
|
|
|
|
|
let arr = [];
|
|
|
if (data.startTime && data.endTime) {
|
|
|
@@ -845,29 +858,29 @@ class PublicContent extends Component {
|
|
|
isPartition
|
|
|
pickerShow={this.state.isPickerRender}
|
|
|
onconditionaljudgment={(v) => {
|
|
|
- const { startTime, endTime, setLv } = v.detail
|
|
|
- let startTimeD = dayjs(dayjs(startTime).second(0).format("YYYY-MM-DD HH:mm:ss"))
|
|
|
- let endTimeD = dayjs(dayjs(endTime).second(0).format("YYYY-MM-DD HH:mm:ss"))
|
|
|
- let currTimeD = dayjs(dayjs().second(0).format("YYYY-MM-DD HH:mm:ss"))
|
|
|
+ let formatTemp = [5, 6].indexOf(dtails.type) > -1 ? "YYYY-MM-DD" : "YYYY-MM-DD HH:mm:ss"
|
|
|
+ let selTimeStr = dayjs(v.detail.startTime).second(0).format(formatTemp)
|
|
|
+ let selEndTimeStr = dayjs(v.detail.endTime).second(0).format(formatTemp)
|
|
|
+
|
|
|
+ let startTimeD = dayjs([5, 6].indexOf(dtails.type) > -1 ? `${selTimeStr} 00:00:00` : selTimeStr);
|
|
|
+ let endTimeD = dayjs([5, 6].indexOf(dtails.type) > -1 ? `${selEndTimeStr} 23:59:59` : selEndTimeStr);
|
|
|
|
|
|
- console.log(dayjs(startTime).format("YYYY-MM-DD HH:mm:ss"))
|
|
|
- if (dayjs(startTime).format("YYYY-MM-DD HH:mm:ss") != this.state.rangeStartMinuteVal) {
|
|
|
- // 如果修改了开始时间,则需要判断开始时间不能小于当前时间
|
|
|
- if (startTimeD.isBefore(currTimeD)) {
|
|
|
- Taro.showToast({
|
|
|
- title: "开始时间不能小于当前时间",
|
|
|
- icon: "none",
|
|
|
- });
|
|
|
- setLv(false);
|
|
|
- }
|
|
|
- }
|
|
|
+ let now = dayjs()
|
|
|
+ let currTime = [5, 6].indexOf(dtails.type) > -1 ? now.subtract(1, 'day').set('hour', 23).set('minute', 59).set('second', 59) : dayjs().second(0)
|
|
|
|
|
|
- if (endTimeD.isBefore(startTimeD)) {
|
|
|
+ let currTimeD = dayjs(currTime.format("YYYY-MM-DD HH:mm:ss"));
|
|
|
+ if (!startTimeD.isAfter(currTimeD)) {
|
|
|
+ Taro.showToast({
|
|
|
+ title: "开始时间不能小于当前时间",
|
|
|
+ icon: "none",
|
|
|
+ });
|
|
|
+ v.detail.setLv(false);
|
|
|
+ } else if (!endTimeD.isAfter(startTimeD)) {
|
|
|
Taro.showToast({
|
|
|
title: "结束时间不能小于开始时间",
|
|
|
icon: "none",
|
|
|
});
|
|
|
- setLv(false);
|
|
|
+ v.detail.setLv(false);
|
|
|
}
|
|
|
|
|
|
}}
|
|
|
@@ -1063,7 +1076,7 @@ class PublicContent extends Component {
|
|
|
<AtIcon value="chevron-right" size="30" color="#bbbbbb" />
|
|
|
</View>
|
|
|
</View>
|
|
|
- { this.state.assistContentType.indexOf('0') > -1 ? (
|
|
|
+ { (this.state.assistContentType || '').indexOf('0') > -1 ? (
|
|
|
<View className="formItem">
|
|
|
<View className="formName">内容说明:</View>
|
|
|
<View
|