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

app-angular/src/app/app.component.html

@@ -8,7 +8,7 @@
         </ion-tab-button>
         <ion-tab-button routerLink="/lesson/community">
             <ion-icon name="people-circle-outline"></ion-icon>
-            社区广场
+            社交广场
         </ion-tab-button>
         <ion-tab-button routerLink="/lesson/lesson">
             <ion-icon name="gift"></ion-icon>

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

@@ -1,99 +1,80 @@
-<ion-header>
-    <ion-toolbar>
-        <ion-title>我的</ion-title>
-        <!-- 编辑信息按钮. -->
-        <ion-buttons slot="end">
-            <ion-button routerLink="/user/info">
-                <ion-icon slot="start" name="create-outline"></ion-icon>
-            </ion-button>
-            <ion-button id="myMenu">
-                <ion-icon name="menu-outline"></ion-icon>
-            </ion-button>
-            <ion-popover trigger="myMenu" triggerAction="click">
-                <ng-template>
-                    <ion-list>
-                        <ion-item [button]="true">
-                            <ion-icon name="scan-outline" size="small"></ion-icon>
-                            <ion-text>扫一扫</ion-text>
-                        </ion-item>
-                        <ion-item [button]="true">
-                            <ion-icon name="share-social-outline" size="small"></ion-icon>
-                            <ion-text>分享</ion-text>
-                        </ion-item>
-                        <ion-item [button]="true">
-                            <ion-icon name="pulse-outline" size="small"></ion-icon>
-                            <ion-text>客服</ion-text>
-                        </ion-item>
+<ion-menu side="end" content-id="main-content">
+    <ion-header>
+      <ion-toolbar>
+        <ion-title>Menu Content</ion-title>
+      </ion-toolbar>
+    </ion-header>
+    <ion-content class="ion-padding"> 
+        
+            <ion-list>
+                <ion-item [button]="true">
+                    <ion-icon name="scan-outline" size="small"></ion-icon>
+                    <ion-text>扫一扫</ion-text>
+                </ion-item>
+                <ion-item [button]="true">
+                    <ion-icon name="share-social-outline" size="small"></ion-icon>
+                    <ion-text>分享</ion-text>
+                </ion-item>
+                <ion-item [button]="true">
+                    <ion-icon name="pulse-outline" size="small"></ion-icon>
+                    <ion-text>客服</ion-text>
+                </ion-item>
 
-                        <ion-item [button]="true">
-                            <ion-icon name="settings-outline" size="small"></ion-icon>
-                            <ion-text>设置</ion-text>
-                        </ion-item>
-                    </ion-list>
-                </ng-template>
-            </ion-popover>
-        </ion-buttons>
-    </ion-toolbar>
-</ion-header>
-<ion-content color="light">
-    <!-- 基本信息栏 -->
-    <ion-card>
-        <ion-list [inset]="true">
-            <ion-item lines="full">
-                <ion-avatar slot="start">
-                    <img alt="头像" src="../../assets/1.jpg" />
+                <ion-item [button]="true">
+                    <ion-icon name="settings-outline" size="small"></ion-icon>
+                    <ion-text>设置</ion-text>
+                </ion-item>
+                <ion-list [inset]="true">
+                    <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-list>
+    </ion-content>
+</ion-menu>
 
+<div class="ion-page" id="main-content">
+        <ion-header>
+          <ion-toolbar>
+            <ion-title>首页</ion-title>
+            <ion-buttons slot="end">
+                <ion-button routerLink="/user/info">
+                    <ion-icon slot="start" name="create-outline"></ion-icon>
+                </ion-button>  
+              <ion-menu-button></ion-menu-button>
+              
+            </ion-buttons>
+          </ion-toolbar>
+        </ion-header>
+        <ion-content class="ion-padding">
+    
+    <div class="card-container">
+        <div class="card">
+            <div class="profile">
+                <ion-avatar>
+                    <img alt="Silhouette of a person's head" src="../../assets/1.jpg" />
                 </ion-avatar>
                 <ion-label>
                     {{currentUser?.get("name") || '昵称'}}
                 </ion-label>
