Merge remote-tracking branch 'outer/代理服务方案' into 代理服务方案

This commit is contained in:
lixiao 2025-04-07 08:39:50 +08:00
commit 51053a3138
2 changed files with 74 additions and 47 deletions

View File

@ -1281,7 +1281,7 @@ struct UserInfo {
}
//835参数值和预约考试次数对比
if(Number(this.systemParam.Param835)<=Number(this.currentUser.yycs)){
this.type='3'
this.type='4'
this.title='当前考生预约考试次数为'+this.currentUser.yycs
this.errorDialog.open()
return

View File

@ -46,17 +46,17 @@ export default struct errorMsgDialog {
Row() {
Flex({ justifyContent: FlexAlign.Center, alignItems: ItemAlign.Center }) {
Text(' 取 消 ')
.fontSize(24 * globalThis.ratio* this.dialogRatio*0.6 )
.fontSize(24 * globalThis.ratio * this.dialogRatio * 0.6)
.fontColor('#fff')
.width(60 * globalThis.ratio* this.dialogRatio)
.width(60 * globalThis.ratio * this.dialogRatio)
}
.commStyle()
.onClick(() => {
if (this.controller != undefined) {
const errorCode=AppStorage.Get('errorMsg');
const errorCode = AppStorage.Get('errorMsg');
// const errorCodeFlage=AppStorage.Get('errorCodeFlage');
// console.log('errorCode',errorCode,errorCodeFlage)
if(errorCode==0){
if (errorCode == 0) {
router.replaceUrl({
url: 'pages/Index',
}, router.RouterMode.Single);
@ -66,64 +66,91 @@ export default struct errorMsgDialog {
this.cancel()
this.controller.close()
}
}).margin({ right: 10 * globalThis.ratio * this.dialogRatio})
}).margin({ right: 10 * globalThis.ratio * this.dialogRatio })
Flex({ justifyContent: FlexAlign.Center, alignItems: ItemAlign.Center }) {
Text(' 确 定 ')
.fontSize(24 * globalThis.ratio* this.dialogRatio*0.6)
.fontSize(24 * globalThis.ratio * this.dialogRatio * 0.6)
.fontColor('#fff')
.width(60 * globalThis.ratio* this.dialogRatio)
.width(60 * globalThis.ratio * this.dialogRatio)
}
.commStyle()
.onClick(() => {
const errorCode=AppStorage.Get('errorCode');
const errorCodeFlage=AppStorage.Get('errorCodeFlage');
console.log('errorCode',errorCode,errorCodeFlage)
if(errorCode==0&&errorCodeFlage){
router.replaceUrl({
url: 'pages/Index',
}, router.RouterMode.Single);
router.clear();
const errorCode = AppStorage.Get('errorCode');
const errorCodeFlage = AppStorage.Get('errorCodeFlage');
console.log('errorCode', errorCode, errorCodeFlage)
if (errorCode == 0 && errorCodeFlage) {
router.replaceUrl({
url: 'pages/Index',
}, router.RouterMode.Single);
router.clear();
}
console.log('errorCode',errorCode,errorCodeFlage)
}
console.log('errorCode', errorCode, errorCodeFlage)
if (this.controller != undefined){
if (this.controller != undefined) {
this.confirm()
this.controller.close()
}
}
}
)
)
}
.padding({ bottom: 20 })
}
if (this.type == '4') {
Flex({ justifyContent: FlexAlign.Center, alignItems: ItemAlign.Center }) {
Text(' 确 定 ')
.fontSize(24 * globalThis.ratio * this.dialogRatio * 0.6)
.fontColor('#fff')
.width(60 * globalThis.ratio * this.dialogRatio)
}
.commStyle()
.onClick(() => {
const errorCode = AppStorage.Get('errorCode');
const errorCodeFlage = AppStorage.Get('errorCodeFlage');
console.log('errorCode', errorCode, errorCodeFlage)
if (errorCode == 0 && errorCodeFlage) {
router.replaceUrl({
url: 'pages/Index',
}, router.RouterMode.Single);
router.clear();
}
console.log('errorCode', errorCode, errorCodeFlage)
if (this.controller != undefined) {
this.confirm()
this.controller.close()
}
}
)
}
}
.backgroundColor('#E6E3DF')
.borderRadius(19 * globalThis.ratio)
.constraintSize({ minWidth: 520 })
}
.padding({bottom:20})
}
}
.
backgroundColor('#E6E3DF')
.borderRadius(19 * globalThis.ratio)
.constraintSize({ minWidth: 520 })
}
aboutToAppear() {
AppStorage.SetOrCreate('errorMsg', 0);
setTimeout(() => {
console.log('this.type', this.type, this.angle)
if (this.type == '2') {
this.angle = 360
}
}, 1000)
if (this.type == '1') {
aboutToAppear() {
AppStorage.SetOrCreate('errorMsg', 0);
setTimeout(() => {
this.controller.close()
}, 2000)
console.log('this.type', this.type, this.angle)
if (this.type == '2') {
this.angle = 360
}
}, 1000)
if (this.type == '1') {
setTimeout(() => {
this.controller.close()
}, 2000)
}
}
}
aboutToDisappear() {
this.title = ''
this.angle = 0
AppStorage.SetOrCreate('errorCodeFlage', false);
}
aboutToDisappear() {
this.title = ''
this.angle = 0
AppStorage.SetOrCreate('errorCodeFlage', false);
}
}