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

# Conflicts:
#	project/src/pages/main3/main3.jsx
合并master

.gitignore

+node_modules
+dist
+.DS_Store
+node_modules
+dist
+
+___cache
\ No newline at end of file

project/.gitignore

 node_modules
 dist
-.DS_Store
\ No newline at end of file
+.DS_Store
+node_modules
+dist
\ No newline at end of file

project/package.json

@@ -33,4 +33,4 @@
   "devDependencies": {
     "mockjs": "^1.1.0"
   }
-}
+}
\ No newline at end of file

project/src/pages/detail2/detail2.jsx

@@ -14,10 +14,7 @@ class Detail2 extends Component {
   }
 
   componentDidMount(){
-    setTimeout(() => {
-      
-      this.props.navigateTo('mainpage')
-    }, 2000);
+
   }
 
   render() {
@@ -27,12 +24,14 @@ class Detail2 extends Component {
     }
     return (
       <div className="detail2 " uuid="c5abc304-1a0b-4804-956a-d61c1d5b75ed">
+        
         <div className="detail2_wrapper" uuid="583667d9-e382-49d8-bfc9-50b6d800c794">
           <img
             className="detail2_bg"
             uuid="2b6c5d97-e458-42a0-b49b-49e9efc6abbc"
             src={this.state.resList['9d6135a5-469f-4293-b931-17786c977974'].url}
           />
+          <img onClick={()=>this.props.navigateTo('mainpage')} className="detail2_back" uuid="detail2_back" src="//yun.duiba.com.cn/spark/assets/805d9455ffa59e37f0f0f19249959c3a9c458f96.png"></img>
           <div className="detail2_item_list" uuid="3804f60d-697f-4d68-98b5-ca8cf2e2d3ba">
             {
               arr.map((i) => (

project/src/pages/detail2/detail2.less

@@ -6,6 +6,7 @@
   top: 0px;
   transform-origin: 0 0 0;
   overflow: hidden;
+
   .detail2_wrapper {
     width: 100%;
     height: 100%;
@@ -22,6 +23,16 @@
       z-index: -1;
       transform-origin: 0 0 0;
     }
+
+    .detail2_back{
+      width: 74px;
+      height: 74px;
+      position: absolute;
+      left: 34px;
+      top: 34px;
+      transform-origin: 0 0 0;
+    }
+
     .detail2_item_list {
       // background-color: red;
       width: 100%;

project/src/pages/main3/main3.jsx

@@ -89,26 +89,32 @@ class Main3 extends Component {
               uuid="5316b02a-5b8e-4355-b556-cd801852df7e"
               src={this.state.resList['31522099-3ea6-4d2b-ae84-99e2877bd2d0'].url}
             />
-            {avatar == 1 && <img
-              className="main3_avatar1 "
-              uuid="f2277018-36fd-4f47-9124-d73324505dff"
-              src={this.state.resList['6dda365e-565e-4e15-9fc9-89b5e173dcd9'].url}
-            />}
-            {avatar == 2 && <img
-              className="main3_avatar2 "
-              uuid="07d1620b-d31e-4ef7-a63a-9b0ef49497da"
-              src={this.state.resList['6ff31046-e036-4218-8cc9-5d715dfa64a1'].url}
-            />}
-            {avatar == 3 && <img
-              className="main3_avatar3 "
-              uuid="dc2306b9-90e0-4e98-a967-e0f263a3217a"
-              src={this.state.resList['b4aa3a56-6a4f-4984-9aa2-1932c35de3b4'].url}
-            />}
+            {avatar == 1 && (
+              <img
+                className="main3_avatar1 "
+                uuid="f2277018-36fd-4f47-9124-d73324505dff"
+                src={this.state.resList['6dda365e-565e-4e15-9fc9-89b5e173dcd9'].url}
+              />
+            )}
+            {avatar == 2 && (
+              <img
+                className="main3_avatar2 "
+                uuid="07d1620b-d31e-4ef7-a63a-9b0ef49497da"
+                src={this.state.resList['6ff31046-e036-4218-8cc9-5d715dfa64a1'].url}
+              />
+            )}
+            {avatar == 3 && (
+              <img
+                className="main3_avatar3 "
+                uuid="dc2306b9-90e0-4e98-a967-e0f263a3217a"
+                src={this.state.resList['b4aa3a56-6a4f-4984-9aa2-1932c35de3b4'].url}
+              />
+            )}
             <span className="main3_num " uuid="018875e0-9592-4854-ba0b-2cd58464a6a2">
-              欢趣豆：{num}
+              欢趣豆：12352
             </span>
             <span className="main3_nick " uuid="a7518930-17cc-427a-a6e5-27a593b309c4">
-              {nickname}
+              用户昵称
             </span>
             <img
               onClick={() => {

project/src/pages/main3/main3.less

@@ -45,8 +45,8 @@
         position: absolute;
       }
       .main3_num {
-        // width: 164px;
-        // height: 22px;
+        width: 164px;
+        height: 22px;
         left: 105px;
         top: 57px;
         position: absolute;
@@ -54,8 +54,8 @@
         color: #ffffff;
       }
       .main3_nick {
-        // width: 96px;
-        // height: 24px;
+        width: 96px;
+        height: 24px;
         left: 105px;
         top: 20px;
         position: absolute;
@@ -103,7 +103,6 @@
     height: 405px;
     top: 1073px;
     position: absolute;
-    opacity: 0;
   }
   .main3_btn4 {
     width: 279px;
@@ -155,7 +154,6 @@
     left: 287px;
     top: 1212px;
     position: absolute;
-    display: none;
   }
 
   .canvas-widget{

project/src/svga.js

@@ -25,10 +25,10 @@ export const loadSVGA = (url) => {
 export const getSVGA = async (url, className, loops, clearsAfterStop) => {
     const videoItem = await loadSVGA(url);
     var svga = new SVGA.Player(className);
-    // if (loops)
-    //     svga.loops = loops;
-    // if (clearsAfterStop)
-    //     svga.clearsAfterStop = clearsAfterStop;
+    if (loops)
+        svga.loops = loops;
+    if (clearsAfterStop)
+        svga.clearsAfterStop = clearsAfterStop;
     svga.setVideoItem(videoItem);
     svga.startAnimation();
     return svga