Merge branch 'hotfix20200326' into dev

egret/resource/skins/HelpBloodSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
-<e:Skin class="HelpBloodSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui">
+<e:Skin class="HelpBloodSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<e:Image source="help_blood_1_bg_png" y="26" horizontalCenter="0"/>
-	<e:Image source="help_blood_1_btn_png" x="108" y="918.5"/>
-	<e:Image source="help_blood_fail_btn_png" x="108" y="1070"/>
+	<e:Group y="855" horizontalCenter="0">
+		<e:Image id="helpbtn" source="help_blood_1_btn_png" x="0" y="0"/>
+		<e:Image id="gobtn" source="help_blood_fail_btn_png" x="0" y="0" visible="false"/>
+	</e:Group>
+	<e:Group y="88" width="100%" horizontalCenter="0">
+		<e:Image id="txt_standby" source="help_blood_1_text_png" y="0" horizontalCenter="0" visible="false"/>
+		<e:Image id="txt_success" source="help_blood_success_text2_png" horizontalCenter="0" visible="false"/>
+		<e:Image id="txt_error" source="help_blood_fail_text_png" horizontalCenter="0" visible="false"/>
+		<e:Image id="txt_error2002002016" source="help_blood_fail_text2_png" horizontalCenter="0" visible="false"/>
+		<e:Image id="txt_error2002002036" source="help_blood_fail_text3_png" horizontalCenter="0"/>
+		<e:Image source="help_blood_fail_text4_png" x="379" y="21" visible="false"/>
+	</e:Group>
 </e:Skin>
\ No newline at end of file

egret/src/panels/help/HelpBloodPanel.ts

@@ -9,17 +9,34 @@ export default class HelpBloodPanel extends Panel {
     start(data) {
         this.netCallback = data.netCallback;
         this.code = data.code;
+        'helpbtn';
+        'gobtn';
+        NetManager.ins.showLog(getlogItem(87));
+
+        this['gobtn'].once(egret.TouchEvent.TOUCH_TAP, this.onclick_gobtn, this);
+        this['helpbtn'].once(egret.TouchEvent.TOUCH_TAP, this.onClick, this);
+        this['txt_standby'].visible = true;
+        this['helpbtn'].visible = true;
+    }
+
+    onclick_gobtn() {
+        NetManager.ins.clickLog(getlogItem(88));
     }
 
-    onClick(){
+    onClick() {
+        this['helpbtn'].visible = false;
+        this['gobtn'].visible = true;
+        this['txt_success'].visible=true;
+        NetManager.ins.showLog(getlogItem(88));
+        NetManager.ins.clickLog(getlogItem(87));
         NetManager.ins.doHelpNew((s, res) => {
             this.netCallback();
+            this['txt_sutxt_standbyccess'].visible=false;
             // doHelpFlag = true;
             if (s) {
-                NetManager.ins.showLog(getlogItem(83))
+                this['txt_success'].visible=true;
                 showToast("助力成功！一起闯关赢现金吧")
-            }
-            else {
+            } else {
                 var codeMsgs = {//具体code还没给
                     "2002002016": "不可以给自己助力哦~",//
                     "2002002036": "已经给好友助力过了哦~",
@@ -35,4 +52,5 @@ export default class HelpBloodPanel extends Panel {
         }, this.code)
     }
     get skinResKey() { return 'helpGroup' }
+    get skinKey() { return 'HelpBlood' }
 }
\ No newline at end of file

mock/config.js

@@ -197,6 +197,9 @@ const config = {
     },
     '/activtyShareCode/getUserShareCode':{
         data: './happyclear/exchangeCoin.json'
+    },
+    '/activtyShareCode/doHelpNew':{
+        data: './happyclear/doHelpNew.json'
     }
 };
 

mock/happyclear/doHelpNew.json

+{
+    "success": true,
+    "code": "0000000000",
+    "desc": "OK",
+    "timestamp": 1571052938097,
+    "data": {
+        "invitationId": null,
+        "invitationCount": 1,
+        "sysTime": 1571052938083,
+        "endTime": 1571134423000,
+        "completeFlag": 1,
+        "openPrizMsg": null,
+        "prizeType": "7",
+        "prizeName": null,
+        "prizeImg": "//yun.dui88.com/images/201910/oblhlej3a6.png",
+        "facePrice": "2",
+        "invitationUser": []
+    }
+}
\ No newline at end of file