Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
surenjun 2024-09-19 18:47:18 +08:00
commit 264db77192

View File

@ -77,6 +77,7 @@ struct UserInfo {
@State FaceOpenStatue: string = '0'; //是否开启人脸识别
@State faceCatchImg: string = ''
@State Param803Str: string = ''
@State Param341Str: string = ''
private title = ''
private type = '2'
// 过程照片拍照
@ -407,6 +408,10 @@ struct UserInfo {
if (sys.v_no === '803') {
this.Param803Str = sys.v_value + '';
}
//判断是否考生是否按顺序考试
if (sys.v_no === '341'&&decodeURIComponent(sys.v_value) == '1') {
this.Param341Str= true
}
})
// faceParam?.[0]?.v_value ||
@ -935,7 +940,7 @@ struct UserInfo {
.backgroundImage(item.sfzmhm != this.currentUser.sfzmhm ? $r('app.media.userbox2') : $r('app.media.userboxbg'))
.backgroundImageSize({ width: '100%', height: '100%' })
.onClick(() => {
if (this.isExamStart && !globalThis.singlePlay) {
if (this.isExamStart && !globalThis.singlePlay&&this.Param341Str) {
return
}
this.currentUser=EmptyCandidateObject