developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
wangliang_wd
6951a464 1 parent 054184dc

feat：优化编辑资料

Inline Side-by-side
Showing 3 changed files with 73 additions and 51 deletions
... ... @@ -129,7 +129,7 @@ struct EditUserInfoPage {
range:['女','男'],
selected:0,
onAccept:(value:TextPickerResult) => {
this.currentUserInfo.userExtend.sex = value.index.toString();
this.currentUserInfo.userExtend.sex = value.index as number;
this.currentUserInfo.editDataType = WDEditDataModelType.WDEditDataModelType_sex
this.updateEditModel()
}
... ... @@ -163,11 +163,12 @@ struct EditUserInfoPage {
updateEditModel(){
this.listData = []
this.listData.push(...EditInfoViewModel.getEditListInfo(this.currentUserInfo))
this.updateUserInfo(this.currentUserInfo)
}
getAccountOwnerInfo(){
EditInfoViewModel.queryAccountOwnerInfo(1,getContext(this)).then((editModel) => {
this.headerImg = editModel.userExtend.headPhotoUrl
this.currentUserInfo = editModel;
this.currentUserInfo = editModel as editModel;
this.listData.push(...EditInfoViewModel.getEditListInfo(editModel))
});
}
... ... @@ -177,4 +178,25 @@ struct EditUserInfoPage {
this.dataSource.push(...value)
})
}
updateUserInfo(item?:editModel){
// if (item.editDataType == WDEditDataModelType.WDEditDataModelType_head) {
// } else if (item.editDataType == WDEditDataModelType.WDEditDataModelType_nickname) {
// let params: editModelParams = { userName: item.userName }
// EditInfoViewModel.updateUserInfo(params)
// }
// else if (item.editDataType == WDEditDataModelType.WDEditDataModelType_intro) {
// let params: editModelParams = { introduction: item.userExtend.introduction }
// EditInfoViewModel.updateUserInfo(params)
// } else if (item.editDataType == WDEditDataModelType.WDEditDataModelType_sex) {
// let params: editModelParams = { sex: item.userExtend.sex.toString() }
// EditInfoViewModel.updateUserInfo(params)
// } else if (item.editDataType == WDEditDataModelType.WDEditDataModelType_birthday) {
// let params: editModelParams = { birthday: item.userExtend.birthday }
// EditInfoViewModel.updateUserInfo(params)
// } else if (item.editDataType == WDEditDataModelType.WDEditDataModelType_region) {
// let params: editModelParams = { county: item.userExtend.county }
// EditInfoViewModel.updateUserInfo(params)
// }
}
}
... ...
... ... @@ -3,13 +3,13 @@
* WDEditDataModelType 更新资料类型
*/
export const enum WDEditDataModelType {
WDEditDataModelType_default, //默认不修改
WDEditDataModelType_default = 0, //默认不修改
WDEditDataModelType_head, //头像
WDEditDataModelType_nickname, //昵称
WDEditDataModelType_intro, //简介
WDEditDataModelType_sex, //性别
WDEditDataModelType_birthday, //生日
WDEditDataModelType_region, //地址
WDEditDataModelType_region //地址
}
export class EditListInfo{
... ... @@ -36,11 +36,11 @@ export class EditInfoModel{
//生日
birthday:string = ''
//性别
sex:string = ''
sex:number = 0
airec:number = 0
constructor(headPhotoUrl?:string , introduction?:string,city?:string , county?:string,birthday?:string , sex?:string,airec?:number) {
constructor(headPhotoUrl?:string , introduction?:string,city?:string , county?:string,birthday?:string , sex?:number,airec?:number) {
}
}
... ... @@ -55,7 +55,7 @@ export class editModel{
userExtend:EditInfoModel = new EditInfoModel()
editDataType:WDEditDataModelType = 0
editDataType:WDEditDataModelType = WDEditDataModelType.WDEditDataModelType_default
constructor(userName?:string , userNameStatus?:string,phone?:string , headPhotoStatus?:string,userExtend?:EditInfoModel,editDataType?:WDEditDataModelType) {
}
... ... @@ -77,4 +77,18 @@ export interface editModelParams {
birthday?:string;
//性别
sex?:string;
}
export interface editItem{
code:number
data:editModel
message:string
success:boolean
timestamp:number
}
\ No newline at end of file
... ...
import { EditInfoModel, EditListInfo, editModel, editModelParams, WDEditDataModelType } from '../model/EditInfoModel';
import {
editItem,
EditListInfo, editModel } from '../model/EditInfoModel';
import HashMap from '@ohos.util.HashMap';
import { HttpUrlUtils, ResponseDTO, WDHttp } from 'wdNetwork';
import { Logger, ResourcesUtils } from 'wdKit';
... ... @@ -23,38 +25,38 @@ class EditInfoViewModel {
BaseGetRequest(requestUrl:string){
let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders()
requestUrl = HttpUrlUtils.HOST_SIT + requestUrl
return WDHttp.get<ResponseDTO>(requestUrl,headers)
requestUrl = HttpUrlUtils.getHost() + requestUrl
return WDHttp.get<editItem>(requestUrl,headers)
}
BasePOSTRequest(requestUrl:string){
BasePostRequest(requestUrl:string,params: object){
let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders()
requestUrl = HttpUrlUtils.HOST_SIT + requestUrl
return WDHttp.post<ResponseDTO>(requestUrl,headers)
requestUrl = HttpUrlUtils.getHost() + requestUrl
return WDHttp.post<ResponseDTO>(requestUrl,params,headers)
}
getEditListInfo(item?:editModel):EditListInfo[]{
this.editListData = [
new EditListInfo('昵称',item&&item.userName.length > 0?item.userName:'待完善'),
new EditListInfo('简介',item&&item.userExtend.introduction.length > 0?item.userExtend.introduction:'待完善'),
new EditListInfo('地区',item&&item.userExtend.city.length > 0?item.userExtend.city:'待完善'),
new EditListInfo('生日',item&&item.userExtend.birthday.length > 0?item.userExtend.birthday:'待完善'),
new EditListInfo('性别',item&&item.userExtend.sex.length > 0?(item.userExtend.sex=== '1'?'男':'女'):'待完善'),]
new EditListInfo('简介',item&&item.userExtend.introduction?item.userExtend.introduction:'待完善'),
new EditListInfo('地区',item&&item.userExtend.city?item.userExtend.city:'待完善'),
new EditListInfo('生日',item&&item.userExtend.birthday?item.userExtend.birthday:'待完善'),
new EditListInfo('性别',item?(item.userExtend.sex === 1?'男':'女'):'待完善'),]
return this.editListData
}
///1普通用户
queryAccountOwnerInfo(userType:number, context: Context):PromiseLike<editModel>{
return new Promise(((success, error) => {
this.BaseGetRequest(userType == 1?HttpUrlUtils.APPOINTMENT_QueryUserDetail_PATH:HttpUrlUtils.APPOINTMENT_AccountOwner_PATH).then((navResDTO:ResponseDTO) =>{
if (navResDTO.code == 200) {
// let editM = navResDTO.data as EditInfoModel
// success(JSON.parse(navResDTO.data)
this.BaseGetRequest(userType == 1?HttpUrlUtils.APPOINTMENT_QueryUserDetail_PATH:HttpUrlUtils.APPOINTMENT_AccountOwner_PATH).then((editDTO:editItem) =>{
if (editDTO.code == 0) {
success(editDTO.data)
}else {
success(this.GetqueryAccountOwnerLocal(context))
}
success(this.GetqueryAccountOwnerLocal(context))
}).catch((error: Error) => {
Logger.info('EditInfoViewModel','EditInfoViewModel','EditInfoViewModel')
Logger.info(TAG,'queryAccountOwnerInfo','EditInfoViewModel')
success(this.GetqueryAccountOwnerLocal(context))
})
}))
... ... @@ -103,34 +105,18 @@ class EditInfoViewModel {
return new AreaListManageModel(item.code,item.id,item.label,item.children)
}
// updateUserInfo(item?:editModel):Promise<ResponseDTO> {
// let params: editModelParams = {};
// if (item.editDataType === WDEditDataModelType.WDEditDataModelType_head) {
// // params =
// } else if (item.editDataType === WDEditDataModelType.WDEditDataModelType_nickname) {
// params = { userName: item.userName }
// } else if (item.editDataType === WDEditDataModelType.WDEditDataModelType_intro) {
// params = { introduction: item.userExtend.introduction }
// } else if (item.editDataType === WDEditDataModelType.WDEditDataModelType_sex) {
// params = { sex: item.userExtend.sex }
// } else if (item.editDataType === WDEditDataModelType.WDEditDataModelType_birthday) {
// params = { birthday: item.userExtend.birthday }
// } else if (item.editDataType === WDEditDataModelType.WDEditDataModelType_region) {
// params = { county: item.userExtend.county }
// } else {
// }
// return new Promise((success, error) => {
// this.BasePOSTRequest(HttpUrlUtils.APPOINTMENT_editUserDetail_PATH)
// .then((navResDTO: ResponseDTO) => {
// if (navResDTO.code == 200) {
// }
// })
// .catch((error: Error) => {
//
// })
// })
// }
updateUserInfo(params:object):Promise<ResponseDTO> {
return new Promise((success, error) => {
this.BasePostRequest(HttpUrlUtils.APPOINTMENT_editUserDetail_PATH,params)
.then((navResDTO: ResponseDTO) => {
if (navResDTO.code == 200) {
}
})
.catch((error: Error) => {
Logger.info(TAG,'updateUserInfo','EditInfoViewModel')
})
})
}
}
const editInfoViewModel = EditInfoViewModel.getInstance();
... ...