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

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

@@ -1241,8 +1241,8 @@ struct UserInfo {
                   LabelBlock({ label: item.label, ratio: this.ratio, value: '*****' })
                 }
               }else if(this.systemParam.Param850=='6'){
-                if(item.key=='ksxl'){
+                if(item.key=='ksxl'||item.key=='kssycs'){
-                  LabelBlock({ label: item.label, ratio: this.ratio, value: this.currentUser.ksxl })
+                  LabelBlock({ label: item.label, ratio: this.ratio, value: this.currentUser[item.key]  })
                 }else if(item.key=='sfzmhm'){
                   LabelBlock({ label: item.label, ratio: this.ratio, value: this.currentUser.sfzmhm.slice(-6) })
                 }else{
@@ -1318,7 +1318,7 @@ struct UserInfo {
                 if (this.systemParam.Param612Str == '1') {
                   return
                 }
-                if(this.systemParam.Param835&&this.currentUser.yycs&&Number(this.systemParam.Param835)<=Number(this.currentUser.yycs)){
+                if(Number(this.systemParam.Param835)&&Number(this.currentUser.yycs)&&Number(this.systemParam.Param835)<=Number(this.currentUser.yycs)){
                   this.type='4'
                   this.title='当前考生预约考试次数为'+this.currentUser.yycs
                   this.errorDialog.open()