Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into develop

app/models/shixun.rb

@@ -293,7 +293,7 @@ class Shixun < ApplicationRecord
 
   # 所属实践课程
   def relation_path
-    subjects.published.unhidden.uniq
+    subjects.visible.unhidden.uniq
   end
 
   private

public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css

@@ -245,6 +245,7 @@
     height: 60px;
     border-radius: 50% !important;
     box-shadow: 0px 0px 12px rgba(0,0,0,0.2);
+    border: 2px solid #459BE5;
 }
 
 .Competitioncenter{
@@ -308,6 +309,7 @@
     width: 64px;
     height: 63px;
     border-radius: 50%;
+    border: 2px solid #459BE5;
 }
 
 .CompetitionsListzhezhao{
@@ -418,4 +420,10 @@
     cursor: default;
     max-width: 100px;
     display: inherit;
+}
+
+.competimgabsolute{
+    position: absolute;
+    left: 106px;
+    bottom: -10px;
 }

public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js

@@ -201,7 +201,10 @@ class CompetitionContents extends Component{
 													<img src={getImageUrl("images/educoder/huangguan-two.png")}/>
 													<div className={"mt10"}>
 														<a href={`/users/${item.user_login}`} target={"_blank"} className="color-dark">
-															<img className={"rankingimg"} src={getImageUrl(`images/${item.user_image===null?`avatars/User/0?1442652658`:item.user_image}`)} />
+															<div>
+																<img className={"rankingimg"} src={getImageUrl(`images/${item.user_image===null?`avatars/User/0?1442652658`:item.user_image}`)} />
+																<div className={"competimgabsolute"}>123</div>
+															</div>
 															<p className="task-hide rankName mt5 jinshaifont">{personal===undefined||personal===null?item.record_user_name:personal===true?item.record_user_name:item.team_name}</p>
 														</a>
 													</div>

public/react/src/modules/courses/members/CourseGroupList.js

@@ -210,12 +210,11 @@ function CourseGroupList(props) {
                 onPressEnter={onPressEnter}
             ></Titlesearchsection>
             
-            {!!none_group_member_count && <div className="mt20 edu-back-white padding20-30 ">
+            {!!none_group_member_count && <div className="mt20 E9F8FF padding20-30 pointer" onClick={() => {props.history.push(`/courses/${courseId}/course_groups/0`)}}>
                 <span>未分班：</span>
                 <span style={{color: '#999999'}}>{none_group_member_count}个学生</span>
 
-                <WordsBtn style="blue" className="fr " 
+                <WordsBtn style="blue" className="fr">查看</WordsBtn>
-                        onClick={() => {props.history.push(`/courses/${courseId}/course_groups/0`)}}>查看</WordsBtn>
             </div>}
 
             <Spin size="large" spinning={isSpin}>

public/react/src/modules/courses/members/studentsList.css

@@ -1,4 +1,8 @@
 .stu_table .ant-table-thead > tr > th, .stu_table .ant-table-tbody > tr > td,
 .courseGroupList .ant-table-thead > tr > th, .courseGroupList .ant-table-tbody > tr > td {
     padding: 14px 6px;
+}
+
+.E9F8FF{
+    background-color: #E9F8FF;
 }