| 
					
				 | 
			
			
				@@ -3,7 +3,8 @@ import { NavController } from '@ionic/angular'; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import { ModalController } from '@ionic/angular'; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import { EditPage } from './edit/edit.page';  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import { IonRouterOutlet } from '@ionic/angular'; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import { CloudObject, CloudQuery } from 'src/lib/ncloud'; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import { CloudObject, CloudQuery, CloudUser } from 'src/lib/ncloud'; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import { ActivatedRoute } from '@angular/router' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 @Component({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   selector: 'app-tab1', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   templateUrl: 'tab1.page.html', 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -20,8 +21,11 @@ export class Tab1Page implements OnInit{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private modalCtrl: ModalController, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private routerOutlet: IonRouterOutlet, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private navCtrl: NavController, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    private activatedRoute: ActivatedRoute 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   ) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    this.loadDiaries(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    this.activatedRoute.params.subscribe(()=>{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.loadDiaries(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -29,6 +33,8 @@ export class Tab1Page implements OnInit{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   diaryList: CloudObject[]=[]; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   async loadDiaries() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     let query=new CloudQuery("Diary") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    //query.equalTo('user',Parse.User.current()?.id) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    //const currentUser = await CloudUser.current(); // 获取当前用户 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     this.diaryList=await query.find(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -40,6 +46,7 @@ export class Tab1Page implements OnInit{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    async importDiary(){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    // 获取当前用户 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     const diaryDataset=[ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     "Did": 1, 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -125,14 +132,15 @@ export class Tab1Page implements OnInit{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         const existing=await query.first(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if(existing){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          console.log(`清单${diary.content}"已存在,保存跳过`); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          console.log(`日记${diary.content}"已存在,保存跳过`); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           continue; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         //创建新日记 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        const newThanks=new CloudObject("Diary"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        newThanks.set(diary); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        const newDiary=new CloudObject("Diary"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        newDiary.set(diary); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         //保存到数据库 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        await newThanks.save(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        await newDiary.save(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         console.log(`日记${diary.content}保存成功`); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }catch(error){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         console.error(`保存日记${diary.content}时出错`,error); 
			 |