1

egret/libs/tw/manager/NetManager.ts

@@ -2211,7 +2211,7 @@ export class NetManager extends ABNetManager {
         const net: INetData = {
             name: NetName.HBRAIN_BASEINFO,
             uri:  window['duiba'] +'/customActivity/happyclear/redRain/doJoin',
-            type: 'get',
+            type: 'post',
             dataType: 'json',
             hideMsg: true,
             param: {

egret/resource/skins/HbPrizeSkin.exml

@@ -6,8 +6,8 @@
 	<e:Image id="money" source="signprize元宝_png" y="423.2" horizontalCenter="1" scaleX="0.8" scaleY="0.8" visible="false"/>
 	<e:Image id="blood" source="singprize体力_png" y="385.8" horizontalCenter="1" visible="false"/>
 	<e:Group id="numsgroup" x="397.38" y="431.4" visible="false">
-		<e:Image id="numsbg0" source="signprize_numsbg_png" x="0" y="0"/>
-		<e:Label id="propnums0" text="X8" size="22" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center"/>
+		<e:Image id="numsbg" source="signprize_numsbg_png" x="0" y="0"/>
+		<e:Label id="propnums" text="X8" size="22" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center"/>
 	</e:Group>
 	<e:Image id="prizeImg" y="422.5" source="" horizontalCenter="0" visible="false"/>
 	<e:Button id="closeBtn" label="" x="597" y="284.33">

egret/src/panels/HongbaoRain/HbCutTime.ts

@@ -36,11 +36,11 @@ export default class HbCutTime extends Panel {
                 return;
             }
             let data = res.data;
-            this.cutTimer = new CutTimer(this.cutTimeLabel, 'hh时mm分ss秒', () => this.hbRainBaseInfo());
+            this.cutTimer = new CutTimer(this.cutTimeLabel, 'hh时mm分ss秒', () => this.hidePanel());
             let sysTime = res.timestamp;    // 当前系统事件
             let time;
             if(data.currentSession) {
-                time = data.currentSession.endTime - sysTime;
+                time = data.currentSession.endTime - sysTime + 3000;
                 if(data.canJoin) {
                     this.ok_btn.source = 'hbCutTime_btn_enable_png';
                     this.ok_btn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchOK, this);
@@ -54,7 +54,7 @@ export default class HbCutTime extends Panel {
                     this.cutTimer.start(time);
                 }
             } else if(data.nextSession) {
-                time = data.nextSession.startTime - sysTime;
+                time = data.nextSession.startTime - sysTime + 3000;
                 this.ok_btn.source = 'hbCutTime_btn_disable_png';
                 this.ok_btn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchOK, this);
                 this.tipImage.source = 'hbCutTime_cutLine_disable_png';
@@ -70,11 +70,18 @@ export default class HbCutTime extends Panel {
         })
     }
 
+    destroy() {
+        this.cutTimer.stop();
+        super.destroy();
+    }
+
     protected onSkinComplete() {
+
     }
 
     initEvents() {
         super.initEvents();
+        this.addEventListener(egret.Event.REMOVED_FROM_STAGE, this.destroy, this);
         this.closeBtn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchTap_closeBtn, this);
         this.ok_btn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchOK, this);
         this.rule_btn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.tapRuleBtn, this);
@@ -86,6 +93,7 @@ export default class HbCutTime extends Panel {
 
     removeEvents() {
         super.removeEvents();
+        this.removeEventListener(egret.Event.REMOVED_FROM_STAGE, this.destroy, this);
         this.closeBtn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchTap_closeBtn, this);
         this.ok_btn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchOK, this);
         this.rule_btn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.tapRuleBtn, this);

egret/src/panels/HongbaoRain/HbGame.ts

@@ -112,10 +112,10 @@ export default class HbGame extends Panel {
                 return;
             }
 
-            if(!data.option || data.categoryType == 1) {
+            if(!data || !data.option || data.categoryType == 1) {
                 PanelCtrl.instance.show("HbNoPrize");
             } else {
-                PanelCtrl.instance.show('TurnPrizePanel', data);
+                PanelCtrl.instance.show('HbPrize', data);
             }
         }, session, this.score);
     }

mock/happyclear/hbRainDoJoin.json

 {
+    "success": true,
     "code": "0000000000",
+    "desc": "OK",
+    "timestamp": 1572945948033,
     "data": {
         "option": {
-            "appItemId": 2322,
-            "categoryType": 1,
-            "coinType": 1,
-            "img": "//yun.dui88.com/images/201910/s0yhv1nlil.jpeg",
-            "maxValue": 2,
-            "minValue": 1,
-            "name": "测试商品",
-            "num": 3,
-            "propType": 2,
-            "rate": "概率",
-            "title": "商品信息",
-            "value": "虚拟商品标识符"
+            "id": "218",
+            "day": null,
+            "categoryType": 2,
+            "title": "10",
+            "rate": "10",
+            "minValue": null,
+            "maxValue": null,
+            "coinType": null,
+            "realValue": null,
+            "propType": null,
+            "num": 4,
+            "img": "",
+            "appItemId": null,
+            "name": "",
+            "value": ""
         },
-        "orderNum": "1234232546"
-    },
-    "desc": "OK",
-    "success": true,
-    "timestamp": 1572921692831
+        "orderNum": null
+    }
 }
\ No newline at end of file