diff --git a/spug_web/src/pages/system/setting/AlarmSetting.js b/spug_web/src/pages/system/setting/AlarmSetting.js
index df93580..eda3b00 100644
--- a/spug_web/src/pages/system/setting/AlarmSetting.js
+++ b/spug_web/src/pages/system/setting/AlarmSetting.js
@@ -4,13 +4,14 @@
* Released under the MIT License.
*/
import React from 'react';
-import { observer } from 'mobx-react';
-import { Button, Form, Input, Radio, message } from 'antd';
+import {observer} from 'mobx-react';
+import {Button, Form, Input, Radio, message, Popover} from 'antd';
import styles from './index.module.css';
-import { http } from 'libs';
+import {http} from 'libs';
import store from './store';
import lds from 'lodash';
+
@observer
class AlarmSetting extends React.Component {
constructor(props) {
@@ -48,21 +49,29 @@ class AlarmSetting extends React.Component {
}
};
+
render() {
const {getFieldDecorator} = this.props.form;
const {mode, spug_key} = this.state;
+ const spugWx =
;
return (
报警服务设置
- 该凭据用于调用spug内置的报警服务,请关注公众号Spug运维在我的页面查看调用凭据。}>
+ help={如需要使用Spug内置的邮件和微信报警服务,请关注公众号
+
+
+ Spug运维
+
+
+ 在【我的】页面获取调用凭据,否则请留空。}>
this.setState({spug_key: e.target.value})}
- placeholder="请输入"/>
+ placeholder="请输入Spug微信公众号获取到的Token"/>
+
)}
@@ -89,7 +98,7 @@ class AlarmSetting extends React.Component {
{required: true, message: '请输入邮件服务端口'}
]
})(
-
+
)}
@@ -98,7 +107,7 @@ class AlarmSetting extends React.Component {
{required: true, message: '请输入邮箱账号'}
]
})(
-
+
)}
@@ -107,12 +116,12 @@ class AlarmSetting extends React.Component {
{required: true, message: '请输入邮箱账号对应的密码或授权码'}
]
})(
-
+
)}
{getFieldDecorator('nickname', {initialValue: this.setting['nickname']})(
-
+
)}
diff --git a/spug_web/src/pages/system/setting/OpenService.js b/spug_web/src/pages/system/setting/OpenService.js
index 2a1d65c..012edd9 100644
--- a/spug_web/src/pages/system/setting/OpenService.js
+++ b/spug_web/src/pages/system/setting/OpenService.js
@@ -32,7 +32,7 @@ export default observer(function () {
lds.set(store.settings, 'api_key.value', e.target.value)}
- placeholder="请输入"/>
+ placeholder="请输入自定义Token"/>