Compare commits
	
		
			No commits in common. "645fc33a23879ed166b39d40901474ec986deacf" and "ee1f1e1636cc4cf2ec4bcc953241dfde3d59806a" have entirely different histories.
		
	
	
		
			645fc33a23
			...
			ee1f1e1636
		
	
		
| @ -4,13 +4,13 @@ | |||||||
|       { |       { | ||||||
|         "name": "default", |         "name": "default", | ||||||
|         "material": { |         "material": { | ||||||
|           "certpath": "C:\\Users\\13440\\.ohos\\config\\openharmony\\auto_ohos_default_subject-two_com.oh.dts.cer", |           "certpath": "/Users/surenjun/.ohos/config/openharmony/auto_ohos_default_subject-two_com.oh.dts.cer", | ||||||
|           "storePassword": "0000001BA3F5B544CB3F01A0085BA69DF10373C170A983B9DEBCCEEFF83C818BD9798696788FC466A6AEC2", |           "storePassword": "0000001BE4BBADDF656A884E7A7BB5FD51F64FBB61DD24A944FEA969482DD693210ED5FF3D29F13642E3A3", | ||||||
|           "keyAlias": "debugKey", |           "keyAlias": "debugKey", | ||||||
|           "keyPassword": "0000001BE763C58C9CD4B93E5D566C87DD1F5A2D2BF96F6C2DE5BF82499477DD12E10F45E8E1A882AFCAB4", |           "keyPassword": "0000001BDEFFDC280B45617E7FC447CB21F2D133540301F543454643D3F5E9F6E5ED2A583A7FA92B260433", | ||||||
|           "profile": "C:\\Users\\13440\\.ohos\\config\\openharmony\\auto_ohos_default_subject-two_com.oh.dts.p7b", |           "profile": "/Users/surenjun/.ohos/config/openharmony/auto_ohos_default_subject-two_com.oh.dts.p7b", | ||||||
|           "signAlg": "SHA256withECDSA", |           "signAlg": "SHA256withECDSA", | ||||||
|           "storeFile": "C:\\Users\\13440\\.ohos\\config\\openharmony\\auto_ohos_default_subject-two_com.oh.dts.p12" |           "storeFile": "/Users/surenjun/.ohos/config/openharmony/auto_ohos_default_subject-two_com.oh.dts.p12" | ||||||
|         } |         } | ||||||
|       } |       } | ||||||
|     ], |     ], | ||||||
|  | |||||||
| @ -1,5 +1,5 @@ | |||||||
| { | { | ||||||
|   "lockfileVersion": 1, |   "lockfileVersion": 2, | ||||||
|   "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.", |   "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.", | ||||||
|   "specifiers": { |   "specifiers": { | ||||||
|     "@ohos/hypium@1.0.6": "@ohos/hypium@1.0.6" |     "@ohos/hypium@1.0.6": "@ohos/hypium@1.0.6" | ||||||
| @ -7,7 +7,9 @@ | |||||||
|   "packages": { |   "packages": { | ||||||
|     "@ohos/hypium@1.0.6": { |     "@ohos/hypium@1.0.6": { | ||||||
|       "resolved": "https://ohpm.openharmony.cn/ohpm/@ohos/hypium/-/hypium-1.0.6.tgz", |       "resolved": "https://ohpm.openharmony.cn/ohpm/@ohos/hypium/-/hypium-1.0.6.tgz", | ||||||
|       "integrity": "sha512-bb3DWeWhYrFqj9mPFV3yZQpkm36kbcK+YYaeY9g292QKSjOdmhEIQR2ULPvyMsgSR4usOBf5nnYrDmaCCXirgQ==" |       "integrity": "sha512-bb3DWeWhYrFqj9mPFV3yZQpkm36kbcK+YYaeY9g292QKSjOdmhEIQR2ULPvyMsgSR4usOBf5nnYrDmaCCXirgQ==", | ||||||
|  |       "registryType": "ohpm", | ||||||
|  |       "shasum": "3f5fed65372633233264b3447705b0831dfe7ea1" | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
| } | } | ||||||
| @ -1278,8 +1278,8 @@ struct UserInfo { | |||||||
|                 if (this.systemParam.Param612Str == '1') { |                 if (this.systemParam.Param612Str == '1') { | ||||||
|                   return |                   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)){ | ||||||
|                   this.type='4' |                   this.type='3' | ||||||
|                   this.title='当前考生预约考试次数为'+this.currentUser.yycs |                   this.title='当前考生预约考试次数为'+this.currentUser.yycs | ||||||
|                   this.errorDialog.open() |                   this.errorDialog.open() | ||||||
|                   return |                   return | ||||||
|  | |||||||
| @ -46,17 +46,17 @@ 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 * globalThis.ratio* this.dialogRatio*0.6 ) | ||||||
|               .fontColor('#fff') |               .fontColor('#fff') | ||||||
|               .width(60 * globalThis.ratio * this.dialogRatio) |               .width(60 * globalThis.ratio* this.dialogRatio) | ||||||
|           } |           } | ||||||
|           .commStyle() |           .commStyle() | ||||||
|           .onClick(() => { |           .onClick(() => { | ||||||
|             if (this.controller != undefined) { |             if (this.controller != undefined) { | ||||||
|               const errorCode = AppStorage.Get('errorMsg'); |               const errorCode=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){ | ||||||
|                 router.replaceUrl({ |                 router.replaceUrl({ | ||||||
|                   url: 'pages/Index', |                   url: 'pages/Index', | ||||||
|                 }, router.RouterMode.Single); |                 }, router.RouterMode.Single); | ||||||
| @ -66,92 +66,64 @@ export default struct errorMsgDialog { | |||||||
|               this.cancel() |               this.cancel() | ||||||
|               this.controller.close() |               this.controller.close() | ||||||
|             } |             } | ||||||
|           }).margin({ right: 10 * globalThis.ratio * this.dialogRatio }) |           }).margin({ right: 10 * globalThis.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 * globalThis.ratio* this.dialogRatio*0.6) | ||||||
|               .fontColor('#fff') |               .fontColor('#fff') | ||||||
|               .width(60 * globalThis.ratio * this.dialogRatio) |               .width(60 * globalThis.ratio* this.dialogRatio) | ||||||
|           } |           } | ||||||
|           .commStyle() |           .commStyle() | ||||||
|           .onClick(() => { |           .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.confirm() | ||||||
|               this.controller.close() |               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 }) |  | ||||||
|   } |   } | ||||||
| 
 | 
 | ||||||
|   aboutToAppear() { |   .padding({bottom:20}) | ||||||
|     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(() => { |     setTimeout(() => { | ||||||
|       console.log('this.type', this.type, this.angle) |       this.controller.close() | ||||||
|       if (this.type == '2') { |     }, 2000) | ||||||
|         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); | ||||||
|   } | } | ||||||
| } | } | ||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user