From 1be0b1fb0e14261b820b6528e003e6461aefea5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E6=A3=9A?= <849005670@qq.com>
Date: Mon, 29 Nov 2021 14:32:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/exchangepage/edittemplate/main.js | 12 +++++++-----
 src/pages/plan/add/step2.js                 |  4 ++--
 src/pages/plan/key/edit.js                  |  8 ++++----
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/pages/exchangepage/edittemplate/main.js b/src/pages/exchangepage/edittemplate/main.js
index c0acc840..c6b1dc18 100644
--- a/src/pages/exchangepage/edittemplate/main.js
+++ b/src/pages/exchangepage/edittemplate/main.js
@@ -135,9 +135,12 @@ export default class edittemplate extends React.Component{
 		 	"button_color" : this.state.model.button_color,
 		 	"top_img": this.state.model.top_img
 		 }
-	    if(info.href!="")
+		 console.log("当前链接")
+		 console.log(info.href)
+		 
+	    if(info.href)
 		{
-			
+			console.log(111111)
 			formdata.list = this.state.model.list
 			formdata.use =  this.state.model.use
 			formdata.link = this.state.model.link
@@ -172,7 +175,7 @@ export default class edittemplate extends React.Component{
 		   		handelResponse(res,(req,msg)=>{
 				 Notify.success("保存成功")
 					
-				this.props.history.push('/home/exchangepage');
+				this.props.history.push('/home/myexchangetemplate');
 		   		},(err)=>{
 				Notify.error(err)
 		  })
@@ -189,8 +192,7 @@ export default class edittemplate extends React.Component{
 		   		handelResponse(res,(req,msg)=>{
 						 Notify.success("保存成功")
 						 setTimeout(() => {
-							let link = window.location.href.replace(window.location.hash,"/home/exchangepage");
-							window.open(link, "_blank")
+								this.props.history.push('/home/myexchangetemplate');
 						 }, 2000);
 					
 		   		},(err)=>{
diff --git a/src/pages/plan/add/step2.js b/src/pages/plan/add/step2.js
index d1c5d477..9a597ac6 100644
--- a/src/pages/plan/add/step2.js
+++ b/src/pages/plan/add/step2.js
@@ -31,8 +31,8 @@ export default class acclist extends React.Component{
 	  model:{       //数据模型不可少
 		  style:1,
 		  quantity:"",
-		  allow_repetition:1,
-		  allow_loss:1,
+		  allow_repetition:0,
+		  allow_loss:0,
 		  merge_stock:1,
 		  code_batch:"",
 		  draw_title:"",
diff --git a/src/pages/plan/key/edit.js b/src/pages/plan/key/edit.js
index 6edacbdd..e19e0377 100644
--- a/src/pages/plan/key/edit.js
+++ b/src/pages/plan/key/edit.js
@@ -22,8 +22,8 @@ export default class acclist extends React.Component{
 	  keys:[{
 			style:1,
 			quantity:"",
-			allow_repetition:1,
-			allow_loss:1,
+			allow_repetition:0,
+			allow_loss:0,
 			merge_stock:1,
 			code_batch:"",
 			draw_title:"",
@@ -32,8 +32,8 @@ export default class acclist extends React.Component{
 			plan_title:"",
 		  style:1,
 		  quantity:"",
-		  allow_repetition:1,
-		  allow_loss:1,
+		  allow_repetition:0,
+		  allow_loss:0,
 		  merge_stock:1,
 		  code_batch:"",
 		  draw_title:"",