From 1ce41ff550edd434c72d184c6f6b3b8b8e7e6c77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Mon, 19 Aug 2019 10:26:54 +0800
Subject: [PATCH] =?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/Index.js     |  2 +-
 .../courses/coursesDetail/CoursesBanner.js    | 28 +++++++++++++++++--
 .../modules/courses/elearning/Elearning.js    |  2 +-
 .../courses/elearning/YslDetailCards.js       |  9 ++++++
 .../modules/courses/gradinforms/Eduinforms.js |  3 +-
 .../courses/gradinforms/myysleduinforms.css   |  2 +-
 6 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/public/react/src/modules/courses/Index.js b/public/react/src/modules/courses/Index.js
index e0044bc34..1409e8468 100644
--- a/public/react/src/modules/courses/Index.js
+++ b/public/react/src/modules/courses/Index.js
@@ -828,7 +828,7 @@ class CoursesIndex extends Component{
               {/*新建金品课堂*/}
               {/*coursesId 课堂id */}
               {/*id 是否是私有或者公有*/}
-              <Route path="/courses/:coursesId/newgold/:id"
+              <Route path="/courses/:subjectid/newgold/:id"
                      render={
                        (props) => (<WrappedCoursesNewAppGoldclass {...this.props} {...props} {...this.state} />)
                      }
diff --git a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
index a136904d2..23360086f 100644
--- a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
+++ b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
@@ -442,6 +442,28 @@ class CoursesBanner extends Component {
                     {/*私有：私有课堂，非课堂成员不能访问
 
                       公开：公开课堂，非课堂成员可以访问*/}
+                    <style>
+                      {
+                        `
+                        .tag-orange .tag-name{
+                        display: block;
+                        width: auto;
+                        background-color: #FF6800;
+                        background-size: 100% 100%;
+                        padding: 0px 4px;
+                        color: #fff;
+                        float: left;
+                        height: 28px;
+                        line-height: 28px;
+                        font-size: 14px;
+                        border-radius: 4px;
+                      }
+                      `
+                      }
+                    </style>
+                    {excellent===true?
+                      <span className="tag-orange fl"><span className="tag-name mt10 ml10">国家精品</span></span>
+                      :""}
                     <span className={"TabsWarp"}>
                       <CoursesListType
                         typelist={coursedata.course_end === true ? ["已结束"] : coursedata.is_public === true ? ["公开"] : ["私有"]}
@@ -539,9 +561,9 @@ class CoursesBanner extends Component {
                                <a className="fr user_default_btn user_white_btn mr20 font-18"  style={{width:"130px"}}
                                   onClick={() => this.myyslgradin()}>加入课堂</a>: ""}
 
-                             {this.props.isStudent()?<a className="fr user_default_btn user_blue_btn mr20 font-18"
-                                                        onClick={() => this.exitclass()}
-                             > 退出课堂 </a>:""}
+                             {/*{this.props.isStudent()?<a className="fr user_default_btn user_blue_btn mr20 font-18"*/}
+                             {/*                           onClick={() => this.exitclass()}*/}
+                             {/*> 退出课堂 </a>:""}*/}
                            </div>
 
                     }
diff --git a/public/react/src/modules/courses/elearning/Elearning.js b/public/react/src/modules/courses/elearning/Elearning.js
index 0941de631..36fea5b86 100644
--- a/public/react/src/modules/courses/elearning/Elearning.js
+++ b/public/react/src/modules/courses/elearning/Elearning.js
@@ -304,7 +304,7 @@ class Elearning extends Component{
 
 					<Spin size="large" spinning={isSpin}  id={"cdiv"}>
 
-						<div className=" clearfix" style={{marginTop:"10px"}}>
+						<div className=" clearfix" style={{marginTop:"20px"}}>
 							<div>
 								{/*开始学习*/}
               <YslDetailCards {...this.state} {...this.props} Startlearningtwo={()=>this.Startlearningtwo()} Myreload={()=>this.Myreload()} ></YslDetailCards>
diff --git a/public/react/src/modules/courses/elearning/YslDetailCards.js b/public/react/src/modules/courses/elearning/YslDetailCards.js
index 2de927c07..ed42f225b 100644
--- a/public/react/src/modules/courses/elearning/YslDetailCards.js
+++ b/public/react/src/modules/courses/elearning/YslDetailCards.js
@@ -151,6 +151,15 @@ class YslDetailCards extends Component{
 						</div>
 					</Spin>
 				</Modal>
+				<style>{
+					`
+					.lesson-saved-list-item {
+							border-bottom: none!important;
+							margin-bottom: 20px;
+							background-color: #fff;
+					}
+					`
+				}</style>
 				{
 					stages && stages.map((item,key)=>{
 
diff --git a/public/react/src/modules/courses/gradinforms/Eduinforms.js b/public/react/src/modules/courses/gradinforms/Eduinforms.js
index 810ac511e..aef54ab13 100644
--- a/public/react/src/modules/courses/gradinforms/Eduinforms.js
+++ b/public/react/src/modules/courses/gradinforms/Eduinforms.js
@@ -195,10 +195,11 @@ class Eduinforms extends Component{
 														 min-height: 37px; 
 														 background: #fff; 
 														 display: none; 
-														 position: absolute; 
+														 position: absolute !important; 
 														 left: 0;
 												     z-index: 10; 
 														 border-bottom: 1px solid #ddd; 
+														 
 														}
 														.yslmt16px .ant-form-item-with-help
 														{
diff --git a/public/react/src/modules/courses/gradinforms/myysleduinforms.css b/public/react/src/modules/courses/gradinforms/myysleduinforms.css
index 1d93ea426..f3fa2fb1a 100644
--- a/public/react/src/modules/courses/gradinforms/myysleduinforms.css
+++ b/public/react/src/modules/courses/gradinforms/myysleduinforms.css
@@ -1,5 +1,5 @@
 .yslmt16px{
-   padding-top: 16px !important;
+   padding-top: 25px !important;
     padding-left: 25px !important;
     padding-right: 25px !important;
     padding-bottom: 1px !important;