From b9c0dc42011d7f075aef2608af2c66c048e66c05 Mon Sep 17 00:00:00 2001
From: caicai8 <1149225589@qq.com>
Date: Fri, 6 Sep 2019 15:06:05 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=93=BE=E6=8E=A5=E8=BF=9B=E5=85=A5?=
 =?UTF-8?q?=E9=A2=98=E5=BA=93=E8=AF=A6=E6=83=85=E7=AD=89=E6=9C=AA=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E9=9C=80=E8=A6=81=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/user/usersInfo/banks/BanksIndex.js | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/public/react/src/modules/user/usersInfo/banks/BanksIndex.js b/public/react/src/modules/user/usersInfo/banks/BanksIndex.js
index 2a3c5c98d..ceaccc5f5 100644
--- a/public/react/src/modules/user/usersInfo/banks/BanksIndex.js
+++ b/public/react/src/modules/user/usersInfo/banks/BanksIndex.js
@@ -72,16 +72,32 @@ class BanksIndex extends Component{
   constructor(props){
     super(props);
     this.state={
-      crumbData:undefined
+      crumbData:undefined,
+      publicly:undefined
     }
   }
 
+  componentDidMount = () =>{
+    let pathname = this.props.location.pathname;
+    this.setState({
+      publicly:pathname.indexOf("/publicly") > -1
+    })
+  }
+
   initPublic = (crumbData) =>{
     this.setState({
       crumbData
     })
   }
 
+  componentDidUpdate=()=>{
+    let { publicly }=this.state
+    
+    if(this.props.current_user && this.props.current_user.professional_certification == false && publicly){
+      this.props.history.push(`/topicbank/${this.props.current_user.login}/publicly`);
+    }
+  }
+
   render(){
     let { crumbData }=this.state
     const common = {

From 3c286cd00a58f9bc9563b7f2c22145896bbf7239 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 6 Sep 2019 15:20:11 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E8=AF=BE=E5=A0=82?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/courses/new/CoursesNew.js    | 9 +++++++--
 public/react/src/modules/courses/new/Goldsubject.js   | 9 +++++++--
 public/react/src/modules/user/usersInfo/usersInfo.css | 9 ++++++---
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/public/react/src/modules/courses/new/CoursesNew.js b/public/react/src/modules/courses/new/CoursesNew.js
index c15a6e9a0..4c020d7d4 100644
--- a/public/react/src/modules/courses/new/CoursesNew.js
+++ b/public/react/src/modules/courses/new/CoursesNew.js
@@ -443,7 +443,9 @@ class CoursesNew extends Component {
     };
 
     handleSearchschool=(value)=>{
-
+			this.setState({
+				smallspinning:true
+			})
 			if(value!="") {
 				// this.props.form.setFieldsValue({
 				// 	// school: value,
@@ -452,10 +454,13 @@ class CoursesNew extends Component {
 				this.setState({
 					fetching: true,
 					school: value,
-					smallspinning:true
 				})
 
 				this.getschool(value)
+			}else{
+				this.setState({
+					smallspinning:false
+				})
 			}
     };
 
diff --git a/public/react/src/modules/courses/new/Goldsubject.js b/public/react/src/modules/courses/new/Goldsubject.js
index bb9480178..0924a6563 100644
--- a/public/react/src/modules/courses/new/Goldsubject.js
+++ b/public/react/src/modules/courses/new/Goldsubject.js
@@ -563,7 +563,9 @@ class Goldsubject extends Component {
 	};
 
 	handleSearchschool=(value)=>{
-
+		this.setState({
+			smallspinning:true
+		})
 		if(value!="") {
 			// this.props.form.setFieldsValue({
 			// 	// school: value,
@@ -572,9 +574,12 @@ class Goldsubject extends Component {
 			this.setState({
 				fetching: true,
 				school: value,
-				smallspinning:true
 			})
 			this.getschool(value)
+		}else{
+			this.setState({
+				smallspinning:false
+			})
 		}
 	};
 
diff --git a/public/react/src/modules/user/usersInfo/usersInfo.css b/public/react/src/modules/user/usersInfo/usersInfo.css
index 3db3097c9..c3100ea54 100644
--- a/public/react/src/modules/user/usersInfo/usersInfo.css
+++ b/public/react/src/modules/user/usersInfo/usersInfo.css
@@ -340,11 +340,14 @@
 .topicsbtn{
     padding: 3px 15px;
     border-radius: 2px;
-    color: #4C4C4C;
+    /*color: #4C4C4C;*/
     cursor: pointer;
     display: inline-block;
-    background-color: #4CACFF!important;
-    color: #fff!important;
+    /*background-color: #4CACFF!important;*/
+    /*color: #fff!important;*/
+    border-radius: 11px;
+    border: 1px solid rgba(76,172,255,1);
+    color: rgba(76,172,255,1);
 }
 
 .pd1323{