Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into onigin/ysl_a

public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js

@@ -249,7 +249,7 @@ class GraduateTaskItem extends Component{
             </h6>
               
             <div className="cl"></div>
-            <p className="color-grey panel-lightgrey mt16 fl">
+            <p className="color-grey mt16 fl">
               <span className="mr50">
                 {/* <a href="/users/innov" className="panel-name-small hide fl mr15 mr30 color-grey3">{discussMessage.author.name}</a> */}
 

public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js

@@ -329,7 +329,7 @@ class ShixunhomeWorkItem extends Component{
             </h6>
 
             <div className="cl"></div>
-            <p className="color-grey panel-lightgrey mt16 fl">
+            <p className="color-grey mt16 fl">
               <span className="mr50 df">
                 {/* <a href="/users/innov" className="panel-name-small hide fl mr15 mr30 color-grey3">{discussMessage.author.name}</a> */}
                 { discussMessage.author && <span className="mr15 color-grey-3">{discussMessage.author}</span> }

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

@@ -163,6 +163,13 @@ class InfosCourse extends Component{
                   </div>
                   <div className="edu-txt-center course-bottom">
                     <div className="inline color-grey-6">
+											{item.visits>0?<span  className="fl ml10 mr10 squareIconSpan">
+                                  <Tooltip placement="bottom" title="访问量">
+                                        <i className="iconfont icon-liulanyan fl mr3"></i>{item.visits}
+                                  </Tooltip>
+
+                                </span>:""}
+
                       {
                         item.members_count > 0 && 
                         <Tooltip placement="bottom" title="成员">
@@ -177,13 +184,13 @@ class InfosCourse extends Component{
                           <i className="iconfont icon-zuoye fl mr3" data-tip-down="作业"></i>{item.homework_commons_count}</span>
                         </Tooltip>
                       }
-                      {
-                        item.attachments_count > 0 && 
-                        <Tooltip placement="bottom" title="资源">
-                          <span className="fl ml10 mr10 squareIconSpan">
-                          <i className="iconfont icon-ziyuan fl mr3" data-tip-down="资源"></i>{item.attachments_count}</span>
-                        </Tooltip>
-                      }
+                      {/*{*/}
+                        {/*item.attachments_count > 0 && */}
+                        {/*<Tooltip placement="bottom" title="资源">*/}
+                          {/*<span className="fl ml10 mr10 squareIconSpan">*/}
+                          {/*<i className="iconfont icon-ziyuan fl mr3" data-tip-down="资源"></i>{item.attachments_count}</span>*/}
+                        {/*</Tooltip>*/}
+                      {/*}*/}
                     </div>
                   </div>
                 </div>

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

@@ -541,7 +541,7 @@ class InfosTopics extends Component{
 
 										<div className="cl"></div>
 
-										<p className="color-grey panel-lightgrey mt16 fl">
+										<p className="color-grey mt16 fl">
 											<span className={"topicswidth600"}>
 												 {types==="publicly"?<span className="topsics135 color-grey9 mr50">{item.creator_name}</span>:""}
 												 <span className="mr50 color-grey9">{item.quotes_count}  次引用</span>