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

egret/resource/skins/MapSkin.exml

@@ -96,7 +96,7 @@
 		</e:Button>
 		<e:Group x="84.67" y="0">
 			<e:Image id="inviteTipsBg" source="invite_txtbg_png" x="0" y="0" touchEnabled="false"/>
-			<e:Label id="inviteTips" text="待领取取" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center" textColor="0xffffff" size="16"/>
+			<e:Label id="inviteTips" text="立即到账" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center" textColor="0xffffff" size="16"/>
 		</e:Group>
 	</e:Group>
 	<e:Group x="30" scaleX="1.4" scaleY="1.4" bottom="23">

egret/src/panels/StartPanel.ts

@@ -32,11 +32,15 @@ export default class StartPanel extends Panel {
         this['empty'].visible = false;
 
         NetManager.ins.hc_levelNumRank(() => {
-            const { data: friends } = DataManager.ins.getData('hc_levelNumRank');
+            let { data: friends } = DataManager.ins.getData('hc_levelNumRank');
+            friends = friends.rank;
             if(friends && friends.length > 0 ) {
                 this.friendlist.visible = true;
                 if (friends.length > 5)
                     friends.length = 5;
+                    friends.forEach((ele,index) => {
+                        ele.rank = index + 1;
+                    });
                 const ac = new eui.ArrayCollection(friends);
                 this.friendlist.dataProvider = ac;
             }

mock/happyclear/levelNumRank.json

 {
     "success": true,
-    "code": null,
-    "desc": null,
-    "timestamp": 1566199822308,
-    "data": [
-        {
-            "nickName": "奈何本人没文化，一句卧槽行天下",
-            "avatar": "http://yun.dui88.com/images/201604/c6s5l4dgea.jpg",
-            "stars": 1,
-            "maxScore": 1234567,
-            "rank": "1"
-        },
-        {
-            "nickName": "2奈何本人没文化，一句卧槽行天下",
-            "avatar": "http://yun.dui88.com/images/201604/c6s5l4dgea.jpg",
-            "stars": 1,
-            "maxScore": 1234567,
-            "rank": "2"
-        },
-        {
-            "nickName": "3奈何本人没文化，一句卧槽行天下",
-            "avatar": "http://yun.dui88.com/images/201604/c6s5l4dgea.jpg",
-            "stars": 1,
-            "maxScore": 1234567,
-            "rank": "3"
-        },
-        {
-            "nickName": "4奈何本人没文化，一句卧槽行天下",
-            "avatar": "http://yun.dui88.com/images/201604/c6s5l4dgea.jpg",
-            "stars": 1,
-            "maxScore": 1234567,
-            "rank": "4"
-        },
-        {
-            "nickName": "5奈何本人没文化，一句卧槽行天下",
-            "avatar": "http://yun.dui88.com/images/201604/c6s5l4dgea.jpg",
-            "stars": 1,
-            "maxScore": 123,
-            "rank": "5"
-        },
-        {
-            "nickName": "6奈何本人没文化，一句卧槽行天下",
-            "avatar": "http://yun.dui88.com/images/201604/c6s5l4dgea.jpg",
-            "stars": 1,
-            "maxScore": 555555,
-            "rank": "6"
-        }
-    ]
+    "code": "0000000000",
+    "desc": "OK",
+    "timestamp": 1571044339755,
+    "data": {
+        "levelNum": 1,
+        "rank": [
+            {
+                "nickName": "https://wx.qlogo.cn/mmopen/vi_32/5icsJibet91SjpqD2GygMAA5twUoqVTiaOqS3NQNia0Jbuia2fZxlh03AIyiaaVTRRKOxo1Ym17icjBBkiaMhicv3zhXgRQ/132",
+                "avatar": "https://wx.qlogo.cn/mmopen/vi_32/5icsJibet91SjpqD2GygMAA5twUoqVTiaOqS3NQNia0Jbuia2fZxlh03AIyiaaVTRRKOxo1Ym17icjBBkiaMhicv3zhXgRQ/132",
+                "stars": 3,
+                "maxScore": 31940,
+                "rank": null,
+                "levelNum": null,
+                "consumerId": null
+            }
+            ,
+            {
+                "nickName": "https://wx.qlogo.cn/mmopen/vi_32/5icsJibet91SjpqD2GygMAA5twUoqVTiaOqS3NQNia0Jbuia2fZxlh03AIyiaaVTRRKOxo1Ym17icjBBkiaMhicv3zhXgRQ/132",
+                "avatar": "https://wx.qlogo.cn/mmopen/vi_32/5icsJibet91SjpqD2GygMAA5twUoqVTiaOqS3NQNia0Jbuia2fZxlh03AIyiaaVTRRKOxo1Ym17icjBBkiaMhicv3zhXgRQ/132",
+                "stars": 3,
+                "maxScore": 31940,
+                "rank": null,
+                "levelNum": null,
+                "consumerId": null
+            }
+        ]
+    }
 }
\ No newline at end of file