Merge branch 'topic_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into topic_bank

public/react/src/modules/user/usersInfo/InfosTopics.js

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import { SnackbarHOC } from 'educoder';
-import {BrowserRouter as Router,Route,Switch} from 'react-router-dom';
+import {BrowserRouter as Router,Route,Switch,Link} from 'react-router-dom';
-import {Tooltip,Menu,Pagination,Spin} from 'antd';
+import {Tooltip,Menu,Pagination,Spin, Dropdown} from 'antd';
 import axios from 'axios';
 import {getImageUrl,WordsBtn} from 'educoder';
 import moment from 'moment';
@@ -136,6 +136,26 @@ class InfosTopics extends Component{
 
 		//types===publicly  公共
 		//types===personal  私有
+
+		const menu = (
+			<Menu>
+				<Menu.Item>
+					<a target="_blank" rel="noopener noreferrer" href="http://www.alipay.com/">
+						1st menu item
+					</a>
+				</Menu.Item>
+				<Menu.Item>
+					<a target="_blank" rel="noopener noreferrer" href="http://www.taobao.com/">
+						2nd menu item
+					</a>
+				</Menu.Item>
+				<Menu.Item>
+					<a target="_blank" rel="noopener noreferrer" href="http://www.tmall.com/">
+						3rd menu item
+					</a>
+				</Menu.Item>
+			</Menu>
+		);
 		return(
 			<div className="educontent mb50">
 				{/*提示*/}
@@ -185,8 +205,9 @@ class InfosTopics extends Component{
 				<Spin size="large" spinning={isSpin}>
 					<div className="clearfix topicsbox">
 						<div className={"topcschild"}>
-							<span className={"topicstopfont fl topcsactive"}>我的题库</span>
+							<a className={types==="personal"?"topicstopfont fl topcsactive":"topicstopfont fl"}
-							<span className={"topicstopfont fr"}>公共题库</span>
+										href={`/users/innov/topics/publicly`}>我的题库</a>
+							<a className={types==="publicly"?"topicstopfont fr topcsactive":"topicstopfont fr"}>公共题库</a>
 						</div>
 
 
@@ -218,9 +239,11 @@ class InfosTopics extends Component{
 								<span className="fr color-grey-9">已选择   <span  className={"color-orange"}>{data&&data.count}</span>  个</span>
 						</p>
 						<p className="font-12 alltopiscright ml25 fr">
-								<span className="fr color-grey-9 mr10">最近更新</span>
+								<Dropdown overlay={menu}>
-								<span className="fr mr30 topcsactive">发送</span>
+										<span className="fr color-grey-9 mr10 pointer">最近更新</span>
-							{types==="personal"?<span className="fr mr30 topcsactive">删除</span>:""}
+								</Dropdown>
+								<span className="fr mr30 topcsactive pointer">发送</span>
+								{types==="personal"?<span className="fr mr30 topcsactive pointer">删除</span>:""}
 						</p>
 					</div>
 
@@ -246,7 +269,8 @@ class InfosTopics extends Component{
 										<div className="cl"></div>
 
 										<p className="color-grey panel-lightgrey mt16 fl">
-											<span className="topicswidth330">
+											<span className={types==="personal"?"topicswidth300":"topicswidth400"}>
+												 {types==="publicly"?<span className="topsics125 color-grey9">{item.creator_name}</span>:""}
 												 <span className="mr50 color-grey9">{item.quotes_count}  次引用</span>
 												 <span className="mr50 color-grey9">{item.solve_count}  次答题</span>
 											   <span className="mr50 color-grey9">{moment(item.updated_at).fromNow()}</span>

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

@@ -254,7 +254,7 @@
     width: 1200px;
     /*min-height: 216px;*/
     background: rgba(255,255,255,1);
-    padding: 0px 40px;
+    padding: 0px 30px 0px 40px;
 }
 
 .topicstopfont{
@@ -326,13 +326,21 @@
 
 .pd1323{
     padding: 10px 30px 25px 30px;
+    cursor: pointer;
 }
-
+.pd1323:hover {
-.topicswidth330{
+    box-shadow: 0px 2px 6px rgba(51,51,51,0.09);
-    width: 330px;
+    opacity: 1;
+    border-radius: 2px;
+}
+.topicswidth400{
+    width: 400px;
+    display: inline-block;
+}
+.topicswidth300{
+    width: 300px;
     display: inline-block;
 }
-
 .topiscfilterbtn{
     font-size: 14px;
     color: #4CACFF !important;
@@ -348,3 +356,7 @@
     position: absolute;
 }
 
+.topsics125{
+    width: 125px;
+    display: inline-block;
+}