From aa66bd1f812562aa09df826ff0abf07f10fca6b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 8 Aug 2019 14:28:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8C=87=E5=BC=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/ListPageIndex.js      | 22 +++----
 .../modules/courses/shixunHomework/Guide.js   | 38 +++++++----
 .../modules/courses/shixunHomework/guide.css  | 65 ++++++++++++++++++-
 3 files changed, 100 insertions(+), 25 deletions(-)

diff --git a/public/react/src/modules/courses/ListPageIndex.js b/public/react/src/modules/courses/ListPageIndex.js
index 9f12f6434..f2dd74fd9 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/shixunHomework/Guide.js b/public/react/src/modules/courses/shixunHomework/Guide.js
index a4ca9b373..d501b2ab5 100644
--- a/public/react/src/modules/courses/shixunHomework/Guide.js
+++ b/public/react/src/modules/courses/shixunHomework/Guide.js
@@ -21,21 +21,32 @@ class Guide extends Component {
 
 	}
 	componentDidMount() {
+		// 1366x768
+		// var mywidthone=7;
 
-    var mywidthone=0;
+		var mywidthone=0;
 		if(window.screen.width===1024){
 			mywidthone=1;
 		}
-		if(window.screen.width===1280){
+		else if(window.screen.width===1280){
 			mywidthone=2;
 		}
-		if(window.screen.width===1440){
+		else if(window.screen.width===1440){
 			mywidthone=3;
 		}
-		if(window.screen.width===1680){
+		else if(window.screen.width===1680){
 			mywidthone=4;
 		}
-		if(window.screen.width===1920){
+		else if(window.screen.width===1920){
+			mywidthone=5;
+		}
+		else if(window.screen.width===1366){
+			mywidthone=6;
+		}
+		else if(window.screen.width===1600){
+			mywidthone=7;
+		}
+		else{
 			mywidthone=5;
 		}
 		this.setState({
@@ -54,8 +65,9 @@ class Guide extends Component {
 	render() {
 		let {page,mywidth}=this.state;
 		// console.log("屏幕宽度");
-		// console.log(window.screen.width);
-		// console.log(mywidth);
+		console.log(window.screen.width);
+		console.log(mywidth);
+
 		return (
 			<div className="guide-shadow">
 				<style>
@@ -70,14 +82,14 @@ class Guide extends Component {
 				{
 					page===1?
 						<div className="guide-content">
-							<img className={mywidth===1?"ysldiv11024":mywidth===2?"ysldiv11280":mywidth===3?"ysldiv11440":mywidth===4?"ysldiv11680":"ysldiv11900"} src={guihome1} onClick={(i)=>this.thissetPage(2)} />
+							<img className={mywidth===1?"ysldiv11024":mywidth===2?"ysldiv11280":mywidth===3?"ysldiv11440":mywidth===4?"ysldiv11680":mywidth===5?"ysldiv11900":mywidth===6?"ysldiv11366":mywidth===7?"ysldiv11600":"ysldiv11900"} src={guihome1} onClick={(i)=>this.thissetPage(2)} />
 						</div>
 						:""
 				}
 				{
 					page===2?
 						<div  className="guide-content">
-              <img  className={mywidth===1?"ysldiv21024":mywidth===2?"ysldiv21280":mywidth===3?"ysldiv21440":mywidth===4?"ysldiv21680":"ysldiv21900"} src={guihome2} onClick={(i)=>this.thissetPage(3)}/>
+              <img  className={mywidth===1?"ysldiv21024":mywidth===2?"ysldiv21280":mywidth===3?"ysldiv21440":mywidth===4?"ysldiv21680":mywidth===5?"ysldiv21900":mywidth===6?"ysldiv21366":mywidth===7?"ysldiv21600":"ysldiv21900"} src={guihome2} onClick={(i)=>this.thissetPage(3)}/>
 						</div>
 						:
 						""
@@ -85,7 +97,7 @@ class Guide extends Component {
 				{
 					page===3?
 						<div  className="guide-content">
-							<img  className={mywidth===1?"ysldiv31024":mywidth===2?"ysldiv31280":mywidth===3?"ysldiv31440":mywidth===4?"ysldiv31680":"ysldiv31900"} src={guihome3} onClick={(i)=>this.thissetPage(4)}/>
+							<img  className={mywidth===1?"ysldiv31024":mywidth===2?"ysldiv31280":mywidth===3?"ysldiv31440":mywidth===4?"ysldiv31680":mywidth===5?"ysldiv31900":mywidth===6?"ysldiv31366":mywidth===7?"ysldiv31600":"ysldiv31900"} src={guihome3} onClick={(i)=>this.thissetPage(4)}/>
 						</div>
 						:
 						""
@@ -93,7 +105,7 @@ class Guide extends Component {
 				{
 					page===4?
 						<div  className="guide-content">
-							<img  className={mywidth===1?"ysldiv41024":mywidth===2?"ysldiv41280":mywidth===3?"ysldiv41440":mywidth===4?"ysldiv41680":"ysldiv41900"} src={guihome4} onClick={(i)=>this.thissetPage(5)}/>
+							<img  className={mywidth===1?"ysldiv41024":mywidth===2?"ysldiv41280":mywidth===3?"ysldiv41440":mywidth===4?"ysldiv41680":mywidth===5?"ysldiv41900":mywidth===6?"ysldiv41366":mywidth===7?"ysldiv41600":"ysldiv41900"} src={guihome4} onClick={(i)=>this.thissetPage(5)}/>
 						</div>
 						:
 						""
@@ -101,7 +113,7 @@ class Guide extends Component {
 				{
 					page===5?
 						<div  className="guide-content">
-							<img  className={mywidth===1?"ysldiv51024":mywidth===2?"ysldiv51280":mywidth===3?"ysldiv51440":mywidth===4?"ysldiv51680":"ysldiv51900"} src={guihome5} onClick={(i)=>this.thissetPage(6)}/>
+							<img  className={mywidth===1?"ysldiv51024":mywidth===2?"ysldiv51280":mywidth===3?"ysldiv51440":mywidth===4?"ysldiv51680":mywidth===5?"ysldiv51900":mywidth===6?"ysldiv51366":mywidth===7?"ysldiv51600":"ysldiv51900"} src={guihome5} onClick={(i)=>this.thissetPage(6)}/>
 						</div>
 						:
 						""
@@ -109,7 +121,7 @@ class Guide extends Component {
 				{
 					page===6?
 						<div  className="guide-content">
-							<img  className={mywidth===1?"ysldiv61024":mywidth===2?"ysldiv61280":mywidth===3?"ysldiv61440":mywidth===4?"ysldiv61680":"ysldiv61900"} src={guihome6} onClick={(i)=>this.thissetPage(7)}/>
+							<img  className={mywidth===1?"ysldiv61024":mywidth===2?"ysldiv61280":mywidth===3?"ysldiv61440":mywidth===4?"ysldiv61680":mywidth===5?"ysldiv61900":mywidth===6?"ysldiv61366":mywidth===7?"ysldiv61600":"ysldiv61900"} src={guihome6} onClick={(i)=>this.thissetPage(7)}/>
 						</div>
 						:
 						""
diff --git a/public/react/src/modules/courses/shixunHomework/guide.css b/public/react/src/modules/courses/shixunHomework/guide.css
index b815b2937..81c67f82e 100755
--- a/public/react/src/modules/courses/shixunHomework/guide.css
+++ b/public/react/src/modules/courses/shixunHomework/guide.css
@@ -20,7 +20,7 @@
   right: 0;
   bottom: 0;
   
-  background-color:  rgba(0, 0, 0, 0.8);
+  background-color:  rgba(0, 0, 0, 0.4);
   transition: all .3s ease-out;
   display: flex;
   justify-content: center;
@@ -240,6 +240,11 @@
   margin-left: 13%;
   margin-right: 10%;
 }
+.ysldiv11600{
+  margin-top: 12%;
+  margin-left: 11%;
+  margin-right: 7%;
+}
 .ysldiv11440{
   margin-top: 14%;
   margin-left: 7%;
@@ -253,6 +258,12 @@
   margin-right: 0%;
   height: 60%;
 }
+.ysldiv11366{
+  margin-top: 15%;
+  margin-left: 5%;
+  margin-right: 2%;
+  height: 60%;
+}
 .ysldiv11024{
   margin-top: 20%;
   margin-left: 0%;
@@ -275,6 +286,11 @@
   margin-right: 20%;
   height: 24%;
 }
+.ysldiv21600{
+  margin-top: 12%;
+  margin-left: 47%;
+  margin-right: 20%;
+}
 .ysldiv21440{
   margin-top: 14%;
   margin-left: 47%;
@@ -288,6 +304,12 @@
   margin-right: 14%;
   height: 25%;
 }
+.ysldiv21366{
+  margin-top: 15%;
+  margin-left: 51%;
+  margin-right: 14%;
+  height: 23%;
+}
 .ysldiv21024{
   margin-top: 20%;
   margin-left: 61%;
@@ -307,6 +329,11 @@
   margin-left: 14%;
   margin-right: 45%;
 }
+.ysldiv31600{
+  margin-top: 12%;
+  margin-left: 12%;
+  margin-right: 45%;
+}
 .ysldiv31440{
   margin-top: 13%;
   margin-left: 8%;
@@ -318,6 +345,11 @@
   margin-left: 3%;
   margin-right: 44%;
 }
+.ysldiv31366{
+  margin-top: 14%;
+  margin-left: 6%;
+  margin-right: 43%;
+}
 .ysldiv31024{
   margin-top: 18%;
   margin-left: 1%;
@@ -337,6 +369,11 @@
   margin-left: 14%;
   margin-right: 23%;
 }
+.ysldiv41600{
+  margin-top: 19%;
+  margin-left: 12%;
+  margin-right: 23%;
+}
 .ysldiv41440{
   margin-top: 24%;
   margin-left: 8%;
@@ -348,6 +385,11 @@
   margin-left: 3%;
   margin-right: 17%;
 }
+.ysldiv41366{
+  margin-top: 22%;
+  margin-left: 6%;
+  margin-right: 20%;
+}
 .ysldiv41024{
   margin-top: 29%;
   margin-left: 0%;
@@ -366,6 +408,11 @@
   margin-left: 13%;
   margin-right: 41%;
 }
+.ysldiv51600{
+  margin-top: 19%;
+  margin-left: 11%;
+  margin-right: 39%;
+}
 .ysldiv51440{
   margin-top: 24%;
   margin-left: 7%;
@@ -377,6 +424,11 @@
   margin-left: 2%;
   margin-right: 38%;
 }
+.ysldiv51366{
+  margin-top: 22%;
+  margin-left: 5%;
+  margin-right: 39%;
+}
 .ysldiv51024{
   margin-top: 34%;
   margin-left: -1%;
@@ -395,6 +447,11 @@
   margin-left: 31%;
   margin-right: 14%;
 }
+.ysldiv61600{
+  margin-top: 19%;
+  margin-left: 30%;
+  margin-right: 12%;
+}
 .ysldiv61440{
   margin-top: 21%;
   margin-left: 28%;
@@ -407,6 +464,12 @@
   margin-right: 3%;
   height: 53%;
 }
+.ysldiv61366{
+  margin-top: 22%;
+  margin-left: 26%;
+  margin-right: 6%;
+  height: 53%;
+}
 .ysldiv61024{
   margin-top: 26%;
   margin-left: 27%;

From 3d0c856623ab9242d8952e253f137ff7199c8871 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 8 Aug 2019 16:27:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8C=87=E5=BC=95css?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/courses/shixunHomework/guide.css  | 51 +++++++++----------
 1 file changed, 24 insertions(+), 27 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/guide.css b/public/react/src/modules/courses/shixunHomework/guide.css
index 81c67f82e..efd7709aa 100755
--- a/public/react/src/modules/courses/shixunHomework/guide.css
+++ b/public/react/src/modules/courses/shixunHomework/guide.css
@@ -236,9 +236,9 @@
 
 }
 .ysldiv11680{
-  margin-top: 11%;
-  margin-left: 13%;
-  margin-right: 10%;
+    margin-top: 11.5%;
+    margin-left: 13%;
+    margin-right: 9%;
 }
 .ysldiv11600{
   margin-top: 12%;
@@ -249,7 +249,6 @@
   margin-top: 14%;
   margin-left: 7%;
   margin-right: 3%;
-  height: 60%;
 }
 
 .ysldiv11280{
@@ -281,10 +280,9 @@
 
 }
 .ysldiv21680{
-  margin-top: 11%;
-  margin-left: 45%;
-  margin-right: 20%;
-  height: 24%;
+    margin-top: 11.5%;
+    margin-left: 45%;
+    margin-right: 20%;
 }
 .ysldiv21600{
   margin-top: 12%;
@@ -295,7 +293,6 @@
   margin-top: 14%;
   margin-left: 47%;
   margin-right: 17%;
-  height: 25%;
 }
 
 .ysldiv21280{
@@ -325,9 +322,9 @@
 
 }
 .ysldiv31680{
-  margin-top: 11%;
-  margin-left: 14%;
-  margin-right: 45%;
+    margin-top: 11.5%;
+    margin-left: 14%;
+    margin-right: 45%;
 }
 .ysldiv31600{
   margin-top: 12%;
@@ -335,7 +332,7 @@
   margin-right: 45%;
 }
 .ysldiv31440{
-  margin-top: 13%;
+  margin-top: 13.5%;
   margin-left: 8%;
   margin-right: 44%;
 }
@@ -359,15 +356,15 @@
 /*目录管理*/
 
 .ysldiv41900{
-  margin-top: 18%;
+  margin-top: 16%;
   margin-left: 19%;
-  margin-right: 28%;
+  margin-right: 29%;
 
 }
 .ysldiv41680{
-  margin-top: 21%;
+  margin-top: 18%;
   margin-left: 14%;
-  margin-right: 23%;
+  margin-right: 24%;
 }
 .ysldiv41600{
   margin-top: 19%;
@@ -375,13 +372,13 @@
   margin-right: 23%;
 }
 .ysldiv41440{
-  margin-top: 24%;
+  margin-top: 21%;
   margin-left: 8%;
-  margin-right: 19%;
+  margin-right: 20%;
 }
 
 .ysldiv41280{
-  margin-top: 27%;
+  margin-top: 24%;
   margin-left: 3%;
   margin-right: 17%;
 }
@@ -398,15 +395,15 @@
 
 /*导航排序*/
 .ysldiv51900{
-  margin-top: 18%;
+  margin-top: 16%;
   margin-left: 18%;
   margin-right: 42%;
 
 }
 .ysldiv51680{
-  margin-top: 20%;
-  margin-left: 13%;
-  margin-right: 41%;
+    margin-top: 18%;
+    margin-left: 13%;
+    margin-right: 40%;
 }
 .ysldiv51600{
   margin-top: 19%;
@@ -414,13 +411,13 @@
   margin-right: 39%;
 }
 .ysldiv51440{
-  margin-top: 24%;
+  margin-top: 21%;
   margin-left: 7%;
-  margin-right: 38%;
+  margin-right: 39%;
 }
 
 .ysldiv51280{
-  margin-top: 27%;
+  margin-top: 24%;
   margin-left: 2%;
   margin-right: 38%;
 }