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

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

@@ -70,7 +70,7 @@
         <ion-button *ngIf="!currentUser?.id" expand="block" routerLink="/user/login">登录</ion-button>
         <ion-button *ngIf="currentUser?.id" fill="clear" expand="block" (click)="logout()">登出</ion-button>
     </ion-list>
-    <ion-card class="myList">
+    <!-- <ion-card class="myList">
         <ion-list [inset]="true">
             <ion-item button detail="true" routerLink="/lesson/me/userFollow">
                 <ion-icon name="people-sharp"></ion-icon>
@@ -92,7 +92,7 @@
                 </ion-label>
             </ion-item>
         </ion-list>
-    </ion-card>
+    </ion-card> -->
 
 
     <ion-accordion-group [multiple]="true" [value]="['first', 'third']">
@@ -129,7 +129,7 @@
           <div class="ion-padding" slot="content"> 
             <ion-item>
             <ion-avatar slot="start">
-                <img alt="头像" src="../../assets/2.jpg" />
+                <img alt="头像" src="../../assets/7.jpg" />
             </ion-avatar>
             <ion-label><span class="bold-text">boss刘</span> <br>  
                 <span class="small-orange-text">还没记录任何该人物的往来信息</span><br>  
@@ -137,7 +137,7 @@
           </ion-item>
           <ion-item>
             <ion-avatar slot="start">
-                <img alt="头像" src="../../assets/3.jpg" />
+                <img alt="头像" src="../../assets/6.jpg" />
             </ion-avatar>
             <ion-label>  
                 <span class="bold-text">飞马智哥</span><br>  
@@ -153,13 +153,23 @@
           <div class="ion-padding" slot="content">
             <ion-item button detail="true" routerLink="/lesson/me/userFollow">
                 <ion-avatar slot="start">
-                    <img alt="" src="../../assets/2.jpg" />
+                    <img alt="" src="../../assets/5.jpg" />
                 </ion-avatar>
-                <ion-label><span class="bold-text2">记账</span> <br>  
-                    <span class="small-orange-text2">金钱往来</span><br>  
+                <ion-label><span class="bold-text2">人情圈</span> <br>  
+                    <span class="small-orange-text2">你的人缘不错哟</span><br>  
                      </ion-label>
               </ion-item>
-              <ion-item>
+             
+              <ion-item button detail="true" routerLink="/lesson/me/userTag">
+                <ion-avatar slot="start">
+                    <img alt="头像" src="../../assets/3.jpg" />
+                </ion-avatar>
+                <ion-label>  
+                    <span class="bold-text2">礼物</span><br>  
+        <span class="small-orange-text2">送出和收到的礼物</span><br>    
+                </ion-label>
+              </ion-item>
+              <ion-item button detail="true" routerLink="/lesson/me/userCollection">
                 <ion-avatar slot="start">
                     <img alt="头像" src="../../assets/3.jpg" />
                 </ion-avatar>
@@ -173,10 +183,11 @@
                     <img alt="头像" src="../../assets/3.jpg" />
                 </ion-avatar>
                 <ion-label>  
-                    <span class="bold-text2">礼物</span><br>  
-        <span class="small-orange-text2">送出和收到的礼物</span><br>    
+                    <span class="bold-text2">关系网</span><br>  
+        <span class="small-orange-text2">我的人物关系网</span><br>    
                 </ion-label>
               </ion-item>
+              
               <ion-item>
                 <ion-avatar slot="start">
                     <img alt="头像" src="../../assets/3.jpg" />
@@ -186,6 +197,16 @@
         <span class="small-orange-text2">检索人物的技能和能力</span><br>    
                 </ion-label>
               </ion-item>
+              <ion-item>
+                <ion-avatar slot="start">
+                    <img alt="头像" src="../../assets/3.jpg" />
+                </ion-avatar>
+                <ion-label>  
+                    <span class="bold-text2">再见的人物</span><br>  
+        <span class="small-orange-text2">不再往来，不在的人物</span><br>    
+                </ion-label>
+              </ion-item>
+              
           </div>
         </ion-accordion>
       </ion-accordion-group>
@@ -212,7 +233,7 @@
             </ion-segment>
             <ion-buttons slot="end"><ion-button>编辑</ion-button></ion-buttons>
         </ion-toolbar>
-        <!-- 好 -->
+        <!-- 好 HH-->
     </ion-card>
     <!-- 推荐图 -->
     <ng-container *ngIf="cate=='推荐'">

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

@@ -10,14 +10,14 @@
     <ion-list [inset]="true">
         <ion-item-group>
             <ion-item-divider>
-                <ion-label>当前会员等级：L1🌟</ion-label>
+                <ion-label>礼物🌟</ion-label>
             </ion-item-divider>
             <ion-segment>
                 <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>还需99积分</ion-label>
+                    <ion-label>送出⬅️</ion-label>
                 </ion-segment-button>
             </ion-segment>
             <ng-container *ngIf="cate=='未获'">