111

project/public/index.html

@@ -75,12 +75,12 @@
   </script>
 
 
-<script src="https://yun.duiba.com.cn/db_games/debug/vconsole.min.js"></script>
+<!-- <script src="https://yun.duiba.com.cn/db_games/debug/vconsole.min.js"></script>
 <script>
 // init vConsole
 var vConsole = new VConsole();
 console.log('Hello world');
-</script>
+</script> -->
 
 
 <!-- <script src="https://js.fundebug.cn/fundebug.2.0.0.min.js"

project/sparkrc.js

@@ -4,6 +4,6 @@ module.exports = {
 	TEMP_DIR: "./.temp",
 	ENTRY: "src/app.jsx",
 	TEMPLATE: "./public/index.html",
-	MOCK_STATUS: false,
+	MOCK_STATUS: true,
 	PX2REM: true
 };

project/src/app.less

@@ -78,3 +78,34 @@ body {
 .canvasLayer{
   z-index: 99999;
 }
+
+
+.popcontainer {
+  position: fixed;
+  // width: 750px;
+  // height: 1624px;
+  // top: 50%;
+  // left: 50%;
+  // margin-top:-812px;
+  // margin-left:-375px;
+  width: 100%;
+  height: calc(100vh);
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%,-50%);
+  background: rgba(0, 0, 0, 0.7);
+
+}
+
+
+.popcontainer_empty {
+  position: fixed;
+  width: 750px;
+  height: 1624px;
+  top: 50%;
+  left: 50%;
+  margin-left:-375px;
+  margin-top:-812px;
+  pointer-events: none;
+  // background: rgba(0, 0, 0, 0.01);
+}
\ No newline at end of file

project/src/components/rule/rule.jsx

@@ -31,7 +31,7 @@ class Rule extends Component {
         <span ref="rule_txt_ref" className="rule_txt " uuid="b1275bdd-01e4-42f2-81c2-12a732f7f38c">
         </span>
         <img
-          onClick={this.props.onClose}
+          onClick={this.props.closeWin}
           className="rule_close "
           uuid="af9001ed-b3c5-404d-ab2a-34939510ea61"
           src={this.state.resList['3814359c-5889-4ffa-8b76-bc52f58ebd5d'].url}

project/src/components/select/select.jsx

@@ -38,7 +38,7 @@ class Select extends Component {
     // console.log("figureid设置==》",Role);
     // setTimeout(() => {
     //   console.log('关闭这个弹窗');
-    //   this.props.onClose();
+    //   this.props.closeWin();
     // }, 1000);
 
     this.nshowidx = startselidx;
@@ -169,7 +169,7 @@ class Select extends Component {
         }
       }
       getHomeInfo();
-      this.props.onClose();
+      this.props.closeWin();
       dataCenter.setData(Store.needguide,true);
     }else{
       if(updateuinfo){

project/src/components/sign/sign.jsx

@@ -36,7 +36,7 @@ class Sign extends Component {
         if (res.data.type !== 'joyBean') {
           // Aup.show('PrizeRule', res.data, this);
         } else {
-          this.props.onClose();
+          this.props.closeWin();
           Toast(`恭喜你成功领取${res.data.awardName}`)
         }
       } else {
@@ -116,7 +116,7 @@ class Sign extends Component {
           src={this.state.resList['7d7b7747-b417-45c0-959c-3d39603afc69'].url}
         />
         <img
-          onClick={this.props.onClose}
+          onClick={this.props.closeWin}
           className="sign_close "
           uuid="e112e990-527f-4a53-8eb4-3eb6bc60ad40"
           src={this.state.resList['104ff753-c9bc-4218-969c-3c3fa4d11610'].url}

project/src/components/userinfo/userinfo.jsx

@@ -40,7 +40,7 @@ class Userinfo extends Component {
       console.log('res', res);
       if (res && res.success) {
         getHomeInfo();
-        this.props.onClose();
+        this.props.closeWin();
       } else {
         switch (res.code) {
           case '10004':
@@ -72,7 +72,7 @@ class Userinfo extends Component {
     //   //   }
     //   // }
     //   // getHomeInfo();
-    //   // this.props.onClose();
+    //   // this.props.closeWin();
     //   // dataCenter.setData(Store.needguide,true);
     // } else {
     //   // if(updateuinfo){
@@ -105,7 +105,7 @@ class Userinfo extends Component {
         {figureId == 2 && <img className="userinfo_avatar " src="//yun.duiba.com.cn/spark/assets/042c2b238932872aa066fd989f2169715789a3c3.png" />}
         {figureId == 3 && <img className="userinfo_avatar " src="//yun.duiba.com.cn/spark/assets/5a672d98433d289091b879a2d546970c281cb9d2.png" />}
         <img
-          onClick={this.props.onClose}
+          onClick={this.props.closeWin}
           className="userinfo_close "
           uuid="4f217b43-8438-451e-b28f-0e9d611fce2b"
           src={this.state.resList['c7826e1a-8b74-44da-922f-0fe078587999'].url}

project/src/pages/loading/loading.jsx

@@ -8,6 +8,8 @@ import resList from '../../resconfig/resList'; //import API from '../../api';
 import API from '../../api';
 import './loading.less';
 import dataCenter, { getAPIdata, getHomeInfo, Store } from '../../dataCenter';
+import ViewCtrl from "../../util/viewCtrl";
+import Enum from '../../util/enum';
 
 class Loading extends Component {
   constructor(props) {
@@ -107,7 +109,7 @@ class Loading extends Component {
 
       if (newUser) {
         //新用户，走选择，然后再走引导，引导结束后，走签到
-        // Aup.show('Select', {}, this);
+        ViewCtrl.showWin(Enum.Com.Select);
         isnewUser = 1;
       }
     }

project/src/util/config.js

 import Userinfo from "../components/userinfo/userinfo.jsx";
+import Select from "../components/select/select.jsx";
 // import Comtask from '../components/comtask/comtask.jsx';
 // import ComconfirmExchange from '../components/comconfirmExcahnge/comconfirmExcahnge.jsx';
 // import ComExchangesuccess from '../components/comexchangesuccess/comexchangesuccess.jsx';
@@ -8,6 +9,7 @@ const { default: Enum } = require("./enum");
 let comMap = new Map();
 
 comMap.set(Enum.Com.Userinfo, Userinfo);
+comMap.set(Enum.Com.Select, Select);
 // comMap.set(Enum.Com.comtask, Comtask);
 // comMap.set(Enum.Com.comconfirmExchange, ComconfirmExchange);
 // comMap.set(Enum.Com.comExchangesuccess, ComExchangesuccess);

project/src/util/enum.js

@@ -24,6 +24,7 @@ const Enum = {
         comconfirmExchange:2003,
         comExchangesuccess:2004,
         Userinfo:2005,
+        Select:2006,
     },
     Store:{