angular.json

@@ -127,13 +127,19 @@
   },
   "cli": {
 <<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> 12d2b49093d6f8ce7867d2e6ee12adc246927d73
     "schematicCollections": [
       "@ionic/angular-toolkit"
     ],
     "analytics": false
+<<<<<<< HEAD
+=======
 =======
     "schematicCollections": ["@ionic/angular-toolkit"]
 >>>>>>> fd52ca36698bd0c3fe861eed14ed929d420a4aa7
+>>>>>>> 12d2b49093d6f8ce7867d2e6ee12adc246927d73
   },
   "schematics": {
     "@ionic/angular-toolkit:component": {

package.json

@@ -30,7 +30,11 @@
 <<<<<<< HEAD
     "fmode-ng": "^0.0.62",
 =======
+<<<<<<< HEAD
+    "fmode-ng": "^0.0.62",
+=======
 >>>>>>> fd52ca36698bd0c3fe861eed14ed929d420a4aa7
+>>>>>>> 12d2b49093d6f8ce7867d2e6ee12adc246927d73
     "ionicons": "^7.2.1",
     "rxjs": "~7.8.0",
     "tslib": "^2.3.0",

src/app/app.module.ts

@@ -2,6 +2,9 @@ import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { RouteReuseStrategy } from '@angular/router';
 <<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> 12d2b49093d6f8ce7867d2e6ee12adc246927d73
 
 import { IonicModule, IonicRouteStrategy } from '@ionic/angular';
 
@@ -35,6 +38,9 @@ Parse.User.become('r:d086cc6a338d83f7b79d4d9d602a91ac')
   ],
   bootstrap: [AppComponent],
 })
+<<<<<<< HEAD
+export class AppModule {}
+=======
 export class AppModule {}
 =======
 import { IonicModule, IonicRouteStrategy } from '@ionic/angular';
@@ -54,3 +60,4 @@ import { AppComponent } from './app.component';
 })
 export class AppModule {} 
 >>>>>>> fd52ca36698bd0c3fe861eed14ed929d420a4aa7
+>>>>>>> 12d2b49093d6f8ce7867d2e6ee12adc246927d73

src/app/tab1/qna/qna.page.html

@@ -10,6 +10,9 @@
 </ion-header>
 
 <<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> 12d2b49093d6f8ce7867d2e6ee12adc246927d73
 <ion-content>
   <!-- 文本域：生成提示词 -->
   <h1>输入问题</h1>
@@ -23,6 +26,8 @@
   
   <!-- 消息传输完成后，实时预览Markdown格式 -->
   <fm-markdown-preview *ngIf="isComplete" class="content-style" [content]="responseMsg"></fm-markdown-preview>
+<<<<<<< HEAD
+=======
 =======
 <ion-content [fullscreen]="true">
   <ion-header collapse="condense">
@@ -31,4 +36,5 @@
     </ion-toolbar>
   </ion-header>
 >>>>>>> fd52ca36698bd0c3fe861eed14ed929d420a4aa7
+>>>>>>> 12d2b49093d6f8ce7867d2e6ee12adc246927d73
 </ion-content>

src/app/tab1/qna/qna.page.ts

@@ -1,27 +1,39 @@
 <<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> 12d2b49093d6f8ce7867d2e6ee12adc246927d73
 import { Component, OnInit } from '@angular/core';
 import { 
   IonTextarea,
   IonInput,
+<<<<<<< HEAD
+=======
 =======
 import { Component } from '@angular/core';
 import { 
 >>>>>>> fd52ca36698bd0c3fe861eed14ed929d420a4aa7
+>>>>>>> 12d2b49093d6f8ce7867d2e6ee12adc246927d73
   IonHeader, 
   IonToolbar, 
   IonTitle, 
   IonContent,
   IonBackButton,
 <<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> 12d2b49093d6f8ce7867d2e6ee12adc246927d73
   IonButtons,
   IonButton
 } from '@ionic/angular/standalone';
 import { CommonModule } from '@angular/common'; // 导入 CommonModule
 import { FmodeChatCompletion, MarkdownPreviewModule } from 'fmode-ng';
+<<<<<<< HEAD
+=======
 =======
   IonButtons
 } from '@ionic/angular/standalone';
 >>>>>>> fd52ca36698bd0c3fe861eed14ed929d420a4aa7
+>>>>>>> 12d2b49093d6f8ce7867d2e6ee12adc246927d73
 
 @Component({
   selector: 'app-qna',
@@ -30,18 +42,27 @@ import { FmodeChatCompletion, MarkdownPreviewModule } from 'fmode-ng';
   standalone: true,
   imports: [
 <<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> 12d2b49093d6f8ce7867d2e6ee12adc246927d73
     CommonModule, // 添加 CommonModule
     MarkdownPreviewModule, // 确保导入 MarkdownPreviewModule
     IonTextarea,
     IonInput,
+<<<<<<< HEAD
+=======
 =======
 >>>>>>> fd52ca36698bd0c3fe861eed14ed929d420a4aa7
+>>>>>>> 12d2b49093d6f8ce7867d2e6ee12adc246927d73
     IonHeader,
     IonToolbar,
     IonTitle,
     IonContent,
     IonBackButton,
 <<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> 12d2b49093d6f8ce7867d2e6ee12adc246927d73
     IonButtons,
     IonButton
   ]
@@ -88,6 +109,8 @@ export class QnaPage implements OnInit {
     this.isComplete = false; // 允许再次提问
     this.userPrompt = ""; // 清空输入框
   }
+<<<<<<< HEAD
+=======
 =======
     IonButtons
   ]
@@ -95,4 +118,5 @@ export class QnaPage implements OnInit {
 export class QnaPage {
   constructor() {}
 >>>>>>> fd52ca36698bd0c3fe861eed14ed929d420a4aa7
+>>>>>>> 12d2b49093d6f8ce7867d2e6ee12adc246927d73
 }

src/app/tab1/tab1.page.html

@@ -33,11 +33,15 @@
           </ion-card-header>
           <ion-card-content>
             <ion-icon name="create" slot="start"></ion-icon>
+<<<<<<< HEAD
+            点击进入测试页面
+=======
 <<<<<<< HEAD
             点击进入测试页面
 =======
             点击进入计划页面
 >>>>>>> fd52ca36698bd0c3fe861eed14ed929d420a4aa7
+>>>>>>> 12d2b49093d6f8ce7867d2e6ee12adc246927d73
           </ion-card-content>
         </ion-card>
       </ion-col>
@@ -50,11 +54,15 @@
           </ion-card-header>
           <ion-card-content>
             <ion-icon name="calendar" slot="start"></ion-icon>
+<<<<<<< HEAD
+            点击进入计划页面
+=======
 <<<<<<< HEAD
             点击进入计划页面
 =======
             点击进入学习页面
 >>>>>>> fd52ca36698bd0c3fe861eed14ed929d420a4aa7
+>>>>>>> 12d2b49093d6f8ce7867d2e6ee12adc246927d73
           </ion-card-content>
         </ion-card>
       </ion-col>

tsconfig.json

@@ -5,7 +5,11 @@
 <<<<<<< HEAD
     "allowSyntheticDefaultImports":true,
 =======
+<<<<<<< HEAD
+    "allowSyntheticDefaultImports":true,
+=======
 >>>>>>> fd52ca36698bd0c3fe861eed14ed929d420a4aa7
+>>>>>>> 12d2b49093d6f8ce7867d2e6ee12adc246927d73
     "baseUrl": "./",
     "outDir": "./dist/out-tsc",
     "forceConsistentCasingInFileNames": true,