-a

egret/src/CardPanel/NoPrizePanel.ts

@@ -74,11 +74,11 @@ export default class NoPrizePanel extends Panel {
         NetManager.ins.showLog(this.backExposure);
     }
     closePanel() {
-        NetManager.ins.getBaseInfo((success, result) => {
+        NetManager.ins.queryTaskList((success, result) => {
             if (!success) {
                 PanelCtrl.instance.show(ModuleTypes.TOAST_PANEL, { msg: result.message })
             }
-            NetManager.ins.queryTaskList((success2, result2) => {
+            NetManager.ins.getBaseInfo((success2, result2) => {
                 if (!success2) {
                     PanelCtrl.instance.show(ModuleTypes.TOAST_PANEL, { msg: result2.message })
                 }
@@ -86,7 +86,7 @@ export default class NoPrizePanel extends Panel {
                     if (!success3) {
                         PanelCtrl.instance.show(ModuleTypes.TOAST_PANEL, { msg: result2.message })
                     }
-                    let data = { baseinfo: result.data, taskinfo: result2.data, pushstatus: result3.data.status };
+                    let data = { baseinfo: result2.data, taskinfo: result.data, pushstatus: result3.data.status };
                     // SceneCtrl.instance.change(ModuleTypes.START_SCENE,data);
                     StartScene.instance.mData = data;
                     StartScene.instance.initUI();
@@ -100,13 +100,13 @@ export default class NoPrizePanel extends Panel {
     backPanel() {
         NetManager.ins.clickLog(this.backExposure);
 
-        NetManager.ins.getBaseInfo((success, result) => {
+        NetManager.ins.queryTaskList((success, result) => {
             if (!success) {
                 PanelCtrl.instance.show(ModuleTypes.TOAST_PANEL, { msg: result.message })
             }
 
 
-            NetManager.ins.queryTaskList((success2, result2) => {
+            NetManager.ins.getBaseInfo((success2, result2) => {
                 if (!success2) {
                     PanelCtrl.instance.show(ModuleTypes.TOAST_PANEL, { msg: result2.message })
                 }
@@ -114,7 +114,7 @@ export default class NoPrizePanel extends Panel {
                     if (!success3) {
                         PanelCtrl.instance.show(ModuleTypes.TOAST_PANEL, { msg: result2.message })
                     }
-                    let data = { baseinfo: result.data, taskinfo: result2.data, pushstatus: result3.data.status };
+                    let data = { baseinfo: result2.data, taskinfo: result.data, pushstatus: result3.data.status };
                     // SceneCtrl.instance.change(ModuleTypes.START_SCENE,data);
                     StartScene.instance.mData = data;
                     StartScene.instance.initUI();

egret/src/Main.ts

@@ -184,17 +184,16 @@ class Main extends eui.UILayer {
         }
       
         NetManager.ins.queryTaskList((success, result) => {
-            console.log('result.message',result.message);
             if (!success && result.code != "100001") {
                 PanelCtrl.instance.show(ModuleTypes.TOAST_PANEL, { msg: result.message })
             }
             
             NetManager.ins.getWechatInfo((successWechat, resultWeChat) => {
                 let data = resultWeChat;
+                ///console.log('是否分享',data)
                 if (data.success) {
-                    window['wx'] &&
-                        window['wx'].config({
-                            debug: false,
+                    window['wx'] && window['wx'].config({
+                            debug: true,
                             appId: data.wxappid,
                             timestamp: data.wxtimestamp,
                             nonceStr: data.wxnonceStr,
@@ -212,12 +211,7 @@ class Main extends eui.UILayer {
                     if(successInvite && resultInvite.data){
                         window['shareData'].link = this.changeURLArg(window['shareData'].link,"shareCode",resultInvite.data);
                         window['oppoShareLink'] = window['oppoShareLink'] + encodeURIComponent(encodeURIComponent('&shareCode='+resultInvite.data));
-                    }else{
-                        //window['loginlinkNoInApp'] = window['loginlinkNoInApp'] + encodeURIComponent(encodeURIComponent("?signEnt="+channelLittle));
-                        //window['shareData'].link = this.changeURLArg(window['shareData'].link,"shareCode",resultInvite.data);
-                        //window['oppoShareLink'] = window['oppoShareLink'] + encodeURIComponent(encodeURIComponent('&shareCode='+resultInvite.data));
                     }
-                  
                     console.log('分享数据', window['shareData'], data,window['oppoShareLink'],window['loginlinkNoInApp']);
                 })
             })

egret/src/startScene/StartScene.ts

@@ -326,12 +326,7 @@ export default class StartScene extends Scene {
         // }
         if(GFun.isIOS){
             PanelCtrl.instance.show(ModuleTypes.IOSNO_PANEL);
-        } else{
-
-            console.log("hhhhhhh")
-        }     // if(GFun.isIOS){
-        //     PanelCtrl.instance.show(ModuleTypes.IOSNO_PANEL);
-        // }
+        }
         console.log('微信唤起登录',window['loginlinkNoInApp']);
         console.log('端内唤起登录',window['loginlinkInApp']);
         this.initBuried();
@@ -380,13 +375,11 @@ export default class StartScene extends Scene {
         }else if(data == "100018"){
             this.addEventListener(egret.TouchEvent.TOUCH_TAP,()=>{PanelCtrl.instance.show(ModuleTypes.TOAST_PANEL,{msg:"账号异常，请重试~"})},this)
         }if (GFun.checkInApp(["oppocommunity"]) || GFun.getIsWxClient()) {
-            console.log("wobuzaiapp he wx")
+            
         } else {
             if(!GFun.isIOS){
-                console.log("isios",GFun.isIOS);
-                // PanelCtrl.instance.show(ModuleTypes.NOTIPS_PANEL);
+                PanelCtrl.instance.show(ModuleTypes.NOTIPS_PANEL);
             }
-            
             //this.removeEvents();
             //this.setEvents()
         }
@@ -394,7 +387,6 @@ export default class StartScene extends Scene {
         this.initTask();
     }
     private turnUrlLink(){
-        console.log("dengluquba");
         if(GFun.getIsWxClient()){
             if(GFun.isIOS){
                 window.location.href = window['ios'] + window['loginlinkNoInApp'];
@@ -604,7 +596,6 @@ export default class StartScene extends Scene {
         this.initTask()
 
         if (GFun.checkInApp(["oppocommunity"]) || GFun.getIsWxClient()) {
-            console.log("wobuzaiapp he wx")
         } else {
             if(!GFun.isIOS){
                 console.log(GFun.isIOS);
@@ -627,7 +618,6 @@ export default class StartScene extends Scene {
         // }
         
         if (this.diheight < this.startGroup.height + setHeight) {
-            console.log('任务',setHeight,this.startGroup.height,this.diheight);//4255  700  4955
             this.diheight = this.startGroup.height + setHeight;
             if(setHeight == 700){
                 this.startGroup.height = 4955;
@@ -635,9 +625,7 @@ export default class StartScene extends Scene {
         }
         //this.startBg.height = this.diheight
         this.diGroup.y = this.diheight - setHeight
-        console.log('任务高度',setHeight,this.diGroup.y,this.startGroup.height);
         if (DataManager.ins.getData(NetName.OPPO_QUERYTASKLIST) && DataManager.ins.getData(NetName.OPPO_QUERYTASKLIST).data && DataManager.ins.getData(NetName.OPPO_QUERYTASKLIST).data.length > 1) {
-            console.log('任务OPPO_QUERYTASKLIST');
             this.diGroup.y = this.diheight - setHeight
         }