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

@@ -99,9 +99,36 @@ 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()
-backgroundColor('#E6E3DF')
+        .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 })
   }