From aec000eafce7043c9149e8f699ba9dff93d1320f Mon Sep 17 00:00:00 2001
From: red-deng-deng <1924913374@qq.com>
Date: Thu, 13 Jan 2022 17:54:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=90=BD=E5=9C=B0=E9=A1=B5?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E8=BF=87=E6=BB=A4bug=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=9A=82=E5=81=9C=E4=B8=AD=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/exchangepage/edittemplate/main.js |  8 ++++++++
 src/pages/exchangepage/main/main.js         | 17 ++++++++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/pages/exchangepage/edittemplate/main.js b/src/pages/exchangepage/edittemplate/main.js
index 9438e705..f6765ffd 100644
--- a/src/pages/exchangepage/edittemplate/main.js
+++ b/src/pages/exchangepage/edittemplate/main.js
@@ -120,6 +120,7 @@ getLandingdata(val){
 			this.setState({activeNavStatus:1});
 			return;
 		}
+		
 		if(!this.state.model.middle_image)
 		{
 			Notify.clear();
@@ -127,6 +128,13 @@ getLandingdata(val){
 			this.setState({activeNavStatus:1});
 			return;
 		}
+		if(!this.state.product_list.list)
+		{
+			Notify.clear();
+			Notify.error("请选择商品列表页样式")
+			this.setState({activeNavStatus:2});
+			return;
+		}
 		if(!this.state.product_list.top_image)
 		{
 			Notify.clear();
diff --git a/src/pages/exchangepage/main/main.js b/src/pages/exchangepage/main/main.js
index 7389ff3c..48349134 100644
--- a/src/pages/exchangepage/main/main.js
+++ b/src/pages/exchangepage/main/main.js
@@ -122,6 +122,8 @@ export default class acclist extends React.Component {
 				title: "未开始"
 			}, {
 				title: "进行中"
+			},{
+				title: "暂停中"
 			}, {
 				title: "已结束"
 			}],
@@ -264,20 +266,21 @@ export default class acclist extends React.Component {
 		let status = null;
 		if(	e > 0)
 		{
-			status = e;
+			if(e==3){
+				status = 5;
+			}else{
+				status = e;
+			}
 			
 		}else{
 			status = null
 		}
 		data.status = status
 		this.setState({status:status})
-		if(this.state.key_word)
-		{
-			data.title = this.state.key_word
-			
-		}
-		this.getTableList(data)
 		
+		setTimeout(() => {
+			this.getTableList(data)
+    }, 10);
 	}
 	onPreview(e,row){
 		let rowdata={};