Showing
3 changed files
with
39 additions
and
16 deletions
| @@ -137,7 +137,7 @@ struct EditUserInfoPage { | @@ -137,7 +137,7 @@ struct EditUserInfoPage { | ||
| 137 | TextPickerDialog.show({ | 137 | TextPickerDialog.show({ |
| 138 | range:['男','女'], | 138 | range:['男','女'], |
| 139 | canLoop:false, | 139 | canLoop:false, |
| 140 | - selected:0, | 140 | + selected:this.currentUserInfo.userExtend.sex === 0?1:0, |
| 141 | onAccept:(value:TextPickerResult) => { | 141 | onAccept:(value:TextPickerResult) => { |
| 142 | this.currentUserInfo.userExtend.sex = value.index == 0?1:0; | 142 | this.currentUserInfo.userExtend.sex = value.index == 0?1:0; |
| 143 | this.currentUserInfo.editDataType = WDEditDataModelType.WDEditDataModelType_sex | 143 | this.currentUserInfo.editDataType = WDEditDataModelType.WDEditDataModelType_sex |
| @@ -52,22 +52,34 @@ struct EditUserIntroductionPage { | @@ -52,22 +52,34 @@ struct EditUserIntroductionPage { | ||
| 52 | .margin(30) | 52 | .margin(30) |
| 53 | .onClick(()=>{ | 53 | .onClick(()=>{ |
| 54 | this.updateEditModel() | 54 | this.updateEditModel() |
| 55 | - let params: editModelParams = { | ||
| 56 | - introduction: this.introduction | ||
| 57 | - } | ||
| 58 | - router.back({ | ||
| 59 | - url:'', | ||
| 60 | - params:params | ||
| 61 | - }) | ||
| 62 | }) | 55 | }) |
| 63 | } | 56 | } |
| 64 | } | 57 | } |
| 65 | 58 | ||
| 66 | 59 | ||
| 67 | updateEditModel(){ | 60 | updateEditModel(){ |
| 61 | + if (this.params.editContent === this.introduction) { | ||
| 62 | + this.goBack() | ||
| 63 | + return | ||
| 64 | + } | ||
| 65 | + | ||
| 68 | let currentUserInfo:editModel = new editModel() | 66 | let currentUserInfo:editModel = new editModel() |
| 69 | currentUserInfo.userExtend.introduction = this.introduction | 67 | currentUserInfo.userExtend.introduction = this.introduction |
| 70 | currentUserInfo.editDataType = WDEditDataModelType.WDEditDataModelType_intro | 68 | currentUserInfo.editDataType = WDEditDataModelType.WDEditDataModelType_intro |
| 71 | - EditInfoViewModel.updateUserInfo(currentUserInfo) | 69 | + EditInfoViewModel.updateUserInfo(currentUserInfo).then(()=>{ |
| 70 | + this.goBack() | ||
| 71 | + }).catch(()=>{ | ||
| 72 | + this.goBack() | ||
| 73 | + }) | ||
| 74 | + } | ||
| 75 | + | ||
| 76 | + goBack(){ | ||
| 77 | + let params: editModelParams = { | ||
| 78 | + introduction: this.introduction | ||
| 79 | + } | ||
| 80 | + router.back({ | ||
| 81 | + url:'', | ||
| 82 | + params:params | ||
| 83 | + }) | ||
| 72 | } | 84 | } |
| 73 | } | 85 | } |
| @@ -60,17 +60,28 @@ struct EditUserNikeNamePage { | @@ -60,17 +60,28 @@ struct EditUserNikeNamePage { | ||
| 60 | } | 60 | } |
| 61 | 61 | ||
| 62 | async updateEditModel(){ | 62 | async updateEditModel(){ |
| 63 | + if (this.params.editContent === this.nikeName) { | ||
| 64 | + this.goBack() | ||
| 65 | + return | ||
| 66 | + } | ||
| 67 | + | ||
| 63 | let currentUserInfo:editModel = new editModel() | 68 | let currentUserInfo:editModel = new editModel() |
| 64 | currentUserInfo.userName = await encryptMessage(this.nikeName); | 69 | currentUserInfo.userName = await encryptMessage(this.nikeName); |
| 65 | currentUserInfo.editDataType = WDEditDataModelType.WDEditDataModelType_nickname | 70 | currentUserInfo.editDataType = WDEditDataModelType.WDEditDataModelType_nickname |
| 66 | EditInfoViewModel.updateUserInfo(currentUserInfo).then(()=>{ | 71 | EditInfoViewModel.updateUserInfo(currentUserInfo).then(()=>{ |
| 67 | - let params: editModelParams = { | ||
| 68 | - userName: this.nikeName | ||
| 69 | - } | ||
| 70 | - router.back({ | ||
| 71 | - url:'', | ||
| 72 | - params:params | ||
| 73 | - }) | 72 | + this.goBack() |
| 73 | + }).catch(()=>{ | ||
| 74 | + this.goBack() | ||
| 74 | }) | 75 | }) |
| 75 | } | 76 | } |
| 77 | + | ||
| 78 | + goBack(){ | ||
| 79 | + let params: editModelParams = { | ||
| 80 | + userName: this.nikeName | ||
| 81 | + } | ||
| 82 | + router.back({ | ||
| 83 | + url:'', | ||
| 84 | + params:params | ||
| 85 | + }) | ||
| 86 | + } | ||
| 76 | } | 87 | } |
-
Please register or login to post a comment