Merge branch 'factory-hxy' of http://172.20.32.203:3000/durian/forgeplus-react into factory

src/factory/components/Scene/index.jsx

@@ -34,7 +34,7 @@ const Scene = ({ zoneId }) => {
           sceneList.map((scene, index) => {
             return <div className="scene-item" key={index}>
               <h3>{scene.name}</h3>
-              <p>{scene.value}</p>
+              <p>{scene.summary}</p>
               <Link to={`/softwareFactory/scene/${index + 1}`}>
                 <span>查看详情</span>
                 <KFIcon type="icon-icon_blackarrow_hover" font={40}/>

src/factory/components/Scene/index.scss

@@ -37,6 +37,7 @@
       }
 
       a {
+        margin-top: auto;
         span {
           margin-top: 14px;
           line-height: 25px;

src/factory/lessons/index.scss

@@ -73,6 +73,7 @@
     width: 1600px;
     display: flex;
     justify-content: space-between;
+    margin-top: -145px;
 
     .lesson-left {
       width: 692px;
@@ -175,6 +176,7 @@
       background-image: url('../../images/factory/lessons/lesson-right.webp');
       background-repeat: no-repeat;
       background-size: 100% 100%;
+      z-index: 1;
 
       .right-item {
         height: 542px;

src/factory/news/index.scss

@@ -32,6 +32,7 @@
     padding: 0 calc((100vw - 1600px) / 2);
     width: 100%;
     margin-top: 60px;
+    overflow: hidden;
 
     .header-left {
       width: 642px;
@@ -90,6 +91,7 @@
     flex-shrink: 1;
     width: 40vw;
     margin-left: 160px;
+    overflow: hidden;
 
 
     .header-item {
@@ -241,7 +243,7 @@
 
           p {
             margin-top: 27px;
-            opacity: 79%;
+            opacity: 0.8;
             line-height: 30px;
             font-family: alibabareg;
             color: #091221;

src/factory/resource/developmentTools/detail/index.scss

@@ -11,6 +11,7 @@
     flex-direction: column;
     align-items: center;
     position: relative;
+    justify-content: flex-start;
 
     .ant-breadcrumb {
       align-self: flex-start;