Merge branch '225' into dev

egret/libs/tw/manager/NetManager.ts

@@ -2401,7 +2401,7 @@ export class NetManager extends ABNetManager {
         const net: INetData = {
             name: "doHelpNew",
             uri: window['duiba'] + '/activtyShareCode/doHelpNew',
-            type: 'get',
+            type: 'post',
             dataType: 'json',
             hideMsg: true,
             param: {

egret/src/mapScene/MapScene.ts

@@ -75,6 +75,7 @@ export default class MapScene extends Scene {
                         //新加的，还没给，其他的都用助力失败
                         "2002002013": "口令无效，请复制正确的口令！",
                         "2002002015": "口令不存在",
+                        "2002002026": "好友今日被助力已达上限啦！"
                     }
                     showToast(res && codeMsgs[res.code] ? codeMsgs[res.code] : "助力失败");
                 }

egret/src/panels/ShareCodePanel.ts

@@ -95,7 +95,7 @@ class ShareCodePanel extends ComponentBase {
     public goBtn: eui.Image;
 
     /**
-     * 0表示微信，1表示朋友圈
+     * 0表示微信，1表示朋友圈，2表示微博，3表示qq
      */
     private mark: 0 | 1 | 2 | 3
     data: ShareData
@@ -166,13 +166,24 @@ class ShareCodePanel extends ComponentBase {
         this.goBtn.touchEnabled = false;
         //点击埋点
         NetManager.ins.clickLog(getlogItem(buridNums[this.data.channel]))
-        //延时1秒跳转，为了埋点
-        setTimeout(() => {
-            //有回调就执行
-            this.data.addFun && this.data.addFun();
+
+        //如果是微信，会调起，延时1秒跳转，为了埋点
+        if (this.mark == 0) {
+            setTimeout(() => {
+                //关闭弹框，
+                this.onTouchClickBg()
+                //有回调就执行，暂时只有体力分享会有回调，只有微信分享才显示toast分享成功
+                this.data.addFun && this.data.addFun();
+                this.goBtn.touchEnabled = true;
+                jumpFun[this.mark]()
+            }, 1000)
+        } else {
+            //其他情况暂时没有回调，不管addFun
+            this.onTouchClickBg();
             this.goBtn.touchEnabled = true;
             jumpFun[this.mark]()
-        }, 1000)
+        }
+
         //有回调执行
         // if (this.data.addFun) {
         //     this.data.addFun();
@@ -278,6 +289,7 @@ export const showShareCodePanel = (channel: CodeChannels, shareCode?: string, ad
     NetManager.ins.showLog(getlogItem(85));
     NetManager.ins.showLog(getlogItem(86));
     _share.setData({ channel, shareCode, addFun });
+    _share.panelGroup.visible = false;//要隐藏弹框
     layers.shareCodeLayer.visible = true;
 }
 
@@ -292,7 +304,7 @@ export const showShareCodePanel = (channel: CodeChannels, shareCode?: string, ad
  * @param shareCode 分享加体力暂时没有分享码（27号版本要加上），排行榜邀请一起玩也没有分享码，默认传0
  */
 function generateCode(callback: Function, channel: CodeChannels, shareCode: string = "0") {
-    var activityCode = getParamString("snactCode") || "ACT0000002863";
+    var activityCode = getParamString("snactCode") || "ACT0000002664";//上线必须改回来，动态获取
     var sceneCode = channel;
     var token = shareCode || "0";
     window['$'].ajax({