feat：优化人民号编辑资料

@@ -7,7 +7,7 @@ import {AreaPickerDialog} from '../view/areaPickerDialog/AreaPickerDialog'
 import {EditUserInfoCustomDialog} from '../view/areaPickerDialog/EditUserInfoCustomDialog'
 import {EditUserInfoCustomDialog} from '../view/areaPickerDialog/EditUserInfoCustomDialog'
 import {EditUserSexCustomDialog} from '../view/areaPickerDialog/EditUserSexCustomDialog'
 import {EditUserSexCustomDialog} from '../view/areaPickerDialog/EditUserSexCustomDialog'
 import {CustomDialogUI} from '../view/areaPickerDialog/CustomDialogUI'
 import {CustomDialogUI} from '../view/areaPickerDialog/CustomDialogUI'
-import {AreaListModel } from '../../model/AreaListModel';
+import { AreaListManageModel, AreaListModel } from '../../model/AreaListModel';
 import router from '@ohos.router';
 import router from '@ohos.router';
 import TrackingPageBrowseUtils from '../../utils/TrackingPageBrowseUtils'
 import TrackingPageBrowseUtils from '../../utils/TrackingPageBrowseUtils'
 import { TrackConstants } from 'wdTracking/Index';
 import { TrackConstants } from 'wdTracking/Index';
