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

app-angular/src/modules/lesson/contact-list/contact-list.component.html

@@ -7,7 +7,7 @@
   </ion-buttons>
     <ion-buttons slot="end">
       <ion-button routerLink="/user/add">
-          <ion-icon slot="start" name="create-outline"></ion-icon>
+          <ion-icon slot="start" name="person-add-outline"></ion-icon>
       </ion-button>
     </ion-buttons>
   </ion-toolbar>

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

@@ -70,13 +70,76 @@
     </div>
     
 
-    <!-- <ion-list [inset]="true">
+    <!-- <ion-list [inset]="true"hh>
         <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-accordion-group [multiple]="true" [value]="['first', 'third']">
+        <ion-accordion value="third">
+            <ion-item slot="header" color="light">
+              <ion-label class="larger-font">🎡功能</ion-label>
+            </ion-item>
+            <div class="ion-padding" slot="content">
+              <ion-item button detail="true" routerLink="/lesson/me/userFollow">
+                  <ion-avatar slot="start">
+                      <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>
+                </ion-item>
+               
+                <ion-item button detail="true" routerLink="/lesson/me/userTag">
+                  <ion-avatar slot="start">
+                      <img alt="头像" src="../../assets/13.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/14.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/userRelationship">
+                  <ion-avatar slot="start">
+                      <img alt="头像" src="../../assets/18.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/userSkill">
+                  <ion-avatar slot="start">
+                      <img alt="头像" src="../../assets/19.png" />
+                  </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/userFollow">
+                  <ion-avatar slot="start">
+                      <img alt="头像" src="../../assets/20.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 value="first">
           <ion-item slot="header" color="light">
          
@@ -151,71 +214,9 @@
           </ion-item>
         </div>
         </ion-accordion>
-        <ion-accordion value="third">
-          <ion-item slot="header" color="light">
-            <ion-label class="larger-font">🎡功能</ion-label>
-          </ion-item>
-          <div class="ion-padding" slot="content">
-            <ion-item button detail="true" routerLink="/lesson/me/userFollow">
-                <ion-avatar slot="start">
-                    <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>
-              </ion-item>
-             
-              <ion-item button detail="true" routerLink="/lesson/me/userTag">
-                <ion-avatar slot="start">
-                    <img alt="头像" src="../../assets/13.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/14.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/userRelationship">
-                <ion-avatar slot="start">
-                    <img alt="头像" src="../../assets/18.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/userSkill">
-                <ion-avatar slot="start">
-                    <img alt="头像" src="../../assets/19.png" />
-                </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/userFollow">
-                <ion-avatar slot="start">
-                    <img alt="头像" src="../../assets/20.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>
-
+<br>
     
 
     <!-- 详细内容 -->

app-angular/src/modules/user/page-login/page-login.component.html

@@ -21,6 +21,7 @@
                 </ion-input>
                 <ion-input [(ngModel)]="userData.password" placeholder="密码" [clearInput]="true" [counter]="true"
                     maxlength="20" type="password">
+                   
                 </ion-input>
             </ion-card-content>
             <ion-button expand="block" (click)="login()">登录</ion-button>