fix:修复bug

TFPower-app/src/app/tab2/tab2.page.html

@@ -165,7 +165,8 @@
                 <ion-item-options side="end">
                   <ion-item-option class="edit-btn" color="primary" shape="round" (click)="editPlan(day)">编辑
                   </ion-item-option>
-                  <ion-item-option class="delete-btn" color="danger" (click)="deletePlan(day)">删除</ion-item-option>
+                  <ion-item-option class="delete-btn" color="danger" shape="round" (click)="deletePlan(day)">删除
+                  </ion-item-option>
                 </ion-item-options>
 
               </ion-item-sliding>

TFPower-app/src/app/tab2/tab2.page.scss

@@ -50,11 +50,13 @@ ion-content {
   color: rgb(7, 6, 6);
   text-align: center;
    display: flex;
+   
     justify-content: center;
     align-items: center;
 }
 .plan-table .table {
   --ion-grid-column-padding: 0px;  /* 去除额外的内边距，避免错位 */
+  font-size: 20px;
 }
 
 .ion-item {
@@ -96,7 +98,22 @@ ion-content {
 
 /* 表格的标题 */
 
+.edit-btn {
+  font-size: 14px;
+  padding: 5px 10px;
+  background-color: #009b7d;
+  color: white;
+  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1); /* 添加阴影效果 */
+}
 
+/* 删除按钮添加阴影和背景渐变 */
+.delete-btn {
+  font-size: 14px;
+  padding: 5px 10px;
+  background: linear-gradient(to right, #ff6347, #f44336); /* 渐变背景色 */
+  color: white;
+  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+}
 .section-title {
   font-size: 20px;
   font-weight: bold;

TFPower-app/src/app/tab2/tab2.page.ts

@@ -333,6 +333,9 @@ export class Tab2Page implements OnInit {
     if (user?.id) {
       this.currentUser = user
     }
+    this.loadPlanList()
+    this.loadCoachList()
+    this.loadPlanUser()
   }
   async signup() {
     // 弹出注册窗口
@@ -340,11 +343,14 @@ export class Tab2Page implements OnInit {
     if (user?.id) {
       this.currentUser = user
     }
-  }
-  logout() {
-    this.currentUser?.logout();
 
   }
+  async logout() {
+    await this.currentUser?.logout();
+    this.loadPlanList()
+    this.loadCoachList()
+    this.loadPlanUser()
+  }
 
   editUser() {
     openUserEditModal(this.modalCtrl)
@@ -372,26 +378,27 @@ export class Tab2Page implements OnInit {
       });
     });
   }
-  regeneratePlan() {
-    console.log('重新生成计划:');
-
-    // 创建一个弹出框
-    this.modalCtrl.create({
-      component: TestPageComponent,
-      componentProps: {}
-    }).then(modal => {
-      modal.present();
-      modal.onDidDismiss().then((result) => {
-        if (result.data) {
-          const updatedPlan = result.data;
-          const index = this.planList.findIndex(item => item.id === updatedPlan.id);
-          if (index !== -1) {
-            this.planList[index] = updatedPlan;
+  async regeneratePlan() {
+    if (await this.checkout()) {
+      console.log('重新生成计划:');
+      // 创建一个弹出框
+      this.modalCtrl.create({
+        component: TestPageComponent,
+        componentProps: {}
+      }).then(modal => {
+        modal.present();
+        modal.onDidDismiss().then((result) => {
+          if (result.data) {
+            const updatedPlan = result.data;
+            const index = this.planList.findIndex(item => item.id === updatedPlan.id);
+            if (index !== -1) {
+              this.planList[index] = updatedPlan;
+            }
           }
-        }
-        this.loadPlanList()
+          this.loadPlanList()
+        });
       });
-    });
+    }
   }
   async deletePlan(day: any) {
     const alert = await this.alertController.create({
@@ -424,6 +431,7 @@ export class Tab2Page implements OnInit {
 
     await alert.present();
   }
+
   //任务链
   actionTaskList: AgentTaskStep[] = []
   healthTaskList: AgentTaskStep[] = []
@@ -437,29 +445,47 @@ export class Tab2Page implements OnInit {
   }
   shareData: any = {}
   // 任务：完成故事意境描述及图像绘制
-  doPoemTask() {
-    this.actionTaskVisible = true;
-    let task1 = TaskPoemPictureDesc({ shareData: this.shareData, modalCtrl: this.modalCtrl });
-    let task2 = TaskPoemPictureCreate({ shareData: this.shareData, modalCtrl: this.modalCtrl });
-    let PoemTaskList = [task1, task2]
-    this.actionTaskList = PoemTaskList
-    startTask(PoemTaskList)
-  }
-  doInqueryTask() {
-    this.healthTaskVisible = true;
-    let task1 = TaskInqueryUserStory({ shareData: this.shareData, modalCtrl: this.modalCtrl });
-    let task2 = TaskInqueryDoctorQuestion({ shareData: this.shareData, modalCtrl: this.modalCtrl });
-    let task3 = TaskInqueryUserAnswer({ shareData: this.shareData, modalCtrl: this.modalCtrl });
-    // 定义任务集
-    let InquireServiceTaskList = [
-      task1, task2, task3
-    ]
-    // 传递给显示组件
-    this.healthTaskList = InquireServiceTaskList
-    // 开始执行任务
-    startTask(InquireServiceTaskList)
+  async doPoemTask() {
+    if (await this.checkout()) {
+      await this.checkout()
+      this.actionTaskVisible = true;
+      let task1 = TaskPoemPictureDesc({ shareData: this.shareData, modalCtrl: this.modalCtrl });
+      let task2 = TaskPoemPictureCreate({ shareData: this.shareData, modalCtrl: this.modalCtrl });
+      let PoemTaskList = [task1, task2]
+      this.actionTaskList = PoemTaskList
+      startTask(PoemTaskList)
+    }
+  }
+  async doInqueryTask() {
+
+    if (await this.checkout()) {
+      this.healthTaskVisible = true;
+      let task1 = TaskInqueryUserStory({ shareData: this.shareData, modalCtrl: this.modalCtrl });
+      let task2 = TaskInqueryDoctorQuestion({ shareData: this.shareData, modalCtrl: this.modalCtrl });
+      let task3 = TaskInqueryUserAnswer({ shareData: this.shareData, modalCtrl: this.modalCtrl });
+      // 定义任务集
+      let InquireServiceTaskList = [
+        task1, task2, task3
+      ]
+      // 传递给显示组件
+      this.healthTaskList = InquireServiceTaskList
+      // 开始执行任务
+      startTask(InquireServiceTaskList)
+    }
   }
   // 聊天页面
+  async checkout() {
+    let currentUser = new CloudUser();
+    if (!currentUser?.id) {
+      console.log("用户未登录，请登录后重试");
+      let user = await openUserLoginModal(this.modalCtrl);
+      if (!user?.id) {
+        return false;  // 用户未登录且登录失败，返回 false
+      }
+      currentUser = user;
+    }
+    return true; // 用户已登录，返回 true
+  }
   async openInquiry(coach: CloudObject) {
     let currentUser = new CloudUser();
     let userPrompt = ``
@@ -492,9 +518,7 @@ export class Tab2Page implements OnInit {
     let ACL: any = {
       "*": { read: false, write: false }
     }
-    if (currentUser?.id) {
-      ACL[currentUser?.id] = { read: true, write: true }
-    }
+
     consult.set({
       title: `交流记录${dateStr}-${coach?.get("name")}`,
       coach: coach.toPointer(),

TFPower-app/src/app/tab2/test-page/test-page.component.html

@@ -86,15 +86,14 @@
     </div>
 
     <!-- 生成计划按钮 -->
-    <ion-button expand="full" shape="round" (click)="generatePlan()" [disabled]="isGenerating"
-      class="generate-plan-btn">
+    <ion-button expand="full" shape="round" (click)="generatePlan()" [disabled]="isRevert" class="generate-plan-btn">
       <ion-icon slot="start" style="margin-right: 5px;" name="fitness"></ion-icon>
       生成健身计划
     </ion-button>
 
     <!-- 显示健身计划结果 -->
     <div *ngIf="generatedPlan" class="result-container">
-      <ion-progress-bar *ngIf="isRevert" type="indeterminate" color="secondary"></ion-progress-bar>
+      <ion-progress-bar *ngIf="isRevert" type="indeterminate" color="success"></ion-progress-bar>
       <h3>您的健身计划：</h3>
       <ion-card>
         <ion-card-header>

TFPower-app/src/app/tab2/test-page/test-page.component.scss

@@ -17,6 +17,7 @@ h3
   border-radius: 8px;
   box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
 }
+
 ion-grid {
   margin-bottom: 8px;
 }