@@ -34,11 +34,16 @@ struct EditUserInfoPage {
 
 
   dialogController: CustomDialogController = new CustomDialogController({
   dialogController: CustomDialogController = new CustomDialogController({
     builder: AreaPickerDialog({dataSource:this.dataSource,firstSelect:this.firstSelect,secondSelect:this.secondSelect,thirdSelect:this.thirdSelect,
     builder: AreaPickerDialog({dataSource:this.dataSource,firstSelect:this.firstSelect,secondSelect:this.secondSelect,thirdSelect:this.thirdSelect,
-      confirmCallback:(province:string,city:string,county:string,address:string)=>{
-        this.currentUserInfo.userExtend.province = province;
-        this.currentUserInfo.userExtend.city = city;
-        this.currentUserInfo.userExtend.county = county;
+      confirmCallback:(province:AreaListManageModel,city:AreaListManageModel,county:AreaListManageModel,address:string)=>{
+        this.currentUserInfo.userExtend.province = province.label;
+        this.currentUserInfo.userExtend.city = city.label;
+        this.currentUserInfo.userExtend.county = county.label;
         this.currentUserInfo.userExtend.address = address;
         this.currentUserInfo.userExtend.address = address;
+
+        this.currentUserInfo.userExtend.provinceCode = province.code;
+        this.currentUserInfo.userExtend.cityCode = city.code;
+        this.currentUserInfo.userExtend.districtCode = county.code;
+
         this.currentUserInfo.editDataType = WDEditDataModelType.WDEditDataModelType_region
         this.currentUserInfo.editDataType = WDEditDataModelType.WDEditDataModelType_region
         this.updateEditModel()
         this.updateEditModel()
         this.getAreaIndex()
         this.getAreaIndex()
@@ -115,7 +120,6 @@ struct EditUserInfoPage {
     }
     }
 
 
     this.getAccountOwnerInfo()
     this.getAccountOwnerInfo()
-    this.getAreaList()
   }
   }
 
 
   onPageShow(){
   onPageShow(){
@@ -280,6 +284,7 @@ struct EditUserInfoPage {
         this.currentUserInfo = editModel as editModel;
         this.currentUserInfo = editModel as editModel;
         this.listData.push(...EditInfoViewModel.getEditListInfo(editModel))
         this.listData.push(...EditInfoViewModel.getEditListInfo(editModel))
       });
       });
+      this.getAreaList()
     }else {
     }else {
       EditInfoViewModel.queryPeopleAccountOwnerInfo(getContext(this)).then((peopleItem) => {
       EditInfoViewModel.queryPeopleAccountOwnerInfo(getContext(this)).then((peopleItem) => {
         EditInfoViewModel.queryAccountOwnerInfo(getContext(this)).then((editM) => {
         EditInfoViewModel.queryAccountOwnerInfo(getContext(this)).then((editM) => {
@@ -290,6 +295,7 @@ struct EditUserInfoPage {
           this.currentUserInfo = editM as editModel;
           this.currentUserInfo = editM as editModel;
           this.listData.push(...EditInfoViewModel.getEditListInfo(editM))
           this.listData.push(...EditInfoViewModel.getEditListInfo(editM))
         });
         });
+        this.getAreaList()
       });
       });
     }
     }
   }
   }

@@ -17,7 +17,7 @@ export  struct AreaPickerDialog {
   secondSelect:number = 0
   secondSelect:number = 0
   thirdSelect:number = 0
   thirdSelect:number = 0
 
 
-  confirmCallback: (province:string,city:string,county:string,address:string) => void = () => {
+  confirmCallback: (province:AreaListManageModel,city:AreaListManageModel,county:AreaListManageModel,address:string) => void = () => {
 
 
   }
   }
 
 
@@ -43,7 +43,7 @@ export  struct AreaPickerDialog {
         Button('提交',{type:ButtonType.Normal})
         Button('提交',{type:ButtonType.Normal})
           .onClick(()=> {
           .onClick(()=> {
             this.controller.close()
             this.controller.close()
-            this.confirmCallback(this.currentFirst.label,this.currentSecondBean.label,this.currentThirdBean.label,this.currentFirst.label+this.currentSecondBean.label+this.currentThirdBean.label);
+            this.confirmCallback(this.currentFirst,this.currentSecondBean,this.currentThirdBean,this.currentFirst.label+this.currentSecondBean.label+this.currentThirdBean.label);
           })
           })
           .width(60)
           .width(60)
           .backgroundColor(0xffffff)
           .backgroundColor(0xffffff)

@@ -39,11 +39,17 @@ export class  EditInfoModel{
   address:string = ''
   address:string = ''
   //生日
   //生日
   birthday:string = ''
   birthday:string = ''
+
+  creatorId:string = ''
   //性别
   //性别
   sex:number = 0
   sex:number = 0
   
   
   airec:number = 0
   airec:number = 0
 
 
+  districtCode:string = ''
+  provinceCode:string = ''
+  cityCode:string = ''
+
 }
 }
 
 
 export class editModel{
 export class editModel{
@@ -84,6 +90,14 @@ export interface editModelParams {
   birthday?:string;
   birthday?:string;
   //性别
   //性别
   sex?:string;
   sex?:string;
+
+  ///人民号
+  name?: string;
+  districtCode?:string;
+  countryCode?:string;
+  provinceCode?:string;
+  cityCode?:string;
+  creatorId?:string;
 }
 }
 
 
 
 

@@ -139,6 +139,8 @@ class EditInfoViewModel {
   }
   }
 
 
   updateUserInfo(item:editModel):Promise<ResponseDTO> {
   updateUserInfo(item:editModel):Promise<ResponseDTO> {
+
+  if (item.userType === 1){
     if (item.editDataType == WDEditDataModelType.WDEditDataModelType_head) {
     if (item.editDataType == WDEditDataModelType.WDEditDataModelType_head) {
     } else if (item.editDataType == WDEditDataModelType.WDEditDataModelType_nickname) {
     } else if (item.editDataType == WDEditDataModelType.WDEditDataModelType_nickname) {
       this.params = { userName: item.userName }
       this.params = { userName: item.userName }
@@ -171,6 +173,41 @@ class EditInfoViewModel {
           promptAction.showToast({ message: error.message })
           promptAction.showToast({ message: error.message })
         })
         })
     })
     })
+  }else {
+    let url = ''
+    if (item.editDataType == WDEditDataModelType.WDEditDataModelType_head) {
+      url = '/api/rmrb-creator-user/c/rmrb-creator-user/creator/updateIcon'
+    } else if (item.editDataType == WDEditDataModelType.WDEditDataModelType_nickname) {
+      this.params = { name: item.userName}
+      url = '/api/rmrb-creator-user/c/rmrb-creator-user/creator/updateName'
+    } else if (item.editDataType == WDEditDataModelType.WDEditDataModelType_intro) {
+      this.params = { introduction: item.userExtend.introduction }
+      url = '/api/rmrb-creator-user/c/rmrb-creator-user/creator/updateIntroduction'
+    } else if (item.editDataType == WDEditDataModelType.WDEditDataModelType_region) {
+      this.params = {provinceCode:item.userExtend.provinceCode,cityCode:item.userExtend.cityCode, districtCode: item.userExtend.districtCode ,countryCode:'86'}
+      url = '/api/rmrb-creator-user/c/rmrb-creator-user/creator/updateArea'
+    }
+
+    this.params.creatorId = item.userExtend.creatorId
+
+    return new Promise((success, error) => {
+      this.BasePostRequest(url,this.params)
+        .then((navResDTO: ResponseDTO) => {
+          if (navResDTO.code == 0) {
+            promptAction.showToast({ message: '您的资料已提交' })
+            success(navResDTO)
+          }else {
+            promptAction.showToast({ message: navResDTO.message })
+          }
+        })
+        .catch((error: Error) => {
+          Logger.info(TAG,'updateUserInfo','EditInfoViewModel')
+          promptAction.showToast({ message: error.message })
+        })
+    })
+  }
+
+
   }
   }
 }
 }