Merge branch 'master' of git.mokasz.com:zouyong/team1_nc

assets/script/game/module/setting/Setting.ts

@@ -49,7 +49,7 @@ export default class Setting extends cc.Component {
         this.lbl_nickname.string = gData.wechatData.nickName;
 
         this.lbl_lv.string = 'Lv:' + gData.gameData.playerProp.gradeLevel.toString();
-        this.lbl_redBagCoin.string = (gData.gameData.playerProp.redMoney/100).toString();
+        this.lbl_redBagCoin.string = (gData.gameData.playerProp.redMoney / 100).toString();
 
         this.lbl_value.string = (gData.gameData.playerProp.redMoney / 1000000).toFixed(3) + '元';
 
@@ -58,11 +58,13 @@ export default class Setting extends cc.Component {
         this.img_music.spriteFrame = await mk.loader.load(music, cc.SpriteFrame);
         this.img_effect.spriteFrame = await mk.loader.load(effect, cc.SpriteFrame);
 
-        this.sp_achieve.spriteFrame =  await mk.loader.load('module/gradeReward/texture/name' + gData.gameData.playerProp.farmGradeName, cc.SpriteFrame);
+        this.sp_achieve.spriteFrame = await mk.loader.load('module/gradeReward/texture/name' + gData.gameData.playerProp.farmGradeName, cc.SpriteFrame);
         console.log("=== gData.wechatData.avatar", gData.wechatData.avatar);
-        let result = await mk.loader.loadRemote(gData.wechatData.avatar + "?aaa=aa.jpg", null);
-        this.img_head.spriteFrame = new cc.SpriteFrame(result);
-        console.log("=== loadHead:", result);
+        if (gData.wechatData.avatar != '') {
+            let result = await mk.loader.loadRemote(gData.wechatData.avatar + "?aaa=aa.jpg", null);
+            this.img_head.spriteFrame = new cc.SpriteFrame(result);
+            console.log("=== loadHead:", result);
+        }
     }
 
     private clickInviteBtn() {