1

project/.vscode/launch.json

+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "chrome",
+            "request": "launch",
+            "name": "Launch Chrome against localhost",
+            "url": "http://localhost:8088/",
+            "webRoot": "${workspaceFolder}"
+        }
+    ]
+}
\ No newline at end of file

project/mock/e-family/index.js

@@ -13,7 +13,7 @@ export const homeInfo = {
                 "figureId": "3"
             }
         ],
-        "newUser": false,
+        "newUser": true,
         "userInfo": {
             "figureId": "1",
             "joyBeans": 10000,

project/src/pages/detail2/detail2.less

@@ -48,36 +48,30 @@
         position: relative;
         box-sizing: border-box;
         width: 618px;
-        height: 91px;
-        padding: 25px 0 0 ;
-
-        // width: 618px;
-        // height: 91px;
-        // left: 65px;
-        // top: 235px;
-        // position: absolute;
+        height: 109px;
         .detail2_item_title {
-          width: 193px;
-          height: 23px;
+          // width: 193px;
+          // height: 23px;
           left: 53px;
+          top:20px;
           position: absolute;
           font-size: 24px;
           color: #474747;
         }
         .detail2_item_day {
-          width: 284px;
-          height: 16px;
+          // width: 284px;
+          // height: 16px;
           left: 52px;
-          top: 42px;
+          top: 62px;
           position: absolute;
           font-size: 20px;
           color: #949494;
         }
         .detail2_item_num {
-          width: 88px;
-          height: 31px;
+          // width: 88px;
+          // height: 31px;
           left: 455px;
-          top: 8px;
+          top: 23px;
           position: absolute;
           font-size: 40px;
           color: #474747;

project/src/pages/loading/loading.jsx

@@ -91,8 +91,14 @@ class Loading extends Component {
     if(homeinfo){
       const {newUser} = homeinfo;
 
-      if(newUser){
+      if(newUser){//新用户，走选择，然后再走引导，引导结束后，走签到
         Aup.show('Select', {}, this);
+      }else {
+        API.signInfo().then((res)=>{
+          const {needPopup} =res.data;
+          if(needPopup)
+            Aup.show('Sign', res.data, this);
+        })
       }
     }
   }

project/src/pages/main3/main3.jsx

@@ -2,7 +2,7 @@
 
 import React, { Component } from 'react';
 import resList from '../../resconfig/resList'; //import API from '../../api';
-
+import API from '../../api';
 import { Aup, AUPOP, AUP_MBX_STATE } from '../../pop';
 import './main3.less';
 import { CanvasWidget } from 'spark-utils';
@@ -29,7 +29,9 @@ class Main3 extends Component {
   }
 
   onClick_signBtn = () => {
-    Aup.show('Sign', {}, this);
+    API.signInfo().then((res)=>{
+      Aup.show('Sign', res.data, this);
+    })
     // console.log('onClick_signBtn')
   }
 
@@ -48,13 +50,6 @@ class Main3 extends Component {
 
   componentDidMount() {
     this.initEvent();
-    // if (this.props.data) {
-    //   setTimeout(() => {
-    //     // Aup.show('PopRule', {}, this)
-    //     // Aup.show('Userinfo', {}, this);
-    //     // Aup.show('Sign', {}, this); // Aup.show('Select', {}, this);
-    //   }, 200);
-    // }
   }
   initEvent() {
     GDispatcher.addEventListener(Store.homeinfo, this.freshHomeInfo, this);