From 85fcdcbc8832a75bad303504624be1c7d3d8169d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 12 Nov 2019 14:06:27 +0800
Subject: [PATCH 1/3] =?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/members/CourseGroupList.js | 5 ++---
 public/react/src/modules/courses/members/studentsList.css   | 4 ++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/public/react/src/modules/courses/members/CourseGroupList.js b/public/react/src/modules/courses/members/CourseGroupList.js
index 6c0e915cc..48bc2efcd 100644
--- a/public/react/src/modules/courses/members/CourseGroupList.js
+++ b/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 " 
-                        onClick={() => {props.history.push(`/courses/${courseId}/course_groups/0`)}}>查看</WordsBtn>
+                <WordsBtn style="blue" className="fr">查看</WordsBtn>
             </div>}
 
             <Spin size="large" spinning={isSpin}>
diff --git a/public/react/src/modules/courses/members/studentsList.css b/public/react/src/modules/courses/members/studentsList.css
index 797305629..b2a41c7e6 100644
--- a/public/react/src/modules/courses/members/studentsList.css
+++ b/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;
 }
\ No newline at end of file

From 98bd6e952129a1283e288b07e65936f0640e75bb Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 12 Nov 2019 14:12:36 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/shixun.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/shixun.rb b/app/models/shixun.rb
index a2c66db79..a0f88260b 100644
--- a/app/models/shixun.rb
+++ b/app/models/shixun.rb
@@ -293,7 +293,7 @@ class Shixun < ApplicationRecord
 
   # 所属实践课程
   def relation_path
-    subjects.published.unhidden.uniq
+    subjects.visible.unhidden.uniq
   end
 
   private

From 3ad42ececcb73b7d360340123d3abb54ca937a32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 12 Nov 2019 14:30:35 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../competitions/Competitioncommon/CompetitionCommon.css  | 8 ++++++++
 .../CompetitionCommonChild/CompetitionContentsChart.js    | 5 ++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css
index 5693fcc2e..9b7edae1c 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css
+++ b/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;
 }
\ No newline at end of file
diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js
index 45b7fd3d2..1bf8f3ffa 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js
+++ b/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>