移除无用功能

admin/config/router.config.js

@@ -73,12 +73,6 @@ export default [
             name: 'sms',
             component: './sysset/notice_set/sms',
           },
-          //邮件配置
-          {
-            path: '/sysset_notice_set/email',
-            name: 'email',
-            component: './sysset/notice_set/email',
-          },
           //消息模板
           {
             path: '/sysset_notice_set/msg_tpl',

admin/src/pages/sysset/notice_set/email.js

@@ -1,156 +0,0 @@
-import { connect } from 'dva/index';
-import React, { Component } from 'react';
-import { Form, Spin } from 'antd';
-import {
-	failTip,
-	sucTip,
-	sldComLanguage,
-  sldCheckEmail
-} from '@/utils/utils';
-import { sld_need_update_setting } from '@/utils/util_data';
-import global from '@/global.less';
-import SldTableEdit from '@/components/SldTableEdit/SldTableEdit';
-import SldComHeader from '@/components/SldComHeader';
-
-let sthis = '';
-@connect(({ sldsetting }) => ({
-  sldsetting,
-}))
-@Form.create()
-export default class Sms extends Component {
-	constructor(props) {
-		super(props);
-		sthis = this;
-		this.state = {
-			flag: 0,
-			submitting: false,//提交按钮加载状态
-			submiting_sec: false,//发送测试邮件按钮加载状态
-			initLoading: false,//页面初始化加载状态
-			info_data: [],
-		};
-	}
-
-	componentDidMount() {
-		this.get_email_info();
-	}
-
-	componentWillUnmount() {
-
-	}
-
-
-	//获取短信配置信息
-	get_email_info = () => {
-		const { dispatch } = this.props;
-		let { info_data } = this.state;
-		dispatch({
-			type: 'sldsetting/get_email_info',
-			callback: (res) => {
-				if (res.state == 200) {
-					for (let i in res.data) {
-						if (res.data[i].type == 1) {
-							if (res.data[i].name == 'notification_sms_tpl_content') {
-								info_data.push({
-									type: 'textarea',
-									label: res.data[i].title,
-									extra: res.data[i].description,
-									name: res.data[i].name,
-									placeholder: '',
-									initialValue: res.data[i].value,
-								});
-							} else {
-								info_data.push({
-									type: 'input',
-									label: res.data[i].title,
-									extra: res.data[i].description,
-									name: res.data[i].name,
-									placeholder: '',
-									initialValue: res.data[i].value,
-								});
-							}
-
-						}
-					}
-					if (info_data.length > 0) {
-						info_data.push({
-							type: 'button',
-							label: '',
-							name: 'button',
-						});
-					}
-				}
-				this.setState({ info_data, flag: 1 });
-			},
-		});
-	};
-
-	//保存事件  test_send 发送测试邮件事件
-	handleSubmit = (values,type='') => {
-
-		const { dispatch } = this.props;
-		let dis_type = '';
-		if(type == 'test_send'){
-			dis_type = 'sldsetting/send_test_mail';
-			this.setState({ submiting_sec: true });
-		}else{
-			dis_type = 'common/saveSetting';
-			this.setState({ submitting: true });
-		}
-		dispatch({
-			type: dis_type,
-			payload: values,
-			callback: (res) => {
-				if (res.state == 200) {
-					sucTip(res.msg);
-				} else {
-					failTip(res.msg);
-				}
-				this.setState({ submitting: false,submiting_sec: false });
-			},
-		});
-	};
-
-	sendTestMail = (val) =>{
-    if (!val.notification_email_test_address) {
-      failTip(`${sldComLanguage('请输入测试邮件')}`);
-      return false;
-    } else {
-      //正则验证邮箱
-      if (sldCheckEmail(val.notification_email_test_address)) {
-        this.handleSubmit({toAddress:val.notification_email_test_address},'test_send')
-      } else {
-        failTip(`${sldComLanguage('请输入正确的邮箱')}`);
-        return false;
-      }
-    }
-	}
-
-	render() {
-		const { info_data, submitting, initLoading, flag,submiting_sec } = this.state;
-		return (
-			<Spin spinning={initLoading}>
-				<div className={global.common_page}>
-					<SldComHeader
-						type={2}
-						title={sldComLanguage('邮件配置')}
-						tip_title={''}
-						tip_data={sld_need_update_setting()}
-					/>
-					{flag == 1 &&
-					<SldTableEdit
-						submiting={submitting}
-						submiting_sec={submiting_sec}
-						width={1000}
-						data={info_data}
-						handleSubmit={this.handleSubmit}
-						showOtherBtn={{
-							text:`${sldComLanguage('发送测试邮件')}`,
-							callback:this.sendTestMail,
-						}}
-					/>
-					}
-				</div>
-			</Spin>
-		);
-	}
-}

admin/src/pages/sysset/notice_set/member_msg_tpl_list.js

@@ -62,35 +62,6 @@ export default class MemberMsgTplList extends Component {
         },
 
       ],//站内信modal框的数据
