From ff110d6163ba0c00784b1962a9ab48e73dbd7a62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 2 Aug 2019 09:51:16 +0800
Subject: [PATCH] Merge branch 'dev_aliyun' of
 https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

# Conflicts:
#	public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
---
 .../modules/courses/exercise/Testpapersettinghomepage.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
index c76e31b7a..1440eac18 100644
--- a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
+++ b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
@@ -171,7 +171,8 @@ class Testpapersettinghomepage extends Component{
 					}
 					console.log("170");
 					console.log(params);
-            axios.get(url+`?${queryString.stringify(params)}`+ '&export=true').then((response) => {
+					const urll=url+`?${queryString.stringify(params)}`;
+					axios.get(urll+ '&export=true').then((response) => {
             	if(response===undefined){
             		return
 							}
@@ -195,13 +196,13 @@ class Testpapersettinghomepage extends Component{
             }else {
 							this.setState({ donwloading: true })
 							downloadFile({
-								url: url+`?${queryString.stringify(params)}`,
+								url: urll,
 								successCallback: (url) => {
-									this.setState({ donwloading: false });
+									this.setState({ donwloading: false })
 									console.log('successCallback')
 								},
 								failCallback: (responseHtml, url) => {
-									this.setState({ donwloading: false });
+									this.setState({ donwloading: false })
 									console.log('failCallback')
 								}
 							})