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

entry/src/main/ets/pages/compontents/errorMsgDialog.ets

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