Merge branch 'disu0811' of http://gitlab2.dui88.com/wildfirecode13/wfc13 into disu0811

project/mock/webNet/dazzle/index.do.json

+{
+    "code": null,
+    "data": {
+        "surplusCount": 1,
+        "credits": 100,
+        "needCredits": 10,
+        "type": 2
+    },
+    "message": null,
+    "success": true
+}
\ No newline at end of file

project/src/SkinJson.ts

@@ -242,10 +242,10 @@ export const SkinJson ={
                 {
                     "name": "index_moneytips2",
                     "x": 608,
-                    "y": 1133,
+                    "y": 1127,
                     "type": "text",
                     "props": {
-                        "text": "XX",
+                        "text": "0",
                         "size": 32,
                         "fillColor": "#000000",
                         "textAlpha": 1
@@ -266,10 +266,10 @@ export const SkinJson ={
                 {
                     "name": "index_timestips2",
                     "x": 255,
-                    "y": 1132,
+                    "y": 1127,
                     "type": "text",
                     "props": {
-                        "text": "XX",
+                        "text": "0",
                         "size": 32,
                         "fillColor": "#000000",
                         "textAlpha": 1
@@ -290,10 +290,10 @@ export const SkinJson ={
                 {
                     "name": "index_costtips",
                     "x": 322,
-                    "y": 434,
+                    "y": 430,
                     "type": "text",
                     "props": {
-                        "text": "XX积分/次",
+                        "text": "0积分/次",
                         "size": 30,
                         "fillColor": "#000000",
                         "textAlpha": 1

project/src/WebNetName.ts

@@ -19,5 +19,9 @@
     /**
      * 获取规则
      */
-    projectRule = "/projectx/{projectId}/projectRule.query"
+     projectRule = "/projectx/{projectId}/projectRule.query",
+    /**
+     * 获取首页数据
+     */
+     projectIndex = "/projectx/{projectId}/dazzle/index.do"
 }
\ No newline at end of file

project/src/scenes/IndexScene.ts

@@ -10,10 +10,12 @@ import { notEnoughMoneyPanel } from "../panels/notEnoughMoney";
 import { PrizePanel } from "../panels/prize";
 import { SharePanel } from "../panels/share";
 import { timesNotEnoughPanel } from "../panels/timesNotEnough";
-import { RulePanel } from "../template/RulePanel";
+import { RulePanel } from "../panels/RulePanel";
 import { Box } from "./Box";
 import { BoxGroup } from "./BoxGroup";
 import { ScrollItem } from "./ScrollItem";
+import { sendWebNet } from "../WebNet";
+import { WebNetName } from "../WebNetName";
 
 
 let boxGroup;
@@ -29,8 +31,13 @@ export class IndexScene extends Scene {
     
     start() {
         super.start();
+<<<<<<< HEAD
+        this.getIndex();
+        // showPanel(SharePanel);
+=======
 
         showPanel(PrizePanel);
+>>>>>>> 4445b545174f45bdb5de86ca86be78b8f149ecec
         getObject(this,'index_sharetips').visible=false;
         this.initContainer();
         this.initmask();
@@ -71,8 +78,20 @@ export class IndexScene extends Scene {
     }
 
     toRule() {
-        // showPanel(SharePanel);
-        console.log("1111111")
+        showPanel(RulePanel);
+    }
+
+    getIndex = async () => {
+        const result = await sendWebNet(WebNetName.projectIndex);
+        if (!result.success) return;
+        if (result && result.data && result.data.type == 2) {
+            const reDegree = getObject(this, 'index_timestips2');
+            reDegree.text = result.data.surplusCount;
+            const credits = getObject(this, 'index_moneytips2');
+            credits.text = result.data.credits;
+            const needCredits = getObject(this, 'index_costtips');
+            needCredits.text = result.data.needCredits + "积分/次";
+        }
     }
 
 }

project/src/template/StartScene.ts

 import { Scene } from "../../module/views/Scene";
 import { showPanel, showWaiting, hideWaiting, showToast, changeScene } from "../../module/ctrls";
-import { RulePanel } from "./RulePanel";
+import { RulePanel } from "../panels/RulePanel";
 import { Tools } from "../Tools";
 import { layers } from "../../module/views/layers";
 import { GDispatcher } from "../Main";