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

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

project/src/app.jsx

@@ -16,7 +16,7 @@ class App extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      page: 'loading',
+      page: 'detail',
     };
   }
 

project/src/pages/detail2/detail2.jsx

@@ -16,6 +16,7 @@ class Detail2 extends Component {
   render() {
     return (
       <div className="detail2 " uuid="c5abc304-1a0b-4804-956a-d61c1d5b75ed">
+        <div className=""></div>
         <img
           className="detail2_bg "
           uuid="2b6c5d97-e458-42a0-b49b-49e9efc6abbc"

project/src/pages/detail2/detail2.less

 .detail2 {
-  width: 750px;
-  height: 1624px;
+  width: 100vw;
+  height: 100vh;
+  opacity: 1;
   position: absolute;
-  left: 0px;
-  top: 0px;
-  transform-origin: 0 0 0;
+  top: 0;
+  left: 0;
+  overflow: hidden;
   .detail2_bg {
     width: 750px;
     height: 1624px;
     position: absolute;
-    left: -2px;
     top: 0px;
     transform-origin: 0px 0px 0px;
   }

project/src/pages/loading/loading.jsx

 'use strict';
 
 import { appID } from 'duiba-utils';
-import React, { Component } from 'react'; // import { Timer } from 'teddi';
+import React, { Component } from 'react'; 
+import { Timer } from 'teddi';
 
 import resList from '../../resconfig/resList'; //import API from '../../api';
 
 import API from '../../api';
 import './loading.less';
-import { Aup } from '../../pop';
 
 class Loading extends Component {
   constructor(props) {
@@ -21,19 +21,16 @@ class Loading extends Component {
     Promise.all([this.getCountdown(), API.getRule()]).then(([, res]) => {
       this.oncomplete(res);
     });
-
-    
   }
 
   getCountdown() {
     return new Promise((r) => {
-      // const delta = 30;
-      // const timer = new Timer(1 * 30, 1000 / 30);
-      // timer.on('timer', this.onupdate, this);
-      // timer.on('complete', r, this);
-      // timer.start();
+      const delta = 30;
+      const timer = new Timer(1 * 30, 1000 / 30);
+      timer.on('timer', this.onupdate, this);
+      timer.on('complete', r, this);
+      timer.start();
       // r();
-      r()
     });
   }
 
@@ -45,8 +42,6 @@ class Loading extends Component {
     this.props.navigateTo('mainpage', {
       info: res.data,
     });
-
-    Aup.show('Select', {}, this);
   }
 
   render() {