yi 1 gadu atpakaļ
vecāks
revīzija
94b2830f14

+ 1 - 1
FilmDraw-app/src/app/homepage/myposts/myposts.page.scss

@@ -37,7 +37,7 @@ ion-accordion-group {
     margin: 0 1px; /* 卡片之间的水平间距 */
     width: 400px; /* 设置宽度,以确保在小屏幕上不会过于拥挤 */
     flex-direction: column; /* 使卡片内容垂直排列 */
-    max-height: 500px; /* 确保卡片高度相同 */
+    max-height: 600px; /* 确保卡片高度相同 */
     overflow-y: auto;
   }
   .mycomment{

+ 2 - 2
FilmDraw-app/src/app/tab4/tab4.page.html

@@ -94,8 +94,8 @@
     </ion-reorder-group>
     </div>
   
-  
+    @if(currentUser?.id){
   <ion-button (click)="toggleReorder()"> Toggle Reorder </ion-button>
-
+    }
 
 </ion-content>

+ 17 - 6
FilmDraw-app/src/app/tab4/tab4.page.ts

@@ -67,21 +67,32 @@ export class Tab4Page {
   goToHelp() {
     this.navCtrl.navigateForward('/help');
   }
-  goToHistory() {
+ async goToHistory() {
+    if(!this.currentUser?.id){
+      await  openUserLoginModal(this.modalCtrl);
+    }
+    else
     this.navCtrl.navigateForward('/history');
   }
-  goToLike() {
+ async goToLike() {
+    if(!this.currentUser?.id){
+      await  openUserLoginModal(this.modalCtrl);
+    }
+    else
     this.navCtrl.navigateForward('/like');
   }
-  goToMyposts() {
+
+ async goToMyposts() {
+  if(!this.currentUser?.id){
+    await  openUserLoginModal(this.modalCtrl);
+  }
+  else
     this.navCtrl.navigateForward('/myposts');
   }
   goToFeedback() {
     this.navCtrl.navigateForward('/feedback');
   }
-  goToPrivacy() {
-    this.navCtrl.navigateForward('/privacy');
-  }
+
 
 
 

+ 8 - 2
FilmDraw-app/src/lib/public/post-comment/post-comment.component.ts

@@ -3,6 +3,7 @@ import { Component, Input, OnInit } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { IonList,IonButton, IonButtons, IonContent, IonHeader, IonInput, IonItem, IonLabel, IonTitle, IonToolbar, ModalController, IonToast, ToastController, IonAvatar } from '@ionic/angular/standalone';
 import { CloudComment, CloudObject, CloudQuery, CloudUser } from 'src/lib/ncloud';
+import { openUserLoginModal } from 'src/lib/user/modal-user-login/modal-user-login.component';
 
 
 @Component({
@@ -22,7 +23,7 @@ export class PostCommentComponent  implements OnInit {
   avatarUrl: string = 'assets/img/random.png'; // 默认头像路径
   usersMap = new Map<string, CloudObject[]>();
 
-  constructor( private toastController: ToastController) {
+  constructor( private toastController: ToastController,private modalCtrl:ModalController) {
       this.currentUser = new CloudUser(); // 初始化当前用户
   }
 
@@ -73,6 +74,11 @@ export class PostCommentComponent  implements OnInit {
  
   // 发送评论
   async sendComment() {
+if(!this.currentUser?.id){
+    await  openUserLoginModal(this.modalCtrl);
+  }
+   if(this.currentUser?.id)
+    {   
       if (!this.commentData['content']) {
           console.error('评论内容不能为空');
           return; // 如果评论内容为空,直接返回
@@ -96,7 +102,7 @@ export class PostCommentComponent  implements OnInit {
       }catch (error) {
         console.error('评论失败:', error);
         
-      }
+      }}
 
   }