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

entry/src/main/ets/pages/UserInfo.ets

@@ -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

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

@@ -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 errorCode = AppStorage.Get('errorCode');
-              const errorCodeFlage=AppStorage.Get('errorCodeFlage');
+            const errorCodeFlage = 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({
-                  url: 'pages/Index',
+                url: 'pages/Index',
-                }, router.RouterMode.Single);
+              }, router.RouterMode.Single);
-                router.clear();
+              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})
+  aboutToAppear() {
-}
+    AppStorage.SetOrCreate('errorMsg', 0);
-}
-.
-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') {
     setTimeout(() => {
-      this.controller.close()
+      console.log('this.type', this.type, this.angle)
-    }, 2000)
+      if (this.type == '2') {
+        this.angle = 360
+      }
+    }, 1000)
+    if (this.type == '1') {
+      setTimeout(() => {
+        this.controller.close()
+      }, 2000)
+    }
   }
-}
 
-aboutToDisappear() {
+  aboutToDisappear() {
-  this.title = ''
+    this.title = ''
-  this.angle = 0
+    this.angle = 0
-  AppStorage.SetOrCreate('errorCodeFlage', false);
+    AppStorage.SetOrCreate('errorCodeFlage', false);
-}
+  }
 }