diff --git a/.idea/marketing-system.iml b/.idea/marketing-system.iml
deleted file mode 100644
index 0c8867d7..00000000
--- a/.idea/marketing-system.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index c64ec0fe..00000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/assets/api.js b/src/assets/api.js
index eb1d5ce9..4b2ae934 100644
--- a/src/assets/api.js
+++ b/src/assets/api.js
@@ -385,6 +385,10 @@ export const getAllEnum = (data) => {
export const postCreateMenu = (data) => {
return req('post', baseurl + "/auth/menu",data)
}
+//编辑菜单
+export const putmodifyMenu = (id,data) => {
+ return req('put', baseurl + "/auth/menu/"+id,data)
+}
//获取落地页下拉菜单
diff --git a/src/pages/system/menu/leftnav/leftnav.js b/src/pages/system/menu/leftnav/leftnav.js
index 555d5233..8afb097c 100644
--- a/src/pages/system/menu/leftnav/leftnav.js
+++ b/src/pages/system/menu/leftnav/leftnav.js
@@ -44,7 +44,7 @@ componentWillMount(){
this.getMenuFn();
}
componentWillReceiveProps(nextProps){//接收
- console.log(4788,nextProps);
+ // console.log(4788,nextProps);
// this.setState({model:nextProps.menuList});
// this.setState({cancelInfo:_.cloneDeep(nextProps.menuList)});
}
diff --git a/src/pages/system/menu/menuright/menuright.js b/src/pages/system/menu/menuright/menuright.js
index 15b7e429..928611b8 100644
--- a/src/pages/system/menu/menuright/menuright.js
+++ b/src/pages/system/menu/menuright/menuright.js
@@ -5,9 +5,10 @@ import Ipt from "../../../../components/input/main"
import Form from "../../../../components/form/main"
import FormItem from "../../../../components/form-item/main"
import "../../../../assets/comm.css"
-import {Select,Button,ImageUpload ,onUpload,Radio,NumberInput } from "zent"
+import {Select,Button,ImageUpload ,Sweetalert,onUpload,Notify,Radio,NumberInput } from "zent"
import Bus from "../../../../assets/eventBus.js"
import _ from "lodash"
+import {putmodifyMenu,handelResponse} from "../../../../assets/api.js"
const RadioGroup = Radio.Group;
const RadioButton = Radio.Button;
export default class adduserinfo extends React.Component{
@@ -56,14 +57,44 @@ methodsonChange = e => {
this.setState({ model: model1 });
}
- submit(){
- this.refs.form1.validator()
+ modifysubmit(){
+ console.log(this.state.model);
+ let modifyFlag=this.refs.form1.validator();
+
+ let self=this;
+ if(modifyFlag){
+ let data=_.cloneDeep(this.state.model);
+ delete data.id;
+ Sweetalert.confirm({
+ type:'warning',
+ closeBtn:true,
+ title:'确认操作',
+ content:
是否修改菜单信息?
,
+ onConfirm:()=>{
+ putmodifyMenu(this.state.model.id,data).then(res=>{
+ handelResponse(res,(response,msg)=>{
+ Notify.clear();
+ Notify.success(msg);
+ },(err)=>{
+
+ })
+ }).catch(err=>{
+ });
+ },
+ onCancel: this.onCancel,
+ className:'questModal',
+ parentComponent: this
+ });
+ }
}
//重置
resetInfo(){
- console.log(888,this.state.cancelInfo);
this.setState({model:this.state.cancelInfo});
- console.log('充值',this.state.cancelInfo);
+ setTimeout(()=>{
+ Notify.clear();
+ Notify.success('重置成功');
+ },500);
+
}
cancel(){
let model2 = { //数据模型不可少
@@ -75,12 +106,30 @@ methodsonChange = e => {
this.refs.form1.cancel();
}
componentWillReceiveProps(nextProps){//接收
- this.setState({model:_.cloneDeep(nextProps.menuList)});
- this.setState({cancelInfo:_.cloneDeep(nextProps.menuList)});
+ this.setState({cancelInfo:this.props.menuList});
+ }
+ // 监听组件内部状态的变化:
+ componentDidUpdate(prevProps,prevState){
+ // 参数分别为改变之前的数据状态对象
+ if(prevState.cancelInfo!=this.state.cancelInfo){
+ let menudata=_.cloneDeep(this.state.cancelInfo);
+ let data={
+ title:menudata.title,
+ fid:menudata.fid,
+ url:menudata.url,
+ auth:menudata.auth,
+ sort:menudata.sort,
+ status:menudata.status,
+ icon:menudata.icon,
+ method:menudata.method,
+ level:menudata.level,
+ id:menudata.id
+ }
+ this.setState({model:data});
+ }
}
render(){
-
- //校验规则
+ //校验规则
const rules = {
menuname: [
{ type: "required", message: "请输入菜单名称"},
@@ -90,7 +139,7 @@ methodsonChange = e => {
return(