From 24dd22aa3554be2bc45af2a29edc37f3008b38f4 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, 12 Aug 2019 17:37:16 +0800
Subject: [PATCH] b

---
 .../src/modules/courses/ListPageIndex.js      | 22 ++++++-------
 .../courses/coursesDetail/CoursesBanner.js    |  2 +-
 .../react/src/modules/courses/css/Courses.css | 14 ++++++++
 .../src/modules/courses/new/CoursesNew.js     | 32 +++++++++++++++----
 .../modules/courses/shixunHomework/guide.css  | 12 +++----
 5 files changed, 57 insertions(+), 25 deletions(-)

diff --git a/public/react/src/modules/courses/ListPageIndex.js b/public/react/src/modules/courses/ListPageIndex.js
index a6c9d6975..8c87c8731 100644
--- a/public/react/src/modules/courses/ListPageIndex.js
+++ b/public/react/src/modules/courses/ListPageIndex.js
@@ -104,17 +104,17 @@ class ListPageIndex extends Component{
               {/*头部banner*/}
               <CoursesBanner {...this.props}></CoursesBanner>
 
-            {yslGuideone===null||yslGuideone===undefined||yslGuideone===false?
-              (
-                this.props.isAdmin()===true?
-                  <Guide
-                    setwindowlocal={(b)=>this.setwindowlocal(b)}
-                  >
-                  </Guide>
-                  :""
-              )
-              :""
-            }
+            {/*{yslGuideone===null||yslGuideone===undefined||yslGuideone===false?*/}
+            {/*  (*/}
+            {/*    this.props.isAdmin()===true?*/}
+            {/*      <Guide*/}
+            {/*        setwindowlocal={(b)=>this.setwindowlocal(b)}*/}
+            {/*      >*/}
+            {/*      </Guide>*/}
+            {/*      :""*/}
+            {/*  )*/}
+            {/*  :""*/}
+            {/*}*/}
 
               <div className="educontent clearfix" style={{flex: "1 0 auto"}}>
 
diff --git a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
index 2ab4228bb..a438e78a8 100644
--- a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
+++ b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
@@ -580,7 +580,7 @@ class CoursesBanner extends Component {
 
                         <li className={"mt7 mr10im ml10"} style={{overflow:"hidden"}}>
                           <a>
-                            <span className="color-grey-c fl font-16">邀请码</span>
+                            <span className="color-grey-c fl font-16" style={{marginRight: "10px"}}>邀请码</span>
                             <span
                               className={coursedata.code_halt === true? "color-white fl font-16 bannerurli width75f" : "color-white fl font-16 bannerurli width107f marleftf10 color-orange-tip"}>
                                             {coursedata.code_halt === true? "已停用" : coursedata.invite_code}
diff --git a/public/react/src/modules/courses/css/Courses.css b/public/react/src/modules/courses/css/Courses.css
index b6388b1e7..7fae8115f 100644
--- a/public/react/src/modules/courses/css/Courses.css
+++ b/public/react/src/modules/courses/css/Courses.css
@@ -1649,3 +1649,17 @@ input.ant-input-number-input:focus {
     left: -95px;
     top:120px;
 }
+
+/*.yslnobinput input{*/
+/*    width: 280px;*/
+/*    height: 40px !important;*/
+/*    background-color: #fafafa!important;*/
+/*}*/
+/*.yslnobinput .ant-input-number-input-wrap{*/
+/*    width: 280px;*/
+/*    height: 40px !important;*/
+/*    background-color: #fafafa!important;*/
+/*}*/
+.yslinputcourput .ant-form-explain{
+    padding-left: 0px !important;
+}
\ No newline at end of file
diff --git a/public/react/src/modules/courses/new/CoursesNew.js b/public/react/src/modules/courses/new/CoursesNew.js
index fc4719013..dc96c211f 100644
--- a/public/react/src/modules/courses/new/CoursesNew.js
+++ b/public/react/src/modules/courses/new/CoursesNew.js
@@ -1,5 +1,5 @@
 import React, {Component} from "React";
-import {Form, Select, Input, Button, Checkbox, DatePicker,Spin,Icon,AutoComplete} from "antd";
+import {Form, Select, Input, Button, Checkbox, DatePicker,Spin,Icon,AutoComplete,InputNumber} from "antd";
 import ApplyForAddOrgModal from '../../user/modal/ApplyForAddOrgModal';
 import axios from 'axios';
 import "../css/Courses.css";
@@ -539,7 +539,7 @@ class CoursesNew extends Component {
 
                                 </div>
 
-                                <div className="stud-class-set bor-bottom-greyE padding1020 coursenavbox coursenavboxtow">
+                                <div className="stud-class-set bor-bottom-greyE padding1020 coursenavbox coursenavboxtow yslinputcourput">
                                     <style>
                                         {`
                                           .ant-form-item{
@@ -551,8 +551,18 @@ class CoursesNew extends Component {
                                         label="总学时"
                                         hasFeedback
                                     >
-                                        {getFieldDecorator("period")(
-                                            <Input id="period" className="greyInput" placeholder="例如：30"/>
+                                        {getFieldDecorator("period",
+                                          {
+                                              rules:[{
+                                                  required:true,
+                                                  pattern: new RegExp(/^[0-9]\d*$/, "g"),
+                                                  message: '不能小于0'
+                                              }],
+                                              getValueFromEvent: (event) => {
+                                                  return event.target.value.replace(/\D/g,'')
+                                              }}
+                                        )(
+                                            <Input id="period" className="greyInput " placeholder="例如：30"/>
                                         )}
                                     </Form.Item>
 
@@ -560,8 +570,18 @@ class CoursesNew extends Component {
                                         label="学分"
                                         hasFeedback
                                     >
-                                        {getFieldDecorator("credit")(
-                                            <Input id="credit" className={"greyInput"} placeholder="例如：3"/>
+                                        {getFieldDecorator("credit",
+                                          {
+                                              rules:[{
+                                                  required:true,
+                                                  pattern: new RegExp(/^[0-9]\d*$/, "g"),
+                                                  message: '不能小于0'
+                                              }],
+                                              getValueFromEvent: (event) => {
+                                                  return event.target.value.replace(/\D/g,'')
+                                              }}
+                                        )(
+                                            <Input id="credit"  className={"greyInput "} placeholder="例如：3"/>
                                         )}
                                     </Form.Item>
                                     <Form.Item
diff --git a/public/react/src/modules/courses/shixunHomework/guide.css b/public/react/src/modules/courses/shixunHomework/guide.css
index efd7709aa..e571884a8 100755
--- a/public/react/src/modules/courses/shixunHomework/guide.css
+++ b/public/react/src/modules/courses/shixunHomework/guide.css
@@ -311,7 +311,6 @@
   margin-top: 20%;
   margin-left: 61%;
   margin-right: 0%;
-  height: 33%;
 }
 
 /*成员列表*/
@@ -348,9 +347,9 @@
   margin-right: 43%;
 }
 .ysldiv31024{
-  margin-top: 18%;
+  margin-top: 19%;
   margin-left: 1%;
-  margin-right: 38%;
+  margin-right: 34%;
 }
 
 /*目录管理*/
@@ -427,8 +426,7 @@
   margin-right: 39%;
 }
 .ysldiv51024{
-  margin-top: 34%;
-  margin-left: -1%;
+  margin-top: 30%;
   margin-right: 27%;
 }
 
@@ -468,8 +466,8 @@
   height: 53%;
 }
 .ysldiv61024{
-  margin-top: 26%;
+  margin-top: 31%;
   margin-left: 27%;
-  margin-right: 0%;
+  margin-right: 0;
   height: 40%;
 }
\ No newline at end of file