~liuwh/nsjcy.git

			@@ -12,6 +12,7 @@
			import { Divider, Modal, message, Tooltip, Progress } from 'antd'
			import moment from 'moment'
			import Fetch from '../fetch';
			import { domain } from '../fetch/_fetch';
			import TableView from '../view/TableView';
			const confirm = Modal.confirm;
			function typeOfName(type) {
			@@ -28,6 +29,17 @@
			return '已摇号';
			}
			}

			function typeStatus(type) {
			switch (type) {
			case 'act_1':
			return "南检活动";
			case 'act_2':
			return "法治培训";
			case 'act_3':
			return "普法预约";
			}
			}
			export default class ActiveManage extends React.Component {
			constructor(props) {
			super(props);
			@@ -42,6 +54,9 @@
			this.getData();
			}
			getData = () => {
			// this.setState({
			// data: []
			// });
			Fetch.activeManage()
			.then(res => {
			for (var i = 0; i < res.length; i++) {
			@@ -54,6 +69,10 @@
			}
			showModal = (id) => {
			this.props.history.push("/activeManageEdit/" + id);
			}

			signIn= (id) => {
			window.open('index.html#/signIn/' + id);
			}

			pulish = (id) => {
			@@ -98,6 +117,11 @@
			dataIndex: 'index',
			key: 'index'
			},{
			title: '活动类型',
			dataIndex: 'activityType',
			key: 'activityType',
			render: text => <span>{typeStatus(text)}</span>
			}, {
			title: '活动标题',
			dataIndex: 'title',
			key: 'title'
			@@ -130,9 +154,7 @@
			key: 'action',
			render: (text, record) => (
			(
			record.status > 0 ? <span>
			<label className='theme-color' onClick={() => this.showModal(record.id)} style={{ cursor: 'pointer' }}>查看</label></span>
			:
			record.status == 0 ?
			<span>
			<label className='theme-color' onClick={() => this.showModal(record.id)} style={{ cursor: 'pointer' }}>修改</label>
			<Divider type="vertical" />
			@@ -140,6 +162,15 @@
			<Divider type="vertical" />
			<label className='theme-color' onClick={() => this.deleteItems(record.id)} style={{ cursor: 'pointer' }}>删除</label>
			</span>
			:
			record.status == 2 ?
			<span>
			<label className='theme-color' onClick={() => this.showModal(record.id)} style={{ cursor: 'pointer' }}>查看</label>
			<Divider type="vertical" />
			<label className='theme-color' onClick={() => this.signIn(record.id)} style={{ cursor: 'pointer' }}>签到上墙</label>
			</span>
			:
			<span><label className='theme-color' onClick={() => this.showModal(record.id)} style={{ cursor: 'pointer' }}>查看</label></span>

			)
			),