|
@@ -6,8 +6,10 @@ import {
|
|
|
Input,
|
|
|
Select,
|
|
|
DatePicker,
|
|
|
- Icon
|
|
|
+ Icon,
|
|
|
+ message
|
|
|
} from "antd";
|
|
|
+
|
|
|
import { connect } from "dva";
|
|
|
import PropTypes, { string } from 'prop-types'
|
|
|
import styles from './index.less';
|
|
@@ -107,7 +109,7 @@ class PushMessage extends React.Component {
|
|
|
if (!items[key])
|
|
|
items[key] = {};
|
|
|
let week1 = items.week;
|
|
|
- var message = this.props.pushMessage.initData.items[key].message;
|
|
|
+ var message1= this.props.pushMessage.initData.items[key].message;
|
|
|
|
|
|
items[key].disable = checked?0:1;
|
|
|
|
|
@@ -127,7 +129,7 @@ class PushMessage extends React.Component {
|
|
|
if (!items[key])
|
|
|
items[key] = {};
|
|
|
let week1 = items.week;
|
|
|
- var message = this.props.pushMessage.initData.items[key].message;
|
|
|
+ var message1 = this.props.pushMessage.initData.items[key].message;
|
|
|
|
|
|
items[key].week = value;
|
|
|
|
|
@@ -162,8 +164,8 @@ class PushMessage extends React.Component {
|
|
|
|
|
|
this.props.dispatch({ type: 'pushMessage/updateState', payload: { times: listData, initData: initData } });
|
|
|
} else {
|
|
|
- this.props.dispatch({ type: 'pushMessage/message', payload: { msg: '最多添加七个时间段' } });
|
|
|
- //message.info('最多添加七个时间段');
|
|
|
+ // this.props.dispatch({ type: 'pushMessage/message', payload: { msg: '最多添加七个时间段' } });
|
|
|
+ message.info('最多添加七个时间段');
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -190,8 +192,8 @@ class PushMessage extends React.Component {
|
|
|
|
|
|
this.props.dispatch({ type: 'pushMessage/updateState', payload: { times: listData, initData: initData } });
|
|
|
} else {
|
|
|
- // message.info('最少保留一个时间段');
|
|
|
- this.props.dispatch({ type: 'pushMessage/message', payload: { msg: '最少保留一个时间段' } });
|
|
|
+ message.info('最少保留一个时间段');
|
|
|
+ // this.props.dispatch({ type: 'pushMessage/message', payload: { msg: '最少保留一个时间段' } });
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -250,11 +252,11 @@ class PushMessage extends React.Component {
|
|
|
|
|
|
let week1 = items.week;
|
|
|
|
|
|
- var message = {msgType:"text"}
|
|
|
+ var message1 = {msgType:"text"}
|
|
|
if(this.props.pushMessage.initData.items&&this.props.pushMessage.initData.items[key]
|
|
|
&&this.props.pushMessage.initData.items[key].message){
|
|
|
|
|
|
- message = this.props.pushMessage.initData.items[key].message
|
|
|
+ message1 = this.props.pushMessage.initData.items[key].message
|
|
|
}
|
|
|
|
|
|
let check = 'text';
|
|
@@ -267,20 +269,20 @@ class PushMessage extends React.Component {
|
|
|
|
|
|
switch (check) {
|
|
|
case 'text':
|
|
|
- message.mediaId = mediaId;
|
|
|
+ message1.mediaId = mediaId;
|
|
|
break;
|
|
|
case 'news':
|
|
|
- message.mediaId = mediaId;
|
|
|
- message.thumbUrl = imgUrl;
|
|
|
+ message1.mediaId = mediaId;
|
|
|
+ message1.thumbUrl = imgUrl;
|
|
|
break;
|
|
|
|
|
|
case 'miniprogrampage':
|
|
|
- message.thumbMediaId = mediaId;
|
|
|
+ message1.thumbMediaId = mediaId;
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
|
|
|
- items[key].message = message;
|
|
|
+ items[key].message = message1;
|
|
|
|
|
|
initData.items = items;
|
|
|
}
|
|
@@ -299,17 +301,17 @@ class PushMessage extends React.Component {
|
|
|
items[key] = {};
|
|
|
let week1 = items.week;
|
|
|
|
|
|
- var message = {msgType:"text"}
|
|
|
+ var message1 = {msgType:"text"}
|
|
|
if(this.props.pushMessage.initData.items&&this.props.pushMessage.initData.items[key]
|
|
|
&&this.props.pushMessage.initData.items[key].message){
|
|
|
|
|
|
- message = this.props.pushMessage.initData.items[key].message
|
|
|
+ message1 = this.props.pushMessage.initData.items[key].message
|
|
|
}
|
|
|
|
|
|
if(chooseKey)
|
|
|
- message.chooseKey = chooseKey;
|
|
|
- message.msgType = chooseKey;
|
|
|
- items[key].message = message;
|
|
|
+ message1.chooseKey = chooseKey;
|
|
|
+ message1.msgType = chooseKey;
|
|
|
+ items[key].message = message1;
|
|
|
|
|
|
initData.items = items;
|
|
|
}
|