liyubing

Merge remote-tracking branch 'origin/main'

@@ -34,20 +34,13 @@ export default struct MinePageUserSimpleInfoUI { @@ -34,20 +34,13 @@ export default struct MinePageUserSimpleInfoUI {
34 Row(){ 34 Row(){
35 //头像 35 //头像
36 Stack(){ 36 Stack(){
37 - if (this.headPhotoUrl.length > 0){  
38 - Image(this.headPhotoUrl)  
39 - .alt(this.userType === "1"?$r('app.media.default_head'):$r('app.media.AccountOwner_DefaultIcon'))  
40 - .width(`${this.calcHeight(100)}lpx`)  
41 - .height(`${this.calcHeight(100)}lpx`)  
42 - .objectFit(ImageFit.Cover)  
43 - .borderRadius(50)  
44 - }else {  
45 - Image(this.userType === "1"?$r('app.media.default_head'):$r('app.media.AccountOwner_DefaultIcon')) 37 +
  38 + Image(this.isLogin?(this.headPhotoUrl?this.headPhotoUrl:this.userType === "1"?$r('app.media.default_head'):$r('app.media.AccountOwner_DefaultIcon')):$r('app.media.default_head'))
  39 + .alt($r('app.media.default_head'))
46 .width(`${this.calcHeight(100)}lpx`) 40 .width(`${this.calcHeight(100)}lpx`)
47 .height(`${this.calcHeight(100)}lpx`) 41 .height(`${this.calcHeight(100)}lpx`)
48 .objectFit(ImageFit.Cover) 42 .objectFit(ImageFit.Cover)
49 .borderRadius(50) 43 .borderRadius(50)
50 - }  
51 44
52 if(StringUtils.isNotEmpty(this.levelHead)){ 45 if(StringUtils.isNotEmpty(this.levelHead)){
53 Image(this.levelHead) 46 Image(this.levelHead)