Compare commits

..

No commits in common. "46d3eb2f71bda704395872a8f642d80ed63fa968" and "ef2e07d1ac3f0dcc5b18b70184818afcb7ba9e98" have entirely different histories.

View File

@ -2,20 +2,21 @@ import router from '@ohos.router';
@CustomDialog @CustomDialog
export default struct errorMsgDialog { export default struct errorMsgDialog {
dialogRatio: number = 0.8
title?: string
type: string //1 tip 2loading 3Dialog
@State angle: number = 0
@State ratio: number = 1700 / 960
private controller?: CustomDialogController private controller?: CustomDialogController
cancel: () => void = () => { cancel: () => void = () => {
} }
confirm: () => void = () => { confirm: () => void = () => {
} }
dialogRatio: number = 0.8
title?: string
type: string //1 tip 2loading 3Dialog
@State angle: number = 0
@Styles @Styles
commStyle(){ commStyle(){
.width(220 * globalThis.ratio * this.dialogRatio * 0.6) .width(220 * this.ratio * this.dialogRatio * 0.6)
.height(69 * globalThis.ratio * this.dialogRatio * 0.6) .height(69 * this.ratio * this.dialogRatio * 0.6)
.backgroundImage($r('app.media.button_nor')) .backgroundImage($r('app.media.button_nor'))
.backgroundImageSize({ width: '100%', height: '100%' }) .backgroundImageSize({ width: '100%', height: '100%' })
// .margin({ bottom: 12 * this.ratio }) // .margin({ bottom: 12 * this.ratio })
@ -46,14 +47,14 @@ export default struct errorMsgDialog {
Row() { Row() {
Flex({ justifyContent: FlexAlign.Center, alignItems: ItemAlign.Center }) { Flex({ justifyContent: FlexAlign.Center, alignItems: ItemAlign.Center }) {
Text(' 取 消 ') Text(' 取 消 ')
.fontSize(24 * globalThis.ratio * this.dialogRatio * 0.6) .fontSize(24 * this.ratio * this.dialogRatio * 0.6)
.fontColor('#fff') .fontColor('#fff')
.width(60 * globalThis.ratio * this.dialogRatio) .width(60 * this.ratio * this.dialogRatio)
} }
.commStyle() .commStyle()
.onClick(() => { .onClick(() => {
if (this.controller != undefined) { if (this.controller != undefined) {
const errorCode = AppStorage.Get('errorMsg'); const errorCode: number = AppStorage.get('errorMsg');
// const errorCodeFlage=AppStorage.Get('errorCodeFlage'); // const errorCodeFlage=AppStorage.Get('errorCodeFlage');
// console.log('errorCode',errorCode,errorCodeFlage) // console.log('errorCode',errorCode,errorCodeFlage)
if (errorCode == 0) { if (errorCode == 0) {
@ -66,18 +67,18 @@ export default struct errorMsgDialog {
this.cancel() this.cancel()
this.controller.close() this.controller.close()
} }
}).margin({ right: 10 * globalThis.ratio * this.dialogRatio }) }).margin({ right: 10 * this.ratio * this.dialogRatio })
Flex({ justifyContent: FlexAlign.Center, alignItems: ItemAlign.Center }) { Flex({ justifyContent: FlexAlign.Center, alignItems: ItemAlign.Center }) {
Text(' 确 定 ') Text(' 确 定 ')
.fontSize(24 * globalThis.ratio * this.dialogRatio * 0.6) .fontSize(24 * this.ratio * this.dialogRatio * 0.6)
.fontColor('#fff') .fontColor('#fff')
.width(60 * globalThis.ratio * this.dialogRatio) .width(60 * this.ratio * this.dialogRatio)
} }
.commStyle() .commStyle()
.onClick(() => { .onClick(() => {
const errorCode = AppStorage.Get('errorCode'); const errorCode: number = AppStorage.get('errorCode');
const errorCodeFlage = AppStorage.Get('errorCodeFlage'); const errorCodeFlage: string = AppStorage.get('errorCodeFlage');
console.log('errorCode', errorCode, errorCodeFlage) console.log('errorCode', errorCode, errorCodeFlage)
if (errorCode == 0 && errorCodeFlage) { if (errorCode == 0 && errorCodeFlage) {
router.replaceUrl({ router.replaceUrl({
@ -99,42 +100,15 @@ export default struct errorMsgDialog {
.padding({ bottom: 20 }) .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') .backgroundColor('#E6E3DF')
.borderRadius(19 * globalThis.ratio) .borderRadius(19 * this.ratio)
.constraintSize({ minWidth: 520 }) .constraintSize({ minWidth: 520 })
} }
aboutToAppear() { aboutToAppear() {
AppStorage.SetOrCreate('errorMsg', 0); AppStorage.SetOrCreate('errorMsg', 0);
setTimeout(() => { setTimeout(() => {
console.log('this.type', this.type, this.angle) console.log('this.type', this.type, this.angle)
if (this.type == '2') { if (this.type == '2') {