Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend

src/App.css

@@ -188,6 +188,6 @@ resize: none;
 	left: 0;
 	top: 0;
 	background-color: rgba(0,0,0,0.5);
-	z-index: 9999;
+	z-index: 2;
 
 }

src/pages/plan/add/add.js

@@ -1,7 +1,7 @@
 import ReactDOM from 'react-dom';
 import React, { Component } from 'react';
 import { HashRouter as Router, Route, Link } from "react-router-dom";
-import { Button ,Card,Icon ,Notify,Radio,RadioGroup,smoothScroll,Sweetalert} from 'zent';
+import { Button ,Card,Icon ,Notify,Radio,RadioGroup,smoothScroll,Sweetalert,Input} from 'zent';
 import  "./add.less"
 import Step1 from "./step1.js"
 import Step2 from "./step2.js"
@@ -25,8 +25,10 @@ export default class add extends React.Component{
 		],
 		phone_list:[],
 		email_list:[],
-		phone:0,
+		phone:"",
-		email:0,
+		email:"",
+		email_radio:null,
+		phone_radio:null,
 		audit_visible:false,
 		card_visible:false
     }
@@ -166,10 +168,10 @@ export default class add extends React.Component{
 	}
 	
 	onPhoneChange(e){
-		this.setState({phone:e.target.value})
+		this.setState({phone_radio:e.target.value})
 	}
 	onEmailChange(e){
-		this.setState({email:e.target.value})
+		this.setState({email_radio:e.target.value})
 	}
 	cancel(e){
 		this.setState({audit_visible:false})
@@ -192,8 +194,8 @@ export default class add extends React.Component{
 	{
 		let plan_id = sessionStorage.getItem("plan_id")
 		let data ={
-			email:  this.state.email_list[this.state.email] ,
+		phone: this.state.phone_radio ?   this.state.phone_list[this.state.phone_radio] : this.state.phone ,
-			phone:this.state.phone_list[this.state.phone] ,
+		email: this.state.email_radio ?  this.state.email_list[this.state.email_radio] : this.state.email
 		}
 		
 		
@@ -209,6 +211,18 @@ export default class add extends React.Component{
 			
 			
 	}
+	phoneChange=(e)=>
+	{
+		
+		this.setState({"phone":e.target.value})
+		
+	}
+	emailChange=(e)=>
+	{
+		
+		this.setState({"email":e.target.value})
+		
+	}
 	
   render(){
     return(
@@ -319,7 +333,7 @@ export default class add extends React.Component{
 		   </div>
 		   <div className="phone-list">
 				 <RadioGroup
-				        value={this.state.phone}
+				        value={this.state.phone_radio}
 				        isValueEqual={this.isValueEqual}
 				        onChange={(e)=>{this.onPhoneChange(e)}}
 				      >
@@ -341,7 +355,7 @@ export default class add extends React.Component{
 			   </div>
 			   <div className="email-list">
 					<RadioGroup
-					       value={this.state.email}
+					       value={this.state.email_radio}
 					       isValueEqual={this.isValueEqual}
 					       onChange={ (e)=>{this.onEmailChange(e)}  }
 					     >
@@ -355,6 +369,12 @@ export default class add extends React.Component{
 					     </RadioGroup>
 			   </div>
 			</div>
+			<div className="input-group">
+			  <Input  placeholder="请输入接收手机号"    onChange={this.phoneChange}   disabled={this.state.phone_radio}   ></Input>
+			</div>
+			<div className="input-group">
+			 <Input  placeholder="请输入接收邮箱" onChange={this.emailChange} disabled={this.state.email_radio}  ></Input>
+			</div>
 			<div className="audit-btn-group">
 			   <Button    onClick={(e)=>{this.onReturn(e)}}>取消</Button>
 			   <Button type="primary"  onClick={(e)=>{this.send(e)}} >发送</Button>

src/pages/plan/add/add.less

@@ -162,7 +162,7 @@
 	left: 50%;
 	margin-left: -200px;
 	top: 30%;
-	z-index: 9999;
+	z-index: 5;
 	.audit-close{
 		font-size: 20px;
 		position: absolute;

src/pages/plan/key/edit.js

@@ -54,7 +54,7 @@ export default class acclist extends React.Component{
 	   rankoptions:[],
 		tempdata:[],
 		distdata:[],
-		pagetitle:"新建key",
+		pagetitle:"编辑key",
 	  	 isEdit:false,
 		 begintime:"",
 		 endtime:"",
@@ -143,6 +143,8 @@ export default class acclist extends React.Component{
 				valide = true;
 				return 
 				},(err)=>{
+					
+							Notify.error(err)
 			   })
 			})