From 0e1ff9ca436defa9594dc6e87e3331e524e6d2ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E6=A3=9A?= <849005670@qq.com>
Date: Wed, 22 Dec 2021 16:52:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5=E7=BF=BB=E9=A1=B5?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=90=8E=E7=AB=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/pagination/main.js   |  5 -----
 src/pages/exchangepage/main/main.js | 28 +++++++++++++++++++---------
 src/pages/plan/key/detail/list.js   | 17 ++++++++++++-----
 src/pages/plan/list/list.js         |  1 +
 4 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/src/components/pagination/main.js b/src/components/pagination/main.js
index 4f9bdf5c..572d8dc6 100644
--- a/src/components/pagination/main.js
+++ b/src/components/pagination/main.js
@@ -121,10 +121,6 @@ import _ from "lodash";
 		 this.onJumpPage(1)
 		switch(key)
 		{
-			case "0":
-			this.setState({count:5})
-			this.props.onCountChange(5);
-			break;
 			case "1":
 			this.setState({count:10})
 			this.props.onCountChange(10);
@@ -187,7 +183,6 @@ import _ from "lodash";
 		     </DropdownClickTrigger>
 		     <DropdownContent>
 		       <Menu onClick={(e,key) => {this.onMenuClick(e,key)}} className="mymenu" >
-					<MenuItem key={0}>5</MenuItem>
 		         <MenuItem key={1}>10</MenuItem>
 		         <MenuItem key={2}>20</MenuItem>
 				 <MenuItem key={3}>50</MenuItem>
diff --git a/src/pages/exchangepage/main/main.js b/src/pages/exchangepage/main/main.js
index e96ca55f..5306a35a 100644
--- a/src/pages/exchangepage/main/main.js
+++ b/src/pages/exchangepage/main/main.js
@@ -26,7 +26,7 @@ import {
 	Pop
 } from 'zent';
 import "../../../assets/comm.css"
-
+import _ from "lodash";
 import Ipt from "../../../components/input/main"
 import Grid from "../../../components/gird/main.js"
 import TabPage from "../../../components/tabPage/main.js"
@@ -139,7 +139,7 @@ export default class acclist extends React.Component {
 			page: 1,
 			limit: 10,
 			key_word:"",
-			status: 1,
+			status: null,
 			dataCount: 0,
 			preview_visible:false,
 			preview_url:"",
@@ -157,7 +157,12 @@ export default class acclist extends React.Component {
 		{
 			data.title = this.state.key_word
 		}
-		getThemeList(data).then((res) => {
+		let queryParams = _.omitBy(data, (value) => {
+					return _.isNaN(value) || _.isNil(value) 
+		})
+		
+		
+		getThemeList(queryParams).then((res) => {
 			handelResponse(res, (req, msg) => {
 				console.log("求结果")
 				console.log(req)
@@ -185,7 +190,8 @@ export default class acclist extends React.Component {
 		let data = {
 			page: e,
 			limit:this.state.limit,
-			title: this.state.key_word
+			title: this.state.key_word,
+			status:this.state.status
 		}
 		this.getTableList(data)
 
@@ -246,11 +252,16 @@ export default class acclist extends React.Component {
 			page: 1,
 			limit:10,
 		}
+		let status = null;
 		if(	e > 0)
 		{
-			data.status = e;
+			status = e;
+			
+		}else{
+			status = null
 		}
-		
+		data.status = status
+		this.setState({status:status})
 		if(this.state.key_word)
 		{
 			data.title = this.state.key_word
@@ -274,12 +285,11 @@ export default class acclist extends React.Component {
 	sureFn(){
 		this.setState({page:1})
 		this.setState({limit:10})
-		console.log("回车")
-		console.log(this.state.key_word)
 		let data={
 			page: 1,
 			limit:10,
-			title:this.state.key_word
+			title:this.state.key_word,
+			status:this.state.status
 		}
 		
 	  this.getTableList(data);
diff --git a/src/pages/plan/key/detail/list.js b/src/pages/plan/key/detail/list.js
index 264bd40e..fe149d8b 100644
--- a/src/pages/plan/key/detail/list.js
+++ b/src/pages/plan/key/detail/list.js
@@ -178,13 +178,20 @@ export default class acclist extends React.Component{
 	
 	tabFn(e){
 		console.log(e)
-		switch(e){
-			
-			
+		let status = e > 0 ? e : null
+		if(!status)
+		{
+				 this.setState({status:e})
 		}
 		
-		
-		
+	
+		 this.setState({search:""})
+		 let params={
+			 page:1,
+			 limit:10,
+			 status : status
+		 }
+		 	this.getKeyCodeList(params)
 	}
   render(){
     const { current, pageSize } = this.state;
diff --git a/src/pages/plan/list/list.js b/src/pages/plan/list/list.js
index 761fd635..c30fee68 100644
--- a/src/pages/plan/list/list.js
+++ b/src/pages/plan/list/list.js
@@ -771,6 +771,7 @@ export default class acclist extends React.Component{
 				        <MenuItem key="2">再次发送key</MenuItem>
 						<MenuItem key="3">修改接收邮箱发送</MenuItem>
 				        <MenuItem key="4">修改接收手机发送</MenuItem>
+						 <MenuItem key="5">作废</MenuItem>
 				      </Menu>