3333123

egret/src/Main.ts

@@ -170,35 +170,35 @@ class Main extends MainBase {
         // Waiting.instance.hide();
         // return;
 
-        if (window['pageID']) {
-            if (GameConst.getQueryString("InviteSource")) {
-                yzwNet.homeBaseInfo((s) => {
-                    if (!s) {
-                        ToastCtrl.instance.show(DataManager.ins.getData("homeBaseInfo").message)
-                        // ToastCtrl.instance.show("网络异常请重试~");
-                        return;
-                    }
-                }, window['projectId'], GameConst.getQueryString("InviteSource"))
-            }
-            Waiting.instance.hide();
+        // if (window['pageID']) {
+        //     if (GameConst.getQueryString("InviteSource")) {
+        //         yzwNet.homeBaseInfo((s) => {
+        //             if (!s) {
+        //                 ToastCtrl.instance.show(DataManager.ins.getData("homeBaseInfo").message)
+        //                 // ToastCtrl.instance.show("网络异常请重试~");
+        //                 return;
+        //             }
+        //         }, window['projectId'], GameConst.getQueryString("InviteSource"))
+        //     }
+        //     Waiting.instance.hide();
 
-            if (window['pageID'] == 'JoinShareScene') {
-                SceneCtrl.instance.change(ModuleTypes.JoinShareScene);
-            }
-            if (window['pageID'] == 'TeamShareScene') {
-                SceneCtrl.instance.change(ModuleTypes.TeamShareScene);
-            }
-            if (window['pageID'] == 'Share2Scene') {
-                SceneCtrl.instance.change(ModuleTypes.Share2Scene);
-            }
-            if (window['pageID'] == 'TeamShareScene') {
-                SceneCtrl.instance.change(ModuleTypes.TeamShareScene);
-            }
-            if (window['pageID'] == 'TransScene') {
-                SceneCtrl.instance.change(ModuleTypes.TransScene);
-            }
-            return;
-        }
+        //     if (window['pageID'] == 'JoinShareScene') {
+        //         SceneCtrl.instance.change(ModuleTypes.JoinShareScene);
+        //     }
+        //     if (window['pageID'] == 'TeamShareScene') {
+        //         SceneCtrl.instance.change(ModuleTypes.TeamShareScene);
+        //     }
+        //     if (window['pageID'] == 'Share2Scene') {
+        //         SceneCtrl.instance.change(ModuleTypes.Share2Scene);
+        //     }
+        //     if (window['pageID'] == 'TeamShareScene') {
+        //         SceneCtrl.instance.change(ModuleTypes.TeamShareScene);
+        //     }
+        //     if (window['pageID'] == 'TransScene') {
+        //         SceneCtrl.instance.change(ModuleTypes.TransScene);
+        //     }
+        //     return;
+        // }
 
 
         loadSvgaRes(getResPath() + 'resource/assets/svgas/standby.svga');

egret/src/rankPanel/RankPanel.ts

@@ -25,7 +25,14 @@ export default class RankPanel extends Panel{
                 let com = new eui.Component();
                 com.skinName = "RankItemSkin"
                 com['ranklab'].text = data.list[i].rank;
-                com['rankid'].text = data.list[i].phone;
+                //没有手机号的情况下
+                if(data.list[i].phone){
+                    com['rankid'].text = data.list[i].phone;
+                }else{
+                    com['rankid'].text = "未知号码"
+                }
+                
+                
                 com['ranknum'].text = data.list[i].count;
                 com.y = i*50;
                 if(data.list[i].rank%2 == 1){

egret/src/yazuwei/PKScene.ts

@@ -85,7 +85,12 @@ export default class PKScene extends Scene{
         
         for(let i = 1;i<data.myTeamMembers.length+1;i++){
             this["team"+i]["onnum"].text = "+"+data.myTeamMembers[i-1].memberStepCounts;
-            this["team"+i]["onphone"].text = data.myTeamMembers[i-1].phone;
+            if(data.myTeamMembers[i-1].phone){
+                this["team"+i]["onphone"].text = data.myTeamMembers[i-1].phone;
+            }else{
+                this["team"+i]["onphone"].text = "未知号码";
+            }
+            
             this["team"+i]["headimg"].source = data.myTeamMembers[i-1].avatar;
             let now = new Date();
             let year = now.getFullYear();
@@ -107,7 +112,12 @@ export default class PKScene extends Scene{
                 this["team"+i]["onGroup"].visible = false;
                 this["team"+i]["notGroup"].visible = true;
                 this.setColor(this["team"+i]["headimg"]);
-                this["team"+i]["notonphone"].text = data.myTeamMembers[i-1].phone;
+                if(data.myTeamMembers[i-1].phone){
+                    this["team"+i]["notonphone"].text = data.myTeamMembers[i-1].phone;
+                }else{
+                    this["team"+i]["notonphone"].text = "未知号码";
+                }
+                
                 this.onTap(this["team"+i]["notonBtn"],this.askOnline);
             }
             if(data.myTeamMembers[i-1].uid == uiddata.consumerId){

egret/src/yazuwei/PKScorePanel.ts

@@ -75,7 +75,12 @@ export default class PKScorePanel extends Panel{
             if(data.pkResult.myTeamMembers[i].uid == uiddata.consumerId){
                 this["team"+(i+1)]["onphone"].text = "我"
             }else{
-                this["team"+(i+1)]["onphone"].text = data.pkResult.myTeamMembers[i].phone
+                if(data.pkResult.myTeamMembers[i].phone){
+                    this["team"+(i+1)]["onphone"].text = data.pkResult.myTeamMembers[i].phone
+                }else{
+                    this["team"+(i+1)]["onphone"].text = "未知号码"
+                }
+                
             }
            
 

egret/src/yazuwei/PlacePanel.ts

@@ -46,7 +46,8 @@ export default class PlacePanel extends Panel{
     backStart(){
         yzwNet.homeBaseInfo((s)=>{
             if(!s){
-                ToastCtrl.instance.show("网络异常请重试~");
+                ToastCtrl.instance.show(DataManager.ins.getData("homeBaseInfo").message)
+                // ToastCtrl.instance.show("网络异常请重试~");
                 return;
             }
             Waiting.instance.hide();

egret/src/yazuwei/RecordScene.ts

@@ -20,6 +20,11 @@ export default class RecordScene extends Scene{
 
     constructor(data){
         super()
+        if(data){
+
+        }else{
+            data = 0;
+        }
         this.initUI(data);
     }
     

mock/yzw/homeBaseInfo.json

 {
     "code":null,
     "data":{
-        "currentLevel":5,
+        "currentLevel":0,
         "treasureBoxNum":0,
         "currentScore":1222,
         "pkResult":{