Skip to content

X
xiaoxiaole
Commit 2c5c539e authored by 邱旭's avatar 邱旭
Browse files
Options

1

parent f52edc3f
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 8 deletions
egret/src/mapScene/MapScene.ts
View file @ 2c5c539e
...@@ -358,18 +358,13 @@ export default class MapScene extends Scene { ...@@ -358,18 +358,13 @@ export default class MapScene extends Scene {
onTap_taskBtn() { onTap_taskBtn() {
PanelCtrl.instance.show('task'); PanelCtrl.instance.show('task');
} }
<<<<<<< HEAD onTap_inviteBtn() {
onTap_inviteBtn(){ NetManager.ins.getInvateInfo((success, res) => {
NetManager.ins.getInvateInfo((success, res)=>{ if(!success || !res.data) {
if(!success || !res.data){
return; return;
} }
PanelCtrl.instance.show('invite', res.data); PanelCtrl.instance.show('invite', res.data);
}); });
=======
onTap_inviteBtn() {
PanelCtrl.instance.show('invite');
>>>>>>> 0a4b334dc0c6f0151f4a6f5714102d247466ff04
} }
onTap_friendBtn() { onTap_friendBtn() {
PanelCtrl.instance.show('friend'); PanelCtrl.instance.show('friend');
......
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