Merge branch 'dev' of http://88.22.24.105:3000/harmony_car/subject-two into dev
This commit is contained in:
		
						commit
						c5dfef44e5
					
				| @ -445,6 +445,12 @@ struct Index { | ||||
|       //   console.log('sql error1', err) | ||||
|       // }) | ||||
|       if (ret) { | ||||
|         if (globalThis.singlePlay) { | ||||
|           router.pushUrl({ | ||||
|             url: 'pages/UserInfo', | ||||
|           }, router.RouterMode.Single) | ||||
|           return | ||||
|         } | ||||
|         getSyncData('MA_SYSSET').then(data => { | ||||
|           console.log('datadata', JSON.stringify(data)) | ||||
|           // @ts-ignore | ||||
|  | ||||
| @ -4,6 +4,7 @@ import { dateFormat } from '../common/utils/tools' | ||||
| import promptAction from '@ohos.promptAction' | ||||
| import FileUtil from '../common/utils/File' | ||||
| import common from '@ohos.app.ability.common' | ||||
| import deviceManager from '@ohos.distributedHardware.deviceManager' | ||||
| 
 | ||||
| @Entry | ||||
| @Component | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user