-      emailData: [
-        {
-          type: 'switch',
-          label: `${sldComLanguage('是否开启')}`,
-          name: 'emailSwitch',
-          placeholder: ``,
-          initialValue: 1,
-        },
-        {
-          type: 'input',
-          label: `${sldComLanguage('邮件标题')}`,//邮件标题
-          name: 'email_subject',
-          placeholder: `${sldComLanguage('请输入邮件标题')}`,
-          initialValue: '',
-          rules: [{
-            required: true,
-            whitespace: true,
-            message: `${sldComLanguage('请输入模板内容')}`,
-          }, ],
-        }, {
-          type: 'quill',
-          label: `${sldComLanguage('邮件内容')}`,
-          name: 'email_content',
-          placeholder: ``,
-          initialValue: '',
-          handleGetContent: (val) => this.handleGetContent(val),
-        },
-
-      ],//邮件modal框的数据
       smsData: [
         {
           type: 'switch',
@@ -125,7 +96,6 @@ export default class MemberMsgTplList extends Component {
             message: `${sldComLanguage('请输入模板内容')}`,
           }, ],
         },
-
       ],//短信modal框的数据
       wxData: [
         {
@@ -190,21 +160,7 @@ export default class MemberMsgTplList extends Component {
               valuepropname={'checked'}/>
           ),
         },
-        {
-          title: `${sldComLanguage('邮件')}`,
-          dataIndex: 'emailSwitch',
-          align: 'center',
-          width: 100,
-          render: (text, record) => (
-            <Switch
-              onChange={(checked) => this.operateMsg({
-                tplCode: record.tplCode,
-                emailSwitch: checked ? 1 : 0,
-              }, 'switch')}
-              checked={text == 1 ? true : false}
-              valuepropname={'checked'}/>
-          ),
-        }, {
+         {
           title: `${sldComLanguage('短信')}`,
           dataIndex: 'smsSwitch',
           align: 'center',
@@ -241,8 +197,6 @@ export default class MemberMsgTplList extends Component {
             <Fragment>
               {sldtbaleOpeBtnText(`${sldComLanguage('站内信')}`, () => this.editMsg(record, 'msg'))}
               <span className={global.splitLine}></span>
-              {sldtbaleOpeBtnText(`${sldComLanguage('邮件')}`, () => this.editMsg(record, 'email'))}
-              <span className={global.splitLine}></span>
               {sldtbaleOpeBtnText(`${sldComLanguage('短信')}`, () => this.editMsg(record, 'sms'))}
               <span className={global.splitLine}></span>
               {sldtbaleOpeBtnText(`${sldComLanguage('微信')}`, () => this.editMsg(record, 'wx'))}
@@ -270,14 +224,6 @@ export default class MemberMsgTplList extends Component {
       for (let i in operateData) {
         operateData[i].initialValue = val[operateData[i].name];
       }
-    } else if (type == 'email') {
-      //邮件
-      modal_width = 900;
-      tmp_data = JSON.parse(val.emailContent);
-      val = { ...val, ...tmp_data };
-      for (let i in operateData) {
-        operateData[i].initialValue = val[operateData[i].name];
-      }
     } else if (type == 'sms') {
       //短信
       tmp_data = {};