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

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("PetAttention")
+    let query = new Parse.Query("HrmAttention")
     this.attention = await query.get(id)
   }
 

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

@@ -55,7 +55,7 @@ export class CommunityComponent implements OnInit {
   }
 
   async getAttentionData() {
-    let query = new Parse.Query("PetAttention");
+    let query = new Parse.Query("HrmAttention");
     let list = await query.find();
     return list;
   }

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

@@ -37,7 +37,7 @@ isReminderExpanded = false;
   }
   myAttentionList: Array<Parse.Object> = []
   async gteAttentionData() {
-    let query = new Parse.Query("PetAttention");
+    let query = new Parse.Query("HrmAttention");
     query.equalTo("user", Parse.User.current()?.toPointer())
     query.include("user")
     let list = await query.find();

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

@@ -7,14 +7,13 @@
         </ion-toolbar>
     </ion-header>
     <ion-content>
-
-        <ion-img [src]="course?.get('foodImg')" alt="图片加载不出来"></ion-img>
+        <ion-img [src]="course?.get('giftImg')" alt="图片加载不出来"></ion-img>
         <ion-list>
             <ion-list-header>
                 <ion-card-title>{{course?.get("point")}}</ion-card-title>
             </ion-list-header>
             <ion-card>
-                <ion-card-title>{{course?.get("foodDescript")}}</ion-card-title>
+                <ion-card-title>{{course?.get("giftDescript")}}</ion-card-title>
                 <ion-button fill="clear">收藏</ion-button>
             </ion-card>
         </ion-list>

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

@@ -18,12 +18,12 @@ export class PageLessonDetailComponent {
   }
   lessonPointer: any;//获取当前指针
   async getCourseById(id: string) {
-    let query = new Parse.Query("PetFood")
+    let query = new Parse.Query("HrmGift")
     query.include('courseAuthor')//查询指针
     this.course = await query.get(id);
     this.lessonPointer = {
       __type: 'Pointer',
-      className: 'PetFood',
+      className: 'HrmGift',
       objectId: this.course.id
     };
   }

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

@@ -58,18 +58,18 @@
                     <ng-container *ngIf="i % 2 === 0">
                         <ion-col size="5.5">
                             <ion-card (click)="goLessonDetail(course)">
-                                <img alt="Silhouette of mountains" [src]="course?.get('foodImg')" />
+                                <img alt="Silhouette of mountains" [src]="course?.get('giftImg')" />
                                 <ion-card-header>
-                                    <ion-card-title>{{course?.get("foodName")}}</ion-card-title>
+                                    <ion-card-title>{{course?.get("giftName")}}</ion-card-title>
                                 </ion-card-header>
 
                             </ion-card>
                         </ion-col>
                         <ion-col size="5.5" *ngIf="i + 1 < courseList.length">
                             <ion-card (click)="goLessonDetail(courseList[i+1])">
-                                <img alt="Silhouette of mountains" [src]="courseList[i + 1].get('foodImg')" />
+                                <img alt="Silhouette of mountains" [src]="courseList[i + 1].get('giftImg')" />
                                 <ion-card-header>
-                                    <ion-card-title>{{courseList[i +1].get("foodName")}}</ion-card-title>
+                                    <ion-card-title>{{courseList[i +1].get("giftName")}}</ion-card-title>
                                 </ion-card-header>
                             </ion-card>
                         </ion-col>

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

@@ -21,7 +21,7 @@ export class PageLessonComponent {
   }
   // 数据加载相关函数
   async getMenuData() {
-    let query = new Parse.Query("PetFood");
+    let query = new Parse.Query("HrmGift");
     query.limit(this.pageSize);
     query.include('courseAuthor')
     if (this.searchInput) {
@@ -37,7 +37,7 @@ export class PageLessonComponent {
   }
   // 搜索功能相关函数与属性
   searchInput: string = ``
-  searchType: string = `foodName`
+  searchType: string = `giftName`
   async search() {
     this.skip = 0; 
     this.courseList = await this.getMenuData();