1

egret/src/Panels/assistancePanel/AssistancePanel.ts

@@ -31,8 +31,12 @@ export default class AssistancePanel extends Panel {
         this.failTip.visible = !this.data.success;
         this.failTip.text = this.data.failTips;
         if(this.data.success) {
+<<<<<<< HEAD
             NetManager.ins.showLog(getlogItem(32));
             window['_hmt'].push(['_trackEvent', '分享打开页面-为好友助力按钮', 'showLog', '曝光']);
+=======
+            NetManager.ins.showLog(getlogItem(35));
+>>>>>>> a01c4bd41d5c68df4758ce0b47441794ead08eaf
         } else {
             // "200001": "您的助力已经达到上限了哦～",
 
@@ -78,8 +82,12 @@ export default class AssistancePanel extends Panel {
     private onTap_clickJoin() {
         console.log('我也要去打榜');
         if(this.data.success) {
+<<<<<<< HEAD
             NetManager.ins.showLog(getlogItem(32));
             window['_hmt'].push(['_trackEvent', '分享打开页面-为好友助力按钮', 'showLog', '曝光']);
+=======
+            NetManager.ins.clickLog(getlogItem(35));
+>>>>>>> a01c4bd41d5c68df4758ce0b47441794ead08eaf
         } else {
             if(this.data.code == '200001') {
                 NetManager.ins.clickLog(getlogItem(33))