Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/yyh into dev

egret/src/yazuwei/PKScene.ts

@@ -120,7 +120,7 @@ export default class PKScene extends Scene{
                 
                 this.onTap(this["team"+i]["notonBtn"],this.askOnline);
             }
-            if(data.myTeamMembers[i-1].uid == uiddata.consumerId){
+            if(data.myTeamMembers[i-1].consumerId == uiddata.consumerId){
                 this["team"+i]["onphone"].text = "我"
             }