Merge branch 'master' of gitlab2.dui88.com:wildfirecode13/icbcrpg into 引导选人load

# Conflicts:
#	dsl.json
#	project/src/pages/detail2/detail2.jsx
#	project/src/pages/detail2/detail2.less
#	project/src/pages/loading/loading.jsx合并冲突

project/src/pages/detail2/detail2.jsx

@@ -9,21 +9,29 @@ class Detail2 extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      resList: resList,
+      resList: resList
     };
   }
 
   render() {
+    const arr = [];
+    for(let i=0; i < 20;i++) {
+      arr.push(i)
+    }
     return (
       <div className="detail2 " uuid="c5abc304-1a0b-4804-956a-d61c1d5b75ed">
+        <div className="detail2_wrapper" uuid="583667d9-e382-49d8-bfc9-50b6d800c794">
           <img
-          className="detail2_bg "
+            className="detail2_bg"
             uuid="2b6c5d97-e458-42a0-b49b-49e9efc6abbc"
             src={this.state.resList['9d6135a5-469f-4293-b931-17786c977974'].url}
           />
+          <div className="detail2_item_list" uuid="3804f60d-697f-4d68-98b5-ca8cf2e2d3ba">
+            {
+              arr.map((i) => (
                 <div className="detail2_item " uuid="4d8289ea-9464-4a92-a81c-3e24c364e707">
                   <span className="detail2_item_title " uuid="48b63d65-a3d8-4b94-b979-3fcb19c9d89c">
-            每日签到
+                    每日签到{i}
                   </span>
                   <span className="detail2_item_day " uuid="5e6c50df-f25c-4b91-acc7-95d4829ff7db">
                     2020-12-25 09:54:30
@@ -37,6 +45,11 @@ class Detail2 extends Component {
                     src={this.state.resList['eed0f2f8-74ef-4680-a29c-d5db6818738f'].url}
                   />
                 </div>
+
+              ))
+            }
+          </div>
+        </div>
       </div>
     );
   }

project/src/pages/detail2/detail2.less

 .detail2 {
-  width: 750px;
-  height: 1624px;
-  position: fixed;
+  width: 100vw;
+  height: 100vh;
+  position: absolute;
   left: 0px;
   top: 0px;
   transform-origin: 0 0 0;
+  overflow: hidden;
+  .detail2_wrapper {
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+    display: flex;
+    flex-direction: row;
+    background-color: transparent;
     .detail2_bg {
       width: 750px;
       height: 1624px;
       position: absolute;
-    left: -2px;
+      left: 0px;
       top: 0px;
+      z-index: -1;
       transform-origin: 0 0 0;
     }
+    .detail2_item_list {
+      background-color: red;
+      width: 100%;
+      // height: 100%;
+      flex: 1;
+      margin-top: 214px;
+      display: flex;
+      flex-flow: row wrap;
+      align-content: flex-start;
+      overflow-y: scroll;
       .detail2_item {
+        margin-left:63px;
+        position: relative;
+        box-sizing: border-box;
         width: 618px;
-    height: 91px;
-    left: 65px;
-    top: 235px;
-    position: absolute;
+        height: 107px;
+
+        // width: 618px;
+        // height: 91px;
+        // left: 65px;
+        // top: 235px;
+        // position: absolute;
         .detail2_item_title {
           width: 193px;
           height: 23px;
@@ -48,8 +73,10 @@
         .detail2_item_bg {
           width: 618px;
           height: 1px;
-      top: 90px;
+          bottom: 0px;
           position: absolute;
         }
       }
+    }
+  }
 }