-                <ion-buttons slot="end">
-                    <ion-button>
-                        <ion-icon name="heart-outline"></ion-icon>
-                        <ion-note>{{currentUser?.get("like") || '99'}}</ion-note>
-                    </ion-button>
-                </ion-buttons>
-            </ion-item>
-            <ion-item lines="none">
-                <ion-badge slot="start">{{currentUser?.get("tag") || '标签'}}</ion-badge>
-            </ion-item>
-            <ion-item lines="none">
-                <ion-label color="medium">
-                    {{currentUser?.get("desc") || '介绍一下自己吧'}}
-                </ion-label>
-            </ion-item>
-        </ion-list>
-    </ion-card>
-    <!-- 列表 -->
     
-    <ion-list [inset]="true">
+                <ion-item lines="none">
+                    <ion-badge slot="start">{{currentUser?.get("tag") || '标签'}}</ion-badge>
+                </ion-item>
+                <ion-item lines="none">
+                    <ion-label color="medium">
+                        {{currentUser?.get("desc") || '介绍一下自己吧'}}
+                    </ion-label>
+                </ion-item>
+            </div>
+        </div>
+    </div>
+    
+
+    <!-- <ion-list [inset]="true">
         <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-list [inset]="true">
-            <ion-item button detail="true" routerLink="/lesson/me/userFollow">
-                <ion-icon name="people-sharp"></ion-icon>
-                <ion-label>
-                    <ion-note>人物,,</ion-note>
-                   
-                </ion-label>
-            </ion-item>
-            <ion-item button detail="true" routerLink="/lesson/me/userTag">
-                <ion-icon name="gift"></ion-icon>
-                <ion-label>
-                    <ion-note>礼物</ion-note>
-                </ion-label>
-            </ion-item>
-            <ion-item button detail="true" routerLink="/lesson/me/userCollection">
-                <ion-icon name="bulb"></ion-icon>
-                <ion-label>
-                    <ion-note>想法</ion-note>
-                </ion-label>
-            </ion-item>
-        </ion-list>
-    </ion-card> -->
-
+    </ion-list> -->
+   
 
     <ion-accordion-group [multiple]="true" [value]="['first', 'third']">
         <ion-accordion value="first">
@@ -223,7 +204,7 @@
               </ion-item>
                 <ion-item button detail="true" routerLink="/lesson/me/userFollow">
                 <ion-avatar slot="start">
-                    <img alt="头像" src="../../assets/20.png" />
+                    <img alt="头像" src="../../assets/20.jpg" />
                 </ion-avatar>
                 <ion-label>  
                     <span class="bold-text2">再见的人物</span><br>  
@@ -243,16 +224,16 @@
         <ion-toolbar>
             <ion-segment value="关注">
                 <ion-segment-button value="推荐" (click)="cate='推荐'">
-                    <ion-icon name="bookmarks-outline"></ion-icon>
-                    <ion-label>浏览记录</ion-label>
+                    <ion-icon name="footsteps-outline"></ion-icon>
+                    <ion-label>我的足迹</ion-label>
                 </ion-segment-button>
                 <ion-segment-button value="关注" (click)="cate='关注'">
                     <ion-icon name="heart-circle-outline"></ion-icon>
                     <ion-label>赞过</ion-label>
                 </ion-segment-button>
                 <ion-segment-button value="科普" (click)="cate='科普'">
-                    <ion-icon name="pricetag-outline"></ion-icon>
-                    <ion-label>笔记</ion-label>
+                    <ion-icon name="star-half-outline"></ion-icon>
+                    <ion-label>收藏</ion-label>
                 </ion-segment-button>
             </ion-segment>
             <ion-buttons slot="end"><ion-button>编辑</ion-button></ion-buttons>
@@ -327,4 +308,6 @@
         </ng-container>
     </ng-container>
 
-</ion-content>
+</ion-content>
+<!-- </ion-content> -->
+</div>

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

@@ -105,4 +105,27 @@ ion-avatar img {
     padding: 4px 8px; /* 内边距，可以根据需要调整 */  
     border-radius: 4px; /* 圆角，可以根据需要调整 */  
   }
- 
+ 
+  
+
+.card-container {
+    width: 100%;
+}
+
+.card {
+    background-color: #fff;
+    padding: 20px;
+    border-radius: 10px;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+}
+
+.profile {
+    text-align: center;
+    display: flex;    
+    flex-direction: column;    
+    align-items: center; 
+}
+
+ion-avatar {
+    margin-bottom: 10px; /* 头像和名字之间的间距 */
+}

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

@@ -5,10 +5,10 @@
         </ion-toolbar>
         <ion-segment value="all">
             <ion-segment-button value="all" (click)="changeTab('all')">
-                <ion-label>AI陪练</ion-label>
+                <ion-label>AI情商课堂</ion-label>
             </ion-segment-button>
             <ion-segment-button value="favorites" (click)="changeTab('favorites')">
-                <ion-label>社交形象制定</ion-label>
+                <ion-label>社交虚拟形象制定</ion-label>
             </ion-segment-button>
         </ion-segment>
     </ion-header>
@@ -74,7 +74,7 @@
         <!-- 显示AI人格定制. -->
         <ng-container *ngIf="currentTab === 'favorites'">
             <ion-list>
-                <h4 style="text-align: center;padding: 15px;">请填写以下信息，以便为你定制社交形象</h4>
+                <h4 style="text-align: center;padding: 15px;">请填写以下信息，以便为你定制虚拟社交形象</h4>
 
                 <ion-item>
                     <ion-select [value]="planOptions.gender" (ionChange)="setOption('gender',$event)" label="性别" placeholder=""cancelText="取消" okText="确定">
@@ -90,21 +90,21 @@
                     <ion-input label="身高（cm）" type="number" placeholder=""></ion-input>
                 </ion-item>
                 <ion-item>
-                    <ion-input label="体重（kg）" type="number" placeholder=""></ion-input>
+                    <ion-input label="年龄（year）" type="number" placeholder=""></ion-input>
                 </ion-item>
                 <ion-item>
-                    <ion-input label="年龄（year）" type="string" placeholder=""></ion-input>
+                    <ion-input label="技能&能力（skill）" type="string" placeholder=""></ion-input>
                 </ion-item>
                 <ion-item>
                     <ion-select [value]="planOptions.targets" (ionChange)="setOption('targets',$event)"
-                        aria-label="object" placeholder="日常性格" [multiple]="true">
-                        <ion-select-option value="慵懒休闲">慵懒休闲</ion-select-option>
-                        <ion-select-option value="活泼好动">活泼好动</ion-select-option>
-                        <ion-select-option value="独立自主">独立安静</ion-select-option>
+                        aria-label="object" placeholder="风格设定" [multiple]="true">
+                        <ion-select-option value="慵懒休闲">成熟稳重</ion-select-option>
+                        <ion-select-option value="活泼好动">自信坦荡</ion-select-option>
+                        <ion-select-option value="独立自主">遇到困难就摆烂</ion-select-option>
                     </ion-select>
                 </ion-item>
                 <ion-item>
-                    <ion-textarea label="你是否有其他信息或补充（如性格测试的结果）" labelPlacement="floating" placeholder=" "></ion-textarea>
+                    <ion-textarea label="你是否有其他信息或补充（如MBTI性格测试的结果）" labelPlacement="floating" placeholder=" "></ion-textarea>
                 </ion-item>
             </ion-list>
             <!-- <div style="display: flex; justify-content: center;"> -->

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

@@ -85,10 +85,10 @@ export class PageChatComponent {
   }
   
   sendPlan() {
-    let content = `宠物的性别:${this.planOptions.gender}，品种，年龄：，体重，
+    let content = `我的性别:${this.planOptions.gender}，身高，年龄，技能，
     信息：${this.planOptions.targets?.join(";")}
     补充：
-    请扮演符合上述信息既可爱又体贴的宠物陪伴我聊天
+    请扮演符合上述信息既专业又体贴的社交大师陪伴我聊天
     ` // 构建计划的内容字符串
     console.log(content)
     return