Merge remote-tracking branch 'origin/topic_bank' into topic_bank

public/react/src/modules/user/usersInfo/banks/BanksIndex.js

@@ -93,7 +93,7 @@ class BanksIndex extends Component{
           {
             crumbData &&
             <Breadcrumb separator=">" className="breadcrumb mt22">
-              <Breadcrumb.Item href="/users/innov/topics/personal">题库</Breadcrumb.Item>
+              <Breadcrumb.Item href="/users/innov/topics/personal">{ crumbData && crumbData.is_public == true ? '公共' : '我的' }题库</Breadcrumb.Item>
               {
                 crumbData.crumbArray && crumbData.crumbArray.map((item,key)=>{
                   return(
@@ -107,7 +107,11 @@ class BanksIndex extends Component{
 					{
 						crumbData &&<p className="clearfix mt10 mb10 ">
             <span className="fl font-24 color-grey-3 task-hide lineh-30" style={{maxWidth:'800px'}}>{crumbData && crumbData.title}</span>
-             <span className="bank_is_public">{crumbData.is_public == true ? '公开':'私有'}</span>
+            { crumbData.is_public == true ? 
+              <span className="bank_is_public">公开</span>
+              :
+              <span className="bank_is_private">私有</span>
+            }
 
           </p> }
 

public/react/src/modules/user/usersInfo/usersInfo.css

@@ -241,14 +241,28 @@
   cursor: default;
 }
 .bank_is_public{
-  background: #E4F2FE;
+  background: #84B6EB;
   float: left;
-  height: 30px;
-  line-height: 30px;
+  height: 24px;
+  line-height: 24px;
+  padding:0px 20px;
+  color: #fff;
+  font-size: 16px;
+  margin-left: 10px;
+  border-radius:20px;
+  margin-top:3px;
+}
+.bank_is_private{
+  background: #56B998;
+  float: left;
+  height: 24px;
+  line-height: 24px;
   padding:0px 20px;
-  color: #4CACFF;
+  color: #fff;
   font-size: 16px;
   margin-left: 10px;
+  border-radius:20px;
+  margin-top:3px;
 }
 .topicsbox{
     width: 1200px;