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

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

@@ -17,6 +17,7 @@ import { PageTestComponent } from './page-test/page-test.component';
 import { ContactListPage } from './contact-list/contact-list.component';
 import { ContactDetailPage } from './contact-detail/contact-detail.component';
 import { UserRelationshipComponent } from './user-relationship/user-relationship.component';
+import { UserSkillComponent } from './user-skill/user-skill.component';
 
 
 const routes: Routes = [
@@ -32,6 +33,7 @@ const routes: Routes = [
   { path: 'community/share', component: ShareComponent, canActivate: [authGuard] },
   { path: "me/userFollow", component: ContactListPage, canActivate: [authGuard] },
   { path: "me/userTag", component: UserTagComponent, canActivate: [authGuard] },
+  { path: "me/userSkill", component: UserSkillComponent, canActivate: [authGuard] },
   { path: "me/userCollection", component: UserCollectionComponent, canActivate: [authGuard] },
   { path: "me/userRelationship", component: UserRelationshipComponent, canActivate: [authGuard] },
   { path: 'me/userFollow/list', component: ContactDetailPage, canActivate: [authGuard]},

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

@@ -20,6 +20,7 @@ import { ContactListPage } from './contact-list/contact-list.component';
 import { ContactDetailPage } from './contact-detail/contact-detail.component';
 import { ExploreContainerComponent } from './explore-container/explore-container.component';
 import { UserRelationshipComponent } from './user-relationship/user-relationship.component';
+import { UserSkillComponent } from './user-skill/user-skill.component';
 
 @NgModule({
   declarations: [
@@ -40,7 +41,7 @@ import { UserRelationshipComponent } from './user-relationship/user-relationship
     ContactDetailPage,
     ExploreContainerComponent,
     UserRelationshipComponent,
-    
+    UserSkillComponent,
   ],
   imports: [
     CommonModule,

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

@@ -212,7 +212,7 @@
                 </ion-label>
             </ion-item>
 
-            <ion-item button detail="true" routerLink="/lesson/me/userTag">
+            <ion-item button detail="true" routerLink="/lesson/me/userSkill">
                 <ion-avatar slot="start">
                     <img alt="头像" src="../../assets/3.jpg" />
                 </ion-avatar>

app-angular/src/modules/lesson/user-skill/user-skill.component.html

@@ -0,0 +1,60 @@
+<ion-header>
+    <ion-toolbar>
+        <ion-buttons slot="start">
+            <ion-button routerLink="/lesson/me" fill="clear" color="dark">
+                <ion-icon name="chevron-back-outline" size="small"></ion-icon>返回</ion-button>
+        </ion-buttons>
+    </ion-toolbar>
+</ion-header>
+<ion-content color="light">
+    <ion-list [inset]="true">
+        <ion-item-group>
+            <ion-item-divider>
+                <ion-label>礼物🌟</ion-label>
+            </ion-item-divider>
+            <ion-segment>
+                <ion-segment-button value="已得" (click)="cate='已得'">
+                    <ion-label>收到➡️</ion-label>
+                </ion-segment-button>
+                <ion-segment-button value="未获" (click)="cate='未获'">
+                    <ion-label>送出⬅️</ion-label>
+                </ion-segment-button>
+            </ion-segment>
+            <ng-container *ngIf="cate=='未获'">
+                <ion-item button detail="false" lines="full">
+                    <ion-label>
+                        <p>
+                            未获标签成就
+                        </p>
+                        <ion-note>
+                            获取条件
+                        </ion-note>
+                    </ion-label>
+                    <ion-buttons slot="end">
+                        <ion-button color="medium">
+                            <ion-icon name="heart-circle" size="large"></ion-icon>
+                        </ion-button>
+                    </ion-buttons>
+                </ion-item>
+            </ng-container>
+            <ng-container *ngIf="cate=='已得'">
+                <ion-item button detail="false" lines="full">
+                    <ion-label>
+                        <p>
+                            已享受10+特权
+                        </p>
+                        <ion-note>
+                            还有7天到期
+                        </ion-note>
+                    </ion-label>
+                    <ion-buttons slot="end">
+                        <ion-button color="danger">
+                        </ion-button>
+                    </ion-buttons>
+                </ion-item>
+            </ng-container>
+
+        </ion-item-group>
+    </ion-list>
+
+</ion-content>

app-angular/src/modules/lesson/user-skill/user-skill.component.scss

@@ -0,0 +1,18 @@
+ion-content {
+    height: calc(100vh - 121px) !important;
+}
+
+ion-item-divider {
+    ion-icon {
+        margin-right: 9px;
+    }
+}
+
+ion-label {
+    ion-note {
+        font-size: 0.7rem;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+}

app-angular/src/modules/lesson/user-skill/user-skill.component.spec.ts

@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { UserSkillComponent } from './user-skill.component';
+
+describe('UserSkillComponent', () => {
+  let component: UserSkillComponent;
+  let fixture: ComponentFixture<UserSkillComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [UserSkillComponent]
+    });
+    fixture = TestBed.createComponent(UserSkillComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

app-angular/src/modules/lesson/user-skill/user-skill.component.ts

@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-user-tag',
+  templateUrl: './user-skill.component.html',
+  styleUrls: ['./user-skill.component.scss']
+})
+export class UserSkillComponent {
+  cate: string = "已得"
+}