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

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 role 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>
                                     {{role?.get('name')}}

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

@@ -12,28 +12,27 @@
     <ion-toolbar>
         <ion-segment value="推荐">
             <ion-segment-button value="推荐" (click)="cate='推荐'">
-                <ion-label>推荐分享</ion-label>
+                <ion-label>此刻🤳</ion-label>
             </ion-segment-button>
             <ion-segment-button value="关注" (click)="cate='关注'">
-                <ion-label>关注分享</ion-label>
+                <ion-label>相机📸</ion-label>
             </ion-segment-button>
             <ion-segment-button value="科普" (click)="cate='科普'">
-                <ion-label>科普分享</ion-label>
+                <ion-label>模板🔍</ion-label>
             </ion-segment-button>
         </ion-segment>
     </ion-toolbar>
-    <!-- 推荐分享 -->
+    <!-- 此刻🤳 -->
     <ng-container *ngIf="cate=='推荐'">
         <ion-list [inset]="true">
             <ion-item lines="full">
-                <!-- <ion-thumbnail><img alt="封面" [src]=" " /></ion-thumbnail> -->
                 <ion-icon name="image-outline" style="margin-right: 3px;"></ion-icon>添加封面
             </ion-item>
             <ion-item lines="none">
-                <ion-input placeholder="好的标题能吸引更多读者" [counter]="true" maxlength="30"></ion-input>
+                <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">
@@ -46,7 +45,7 @@
             </ion-item>
             <ion-item lines="none"><ion-label style="font-size: 0.9rem;">
                     参与话题：
-                    <ion-note class="viewTopic" button>#雪域奇景</ion-note><ion-note class="viewTopic">#自由行</ion-note>...
+                    <ion-note class="viewTopic" button>#养猫日常</ion-note><ion-note class="viewTopic">#小狗日常</ion-note>...
                     <ion-note button>更多</ion-note>
                 </ion-label>
             </ion-item>
@@ -60,7 +59,7 @@
         </ion-list>
     </ng-container>
 
-    <!-- 关注分享 -->
+    <!-- 相机📸 -->
     <ng-container *ngIf="cate=='关注'">
         <ion-list [inset]="true">
             <ion-item lines="full">
@@ -68,18 +67,16 @@
                 <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">
-                    <ion-select-option value="二次元">二次元</ion-select-option>
-                    <ion-select-option value="水彩">水彩</ion-select-option>
-                    <ion-select-option value="真人写实">真人写实</ion-select-option>
-                    <ion-select-option value="泼墨">泼墨</ion-select-option>
+                    <ion-select-option value="小狗">小狗🐕-日记</ion-select-option>
+                    <ion-select-option value="小猫">小猫🐱-日常</ion-select-option>
                 </ion-select>
             </ion-item>
             <ion-item lines="none">
-                <ion-textarea placeholder="分享你的关注生成提示词" rows="9">
+                <ion-textarea placeholder="记录爱宠日常" rows="9">
                 </ion-textarea>
             </ion-item>
             <ion-item lines="full">
@@ -88,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>
@@ -103,24 +101,23 @@
 
     </ng-container>
 
-    <!-- 科普分享 -->
+    <!-- 模板 -->
     <ng-container *ngIf="cate=='科普'">
         <ion-list [inset]="true">
             <ion-item lines="full">
-                <!-- <ion-thumbnail><img alt="封面" [src]=" " /></ion-thumbnail> -->
                 <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">
-                    <ion-select-option value="中餐">中餐</ion-select-option>
-                    <ion-select-option value="西餐">西餐</ion-select-option>
+                    <ion-select-option value="图文">图文</ion-select-option>
+                    <ion-select-option value="特效">特效</ion-select-option>
                 </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">
@@ -133,7 +130,7 @@
             </ion-item>
             <ion-item lines="none"><ion-label style="font-size: 0.9rem;">
                     参与/添加话题：
-                    <ion-note class="viewTopic" button>#火锅</ion-note><ion-note class="viewTopic">#变态辣</ion-note>...
+                    <ion-note class="viewTopic" button>#小猫日记</ion-note><ion-note class="viewTopic">#狗狗日常</ion-note>...
                     <ion-note button>更多</ion-note>
                 </ion-label>
             </ion-item>