yuebuzu-creater пре 4 месеци
родитељ
комит
e4264cc3db

+ 8 - 5
wisdom-app/src/app/page/page-inquiry/page-inquiry.component.ts

@@ -151,11 +151,14 @@ export class PageInquiryComponent  implements OnInit {
       let userPrompt = ``
       if(!currentUser?.id){
         console.log("用户未登录,请登录后重试");
-        let user = await openUserLoginModal(this.modalCtrl);
-        if(!user?.id){
-          return
-        }
-        currentUser = user;
+        this.router.navigate(['/tabs/tab4']);
+        return
+        // let user = await openUserLoginModal(this.modalCtrl);
+        // if(!user?.id){
+        //   this.router.navigate(['/tabs/tab4']);
+        //   return
+        // }
+        // currentUser = user;
       }
       
       if(currentUser?.get("realname")){

+ 15 - 0
wisdom-app/src/app/tab1/tab1.page.ts

@@ -189,6 +189,11 @@ export class Tab1Page {
    */
   goToPage1(){
     console.log(['route'])
+    let user = new CloudUser;
+    if (!user.id){
+      this.router.navigate(['/tabs/tab4'])
+      return
+    }
     this.router.navigate(['/tabs/inquiry/ai'])
   }
 
@@ -196,6 +201,11 @@ export class Tab1Page {
    * Go to the human page
    */
   goToPage2(){
+    let user = new CloudUser;
+    if (!user.id){
+      this.router.navigate(['/tabs/tab4'])
+      return
+    }
     this.router.navigate(['/tabs/inquiry/human'])
   }
 
@@ -230,6 +240,11 @@ export class Tab1Page {
 
   // 导航到指定路由
   navigateTo(route: string) {
+    let user = new CloudUser;
+    if (!user.id){
+      this.router.navigate(['/tabs/tab4'])
+      return
+    }
     this.router.navigate([route]);
     console.log("route: ",route)
   }

+ 6 - 1
wisdom-app/src/app/tab2/tab2.page.ts

@@ -5,7 +5,7 @@ import { addIcons } from 'ionicons';
 import { airplane, bluetooth, call, wifi } from 'ionicons/icons';
 import { ArticleCardComponent } from '../component/article-card/article-card.component';
 import { CommonModule } from '@angular/common';
-import { CloudObject, CloudQuery } from 'src/lib/ncloud';
+import { CloudObject, CloudQuery, CloudUser } from 'src/lib/ncloud';
 import { NavigationLanComponent } from '../component/navigation-lan/navigation-lan.component';
 import { Router } from '@angular/router';
 import {
@@ -93,6 +93,11 @@ startAutoSlide() {
   currentProduct: any;      // 当前选择的科普信息
 
   openDetailModal(product?: any) {
+    let user = new CloudUser;
+    if (!user.id){
+      this.router.navigate(['/tabs/tab4'])
+      return
+    }
     this.isModalOpen = true;
     this.currentProduct = product;
   }