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

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

@@ -75,7 +75,7 @@
             <ion-item button detail="true" routerLink="/lesson/me/userFollow">
                 <ion-icon name="people-sharp"></ion-icon>
                 <ion-label>
-                    <ion-note>人物,</ion-note>
+                    <ion-note>人物,,</ion-note>
                    
                 </ion-label>
             </ion-item>

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

@@ -1,7 +1,18 @@
 <!-- user-relationship.component.html -->
-
+<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-label>返回</ion-label>
+           
+    </ion-toolbar>
+</ion-header>
 <div class="container">
-    <h1>Welcome to the Image Generator Page</h1>
+    <h1>关系网<br></h1>
+    <h2>Welcome to the Image Generator Page</h2>
   
     <!-- Display an example image -->
     <img src="assets/gxitu.png" alt="https://www.lddgo.net/chart/character-relationship" class="example-image">
@@ -10,5 +21,5 @@
     <button (click)="redirectToExternalLink()" class="btn">Go to Online Generator</button>
   
     <!-- Button to go back -->
-    <button (click)="goBack()" class="btn">Back</button>
+    <!-- <button (click)="goBack()" class="btn">Back</button> -->
 </div>

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

@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-
+import { Router } from '@angular/router'; 
 @Component({
   selector: 'app-user-relationship',
   templateUrl: './user-relationship.component.html',
@@ -10,6 +10,7 @@ export class UserRelationshipComponent {
 
   constructor() {
     this.previousUrl = window.location.href;
+    
   }
 
   redirectToExternalLink() {
@@ -18,5 +19,6 @@ export class UserRelationshipComponent {
 
   goBack() {
     window.history.back();
+    
   }
 }