feat

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

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

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

@@ -34,8 +34,8 @@
             <ion-row>
                 <ng-container *ngFor="let attention of recommendList">
                     <ion-col size="6">
-                        <ion-card class="roleCard" (click)="goRecommendDetail(role)">
-                            <img alt="推荐图" [src]="role?.get('img')" />
+                        <ion-card class="roleCard" (click)="goRecommendDetail(attention)">
+                            <img alt="推荐图" [src]="attention?.get('img')" />
                             <ion-card-header>
                                 <ion-card-title>
                                     {{attention?.get('name')}}
@@ -89,22 +89,6 @@
 
     <!-- 科普 -->
     <ng-container *ngIf="cate=='科普'">
-<<<<<<< HEAD
-        <ng-container *ngFor="let sciene of scienceList">
-            <ion-card (click)="goScienceDetail(sciene)">
-                <img alt="科普图" [src]="sciene?.get('img')" />
-                <ion-card-header>
-                    <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>{{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>{{sciene?.get('like')}}</ion-note>
-=======
         <ng-container *ngFor="let science of scienceList">
             <ion-card (click)="goScienceDetail(science)">
                 <img alt="科普图" [src]="science?.get('img')" />
@@ -119,16 +103,11 @@
                         <ion-button fill="clear" color="dark" size="small" class="like">
                             <ion-icon name="heart-outline" size="small"></ion-icon>
                             <ion-note>{{science?.get('like')}}</ion-note>
->>>>>>> 8055be6d18ac165452aa094fb923b58460946ed3
                         </ion-button>
                     </div>
                 </ion-card-header>
                 <ion-card-content>
-<<<<<<< HEAD
-                    <p class="foodContent">{{sciene?.get('content')}}</p>
-=======
                     <p class="foodContent">{{science?.get('content')}}</p>
->>>>>>> 8055be6d18ac165452aa094fb923b58460946ed3
                 </ion-card-content>
             </ion-card>
         </ng-container>

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

@@ -152,24 +152,6 @@
 
     <!-- 科普笔记 -->
     <ng-container *ngIf="cate=='科普'">
-<<<<<<< HEAD
-        <ng-container *ngFor="let sciene of myFoodList">
-            <ion-card>
-                <img alt="科普图" [src]="sciene?.get('img')" />
-                <ion-card-header>
-                    <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-sciene">
-                        <ion-buttons slot="end">
-                            <ion-button>
-                                <ion-icon name="eye-outline" size="small"></ion-icon>
-                                <ion-note>{{sciene?.get('see')}}</ion-note>
-                            </ion-button>
-                            <ion-button>
-                                <ion-icon name="heart-outline" size="small"></ion-icon>
-                                <ion-note>{{sciene?.get('like')}}</ion-note>
-=======
         <ng-container *ngFor="let science of myFoodList">
             <ion-card>
                 <img alt="科普图" [src]="science?.get('img')" />
@@ -186,17 +168,12 @@
                             <ion-button>
                                 <ion-icon name="heart-outline" size="small"></ion-icon>
                                 <ion-note>{{science?.get('like')}}</ion-note>
->>>>>>> 8055be6d18ac165452aa094fb923b58460946ed3
                             </ion-button>
                         </ion-buttons>
                     </div>
                 </ion-card-header>
                 <ion-card-content>
-<<<<<<< HEAD
-                    <p class="foodContent">{{sciene?.get('content')}}</p>
-=======
                     <p class="foodContent">{{science?.get('content')}}</p>
->>>>>>> 8055be6d18ac165452aa094fb923b58460946ed3
                 </ion-card-content>
             </ion-card>
         </ng-container>

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

@@ -28,7 +28,6 @@ export class MeComponent {
   }
 
   cate: string = "关注"
-  //我的推荐分享
   myViewList: Array<Parse.Object> = []
   async getViewDate() {
     let query = new Parse.Query("PetRecommend");
@@ -37,7 +36,7 @@ export class MeComponent {
     let list = await query.find();
     return list
   }
-  //我的科普关注
+  
   myRoleList: Array<Parse.Object> = []
   async gteAttentionData() {
     let query = new Parse.Query("PetAttention");
@@ -46,7 +45,6 @@ export class MeComponent {
     let list = await query.find();
     return list
   }
-  //我的科普分享
   myFoodList: Array<Parse.Object> = []
   async getScienceData() {
     let query = new Parse.Query("PetScience");

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

@@ -32,7 +32,7 @@
                 <ion-input placeholder="日常碎片PLOG📸" [counter]="true" maxlength="30"></ion-input>
             </ion-item>
             <ion-item lines="none">
-                <ion-textarea placeholder="分享你的日常" rows="9" [counter]="true" maxlength="30000">
+                <ion-textarea placeholder="一键定格美好瞬间" rows="9" [counter]="true" maxlength="30000">
                 </ion-textarea>
             </ion-item>
             <ion-item lines="full">
@@ -67,7 +67,7 @@
                 <ion-icon name="image-outline" style="margin-right: 3px;"></ion-icon>添加封面
             </ion-item>
             <ion-item lines="none">
-                <ion-input placeholder="科普名称/标题（30）" maxlength="30"></ion-input>
+                <ion-input placeholder="📛相册取名/标题" maxlength="5"></ion-input>
             </ion-item>
             <ion-item lines="none">
                 <ion-select label="关注类型" interface="popover">
@@ -85,7 +85,8 @@
             </ion-item>
             <ion-item lines="none"><ion-label style="font-size: 0.9rem;">
                     参与话题：
-                    <ion-note class="viewTopic" button>#哈基米</ion-note>...
+                    <ion-note class="viewTopic" button>#哈基米🐶</ion-note>
+                    <ion-note class="viewTopic" button>#吸猫日记</ion-note>...
                     <ion-note button>更多</ion-note>
                 </ion-label>
             </ion-item>
@@ -107,7 +108,7 @@
                 <ion-icon name="image-outline" style="margin-right: 3px;"></ion-icon>添加封面
             </ion-item>
             <ion-item lines="none">
-                <ion-input placeholder="不要把标题吃了" maxlength="30"></ion-input>
+                <ion-input placeholder="记录美好🏷️" maxlength="30"></ion-input>
             </ion-item>
             <ion-item lines="none">
                 <ion-select label="属于" interface="popover">
@@ -116,7 +117,7 @@
                 </ion-select>
             </ion-item>
             <ion-item lines="none">
-                <ion-textarea placeholder="分享你的科普经历" rows="9" [counter]="true" maxlength="3000">
+                <ion-textarea placeholder="2023年关键帧🎬" rows="9" [counter]="true" maxlength="3000">
                 </ion-textarea>
             </ion-item>
             <ion-item lines="full">