调整

public/javascripts/educoder/edu_application.js

@@ -125,7 +125,7 @@ $(window).resize(function() {
     rightSlider();
 });
 function rightSlider() {
-    var poi = parseInt((parseInt($(window).width()) - 1200) / 2) - 60;
+    var poi = parseInt((parseInt($(window).width()) - 1200) / 2) - 34;
     // console.log(parseInt($(window).width())+"  "+poi);
     if (poi > 0) {
         $(".-task-sidebar").css("right", poi);

public/react/config/webpack.config.dev.js

@@ -114,21 +114,21 @@ module.exports = {
       // First, run the linter.
       // It's important to do this before Babel processes the JS.
         // 上线然后要注释回来
-      {
+      // {
-        test: /\.(js|jsx|mjs)$/,
+      //   test: /\.(js|jsx|mjs)$/,
-        enforce: 'pre',
+      //   enforce: 'pre',
-        use: [
+      //   use: [
-          {
+      //     {
-            options: {
+      //       options: {
-              formatter: eslintFormatter,
+      //         formatter: eslintFormatter,
-              eslintPath: require.resolve('eslint'),
+      //         eslintPath: require.resolve('eslint'),
-
+			//
-            },
+      //       },
-            loader: require.resolve('eslint-loader'),
+      //       loader: require.resolve('eslint-loader'),
-          },
+      //     },
-        ],
+      //   ],
-        include: paths.appSrc,
+      //   include: paths.appSrc,
-      },
+      // },
       {
         // "oneOf" will traverse all following loaders until one will
         // match the requirements. When no loader matches it will fall

public/react/src/modules/home/shixunsHome.js

@@ -198,13 +198,13 @@ class ShixunsHome extends Component {
                                 </div>
                                 <Link to={"/paths"} className="moreitem">更多<i className="fa fa-angle-right ml5"></i></Link>
 
-                                <div className="square-list clearfix">
+                                <div className="square-list clearfix" style={{width:'102%'}}>
 
 
                                     {homedatalist===undefined?"":homedatalist.subjects.map((item,key)=>{
                                         if(key<8)
                                         return(
-                                            <div className="square-Item" key={key} id={item.id}>
+                                            <div className="square-Item" key={key} id={item.id} style={{width:'286px'}}>
 
                                                 <div className="tag-green">
                                                     <span className="tag-name"> {item.name}</span>
@@ -272,10 +272,10 @@ class ShixunsHome extends Component {
                                 </div>
                                 <Link to={"/shixuns"} className="moreitem">更多<i className="fa fa-angle-right ml5"></i></Link>
 
-                                <div className="square-list clearfix">
+                                <div className="square-list clearfix" style={{width:'102%'}}>
                                     {homedatalist===undefined?"":homedatalist.shixuns.map((item,key)=>{
                                         return(
-                                            <div className="square-Item" key={key} id={item.id}>
+                                            <div className="square-Item" key={key} id={item.id} style={{width:'286px'}}>
 
                                                 <div className="tag-green">
                                                     <span className="tag-name"> {item.tag_name}</span>

public/react/src/modules/tpm/NewFooter.js

@@ -16,7 +16,7 @@ class NewFooter extends Component {
 
   render() {
     return (
-      <div className="newFooter edu-txt-center">
+      <div className="newFooter edu-txt-center newContainers">
         <div className="inner-footer_con">
           <div className="footercon">
             <div className="inline mt40 mb5">

public/react/src/modules/tpm/SiderBar.js

@@ -23,7 +23,7 @@ $(window).scroll(function(){
 });
 
 function rightSlider(){
-  var poi=parseInt((parseInt($(window).width())- 1200 )/2)-60;
+  var poi=parseInt((parseInt($(window).width())- 1200 )/2)-34;
   // console.log(parseInt($(window).width())+"  "+poi);
   if(poi>0){
     $(".-task-sidebar").css("right",poi);

public/react/src/modules/tpm/TPMIndexHOC.js

@@ -294,12 +294,21 @@ export function TPMIndexHOC(WrappedComponent) {
 		    return (
 		    	<div>
 
-
+            <SiderBar Headertop={Headertop}/>
-            <SiderBar
+						<style>{
-                        Headertop={Headertop}
+							`
-                    />
+							.newContainers{
+								width: 100%;
+								min-width: 1440px;
+							  max-width: unset;
+							}
+							// .-task-sidebar{
+						  //   right: 270px !important;
+							// }
+							`
+						}</style>
 						<NewHeader {...this.state} {...this.props}></NewHeader>
-                    <div className="newContainer">
+						<div className="newContainer newContainers">
 								<WrappedComponent initCommonState={(user)=>this.initCommonState(user)}
 									{...this.props} {...this.state}
 									showShixun={this.showShixun} aboutFocus={this.aboutFocus}
@@ -308,6 +317,8 @@ export function TPMIndexHOC(WrappedComponent) {
 							</WrappedComponent>
 
 						</div>
+
+
 						<NewFooter
 								Footerdown={Footerdown}
 						/>