Merge branch 'dev' of gitlab2.dui88.com:wanghongyuan/xiaoxiaole into dev

egret/resource/skins/InvitePrizePanelSkin.exml

@@ -20,10 +20,5 @@
 			</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Group x="84" y="845.33">
-		<e:Image y="0" source="invite_prize_ad_png" x="0"/>
-		<e:Image id="ad_ico" source="" x="48" y="55.67"/>
-		<e:Label id="label1" text="Label" x="277.5" y="77.5" textColor="0xe5150e" size="24"/>
-		<e:Label id="label2" text="Label" x="262.5" y="124.5" textColor="0xE5150E" size="34" bold="true"/>
-	</e:Group>
+	<e:Component y="845.33" skinName="ADSmallSkin" horizontalCenter="0"/>
 </e:Skin>
\ No newline at end of file

egret/resource/skins/InviteRulePanelSkin.exml

@@ -10,7 +10,7 @@
 			</e:layout>
 		</e:Group>
 	</e:Scroller>
-	<e:Button id="closeBtn" label="" x="614" y="280">
+	<e:Button id="closeBtn" label="" x="608" y="322">
 		<e:skinName>
 		<e:Skin states="up,down,disabled">
 			<e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png" source.disabled="closeCommonBtn_png"/>

egret/src/panels/InvitePanel.ts

@@ -4,9 +4,7 @@ import layers from "../../libs/new_wx/views/layers";
 import ComponentBase from "../../libs/new_wx/components/ComponentBase";
 import { iswx } from "../iswx";
 import getSkinPath from "../../libs/new_wx/utils/getSkinPath";
-import PanelCtrl from "../../libs/new_wx/ctrls/panelCtrl";
 import InviteRulePanel from "./InviteRulePanel";
-import Loading from "../../libs/new_wx/components/Loading";
 
 export default class InvitePanel extends Panel {
     public prizeImg: eui.Image;

egret/src/panels/InvitePrizePanel.ts

@@ -10,9 +10,6 @@ export default class InvitePrizePanel extends Panel {
     public prizeImg:eui.Image;
     public closeBtn:eui.Button;
     public ok_btn:eui.Button;
-    public ad_ico:eui.Image;
-    public label1:eui.Label;
-    public label2:eui.Label;
 
     start() {
         super.start();

mock/config.js

@@ -80,7 +80,7 @@ const config = {
     '/activityPlugDrawInfo/getPrizeInfo': {
         data: './json/getPlugDrawPrizeInfo.json'
     },
-   
+
     // 活动工具新游戏
     '/hdtool/rank/rankList': {
         data: './rankList.json'
@@ -108,8 +108,17 @@ const config = {
     },
     '/hdtool/recon/ngame/resurrectionStatus': {
         data: './resurrectionStatus.json'
-    }
-
+    },
+    //////////////////// 消消乐邀请有礼 ////////////////////
+    '/customActivity/happyclear/getShareCode': {
+        data: './happyclear/getShareCode.json'
+    },
+    '/customActivity/happyclear/doHelp': {
+        data: './happyclear/doHelp.json'
+    },
+    '/customActivity/happyclear/invitationInfo': {
+        data: './happyclear/getInviteInfo.json'
+    },
 }
 
 for (let item in config) {

mock/happyclear/doHelp.json

+{
+    "success":true,
+    "code":null,
+    "desc":null,
+    "timestamp":1566199822308,
+    "data":""
+}
\ No newline at end of file

mock/happyclear/getInviteInfo.json

+{
+    "success":true,
+    "code":null,
+    "desc":null,
+    "timestamp":1566199822308,
+    "data":{
+        "invitationId":"活动id",
+        "invitationCount":1,
+        "img":"图片",
+        "sysTime":1566199822308,
+        "endTime":1566199822308,
+        "invitationUser":[
+            {
+                "nickname":"nickname",
+                "avatar":"avatar"
+            }
+        ],
+        "completeFlag":true,
+        "openPriz":true,
+        "openPrizMsg":"图片"
+    }
+}
\ No newline at end of file

mock/happyclear/getShareCode.json

+{
+    "success":true,
+    "code":null,
+    "desc":null,
+    "timestamp":1566199822308,
+    "data":""
+}
\ No newline at end of file