Merge branch 'master' of codehub-cn-south-1.devcloud.huaweicloud.com:web3000003/web-0210402

app-angular/src/app/app.component.html

@@ -6,6 +6,10 @@
             <ion-icon name="home-outline"></ion-icon>
             社区
         </ion-tab-button>
+        <ion-tab-button routerLink="/lesson/lesson">
+            <ion-icon name="alert-circle-outline"></ion-icon>
+                能不能吃
+            </ion-tab-button>
         <ion-tab-button routerLink="/lesson/page-chat">
             <ion-icon name="logo-snapchat"></ion-icon>
             AI养宠
@@ -14,10 +18,6 @@
             <ion-icon name="logo-octocat"></ion-icon>
             性格测试
           </ion-tab-button>
-      <ion-tab-button routerLink="/lesson/lesson">
-        <ion-icon name="alert-circle-outline"></ion-icon>
-            能不能吃
-        </ion-tab-button>
         <ion-tab-button routerLink="/lesson/me">
             <ion-icon name="person-circle"></ion-icon>
             我的

app-angular/src/modules/lesson/community/community.component.ts

@@ -69,11 +69,6 @@ export class CommunityComponent {
       queryParams: attention
     })
   }
-  goHateDetail(attention: Parse.Object) {
-    this.router.navigate(["/lesson/community/hateDetail"], {
-      queryParams: attention
-    })
-  }
-// 888
+
 
 }

app-angular/src/modules/lesson/community/community.module.ts

@@ -4,15 +4,11 @@ import { FormsModule } from '@angular/forms';
 import { IonicModule } from '@ionic/angular';
 
 import { CommunityRoutingModule } from './community-routing.module';
-import { ScienceDetailComponent } from '../science-detail/science-detail.component';
-
 
 @NgModule({
 
     declarations: [
        
-        // ScienceDetailComponent,
-
     ],
     imports: [
         CommonModule,

app-angular/src/modules/lesson/me/me.component.html

@@ -63,7 +63,6 @@
             </ion-item>
         </ion-list>
     </ion-card>
-
     <!-- 列表 -->
     <ion-card class="myList">
         <ion-list [inset]="true">
@@ -88,7 +87,6 @@
         <ion-button *ngIf="!currentUser?.id" expand="block" routerLink="/user/login">登录</ion-button>
         <ion-button *ngIf="currentUser?.id" fill="clear" expand="block" (click)="logout()">登出</ion-button>
     </ion-list>
-
     <!-- 详细内容 -->
     <!-- 导航 -->
     <ion-card>
@@ -110,9 +108,7 @@
             <ion-buttons slot="end"><ion-button>编辑</ion-button></ion-buttons>
         </ion-toolbar>
     </ion-card>
-
-    <!-- 美景推荐 -->
-
+    <!-- 推荐图 -->
     <ng-container *ngIf="cate=='推荐'">
         <ion-list [inset]="true" lines="inset">
             <ng-container *ngFor="let recommend of myRecommendList">
@@ -129,7 +125,6 @@
             </ng-container>
         </ion-list>
     </ng-container>
-
     <!-- 科普关注 -->
     <ng-container *ngIf="cate=='关注'">
         <ion-grid>
@@ -152,7 +147,6 @@
             </ion-row>
         </ion-grid>
     </ng-container>
-
     <!-- 科普笔记 -->
     <ng-container *ngIf="cate=='科普'">
         <ng-container *ngFor="let science of myScienceList">

app-angular/src/modules/lesson/me/me.component.scss

@@ -9,7 +9,6 @@ ion-item {
 
     font-size: 0.9rem;
 }
-
 .foodContent {
     display: -webkit-box;
     -webkit-box-orient: vertical;
@@ -17,7 +16,6 @@ ion-item {
     overflow: hidden;
     text-overflow: ellipsis;
 }
-
 .myList {
     padding: 0%;
 
@@ -25,12 +23,9 @@ ion-item {
         margin: 0%;
     }
 }
-
-
 .roleCard {
     margin: 0px;
 }
-
 .metadata-end-wrapper {
     position: absolute;
 
@@ -42,7 +37,6 @@ ion-item {
     display: flex;
     align-items: center;
 }
-
 .metadata-end-wrapper-science {
     position: absolute;
 

app-angular/src/modules/lesson/page-chat/page-chat.component.html

@@ -22,7 +22,7 @@
                     <!--AI固定内容-->
                     <div class="message-container">
                         <img class="avatar-left"
-                            src="https://imgsource.huashi6.com/images/ai/2023/12/2/15_98156.jpg?e=1701504174&token=qFZErZx7WS1v5B4rgQE2KLMHlYHVNaCuXeaA9OLD:hb4mNBg4O9FVkTgqkjIu1FpL_sU=?x-image-process=image/resize,m_fixed,w_300"
+                            src="https://ts1.cn.mm.bing.net/th/id/R-C.96b2f4c011c90a93e0804dc0368947bb?rik=iuURCAQtZJGBTg&riu=http%3a%2f%2fimg.sytuku.com%2fuptu%2fyulantu%2f160528%2f5-16052R00554.jpg&ehk=cHY%2bSRHYCp30WP97Brg%2fdhkRkesXy91PqmVmm6Q%2fU8A%3d&risl=&pid=ImgRaw&r=0"
                             alt="Avatar">
                         <div class="message-box-left">
                             <div class="message-content">
@@ -35,7 +35,7 @@
                         <ng-container *ngIf="msg?.role === 'assistant'">
                             <div class="message-container">
                                 <img class="avatar-left"
-                                    src="https://imgsource.huashi6.com/images/ai/2023/12/2/15_98156.jpg?e=1701504174&token=qFZErZx7WS1v5B4rgQE2KLMHlYHVNaCuXeaA9OLD:hb4mNBg4O9FVkTgqkjIu1FpL_sU=?x-image-process=image/resize,m_fixed,w_300"
+                                    src="https://ts1.cn.mm.bing.net/th/id/R-C.96b2f4c011c90a93e0804dc0368947bb?rik=iuURCAQtZJGBTg&riu=http%3a%2f%2fimg.sytuku.com%2fuptu%2fyulantu%2f160528%2f5-16052R00554.jpg&ehk=cHY%2bSRHYCp30WP97Brg%2fdhkRkesXy91PqmVmm6Q%2fU8A%3d&risl=&pid=ImgRaw&r=0"
                                     alt="Avatar">
                                 <div class="message-box-left">
                                     <div class="message-content">
@@ -47,7 +47,7 @@
                         <ng-container *ngIf="msg?.role === 'user'">
                             <div class="message-container-mine">
                                 <img class="avatar-right"
-                                    [src]="currentUser?.get('avatar')||'https://ionicframework.com/docs/img/demos/avatar.svg'"
+                                    [src]="currentUser?.get('avatar')||'https://pic2.zhimg.com/v2-45e3ca228438d1e4c3e98e38c8f8e4a4_r.jpg?source=1940ef5c'"
                                     alt="Avatar">
                                 <div class="message-box-right">
                                     <div class="message-content">

app-angular/src/modules/lesson/page-lesson/page-lesson.component.ts

@@ -61,25 +61,6 @@ export class PageLessonComponent {
   
   groupedCourseList: any[] = [];
 
-  // 在获取课程数据后，将课程按照每4个为一组进行分组
-  // groupCoursesByCategory() {
-  //   const coursesPerCategory = 4;
-  //   const totalCourses = this.courseList.length;
-  //   const totalCategories = Math.ceil(totalCourses / coursesPerCategory);
-  
-  //   for (let i = 0; i < totalCategories; i++) {
-  //     const startIndex = i * coursesPerCategory;
-  //     const endIndex = startIndex + coursesPerCategory;
-  //     const categoryCourses = this.courseList.slice(startIndex, endIndex);
-  //     this.groupedCourseList.push(categoryCourses);
-  //   }
-  // }
-  // ngOnInit() {
-  //   this.groupCoursesByCategory();
-  // }
-  
-  
-
   goLessonDetail(lesson: any) {
     this.router.navigate(["/lesson/lesson/detail"], { queryParams: lesson })
   }

app-angular/src/modules/lesson/page-test/page-test.component.html

@@ -6,7 +6,6 @@
             </ion-segment-button>
             <ion-segment-button value="favorites" (click)="changeTab('favorites')">
                 <ion-label>宠物性格测试</ion-label>
-            
             </ion-segment-button>
         </ion-segment>
     </ion-header>
@@ -14,14 +13,7 @@
     <ion-content>
         
         <ng-container *ngIf="currentTab === 'all'">
-         
-
-           
-          
-
-   
             <ion-content>
-                <ng-container *ngIf="currentTab === 'all'">
                     <ion-card>
                       <ion-card-header>
                         <ion-card-title>宠物MBTI各个维度解释</ion-card-title>
@@ -32,7 +24,7 @@
                         <p>L(学习型）- S(稳定型）：表示狗狗在学习和适应环境中的表现，L表示狗狗学习能力强、适应能力高，S表示狗狗倾向于稳定的环境和习惯。</p>
                       </ion-card-content>
                     </ion-card>
-                  </ng-container>
+                    
                 <ion-grid>
                     <ion-row>
                         <ng-container *ngFor="let course of courseList; let i = index">
@@ -56,9 +48,6 @@
             </ion-content>
         </ng-container>
 
-
-
-
         <!-- 宠物测试 -->
         <ng-container *ngIf="currentTab === 'favorites'">
             <h4 style="text-align: center;padding: 15px;">开始测试</h4>

app-angular/src/modules/lesson/page-test/page-test.component.ts

@@ -38,7 +38,6 @@ import { Router } from '@angular/router';
       console.log(list);
       return list
     }
-    
     planOptions: any = {
       gender: "未知",
       option1: "",
@@ -48,7 +47,6 @@ import { Router } from '@angular/router';
     setOption(optionName: string, event: any) {
       this.planOptions[optionName] = event.detail.value;
     }
-    
     // 触底加载函数逻辑
     pageSize = 30
     skip: number = 0 // 跳过多少条进行加载
@@ -59,7 +57,4 @@ import { Router } from '@angular/router';
       this.courseList = this.courseList.concat(list)
       infiScroll?.complete();
     }
-    // goLessonDetail(lesson: any) {
-    //   this.router.navigate(["/lesson/test/detail"], { queryParams: lesson })
-    // }
   }

app-angular/src/modules/lesson/recommend-detail/recommend-detail.component.html

@@ -9,7 +9,6 @@
                 <ion-note>收藏</ion-note>
             </ion-button>
         </ion-buttons>
-
     </ion-toolbar>
 </ion-header>
 <ion-content color="light">

app-angular/src/modules/user/page-login/page-login.component.html

@@ -8,7 +8,6 @@
     </ion-toolbar>
 </ion-header>
 <ion-content color="light">
-
     <div class="login-modal">
         <ion-card>
             <ion-card-header>
@@ -30,15 +29,13 @@
     <ion-list [inset]="true">
         <ion-item>
             <ion-label class="register-modal">
-                未有账号？请选择：<ion-button fill="outline" color="dark" (click)="goRegister()" class="register">
+                未有账号？请选择<ion-button fill="outline" color="dark" (click)="goRegister()" class="register">
                     注册一下
                 </ion-button>
             </ion-label>
         </ion-item>
     </ion-list>
 </ion-content>
-
-
 <ng-container *ngIf="false">
 
     请输入用户名：{{userData.username}} <br />

app-angular/src/modules/user/page-login/page-login.component.ts

@@ -29,7 +29,6 @@ export class PageLoginComponent {
   goRegister() {
     let path = "/user/register"
     this.router.navigate([path])
-    console.log('账户已保存，去登录吧')
   }
 
   async login() {
@@ -52,7 +51,6 @@ export class PageLoginComponent {
       message: err,
       buttons: ['好的'],
     });
-
     await alert.present();
   }
 }

app-angular/src/modules/user/page-register/page-register.component.ts

@@ -15,7 +15,6 @@ export class PageRegisterComponent {
 
   async register() {
     // 处理注册逻辑，例如发送注册请求到后端
-
     // 显示注册成功的提示框
     const alert = await this.alertController.create({
       header: '提示',
@@ -27,9 +26,7 @@ export class PageRegisterComponent {
     // 导航到登录页面
     this.router.navigate(['/user/login']);
   }
-
   goBack() {
     this.router.navigate(['/user/login']);
   }
-
 }