gdxz/harmony
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改bug

Browse Source
This commit is contained in:
xiaoxiao
2025-06-04 11:19:27 +08:00
parent a83890881e
commit 195e42f50e
10 changed files with 176 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/mypage/src/main/ets/view/ChangePasswordComp.ets
+7 -8
View File
@@ -1,4 +1,4 @@
import { hdHttp, HdResponse, BasicConstant, ExpertData, authStore } from '@itcast/basic'
import { hdHttp, HdResponse, BasicConstant, ExpertData, authStore, ChangeUtil } from '@itcast/basic'
import { BusinessError } from '@kit.BasicServicesKit';
import promptAction from '@ohos.promptAction';
import HashMap from '@ohos.util.HashMap';
@@ -106,24 +106,23 @@ export struct ChangePasswordComp {
.borderWidth(1)
.fontColor($r('app.color.main_color'))
.onClick(() => {
const passwordRegex = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$/
if (this.oldPassword.length <= 0 || !this.oldPassword) {
if (!this.oldPassword) {
promptAction.showToast({message:'请输入原密码'})
return
}
if (!passwordRegex.test(this.oldPassword)) {
if (!ChangeUtil.isPassword(this.oldPassword)) {
promptAction.showToast({message:'原密码格式错误'})
return
}
if (this.newPassword.length <= 0 || !this.newPassword) {
if (!this.newPassword) {
promptAction.showToast({message:'请输入原密码'})
return
}
if (!passwordRegex.test(this.newPassword)) {
if (!ChangeUtil.isPassword(this.newPassword)) {
promptAction.showToast({message:'新密码格式错误'})
return
}
if (this.confirmPassword.length <= 0 || !this.confirmPassword) {
if (!this.confirmPassword) {
promptAction.showToast({message:'请确认新密码'})
return
}
@@ -131,7 +130,7 @@ export struct ChangePasswordComp {
promptAction.showToast({message:'新密码与确认密码不一致'})
return
}
if (!passwordRegex.test(this.confirmPassword)) {
if (!ChangeUtil.isPassword(this.confirmPassword)) {
promptAction.showToast({message:'密码格式不正确，请重新输入！'})
return
}
features/mypage/src/main/ets/view/ChangePhoneComp.ets
+5 -8
View File
@@ -1,4 +1,4 @@
import { hdHttp, HdResponse, BasicConstant, ExpertData, authStore } from '@itcast/basic'
import { hdHttp, HdResponse, BasicConstant, ExpertData, authStore, ChangeUtil } from '@itcast/basic'
import { BusinessError } from '@kit.BasicServicesKit';
import promptAction from '@ohos.promptAction';
import HashMap from '@ohos.util.HashMap';
@@ -130,7 +130,7 @@ export struct ChangePhoneComp {
promptAction.showToast({message:'请输入手机号'})
return
}
if (!EMAIL_REGEX.test(this.phoneNumber)) {
if (!ChangeUtil.isMobileNum(this.phoneNumber)) {
promptAction.showToast({message:'请输入正确的手机号'})
return
}
@@ -154,12 +154,12 @@ export struct ChangePhoneComp {
.fontSize(18)
.position({x:'5%',y:'80%'})
.onClick(() => {
if (this.phoneNumber.length < 11 || !this.phoneNumber) {
if (!this.phoneNumber) {
promptAction.showToast({message:'请输入手机号'})
return
}
if (!EMAIL_REGEX.test(this.phoneNumber)) {
promptAction.showToast({message:'请输入正确的手机号'})
if (!ChangeUtil.isMobileNum(this.phoneNumber)) {
promptAction.showToast({message:'手机号格式错误，请重新输入'})
return
}
if (!this.smsCode) {
@@ -174,6 +174,3 @@ export struct ChangePhoneComp {
.backgroundColor('#FFFFFF')
}
}
// 手机正则表达式
const EMAIL_REGEX = /^1[3-9][0-9]{9}$/
features/mypage/src/main/ets/view/ChooseEmailComp.ets
+5 -12
View File
@@ -1,4 +1,4 @@
import { hdHttp, HdResponse, BasicConstant, ExpertData, authStore } from '@itcast/basic'
import { hdHttp, HdResponse, BasicConstant, ExpertData, authStore, ChangeUtil } from '@itcast/basic'
import { BusinessError } from '@kit.BasicServicesKit';
import promptAction from '@ohos.promptAction';
import { router } from '@kit.ArkUI';
@@ -66,10 +66,6 @@ export struct ChooseEmailComp {
})
}
private validateEmailFormat(email: string): boolean {
return EMAIL_REGEX.test(email.trim())
}
build() {
Column() {
// 手机号输入框
@@ -114,10 +110,10 @@ export struct ChooseEmailComp {
.fontSize(18)
.position({x:'5%',y:'80%'})
.onClick(() => {
// if (this.validateEmailFormat(this.emailString)) {
// promptAction.showToast({message:'请输入正确的邮箱格式'})
// return
// }
if (!ChangeUtil.isEmail(this.emailString)) {
promptAction.showToast({message:'请输入正确的邮箱格式'})
return
}
this.commitEmailData(this.emailString);
})
}
@@ -126,6 +122,3 @@ export struct ChooseEmailComp {
.backgroundColor('#FFFFFF')
}
}
// 邮箱正则表达式
const EMAIL_REGEX = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
features/mypage/src/main/ets/view/ForgetPasswordComp.ets
+74 -29
View File
@@ -1,5 +1,21 @@
import promptAction from '@ohos.promptAction';
import { router } from '@kit.ArkUI';
import HashMap from '@ohos.util.HashMap';
import { hdHttp, HdResponse, BasicConstant, ChangeUtil, authStore } from '@itcast/basic'
import { BusinessError } from '@kit.BasicServicesKit';
import promptAction from '@ohos.promptAction';
interface callBackData {
code: number,
message:string,
msg:string,
data: string
}
interface updateExtraData {
mobile: string,
password: string,
sms: string
}
@Preview
@Component
@@ -12,7 +28,44 @@ export struct ForgetPasswordComp {
@State passWordSrc1: Resource = $r('app.media.icon_forgetpassword_show');
@State passWordSrc2: Resource = $r('app.media.icon_forgetpassword');
// 验证码倒计时
submitData() {
if (!this.phoneNumber) {
promptAction.showToast({message:'请输入手机号'})
return
}
if (!ChangeUtil.isMobileNum(this.phoneNumber)) {
promptAction.showToast({message:'手机号格式错误，请重新输入'})
return
}
if (!this.smsCode) {
promptAction.showToast({message:'请输入验证码'})
return
}
if (!this.password) {
promptAction.showToast({message:'请输入密码'})
return
}
if (!ChangeUtil.isPassword(this.password)) {
promptAction.showToast({message:'密码格式错误，请重新输入'})
return
}
const hashMap: HashMap<string, string> = new HashMap();
hashMap.set('mobile',this.phoneNumber)
hashMap.set('password',this.password)
hashMap.set('sms',this.smsCode)
hdHttp.httpReq<string>(BasicConstant.updatePwd, hashMap).then(async (res: HdResponse<string>) => {
let json:callBackData = JSON.parse(res+'') as callBackData;
console.log('忘记密码 修改数据成功:',json);
promptAction.showToast({message:json.message});
if (json.code === 200) {
router.back();
}
}).catch((err: BusinessError) => {
console.error(`忘记密码 修改数据 fail: ${err}`);
})
}
private startCountdown() {
this.countdown = 60
const timer = setInterval(() => {
@@ -32,7 +85,6 @@ export struct ForgetPasswordComp {
.height(18)
.objectFit(ImageFit.Contain)
.margin({left:10})
// 手机号输入框
TextInput({ placeholder: '请输入手机号码' })
.fontSize(16)
.backgroundColor(Color.White)
@@ -47,7 +99,6 @@ export struct ForgetPasswordComp {
.borderWidth(1)
.borderColor('#CCCCCC')
// 验证码输入区域
Row() {
Row() {
Image($r('app.media.icon_verification_code'))
@@ -58,6 +109,9 @@ export struct ForgetPasswordComp {
TextInput({ placeholder: '请输入验证码' })
.fontSize(16)
.backgroundColor(Color.White)
.onChange((value:string)=>{
this.smsCode = value;
})
}
.margin({ top: 10 })
.width('60%')
@@ -80,10 +134,10 @@ export struct ForgetPasswordComp {
.margin({ top: 10 })
.enabled(this.countdown === 0)
.onClick(() => {
if (this.phoneNumber.length >= 11) {
if (ChangeUtil.isMobileNum(this.phoneNumber)) {
this.startCountdown()
} else {
promptAction.showToast({message:'请输入手机号'})
promptAction.showToast({message:'手机号格式错误，请重新输入'})
}
})
}
@@ -91,18 +145,26 @@ export struct ForgetPasswordComp {
.justifyContent(FlexAlign.SpaceBetween)
Row() {
Image($r('app.media.icon_forgetpassword_show'))
Image($r('app.media.login_password'))
.width(18)
.height(18)
.objectFit(ImageFit.Contain)
.margin({left:10})
// 密码输入框
TextInput({ placeholder: '6~16位数字字母组合' })
.fontSize(16)
.width('95%')
.width('83%')
.backgroundColor(Color.White)
.type(this.showPassword ? InputType.Normal : InputType.Password)
.passwordIcon({ onIconSrc: this.passWordSrc1, offIconSrc: this.passWordSrc2 })
.showPasswordIcon(false)
.type(this.showPassword?InputType.Normal:InputType.Password)
.onChange((value:string)=>{
this.password = value;
})
Image(this.showPassword?this.passWordSrc1:this.passWordSrc2)
.width(20)
.height(15)
.onClick(()=>{
this.showPassword = !this.showPassword;
})
}
.margin({ top: 10 })
.width('95%')
@@ -111,7 +173,6 @@ export struct ForgetPasswordComp {
.borderWidth(1)
.borderColor('#CCCCCC')
// 登录按钮
Button({type:ButtonType.Normal}){
Text('登 录')
}
@@ -123,23 +184,7 @@ export struct ForgetPasswordComp {
.fontColor('#FFFFFF')
.fontSize(18)
.onClick(() => {
// 处理登录逻辑
if (!/^1[3-9]\d{9}$/.test(this.phoneNumber)) {
promptAction.showToast({message:'请输入有效手机号'})
return
}
if (!this.smsCode) {
promptAction.showToast({message:'请输入验证码'})
return
}
if (!/^(?=.*[a-zA-Z])(?=.*\d)[\w]{6,16}$/.test(this.password)) {
promptAction.showToast({message:'密码格式不正确'})
return
}
// 执行登录操作...
this.submitData();
})
}
.width('100%')
features/mypage/src/main/ets/view/FourSection.ets
+20 -5
View File
@@ -16,10 +16,15 @@ export struct FourSection {
@State refreshFlag: boolean = false;
@State fourSectionList:Array<MyPageSectionClass> = [
new MyPageSectionClass('oneItem',$r('app.media.app_icon'),'微信绑定',''),
new MyPageSectionClass('twoItem',$r('app.media.my_page_choosePhone'),'更换手机号','pages/MinePage/ChangePhonePage'),
new MyPageSectionClass('threeItem',this.pushIconPath,this.pushStatus,''),
new MyPageSectionClass('fourItem',$r('app.media.my_page_version'),'发现新版本','')
// new MyPageSectionClass('oneItem',$r('app.media.app_icon'),'微信绑定',''),
// new MyPageSectionClass('twoItem',$r('app.media.my_page_choosePhone'),'更换手机号','pages/MinePage/ChangePhonePage'),
// new MyPageSectionClass('threeItem',this.pushIconPath,this.pushStatus,''),
// new MyPageSectionClass('fourItem',$r('app.media.my_page_version'),'发现新版本','')
new MyPageSectionClass('oneItem',$r('app.media.my_page_choosePhone'),'更换手机号','pages/MinePage/ChangePhonePage'),
new MyPageSectionClass('twoItem',this.pushIconPath,this.pushStatus,''),
new MyPageSectionClass('threeItem',$r('app.media.app_icon'),'关于','pages/WebView/WebPage'),
new MyPageSectionClass('fourItem',$r('app.media.app_icon'),'直播群','pages/WebView/WebPage')
];
aboutToAppear() {
@@ -54,7 +59,7 @@ export struct FourSection {
this.pushIconPath = this.pushStatus == '通知已开'?$r('app.media.my_page_message_on'):$r('app.media.my_home_push_down');
// 更新数组中的标题
this.fourSectionList = this.fourSectionList.map((item, index) => {
if (index === 2) {
if (index === 1) {
return new MyPageSectionClass(item.id, this.pushIconPath, this.pushStatus, item.path);
}
return item;
@@ -102,6 +107,16 @@ export struct FourSection {
.onClick(()=>{
if (item.title.includes('通知')) {
this.handleNotificationClick();
} else if (item.title.includes('关于')) {
router.pushUrl({
url:item.path,
params: { url: 'http://doc.igandan.com/app/html/about/2017/about2.html' ,title:'关于肝胆相照'}
})
} else if (item.title.includes('直播群')) {
router.pushUrl({
url: 'pages/WebView/WebPage',
params: { url: 'http://wx.igandan.com/qun/gdxzqun' ,title:'肝胆相照直播群'}
})
} else {
router.pushUrl({
url:item.path
features/mypage/src/main/ets/view/HeaderView.ets
+21 -17
View File
@@ -15,6 +15,13 @@ interface callBackData {
specialy:[]
}
interface callMyBackData {
expert:ExpertData,
code:number,
message:string,
specialy:[]
}
interface heroFirst {
id: string;
nick_name: string;
@@ -28,12 +35,12 @@ export struct HeaderView {
@State name:string = authStore.getUser().realName;
@State myPageData:object = new Object;
@State heroArray:Array<object> = [];
@State clickHeroId:string = '';
private scrollerForList: Scroller = new Scroller()
private heroList: string[] = ['2020年英雄榜','2021年英雄榜','2022年英雄榜','2023年英雄榜','2024年英雄榜']
dialogController: CustomDialogController = new CustomDialogController({
builder: HeroPopWindow(),
builder: HeroPopWindow({heroId:this.clickHeroId}),
alignment: DialogAlignment.Center,
customStyle: true
})
@@ -64,21 +71,21 @@ export struct HeaderView {
uploadBackImgAction() {
const hashMap: HashMap<string, string> = new HashMap();
const userDataUrl:string = BasicConstant.urlExpertAPI+'my';
hdHttp.httpReq<string>(userDataUrl,hashMap).then(async (res: HdResponse<string>) => {
hdHttp.httpReq<string>(BasicConstant.myData,hashMap).then(async (res: HdResponse<string>) => {
console.info(`我的背景图: ${res}`);
let json:RequestDefaultModel = JSON.parse(res+'') as RequestDefaultModel;
if(json.code == '200') {
this.heroArray = json.data["honor_list"];
this.myPageData = json.data;
// 获取ranking值（带安全类型转换）
const ranking: string = this.myPageData["ranking"]?.toString() ?? "";
if (Number(ranking) > 0) {
// 创建排名对象[4](@ref)
// 创建排名对象
const rankDic: heroFirst = {
"id": "ranking",
"nick_name": `随访达人 I 排名${ranking}`
};
// 插入数组首位[9](@ref)
// 插入数组首位
this.heroArray.unshift(rankDic);
}
} else {
@@ -103,7 +110,7 @@ export struct HeaderView {
.width(60)
.height(60)
.borderRadius(5)
.objectFit(ImageFit.Fill)
.objectFit(ImageFit.Cover)
.onClick(()=>this.handleAvatarClick())
Column({space:5}) {
Text(this.name)
@@ -111,14 +118,14 @@ export struct HeaderView {
.fontColor('#FFFFFF')
.onClick(()=>this.handleAvatarClick())
List({space:5,initialIndex:this.heroIndex,scroller:this.scrollerForList}) {
ForEach(this.heroArray, (item: object,index:number) => {
ForEach(this.heroArray, (item: heroFirst) => {
ListItem() {
Row() {
Image($r('app.media.my_home_hero_ranking'))
Image(item.id === 'ranking'?$r('app.media.my_home_hero_ranking'):$r('app.media.my_page_header_hertIcon'))
.width(13)
.height(13)
.margin({left:7})
Text(item["nick_name"])
Text(item.nick_name)
.fontColor(Color.White)
.fontSize(11)
.margin({left:4,right:10})
@@ -128,14 +135,11 @@ export struct HeaderView {
.borderRadius(9)
.borderWidth(1)
.borderColor(Color.White)
.onClick(() => {
console.log('Show HeroPopWindow');
})
.onClick(()=>{
this.dialogController.open();
// if (!this.heroArray[index] as heroFirst == 'ranking') {
// this.dialogController.open(heroId:this.heroArray[index]['id'] as string);
// }
if (item.id !== 'ranking') {
this.clickHeroId = item.id;
this.dialogController.open();
}
})
}
})
features/mypage/src/main/resources/base/media/login_password.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB