flowaaa 1 năm trước cách đây
mục cha
commit
fe03d2dde3

+ 6 - 6
app-angular/src/modules/lesson/attention-detail/attention-detail.component.html

@@ -13,15 +13,15 @@
 </ion-header>
 <ion-content color="light">
     <ion-card>
-        <img alt="角色图" [src]="role?.get('img')" />
+        <img alt="角色图" [src]="attention?.get('img')" />
         <ion-card-header>
-            <ion-card-title>{{role?.get('name')}}</ion-card-title>
-            <ion-card-subtitle>作者:{{role?.get('user')?.get('name')||"无名"}}</ion-card-subtitle>
-            <ion-card-subtitle>{{role?.get('type')||"角色类型"}}</ion-card-subtitle>
-            <ion-card-subtitle>{{role?.get('createdAt')| date: 'YYYY/MM/dd/HH:mm'||"发布时间"}}</ion-card-subtitle>
+            <ion-card-title>{{attention?.get('name')}}</ion-card-title>
+            <ion-card-subtitle>作者:{{attention?.get('user')?.get('name')||"无名"}}</ion-card-subtitle>
+            <ion-card-subtitle>{{attention?.get('type')||"角色类型"}}</ion-card-subtitle>
+            <ion-card-subtitle>{{attention?.get('createdAt')| date: 'YYYY/MM/dd/HH:mm'||"发布时间"}}</ion-card-subtitle>
         </ion-card-header>
         <ion-card-content>
-            {{role?.get('cueword')||"角色生成的提示词..."}}
+            {{attention?.get('cueword')||"角色生成的提示词..."}}
         </ion-card-content>
     </ion-card>
     <!-- 评论区 -->

+ 1 - 1
app-angular/src/modules/lesson/attention-detail/attention-detail.component.ts

@@ -35,7 +35,7 @@ export class AttentionDetailComponent {
     })
   }
   async getRoleInfoById(id: string) {
-    let query = new Parse.Query("SqzRoleInfo")
+    let query = new Parse.Query("PetAttention")
     this.attention = await query.get(id)
   }
 

+ 2 - 2
app-angular/src/modules/lesson/attention-detail/rattention-detail.component.ts

@@ -28,7 +28,7 @@ export class AttentionDetailComponent {
     }
   }
 
-  role: Parse.Object | undefined;
+  attention: Parse.Object | undefined;
   constructor(private router: ActivatedRoute) {
     this.router.queryParams.subscribe(param => {
       this.getRoleInfoById(param["id"])
@@ -36,7 +36,7 @@ export class AttentionDetailComponent {
   }
   async getRoleInfoById(id: string) {
     let query = new Parse.Query("SqzRoleInfo")
-    this.role = await query.get(id)
+    this.attention = await query.get(id)
   }
 
 }

+ 20 - 20
app-angular/src/modules/lesson/community/community.component.html

@@ -32,22 +32,22 @@
     <ng-container *ngIf="cate=='推荐'">
         <ion-grid>
             <ion-row>
-                <ng-container *ngFor="let role of recommendList">
+                <ng-container *ngFor="let attention of recommendList">
                     <ion-col size="6">
-                        <ion-card class="roleCard" (click)="goAttentionDetail(role)">
-                            <img alt="推荐图" [src]="role?.get('img')" />
+                        <ion-card class="roleCard" (click)="goAttentionDetail(attention)">
+                            <img alt="推荐图" [src]="attention?.get('img')" />
                             <ion-card-header>
                                 <ion-card-title>
-                                    {{role?.get('name')}}
+                                    {{attention?.get('name')}}
                                 </ion-card-title>
                                 <ion-card-subtitle style="font-size:0.7rem;">
-                                    作者:{{role?.get('user')?.get('name')||"无名"}}
+                                    作者:{{attention?.get('user')?.get('name')||"无名"}}
                                 </ion-card-subtitle>
                             </ion-card-header>
                             <div class="metadata-end-wrapper">
                                 <ion-button shape="round" size="small" color="danger">
                                     <ion-icon name="heart-outline" size="small"></ion-icon>
-                                    {{role?.get('like')}}
+                                    {{attention?.get('like')}}
                                 </ion-button>
                             </div>
                         </ion-card>
@@ -62,22 +62,22 @@
     <ng-container *ngIf="cate=='关注'">
         <ion-grid>
             <ion-row>
-                <ng-container *ngFor="let role of attentionList">
+                <ng-container *ngFor="let attention of attentionList">
                     <ion-col size="6">
-                        <ion-card class="roleCard" (click)="goAttentionDetail(role)">
-                            <img alt="关注图" [src]="role?.get('img')" />
+                        <ion-card class="roleCard" (click)="goAttentionDetail(attention)">
+                            <img alt="关注图" [src]="attention?.get('img')" />
                             <ion-card-header>
                                 <ion-card-title>
-                                    {{role?.get('name')}}
+                                    {{attention?.get('name')}}
                                 </ion-card-title>
                                 <ion-card-subtitle style="font-size:0.7rem;">
-                                    作者:{{role?.get('user')?.get('name')||"无名"}}
+                                    作者:{{attention?.get('user')?.get('name')||"无名"}}
                                 </ion-card-subtitle>
                             </ion-card-header>
                             <div class="metadata-end-wrapper">
                                 <ion-button shape="round" size="small" color="danger">
                                     <ion-icon name="heart-outline" size="small"></ion-icon>
-                                    {{role?.get('like')}}
+                                    {{attention?.get('like')}}
                                 </ion-button>
                             </div>
                         </ion-card>
@@ -89,25 +89,25 @@
 
     <!-- 科普 -->
     <ng-container *ngIf="cate=='科普'">
-        <ng-container *ngFor="let food of scienceList">
-            <ion-card (click)="goScienceDetail(food)">
-                <img alt="科普图" [src]="food?.get('img')" />
+        <ng-container *ngFor="let sciene of scienceList">
+            <ion-card (click)="goScienceDetail(sciene)">
+                <img alt="科普图" [src]="sciene?.get('img')" />
                 <ion-card-header>
-                    <ion-card-title>{{food?.get('name')}}</ion-card-title>
-                    <ion-card-subtitle>{{food?.get('createdAt')| date: 'YYYY/MM/dd'||"发布时间"}}</ion-card-subtitle>
+                    <ion-card-title>{{sciene?.get('name')}}</ion-card-title>
+                    <ion-card-subtitle>{{sciene?.get('createdAt')| date: 'YYYY/MM/dd'||"发布时间"}}</ion-card-subtitle>
                     <div class="metadata-end-wrapper">
                         <ion-button fill="clear" color="dark" size="small" class="see">
                             <ion-icon name="eye-outline" size="small"></ion-icon>
-                            <ion-note>{{food?.get('see')}}</ion-note>
+                            <ion-note>{{sciene?.get('see')}}</ion-note>
                         </ion-button>
                         <ion-button fill="clear" color="dark" size="small" class="like">
                             <ion-icon name="heart-outline" size="small"></ion-icon>
-                            <ion-note>{{food?.get('like')}}</ion-note>
+                            <ion-note>{{sciene?.get('like')}}</ion-note>
                         </ion-button>
                     </div>
                 </ion-card-header>
                 <ion-card-content>
-                    <p class="foodContent">{{food?.get('content')}}</p>
+                    <p class="foodContent">{{sciene?.get('content')}}</p>
                 </ion-card-content>
             </ion-card>
         </ng-container>

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

@@ -52,21 +52,21 @@ export class CommunityComponent {
 
 
   // 跳转函数
-  goScienceDetail(food: Parse.Object) {
+  goScienceDetail(sciene: Parse.Object) {
     this.router.navigate(["/lesson/community/scienceDetail"], {
-      queryParams: food
+      queryParams: sciene
     })
   }
 
-  goRecommendDetail(view: Parse.Object) {
+  goRecommendDetail(recommend: Parse.Object) {
     this.router.navigate(["/lesson/community/recommendDetail"], {
-      queryParams: view
+      queryParams: recommend
     })
   }
 
-  goAttentionDetail(role: Parse.Object) {
+  goAttentionDetail(attention: Parse.Object) {
     this.router.navigate(["/lesson/community/attentionDetail"], {
-      queryParams: role
+      queryParams: attention
     })
   }
 

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

@@ -100,7 +100,7 @@
                     <ion-label>关注</ion-label>
                 </ion-segment-button>
                 <ion-segment-button value="科普" (click)="cate='科普'">
-                    <ion-icon name="fast-food-outline"></ion-icon>
+                    <ion-icon name="fast-sciene-outline"></ion-icon>
                     <ion-label>笔记</ion-label>
                 </ion-segment-button>
             </ion-segment>
@@ -112,15 +112,15 @@
 
     <ng-container *ngIf="cate=='推荐'">
         <ion-list [inset]="true" lines="inset">
-            <ng-container *ngFor="let view of myViewList">
+            <ng-container *ngFor="let recommend of myViewList">
                 <ion-item>
                     <ion-thumbnail slot="end">
-                        <img alt="推荐图" [src]="view?.get('img')" />
+                        <img alt="推荐图" [src]="recommend?.get('img')" />
                     </ion-thumbnail>
                     <ion-label>
-                        <h2>{{view?.get('title')}}</h2>
-                        <p>{{view?.get('content')}}</p>
-                        <ion-note slot="start">{{view?.get('createdAt')| date: 'YYYY/MM/dd'||"发布时间"}}</ion-note>
+                        <h2>{{recommend?.get('title')}}</h2>
+                        <p>{{recommend?.get('content')}}</p>
+                        <ion-note slot="start">{{recommend?.get('createdAt')| date: 'YYYY/MM/dd'||"发布时间"}}</ion-note>
                     </ion-label>
                 </ion-item>
             </ng-container>
@@ -131,15 +131,15 @@
     <ng-container *ngIf="cate=='关注'">
         <ion-grid>
             <ion-row>
-                <ng-container *ngFor="let role of myRoleList">
+                <ng-container *ngFor="let attention of myRoleList">
                     <ion-col size="6">
                         <ion-card class="roleCard">
-                            <img alt="关注图" [src]="role?.get('img')" />
+                            <img alt="关注图" [src]="attention?.get('img')" />
                             <ion-card-header>
                                 <ion-card-title>
-                                    {{role?.get('name')}}
+                                    {{attention?.get('name')}}
                                 </ion-card-title>
-                                <ion-card-subtitle>{{role?.get('createdAt')| date:
+                                <ion-card-subtitle>{{attention?.get('createdAt')| date:
                                     'YYYY/MM/dd'||"发布时间"}}</ion-card-subtitle>
                             </ion-card-header>
 
@@ -152,28 +152,28 @@
 
     <!-- 科普笔记 -->
     <ng-container *ngIf="cate=='科普'">
-        <ng-container *ngFor="let food of myFoodList">
+        <ng-container *ngFor="let sciene of myFoodList">
             <ion-card>
-                <img alt="科普图" [src]="food?.get('img')" />
+                <img alt="科普图" [src]="sciene?.get('img')" />
                 <ion-card-header>
-                    <ion-card-title>{{food?.get('name')}}</ion-card-title>
-                    <ion-card-subtitle>{{food?.get('createdAt')| date:
+                    <ion-card-title>{{sciene?.get('name')}}</ion-card-title>
+                    <ion-card-subtitle>{{sciene?.get('createdAt')| date:
                         'YYYY/MM/dd/HH:mm'||"发布时间"}}</ion-card-subtitle>
-                    <div class="metadata-end-wrapper-food">
+                    <div class="metadata-end-wrapper-sciene">
                         <ion-buttons slot="end">
                             <ion-button>
                                 <ion-icon name="eye-outline" size="small"></ion-icon>
-                                <ion-note>{{food?.get('see')}}</ion-note>
+                                <ion-note>{{sciene?.get('see')}}</ion-note>
                             </ion-button>
                             <ion-button>
                                 <ion-icon name="heart-outline" size="small"></ion-icon>
-                                <ion-note>{{food?.get('like')}}</ion-note>
+                                <ion-note>{{sciene?.get('like')}}</ion-note>
                             </ion-button>
                         </ion-buttons>
                     </div>
                 </ion-card-header>
                 <ion-card-content>
-                    <p class="foodContent">{{food?.get('content')}}</p>
+                    <p class="foodContent">{{sciene?.get('content')}}</p>
                 </ion-card-content>
             </ion-card>
         </ng-container>

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

@@ -43,7 +43,7 @@ ion-item {
     align-items: center;
 }
 
-.metadata-end-wrapper-food {
+.metadata-end-wrapper-sciene {
     position: absolute;
 
     top: 0px;

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

@@ -14,20 +14,20 @@
 </ion-header>
 <ion-content color="light">
     <ion-card>
-        <img alt="美景图" [src]="view?.get('img')" />
+        <img alt="美景图" [src]="recommend?.get('img')" />
         <ion-card-header>
-            <ion-card-title>{{view?.get('name')}}</ion-card-title>
-            <ion-card-subtitle>作者:{{view?.get('user')?.get('name')||"无名"}}</ion-card-subtitle>
-            <ion-card-subtitle>{{view?.get('createdAt')| date: 'YYYY/MM/dd/HH:mm'||"发布时间"}}</ion-card-subtitle>
+            <ion-card-title>{{recommend?.get('name')}}</ion-card-title>
+            <ion-card-subtitle>作者:{{recommend?.get('user')?.get('name')||"无名"}}</ion-card-subtitle>
+            <ion-card-subtitle>{{recommend?.get('createdAt')| date: 'YYYY/MM/dd/HH:mm'||"发布时间"}}</ion-card-subtitle>
             <div class="metadata-end-wrapper">
                 <ion-button fill="clear" color="dark" size="small" class="see">
                     <ion-icon name="eye-outline" size="small"></ion-icon>
-                    <ion-note>{{view?.get('see')}}</ion-note>
+                    <ion-note>{{recommend?.get('see')}}</ion-note>
                 </ion-button>
             </div>
         </ion-card-header>
         <ion-card-content>
-            {{view?.get('content')}}
+            {{recommend?.get('content')}}
         </ion-card-content>
     </ion-card>
     <!-- 评论区 -->

+ 3 - 3
app-angular/src/modules/lesson/recommend-detail/recommend-detail.component.ts

@@ -28,17 +28,17 @@ export class RecommendDetailComponent {
   }
 
   //预设值变量
-  view: Parse.Object | undefined;
+  recommend: Parse.Object | undefined;
   // 依赖注入
   constructor(private route: ActivatedRoute) {
-    // 查询参数获取并赋值给this.view
+    // 查询参数获取并赋值给this.recommend
     this.route.queryParams.subscribe(params => {
       this.getViewInfoById(params["id"])
     })
   }
   async getViewInfoById(id: string) {
     let query = new Parse.Query("PetRecommend")
-    this.view = await query.get(id)
+    this.recommend = await query.get(id)
   }
 
 

+ 6 - 6
app-angular/src/modules/lesson/science-detail/science-detail.component.html

@@ -13,15 +13,15 @@
 </ion-header>
 <ion-content color="light">
     <ion-card>
-        <img alt="科普图" [src]="food?.get('img')" />
+        <img alt="科普图" [src]="sciene?.get('img')" />
         <ion-card-header>
-            <ion-card-title>{{food?.get('name')}}</ion-card-title>
-            <ion-card-subtitle>作者:{{food?.get('user')?.get('name')||"无名"}}</ion-card-subtitle>
-            <ion-card-subtitle>{{food?.get('type')||"科普类别"}}</ion-card-subtitle>
-            <ion-card-subtitle>{{food?.get('createdAt')| date: 'YYYY/MM/dd/HH:mm'||"发布时间"}}</ion-card-subtitle>
+            <ion-card-title>{{sciene?.get('name')}}</ion-card-title>
+            <ion-card-subtitle>作者:{{sciene?.get('user')?.get('name')||"无名"}}</ion-card-subtitle>
+            <ion-card-subtitle>{{sciene?.get('type')||"科普类别"}}</ion-card-subtitle>
+            <ion-card-subtitle>{{sciene?.get('createdAt')| date: 'YYYY/MM/dd/HH:mm'||"发布时间"}}</ion-card-subtitle>
         </ion-card-header>
         <ion-card-content>
-            {{food?.get('content')}}
+            {{sciene?.get('content')}}
         </ion-card-content>
     </ion-card>
     <!-- 评论区 -->

+ 3 - 3
app-angular/src/modules/lesson/science-detail/science-detail.component.ts

@@ -29,17 +29,17 @@ export class ScienceDetailComponent {
   }
 
   //预设值变量
-  food: Parse.Object | undefined;
+  sciene: Parse.Object | undefined;
   // 依赖注入
   constructor(private route: ActivatedRoute) {
-    // 查询参数获取并赋值给this.food
+    // 查询参数获取并赋值给this.sciene
     this.route.queryParams.subscribe(params => {
       this.getFoodInfoById(params["id"])
     })
   }
   async getFoodInfoById(id: string) {
     let query = new Parse.Query("PetScience")
-    this.food = await query.get(id)
+    this.sciene = await query.get(id)
   }