Skip to content

X
xiaoxiaole
Commit 0907319a authored by wjf's avatar wjf
Browse files
Options

Merge branch 'dev' into 225

parents 77883254 24b27212
Hide whitespace changes
Inline Side-by-side
Showing with 319 additions and 301 deletions
egret/libs/tw/manager/NetManager.ts
View file @ 0907319a
...@@ -2386,7 +2386,7 @@ export class NetManager extends ABNetManager { ...@@ -2386,7 +2386,7 @@ export class NetManager extends ABNetManager {
param: { param: {
activityId: DataManager.ins.customCfgData.actId, activityId: DataManager.ins.customCfgData.actId,
activityType: "hdtool", activityType: "hdtool",
// dateUnit // dateUnit //不传就是不失效，传1当天有效
}, },
callback: callback callback: callback
}; };
...@@ -2408,7 +2408,7 @@ export class NetManager extends ABNetManager { ...@@ -2408,7 +2408,7 @@ export class NetManager extends ABNetManager {
activityId: DataManager.ins.customCfgData.actId, activityId: DataManager.ins.customCfgData.actId,
activityType: "hdtool", activityType: "hdtool",
shareCode, shareCode,
// singleLimitType: "",//待写 singleLimitType: 0,//0每日一次，1永久一次
// subType: "" //待写 // subType: "" //待写
}, },
callback: callback callback: callback
......
egret/resource/TextureMerger/sharecodepanel.tmproject
View file @ 0907319a
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"sharecodepanel","version":5,"files":["../assets/shareCodePanel/lijiqianwang.png","../assets/shareCodePanel/copyCodeBg.png","../assets/shareCodePanel/shareWxpyqIcon.png","../assets/shareCodePanel/shareWxIcon.png","../assets/shareCodePanel/shareQqIcon.png","../assets/shareCodePanel/shareWeiboIcon.png","../assets/shareCodePanel/zhantiegeihaoyou.png"]} <<<<<<< HEAD
\ No newline at end of file {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"sharecodepanel","version":5,"files":["..\\assets\\shareCodePanel\\lijiqianwang.png","..\\assets\\shareCodePanel\\copyCodeBg.png","..\\assets\\shareCodePanel\\shareWxpyqIcon.png","..\\assets\\shareCodePanel\\shareWxIcon.png","..\\assets\\shareCodePanel\\shareQqIcon.png","..\\assets\\shareCodePanel\\shareWeiboIcon.png","..\\assets\\shareCodePanel\\zhantiegeihaoyou.png"]}
=======
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"sharecodepanel","version":5,"files":["../assets/shareCodePanel/lijiqianwang.png","../assets/shareCodePanel/copyCodeBg.png","../assets/shareCodePanel/shareWxpyqIcon.png","../assets/shareCodePanel/shareWxIcon.png","../assets/shareCodePanel/shareQqIcon.png","../assets/shareCodePanel/shareWeiboIcon.png","../assets/shareCodePanel/zhantiegeihaoyou.png"]}
>>>>>>> cc335fd429a254bc0a7d0e0a972062841c38abeb
egret/src/mapScene/MapScene.ts
View file @ 0907319a
...@@ -60,25 +60,27 @@ export default class MapScene extends Scene { ...@@ -60,25 +60,27 @@ export default class MapScene extends Scene {
//0224修改，取sceneCode， //0224修改，取sceneCode，
const sceneCode = Utils.getRequestByKey('sceneCode') const sceneCode = Utils.getRequestByKey('sceneCode')
if (sceneCode == CodeChannels.AddBlood) {//加体力的，0228到时会修改成助力，这里要加逻辑 if (sceneCode == CodeChannels.AddBlood) {//加体力的，0228到时会修改成助力，这里要加逻辑
if (window["test0228"]) {//测试助力，到时失败code再和后端对接 //if (window["test0228"]) {//测试助力，到时失败code再和后端对接
NetManager.ins.doHelpNew((s, res) => { NetManager.ins.doHelpNew((s, res) => {
if (s) { if (s) {
NetManager.ins.showLog(getlogItem(83)) NetManager.ins.showLog(getlogItem(83))
showToast("助力成功！一起闯关赢现金吧") showToast("助力成功！一起闯关赢现金吧")
} }
else if (res) { else {
if (res.code == "0000") {//code再和后端对接 var codeMsgs = {//具体code还没给
showToast("已经给好友助力过了哦~") "2002002016": "不可以给自己助力哦~",//
} else if (res.code == "00001") { //code再和后端对接 "2002002036": "已经给好友助力过了哦~",
showToast("今日助力次数已达上限啦！") "2002002037": "已经给好友助力过了哦~",
} else { showToast("助力失败") } "2002002025": "今日助力次数已达上限啦！",
} else { //新加的
showToast("助力失败")
} }
}, code) showToast(res && codeMsgs[res.code] ? codeMsgs[res.code] : "助力失败");
} else { }
showToast("欢迎小主，闯关就能拿现金~"); }, code)
} // } else {
// showToast("欢迎小主，闯关就能拿现金~");
// }
} }
else if (sceneCode == CodeChannels.RankPlay) {//排行榜邀请好友的，不需要了 else if (sceneCode == CodeChannels.RankPlay) {//排行榜邀请好友的，不需要了
showToast("欢迎加入游戏，去闯关吧"); showToast("欢迎加入游戏，去闯关吧");
......
egret/src/panels/BloodPanel.ts
View file @ 0907319a
...@@ -92,108 +92,108 @@ export default class BloodPanel extends Panel { ...@@ -92,108 +92,108 @@ export default class BloodPanel extends Panel {
}, 1); }, 1);
} }
onTapInvite() {
if(iswx()) {
getShareUrl(this.stage);
} else
showShare(1);
NetManager.ins.clickLog(getlogItem(4));
const data = getHomeData();
if(data.askForEnergy >= BloodPanel.MAX) {
showToast('对不起，索要体力的机会已经用完了~');
return;
}
this['inviteBtn'].enabled = false;
NetManager.ins.hc_askForEnergy((success) => {
this['inviteBtn'].enabled = true;
if(success) {
}
NetManager.ins.hc_home(() => {
this.updateData();
updateMainTimer();
SceneCtrl.instance.updateScene();
}, window['collectRuleId']);
wait(2000).then(() => {
showToast('分享成功~');
});
})
}
//0224修改
// onTapInvite() { // onTapInvite() {
// if(iswx()) {
// getShareUrl(this.stage);
// } else
// showShare(1);
// NetManager.ins.clickLog(getlogItem(4)); // NetManager.ins.clickLog(getlogItem(4));
// const data = getHomeData(); // const data = getHomeData();
// if (iswx()) { // if(data.askForEnergy >= BloodPanel.MAX) {
// //微信流程不变 // showToast('对不起，索要体力的机会已经用完了~');
// getShareUrl(this.stage); // return;
// if (data.askForEnergy >= BloodPanel.MAX) {
// showToast('对不起，索要体力的机会已经用完了~');
// return;
// }
// this['inviteBtn'].enabled = false;
// NetManager.ins.hc_askForEnergy((success) => {
// this['inviteBtn'].enabled = true;
// if (success) {
// }
// NetManager.ins.hc_home(() => {
// this.updateData();
// updateMainTimer();
// SceneCtrl.instance.updateScene();
// }, window['collectRuleId']);
// wait(2000).then(() => {
// showToast('分享成功~');
// });
// })
// } else {
// if (window["test0228"]) {
// //如果之前没获取到，就再发接口，几率很低
// if (!DataManager.ins.getData("getUserShareCode")) {
// this.touchEnabled = false
// this.touchChildren = false
// NetManager.ins.getUserShareCode((s, res) => {
// this.touchEnabled = true
// this.touchChildren = true
// if (!s) {
// showToast("获取分享信息失败，请重试")
// } else {
// showShareCodePanel(
// CodeChannels.AddBlood,
// res.data,
// () => { wait(2000).then(() => { showToast('分享成功'); }); }
// )
// }
// })
// } else {
// showShareCodePanel(
// CodeChannels.AddBlood,
// DataManager.ins.getData("getUserShareCode").data,
// () => { wait(2000).then(() => { showToast('分享成功'); }); }
// );
// }
// } else {
// showShareCodePanel(CodeChannels.AddBlood, null, () => {
// if (data.askForEnergy >= BloodPanel.MAX) {
// wait(2000).then(() => {
// showToast('对不起，索要体力的机会已经用完了~');
// });
// } else {
// NetManager.ins.hc_askForEnergy((success) => {
// NetManager.ins.hc_home(() => {
// this.updateData();
// updateMainTimer();
// SceneCtrl.instance.updateScene();
// }, window['collectRuleId']);
// wait(2000).then(() => {
// showToast('分享成功');
// });
// })
// }
// })
// }
// } // }
// this['inviteBtn'].enabled = false;
// NetManager.ins.hc_askForEnergy((success) => {
// this['inviteBtn'].enabled = true;
// if(success) {
// }
// NetManager.ins.hc_home(() => {
// this.updateData();
// updateMainTimer();
// SceneCtrl.instance.updateScene();
// }, window['collectRuleId']);
// wait(2000).then(() => {
// showToast('分享成功~');
// });
// })
// } // }
//0224修改
onTapInvite() {
NetManager.ins.clickLog(getlogItem(4));
const data = getHomeData();
if (iswx()) {
//微信流程不变
getShareUrl(this.stage);
if (data.askForEnergy >= BloodPanel.MAX) {
showToast('对不起，索要体力的机会已经用完了~');
return;
}
this['inviteBtn'].enabled = false;
NetManager.ins.hc_askForEnergy((success) => {
this['inviteBtn'].enabled = true;
if (success) {
}
NetManager.ins.hc_home(() => {
this.updateData();
updateMainTimer();
SceneCtrl.instance.updateScene();
}, window['collectRuleId']);
wait(2000).then(() => {
showToast('分享成功~');
});
})
} else {
// if (window["test0228"]) {
//如果之前没获取到，就再发接口，几率很低
if (!DataManager.ins.getData("getUserShareCode")) {
this.touchEnabled = false
this.touchChildren = false
NetManager.ins.getUserShareCode((s, res) => {
this.touchEnabled = true
this.touchChildren = true
if (!s) {
showToast("获取分享信息失败，请重试")
} else {
showShareCodePanel(
CodeChannels.AddBlood,
res.data,
() => { wait(2000).then(() => { showToast('分享成功'); }); }
)
}
})
} else {
showShareCodePanel(
CodeChannels.AddBlood,
DataManager.ins.getData("getUserShareCode").data,
() => { wait(2000).then(() => { showToast('分享成功'); }); }
);
}
// } else {
// showShareCodePanel(CodeChannels.AddBlood, null, () => {
// if (data.askForEnergy >= BloodPanel.MAX) {
// wait(2000).then(() => {
// showToast('对不起，索要体力的机会已经用完了~');
// });
// } else {
// NetManager.ins.hc_askForEnergy((success) => {
// NetManager.ins.hc_home(() => {
// this.updateData();
// updateMainTimer();
// SceneCtrl.instance.updateScene();
// }, window['collectRuleId']);
// wait(2000).then(() => {
// showToast('分享成功');
// });
// })
// }
// })
// }
}
}
protected get closeBtns(): eui.Button[] { protected get closeBtns(): eui.Button[] {
......
egret/src/panels/BloodPanel2.ts
View file @ 0907319a
...@@ -88,110 +88,110 @@ export default class BloodPanel2 extends Panel { ...@@ -88,110 +88,110 @@ export default class BloodPanel2 extends Panel {
}, 1); }, 1);
} }
onTapInvite() { // onTapInvite() {
if(iswx()) { // if(iswx()) {
getShareUrl(this.stage); // getShareUrl(this.stage);
} else // } else
showShare(1); // showShare(1);
// NetManager.ins.clickLog(getlogItem(4));
// const data = getHomeData();
// if(data.askForEnergy >= BloodPanel.MAX) {
// showToast('对不起，索要体力的机会已经用完了~');
// return;
// }
// this['inviteBtn'].enabled = false;
// NetManager.ins.hc_askForEnergy((success) => {
// this['inviteBtn'].enabled = true;
// if(success) {
// }
// NetManager.ins.hc_home(() => {
// this.updateData();
// updateMainTimer();
// SceneCtrl.instance.updateScene();
// }, window['collectRuleId']);
// wait(2000).then(() => {
// showToast('分享成功~');
// });
// })
// }
//0224修改
onTapInvite() {
NetManager.ins.clickLog(getlogItem(4)); NetManager.ins.clickLog(getlogItem(4));
const data = getHomeData(); const data = getHomeData();
if(data.askForEnergy >= BloodPanel.MAX) { if (iswx()) {
showToast('对不起，索要体力的机会已经用完了~'); getShareUrl(this.stage);
return; //原先微信流程不变
} if (data.askForEnergy >= BloodPanel.MAX) {
this['inviteBtn'].enabled = false; showToast('对不起，索要体力的机会已经用完了~');
NetManager.ins.hc_askForEnergy((success) => { return;
this['inviteBtn'].enabled = true; }
if(success) { this['inviteBtn'].enabled = false;
NetManager.ins.hc_askForEnergy((success) => {
this['inviteBtn'].enabled = true;
if (success) {
}
NetManager.ins.hc_home(() => {
this.updateData();
updateMainTimer();
SceneCtrl.instance.updateScene();
}, window['collectRuleId']);
wait(2000).then(() => {
showToast('分享成功~');
});
})
} else {
// if (window["test0228"]) {
//如果之前没获取到，就再发接口，几率很低
if (!DataManager.ins.getData("getUserShareCode")) {
this.touchEnabled = false
this.touchChildren = false
NetManager.ins.getUserShareCode((s, res) => {
this.touchEnabled = true
this.touchChildren = true
if (!s) {
showToast("获取分享信息失败，请重试")
} else {
showShareCodePanel(
CodeChannels.AddBlood,
res.data,
() => { wait(2000).then(() => { showToast('分享成功'); }); }
)
}
})
} else {
showShareCodePanel(
CodeChannels.AddBlood,
DataManager.ins.getData("getUserShareCode").data,
() => { wait(2000).then(() => { showToast('分享成功'); }); }
);
} }
NetManager.ins.hc_home(() => { // } else {
this.updateData(); // showShareCodePanel(CodeChannels.AddBlood, null, () => {
updateMainTimer(); // if (data.askForEnergy >= BloodPanel.MAX) {
SceneCtrl.instance.updateScene(); // wait(2000).then(() => {
}, window['collectRuleId']); // showToast('对不起，索要体力的机会已经用完了~');
wait(2000).then(() => { // });
showToast('分享成功~'); // } else {
}); // NetManager.ins.hc_askForEnergy((success) => {
}) // NetManager.ins.hc_home(() => {
// this.updateData();
// updateMainTimer();
// SceneCtrl.instance.updateScene();
// }, window['collectRuleId']);
// wait(2000).then(() => {
// showToast('分享成功');
// });
// })
// }
// })
// }
}
} }
//0224修改
// onTapInvite() {
// NetManager.ins.clickLog(getlogItem(4));
// const data = getHomeData();
// if (iswx()) {
// getShareUrl(this.stage);
// //原先微信流程不变
// if (data.askForEnergy >= BloodPanel.MAX) {
// showToast('对不起，索要体力的机会已经用完了~');
// return;
// }
// this['inviteBtn'].enabled = false;
// NetManager.ins.hc_askForEnergy((success) => {
// this['inviteBtn'].enabled = true;
// if (success) {
// }
// NetManager.ins.hc_home(() => {
// this.updateData();
// updateMainTimer();
// SceneCtrl.instance.updateScene();
// }, window['collectRuleId']);
// wait(2000).then(() => {
// showToast('分享成功~');
// });
// })
// } else {
// if (window["test0228"]) {
// //如果之前没获取到，就再发接口，几率很低
// if (!DataManager.ins.getData("getUserShareCode")) {
// this.touchEnabled = false
// this.touchChildren = false
// NetManager.ins.getUserShareCode((s, res) => {
// this.touchEnabled = true
// this.touchChildren = true
// if (!s) {
// showToast("获取分享信息失败，请重试")
// } else {
// showShareCodePanel(
// CodeChannels.AddBlood,
// res.data,
// () => { wait(2000).then(() => { showToast('分享成功'); }); }
// )
// }
// })
// } else {
// showShareCodePanel(
// CodeChannels.AddBlood,
// DataManager.ins.getData("getUserShareCode").data,
// () => { wait(2000).then(() => { showToast('分享成功'); }); }
// );
// }
// } else {
// showShareCodePanel(CodeChannels.AddBlood, null, () => {
// if (data.askForEnergy >= BloodPanel.MAX) {
// wait(2000).then(() => {
// showToast('对不起，索要体力的机会已经用完了~');
// });
// } else {
// NetManager.ins.hc_askForEnergy((success) => {
// NetManager.ins.hc_home(() => {
// this.updateData();
// updateMainTimer();
// SceneCtrl.instance.updateScene();
// }, window['collectRuleId']);
// wait(2000).then(() => {
// showToast('分享成功');
// });
// })
// }
// })
// }
// }
// }
protected get closeBtns(): eui.Button[] { protected get closeBtns(): eui.Button[] {
return [this['closeBtn']] return [this['closeBtn']]
} }
......
egret/src/panels/InvitePanel.ts
View file @ 0907319a
...@@ -130,9 +130,9 @@ export default class InvitePanel extends Panel { ...@@ -130,9 +130,9 @@ export default class InvitePanel extends Panel {
window["invokeWX"](); window["invokeWX"]();
} else {//端内 } else {//端内
this.wxShareTip.visible = false; this.wxShareTip.visible = false;
window["inviteShare"](shareCode); // window["inviteShare"](shareCode);
//0224修改，去掉原先邀请逻辑，新增口令逻辑 //0224修改，去掉原先邀请逻辑，新增口令逻辑
// showShareCodePanel(CodeChannels.InvitePrize, shareCode) showShareCodePanel(CodeChannels.InvitePrize, shareCode)
} }
}); });
} }
......
egret/src/panels/ScratchPanel.ts
View file @ 0907319a
...@@ -264,9 +264,9 @@ class ScratchItem extends eui.ItemRenderer { ...@@ -264,9 +264,9 @@ class ScratchItem extends eui.ItemRenderer {
window["invokeWX"](); window["invokeWX"]();
} else {//端内 } else {//端内
this.data.wxShareTip.visible = false; this.data.wxShareTip.visible = false;
window["scratchShare"](code); // window["scratchShare"](code);
//0224修改，去掉原先邀请逻辑，新增口令逻辑 //0224修改，去掉原先邀请逻辑，新增口令逻辑
// showShareCodePanel(CodeChannels.Scratch, code) showShareCodePanel(CodeChannels.Scratch, code)
} }
}, this.data.scratchTaskId); }, this.data.scratchTaskId);
}, this); }, this);
......
egret/src/panels/ShareCodePanel.ts
View file @ 0907319a
...@@ -60,7 +60,7 @@ const jumpFun = [ ...@@ -60,7 +60,7 @@ const jumpFun = [
// ifr.style.display = "none"; // ifr.style.display = "none";
// document.body.appendChild(ifr); // document.body.appendChild(ifr);
// } else { // } else {
window.location.href = locatUrl; window.location.href = locatUrl;
// } // }
}, },
function () {//跳转微信朋友圈，暂时用跳转微信代替 function () {//跳转微信朋友圈，暂时用跳转微信代替
...@@ -75,10 +75,10 @@ const jumpFun = [ ...@@ -75,10 +75,10 @@ const jumpFun = [
} }
}, },
function () {//跳转微博 function () {//跳转微博
showToast("快打开微博，粘贴给好友吧")
}, },
function () {//跳转qq function () {//跳转qq
showToast("快打开QQ，粘贴给好友吧")
}, },
] ]
...@@ -142,40 +142,50 @@ class ShareCodePanel extends ComponentBase { ...@@ -142,40 +142,50 @@ class ShareCodePanel extends ComponentBase {
onTouchWxBtn() { onTouchWxBtn() {
this.mark = 0; this.mark = 0;
this.codeOpr() this.codeOpr();
NetManager.ins.showLog(getlogItem(84));
} }
onTouchWxpyqBtn() { onTouchWxpyqBtn() {
this.mark = 1; this.mark = 1;
this.codeOpr() this.codeOpr();
} }
onTouchWeiboBtn() { onTouchWeiboBtn() {
this.mark = 2; this.mark = 2;
this.codeOpr() this.codeOpr();
NetManager.ins.showLog(getlogItem(85));
} }
onTouchQqBtn() { onTouchQqBtn() {
this.mark = 3; this.mark = 3;
this.codeOpr() this.codeOpr();
NetManager.ins.showLog(getlogItem(86));
} }
onTouchGoBtn() { onTouchGoBtn() {
this.goBtn.touchEnabled = false; this.goBtn.touchEnabled = false;
//点击埋点 //点击埋点
NetManager.ins.clickLog(getlogItem(buridNums[this.data.channel])) NetManager.ins.clickLog(getlogItem(buridNums[this.data.channel]))
//延时1秒跳转，为了埋点
setTimeout(() => {
//有回调就执行
this.data.addFun && this.data.addFun();
this.goBtn.touchEnabled = true;
jumpFun[this.mark]()
}, 1000)
//有回调执行 //有回调执行
if (this.data.addFun) { // if (this.data.addFun) {
this.data.addFun(); // this.data.addFun();
//跳转，考虑到要发接口,0228版本就没有接口要发了，可以只保留点击埋点延时1秒 // //跳转，考虑到要发接口,0228版本就没有接口要发了，可以只保留点击埋点延时1秒
setTimeout(() => { // setTimeout(() => {
this.goBtn.touchEnabled = true; // this.goBtn.touchEnabled = true;
jumpFun[this.mark]() // jumpFun[this.mark]()
}, 2000) // }, 2000)
} else { // } else {
//跳转，考虑到要发接口 // //跳转，考虑到要发接口
setTimeout(() => { // setTimeout(() => {
this.goBtn.touchEnabled = true; // this.goBtn.touchEnabled = true;
jumpFun[this.mark]() // jumpFun[this.mark]()
}, 1000) // }, 1000)
} // }
} }
onTouchClickBg() { onTouchClickBg() {
...@@ -261,6 +271,10 @@ export const showShareCodePanel = (channel: CodeChannels, shareCode?: string, ad ...@@ -261,6 +271,10 @@ export const showShareCodePanel = (channel: CodeChannels, shareCode?: string, ad
initShare(); initShare();
inited = true; inited = true;
} }
//三个渠道点击埋点
NetManager.ins.showLog(getlogItem(84));
NetManager.ins.showLog(getlogItem(85));
NetManager.ins.showLog(getlogItem(86));
_share.setData({ channel, shareCode, addFun }); _share.setData({ channel, shareCode, addFun });
layers.shareCodeLayer.visible = true; layers.shareCodeLayer.visible = true;
} }
......
egret/src/panels/StartPanel.ts
View file @ 0907319a
...@@ -91,70 +91,68 @@ export default class StartPanel extends Panel { ...@@ -91,70 +91,68 @@ export default class StartPanel extends Panel {
if (homeData.askForEnergy) { if (homeData.askForEnergy) {
PanelCtrl.instance.show('blood2Panel'); PanelCtrl.instance.show('blood2Panel');
} else { } else {
if(iswx()) { // if(iswx()) {
getShareUrl(this.stage);
} else
showShare(1);
NetManager.ins.hc_askForEnergy((success) => {
NetManager.ins.hc_home(() => {
SceneCtrl.instance.updateScene();
}, window['collectRuleId']);
wait(2000).then(() => {
showToast('分享成功~');
});
})
//0224修改，微信环境不变
// if (iswx()) {
// getShareUrl(this.stage); // getShareUrl(this.stage);
// NetManager.ins.hc_askForEnergy((success) => {
// NetManager.ins.hc_home(() => {
// SceneCtrl.instance.updateScene();
// }, window['collectRuleId']);
// wait(2000).then(() => {
// showToast('分享成功~');
// });
// })
// } else // } else
// // showShare(1); // showShare(1);
// { // NetManager.ins.hc_askForEnergy((success) => {
// if (window["test0228"]) { // NetManager.ins.hc_home(() => {
// //如果之前没获取到，就再发接口，几率很低 // SceneCtrl.instance.updateScene();
// if (!DataManager.ins.getData("getUserShareCode")) { // }, window['collectRuleId']);
// this.touchEnabled = false // wait(2000).then(() => {
// this.touchChildren = false // showToast('分享成功~');
// NetManager.ins.getUserShareCode((s, res) => { // });
// this.touchEnabled = true // })
// this.touchChildren = true //0224修改，微信环境不变
// if (!s) { if (iswx()) {
// showToast("获取分享信息失败，请重试") getShareUrl(this.stage);
// } else { NetManager.ins.hc_askForEnergy((success) => {
// showShareCodePanel( NetManager.ins.hc_home(() => {
// CodeChannels.AddBlood, SceneCtrl.instance.updateScene();
// res.data, }, window['collectRuleId']);
// () => { wait(2000).then(() => { showToast('分享成功'); }); } wait(2000).then(() => {
// ) showToast('分享成功~');
// } });
// }) })
// } else { } else {
// showShareCodePanel( // if (window["test0228"]) {
// CodeChannels.AddBlood, //如果之前没获取到，就再发接口，几率很低
// DataManager.ins.getData("getUserShareCode").data, if (!DataManager.ins.getData("getUserShareCode")) {
// () => { wait(2000).then(() => { showToast('分享成功'); }); } this.touchEnabled = false
// ); this.touchChildren = false
// } NetManager.ins.getUserShareCode((s, res) => {
// } else { this.touchEnabled = true
// showShareCodePanel(CodeChannels.AddBlood, null, () => { this.touchChildren = true
// NetManager.ins.hc_askForEnergy((success) => { if (!s) {
// NetManager.ins.hc_home(() => { showToast("获取分享信息失败，请重试")
// SceneCtrl.instance.updateScene(); } else {
// }, window['collectRuleId']); showShareCodePanel(
// wait(2000).then(() => { CodeChannels.AddBlood,
// showToast('分享成功'); res.data,
// }); () => { wait(2000).then(() => { showToast('分享成功'); }); }
// }) )
// }); }
// } })
// } } else {
showShareCodePanel(
CodeChannels.AddBlood,
DataManager.ins.getData("getUserShareCode").data,
() => { wait(2000).then(() => { showToast('分享成功'); }); }
);
}
// } else {
// showShareCodePanel(CodeChannels.AddBlood, null, () => {
// NetManager.ins.hc_askForEnergy((success) => {
// NetManager.ins.hc_home(() => {
// SceneCtrl.instance.updateScene();
// }, window['collectRuleId']);
// wait(2000).then(() => {
// showToast('分享成功');
// });
// })
// });
// }
}
} }
return; return;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment