Browse Source

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

hid_msrpuwgj56ccf29 9 months ago
parent
commit
ecb00c747d

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

@@ -8,15 +8,15 @@
         </ion-tab-button>
         <ion-tab-button routerLink="/lesson/lesson">
             <ion-icon name="alert-circle-outline"></ion-icon>
-                能不能吃
+                礼物挑选
             </ion-tab-button>
         <ion-tab-button routerLink="/lesson/page-chat">
             <ion-icon name="logo-snapchat"></ion-icon>
-            AI养宠
+            AI陪练
         </ion-tab-button>
         <ion-tab-button routerLink="/lesson/page-test">
             <ion-icon name="logo-octocat"></ion-icon>
-            性格测试
+            性格分析
           </ion-tab-button>
         <ion-tab-button routerLink="/lesson/me">
             <ion-icon name="person-circle"></ion-icon>

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

@@ -29,13 +29,13 @@ const routes: Routes = [
   { path: 'community/scienceDetail', component: ScienceDetailComponent },
   { path: 'community/attentionDetail', component: AttentionDetailComponent },
   { path: 'community/recommendDetail', component: RecommendDetailComponent },
-  { path: 'community/share', component: ShareComponent },
-  { path: "me/userFollow", component: ContactListPage },
-  { path: "me/userTag", component: UserTagComponent },
-  { path: "me/userCollection", component: UserCollectionComponent },
-  { path: "me/userRelationship", component: UserRelationshipComponent },
-  { path: 'me/userFollow/list', component: ContactDetailPage},
-  { path: 'me/userFollow/detail/:id', component: ContactDetailPage },
+  { path: 'community/share', component: ShareComponent, canActivate: [authGuard] },
+  { path: "me/userFollow", component: ContactListPage, canActivate: [authGuard] },
+  { path: "me/userTag", component: UserTagComponent, canActivate: [authGuard] },
+  { path: "me/userCollection", component: UserCollectionComponent, canActivate: [authGuard] },
+  { path: "me/userRelationship", component: UserRelationshipComponent, canActivate: [authGuard] },
+  { path: 'me/userFollow/list', component: ContactDetailPage, canActivate: [authGuard]},
+  { path: 'me/userFollow/detail/:id', component: ContactDetailPage , canActivate: [authGuard]},
 
 
 

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

@@ -212,7 +212,7 @@
                 </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>
@@ -221,7 +221,7 @@
         <span class="small-orange-text2">检索人物的技能和能力</span><br>    
                 </ion-label>
               </ion-item>
-              <ion-item>
+                <ion-item button detail="true" routerLink="/lesson/me/userFollow">
                 <ion-avatar slot="start">
                     <img alt="头像" src="../../assets/3.jpg" />
                 </ion-avatar>

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

@@ -1,20 +1,20 @@
 <div class="ion-page">
     <ion-header>
         <ion-toolbar>
-            <ion-title>AI养宠</ion-title>
+            <ion-title>AI</ion-title>
         </ion-toolbar>
         <ion-segment value="all">
             <ion-segment-button value="all" (click)="changeTab('all')">
-                <ion-label>宠物问诊</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>
     <ion-content>
 
-        <!-- AI宠物 -->
+        <!-- AI人格 -->
         <ng-container *ngIf="currentTab === 'all'">
 
             <div class="page">
@@ -72,10 +72,10 @@
 
         </ng-container>
 
-        <!-- 显示AI宠物定制. -->
+        <!-- 显示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="性别"
@@ -87,27 +87,27 @@
                 </ion-item>
 
                 <ion-item>
-                    <ion-input label="宠物品种" type="number" placeholder=""></ion-input>
+                    <ion-input label="称呼" type="number" placeholder=""></ion-input>
                 </ion-item>
                 <ion-item>
-                    <ion-input label="身(cm)" type="number" placeholder=""></ion-input>
+                    <ion-input label="身(cm)" type="number" placeholder=""></ion-input>
                 </ion-item>
                 <ion-item>
                     <ion-input label="体重(kg)" type="number" placeholder=""></ion-input>
                 </ion-item>
                 <ion-item>
-                    <ion-input label="陪你走过的岁月(year)" type="string" placeholder=""></ion-input>
+                    <ion-input label="年龄(year)" type="string" placeholder=""></ion-input>
                 </ion-item>
                 <ion-item>
                     <ion-select [value]="planOptions.targets" (ionChange)="setOption('targets',$event)"
-                        aria-label="object" placeholder="宠物的性格" [multiple]="true">
+                        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="你是否有其他信息或补充(如性格测试的结果)" labelPlacement="floating" placeholder=" "></ion-textarea>
                 </ion-item>
             </ion-list>
             <!-- <div style="display: flex; justify-content: center;"> -->

+ 18 - 18
app-angular/src/modules/lesson/page-lesson/page-lesson.component.html

@@ -2,36 +2,36 @@
 <ion-menu contentId="main-content">
     <ion-header>
       <ion-toolbar>
-        <ion-title>物分类</ion-title>
+        <ion-title>物分类</ion-title>
       </ion-toolbar>
     </ion-header>
     <ion-content class="ion-padding">
       <ion-item (click)="scrollToCardSection('热门')">
         热门
       </ion-item>
-      <ion-item (click)="scrollToCardSection('水果')">
-        水果
+      <ion-item (click)="scrollToCardSection('文创')">
+        文创
       </ion-item>
-      <ion-item (click)="scrollToCardSection('食')">
-        
+      <ion-item (click)="scrollToCardSection('食')">
+        
       </ion-item>
-      <ion-item (click)="scrollToCardSection('食')">
-        主食
+      <ion-item (click)="scrollToCardSection('食')">
+        家居
       </ion-item>
-      <ion-item (click)="scrollToCardSection('食')">
-        果蔬类
+      <ion-item (click)="scrollToCardSection('食')">
+        配饰
       </ion-item>
-      <ion-item (click)="scrollToCardSection('食')">
-        肉蛋类
+      <ion-item (click)="scrollToCardSection('食')">
+        彩妆
       </ion-item>
-      <ion-item (click)="scrollToCardSection('食')">
-        菌菇类
+      <ion-item (click)="scrollToCardSection('食')">
+        护肤
       </ion-item>
-      <ion-item (click)="scrollToCardSection('食')">
-        调味品
+      <ion-item (click)="scrollToCardSection('食')">
+        保健
       </ion-item>
-      <ion-item (click)="scrollToCardSection('食')">
-        药品补品
+      <ion-item (click)="scrollToCardSection('食')">
+        图书
       </ion-item>
       <!-- 其他分类项 -->
     </ion-content>
@@ -46,7 +46,7 @@
                 <ion-menu-button></ion-menu-button>
             </ion-buttons>
             <ion-searchbar [(ngModel)]="searchInput" (ionChange)="search()" (ionClear)="search()"
-                placeholder="小猫咪不能吃胡萝卜?"></ion-searchbar>
+                placeholder="搜索你想要的礼物"></ion-searchbar>
         </ion-toolbar>
     </ion-header>
     <!--课程卡片区-->

+ 101 - 103
app-angular/src/modules/lesson/page-test/page-test.component.html

@@ -2,26 +2,25 @@
     <ion-header>
         <ion-segment value="all">
             <ion-segment-button value="all" (click)="changeTab('all')">
-                <ion-label>不同MBTI宠物</ion-label>
+                <ion-label>不同MBTI</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>
-
     <ion-content>
-        
         <ng-container *ngIf="currentTab === 'all'">
             <ion-content>
                     <ion-card>
                       <ion-card-header>
-                        <ion-card-title>宠物MBTI各个维度解释</ion-card-title>
+                        <ion-card-title>MBTI各个维度解释</ion-card-title>
                       </ion-card-header>
                       <ion-card-content>
-                        <p>E(外向)—— |(内向):表示宠物在社交场合中的表现,E表示狗狗热情、亲近人,|表示宠物较为内敛、保持距离。</p>
-                        <p>A(积极)—— C(谨慎):表示宠物对新事物的接受程度,A表示狗狗好奇、敢于尝试,C表示狗狗谨慎、保守。</p>
-                        <p>L(学习型)- S(稳定型):表示狗狗在学习和适应环境中的表现,L表示狗狗学习能力强、适应能力高,S表示狗狗倾向于稳定的环境和习惯。</p>
+                        <p>外向(E)- 内向(I):外向的人更倾向于外部世界,喜欢社交和活动;内向的人更倾向于内部世界,喜欢独处和深思熟虑。                          
+                        <p> 感觉(S)- 直觉(N):感觉型的人更注重现实和细节,喜欢具体的经验;直觉型的人更注重未来和可能性,喜欢思考抽象概念。                        </p>
+                        <p> 思维(T)- 情感(F):思维型的人更倾向于理性和逻辑,喜欢基于事实做决定;情感型的人更倾向于情感和价值观,喜欢考虑他人感受。                        </p>
+                        <p> 判断(J)- 感知(P):判断型的人更喜欢有计划和组织,喜欢做出决定;感知型的人更喜欢灵活和开放,喜欢适应环境。                      </p>
                       </ion-card-content>
                     </ion-card>
                     
@@ -46,101 +45,100 @@
                     </ion-row>
                 </ion-grid>
             </ion-content>
-        </ng-container>
-
-        <!-- 宠物测试 -->
-        <ng-container *ngIf="currentTab === 'favorites'">
-            <h4 style="text-align: center;padding: 15px;">开始测试</h4>
-            <ion-list>
-                <ion-item class="question">
-                    <ion-label class="question-label">1.当你坐在沙发上看电视时,你的宠物会:
-                        </ion-label>
-                  </ion-item>
-                  
-                  <ion-radio-group [(ngModel)]="planOptions.option1">
-                    <ion-item class="option">
-                      <ion-label class="option-label">A 跳上来陪你</ion-label>
-                      <ion-radio value="慵懒休闲"></ion-radio>
-                    </ion-item>
-                    <ion-item class="option">
-                      <ion-label class="option-label">B 在旁边的地板上休息
-                        </ion-label>
-                      <ion-radio value="活泼好动"></ion-radio>
-                    </ion-item>
-                    
-                    <ion-item class="option">
-                      <ion-label class="option-label">C 无所谓,表现地很平静</ion-label>
-                      <ion-radio value="无所谓"></ion-radio>
-                    </ion-item>
-                  </ion-radio-group>
-                  
-                <ion-item class="question">
-                    <ion-label class="question-label">2.当你的宠物遇到陌生人时,它会</ion-label>
-                  </ion-item>
-                  
-                  <ion-radio-group [(ngModel)]="planOptions.option1">
-                    <ion-item class="option">
-                      <ion-label class="option-label">A 热情地走近,并好奇地闻闻</ion-label>
-                      <ion-radio value="慵懒休闲"></ion-radio>
-                    </ion-item>
-                    <ion-item class="option">
-                      <ion-label class="option-label">B 躲在安全的地方观察一会再决定是否靠近</ion-label>
-                      <ion-radio value="活泼好动"></ion-radio>
-                    </ion-item>
-                    
-                    <ion-item class="option">
-                      <ion-label class="option-label">C 无所谓,表现地很平静</ion-label>
-                      <ion-radio value="无所谓"></ion-radio>
-                    </ion-item>
-                  </ion-radio-group>
-                  
-                  <ion-item class="question">
-                    <ion-label class="question-label">3.当你回到家时,你的宠物会</ion-label>
-                  </ion-item>
-                  
-                  <ion-radio-group [(ngModel)]="planOptions.option2">
-                    <ion-item class="option">
-                      <ion-label class="option-label">A 热情地迎接你并蹭你的腿</ion-label>
-                      <ion-radio value="慵懒休闲"></ion-radio>
-                    </ion-item>
-                    <ion-item class="option">
-                      <ion-label class="option-label">B 躲在某个地方等待你</ion-label>
-                      <ion-radio value="活泼好动"></ion-radio>
-                    </ion-item>
-                  
-                    <ion-item class="option">
-                      <ion-label class="option-label">C 无所谓,表现地很平静</ion-label>
-                      <ion-radio value="无所谓"></ion-radio>
-                    </ion-item>
-                  </ion-radio-group>
-                  <ion-item class="question">
-                    <ion-label class="question-label">4.当你打开一个新的盒子或者移动家具时,你的宠物会</ion-label>
-                  </ion-item>
-                  
-                  <ion-radio-group [(ngModel)]="planOptions.option2">
-                    <ion-item class="option">
-                      <ion-label class="option-label">A 好奇地探索新环境
-                        </ion-label>
-                      <ion-radio value="慵懒休闲"></ion-radio>
-                    </ion-item>
-                    <ion-item class="option">
-                      <ion-label class="option-label">B 保持距离观望
-                        </ion-label>
-                      <ion-radio value="活泼好动"></ion-radio>
-                    </ion-item>
-                  
-                    <ion-item class="option">
-                      <ion-label class="option-label">C 无所谓,表现地很平静</ion-label>
-                      <ion-radio value="无所谓"></ion-radio>
-                    </ion-item>
-                  </ion-radio-group>
-                  
+        </ng-container>    
+        <div *ngIf="currentTab === 'favorites'">
+          <div class="popup" *ngIf="showPopup">
+            <img src="../../../assets/gxitu.png" alt="Test Result Image">
+            <p>这是测试结果的解释。</p>
+            <button type="button" (click)="showPopup = false">关闭</button>
+        </div>
+          <div class="question">
+              <p>1. 当你需要集中精力时,你会:</p>
+              <label>
+                  <input type="radio" name="question1" value="A"> A 喜欢一个安静的环境
+              </label><br>
+              <label>
+                  <input type="radio" name="question1" value="B"> B 喜欢有背景音乐的环境
+              </label><br>
+              <label>
+                  <input type="radio" name="question1" value="C"> C 喜欢有人陪伴的环境
+              </label>
+          </div>
+          
+          <div class="question">
+              <p>2. 在社交场合,你更倾向于:</p>
+              <label>
+                  <input type="radio" name="question2" value="A"> A 和几个亲近的朋友深入交流
+              </label><br>
+              <label>
+                  <input type="radio" name="question2" value="B"> B 参与大型团体活动
+              </label><br>
+              <label>
+                  <input type="radio" name="question2" value="C"> C 寻找新朋友认识
+              </label>
+          </div>
+          
+          <div class="question">
+              <p>3. 当面对冲突时,你通常:</p>
+              <label>
+                  <input type="radio" name="question3" value="A"> A 寻求妥协
+              </label><br>
+              <label>
+                  <input type="radio" name="question3" value="B"> B 直接表达自己的意见
+              </label><br>
+              <label>
+                  <input type="radio" name="question3" value="C"> C 尽量避免冲突
+              </label>
+          </div>
+          
+          <div class="question">
+              <p>4. 在工作中,你更喜欢:</p>
+              <label>
+                  <input type="radio" name="question4" value="A"> A 有明确的工作安排和计划
+              </label><br>
+              <label>
+                  <input type="radio" name="question4" value="B"> B 灵活应对各种情况
+              </label><br>
+              <label>
+                  <input type="radio" name="question4" value="C"> C 与团队合作完成任务
+              </label>
+          </div>
+          
+          <div class="question">
+              <p>5. 当需要做决定时,你更倾向于:</p>
+              <label>
+                  <input type="radio" name="question5" value="A"> A 依据逻辑和事实
+              </label><br>
+              <label>
+                  <input type="radio" name="question5" value="B"> B 依据感觉和直觉
+              </label><br>
+              <label>
+                  <input type="radio" name="question5" value="C"> C 寻求他人的意见
+              </label>
+          </div>
+          
+          <div class="question">
+              <p>6. 你更喜欢:</p>
+              <label>
+                  <input type="radio" name="question6" value="A"> A 计划和组织事物
+              </label><br>
+              <label>
+                  <input type="radio" name="question6" value="B"> B 探索新的想法和可能性
+              </label><br>
+              <label>
+                  <input type="radio" name="question6" value="C"> C 与他人分享经验和感受
+              </label>
+          </div>
                 <ion-item class="question">
                     <ion-textarea label="你是否有其他信息或补充" labelPlacement="floating" placeholder=" "></ion-textarea>
                 </ion-item>
-            </ion-list>
-            <ion-button  expand="block">生成测试结果</ion-button>
-        </ng-container>
-        <div class="navfooter"> </div>
-    </ion-content>
-</div>
+                <div style="text-align: center; margin-bottom: 20px;">
+                  <button type="button" (click)="showPopup = true">生成测试结果</button>
+              </div>
+          </div>
+      </ion-content>
+      
+      <div class="navfooter">
+          <!-- 底部导航栏内容 -->
+      </div>
+  </div>

+ 45 - 93
app-angular/src/modules/lesson/page-test/page-test.component.scss

@@ -1,114 +1,66 @@
-// AI禁忌事项
-.page {
-    background-color: #f2f2f2;
-    height: calc(100% - 114px);
-    width: 100vw;
-    overflow-y: scroll;
+.ion-page {
+    font-family: Arial, sans-serif;
+    color: #333;
 }
 
-.footer {
-    position: fixed;
-    bottom: 60px;
-    width: 100vw;
-}
-
-.chat-container {
+.ion-card {
+    margin: 20px;
     padding: 10px;
-
-}
-
-.message-container {
-    display: flex;
-    align-items: flex-start;
-    margin-bottom: 10px;
-}
-
-.message-container-mine {
-    display: flex;
-    align-items: flex-start;
-    margin-bottom: 10px;
-    flex-direction: row-reverse;
+    border-radius: 10px;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
 }
 
-.avatar-left {
-    width: 40px;
-    height: 40px;
-    border-radius: 50%;
-    margin-right: 10px;
-
+.question {
+    margin: 20px;
+    padding: 10px;
+    background-color: #f9f9f9;
+    border-radius: 5px;
 }
 
-.avatar-right {
-    width: 40px;
-    height: 40px;
-    border-radius: 50%;
-    margin-left: 10px;
+.question p {
+    font-weight: bold;
 }
 
-.message-box-left {
-    background-color: #fff;
-    border-radius: 10px;
-    padding: 10px;
-    max-width: 70%;
+.question label {
+    display: block;
+    margin-top: 5px;
 }
 
-.message-box-right {
-    background-color: #95ec69;
-    border-radius: 10px;
-    padding: 10px;
-    max-width: 70%;
+button {
+    padding: 10px 20px;
+    background-color: #007bff;
+    color: white;
+    border: none;
+    border-radius: 5px;
+    cursor: pointer;
 }
 
-.message-content {
-    word-wrap: break-word;
+button:hover {
+    background-color: #0056b3;
 }
 
-.send-container {
-    display: flex;
-    align-items: center;
-    padding: 10px;
+navfooter {
+    height: 50px;
     background-color: #f2f2f2;
-
 }
-
-.message-input {
-    flex: 1;
-    padding: 8px;
-    border: none;
-    border-radius: 20px;
-    background-color: #fff;
+.navfooter {
+    height: 50px;
+    background-color: #f2f2f2;
 }
-
-.send-button {
-    padding: 8px 15px;
-    border: none;
-    border-radius: 20px;
-    background-color: #38c1f5;
-    color: white;
-    font-weight: bold;
-    cursor: pointer;
-    margin-left: 10px;
+.popup {
+    position: fixed;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    background-color: #f0f0f0;
+    padding: 20px;
+    border: 1px solid #ccc;
+    border-radius: 5px;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+    text-align: center; /* 居中文本 */
+    z-index: 9999;
 }
 
-.navfooter {
-    width: 100%;
-    height: 120px;
+.popup button {
+    margin-top: 10px; /* 按钮与文本之间的间距 */
 }
-.question {
-    font-weight: bold;
-    margin-bottom: 10px;
-    
-  }
-  
-  .question-label {
-    font-size: 18px;
-  }
-  
-  .option {
-    margin-bottom: 8px;
-  }
-  
-  .option-label {
-    font-size: 16px;
-  }
-  

+ 5 - 0
app-angular/src/modules/lesson/page-test/page-test.component.ts

@@ -13,6 +13,10 @@ import { Router } from '@angular/router';
 })
 
   export class PageTestComponent {
+    showPopup: boolean = false; // 控制弹出框显示状态
+    showTestResultPopup() {
+        this.showPopup = true;
+    }
     currentUser = Parse.User.current() // 当前用户对象
   currentTab: string = 'all'; // 当前选项卡的标识符
   changeTab(tab: string) {
@@ -39,6 +43,7 @@ import { Router } from '@angular/router';
       return list
     }
     planOptions: any = {
+      
       gender: "未知",
       option1: "",
       option2: ""

+ 18 - 18
app-angular/src/modules/lesson/share/share.component.html

@@ -12,13 +12,13 @@
     <ion-toolbar>
         <ion-segment value="推荐">
             <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>相机📸</ion-label>
+                <ion-label>教程分享📸</ion-label>
             </ion-segment-button>
             <ion-segment-button value="科普" (click)="cate='科普'">
-                <ion-label>模板🔍</ion-label>
+                <ion-label>技能提升🔍</ion-label>
             </ion-segment-button>
         </ion-segment>
     </ion-toolbar>
@@ -29,10 +29,10 @@
                 <ion-icon name="image-outline" style="margin-right: 3px;"></ion-icon>添加封面
             </ion-item>
             <ion-item lines="none">
-                <ion-input placeholder="日常碎片PLOG📸" [counter]="true" maxlength="30"></ion-input>
+                <ion-input placeholder="打卡练习PLOG📸" [counter]="true" maxlength="30"></ion-input>
             </ion-item>
             <ion-item lines="none">
-                <ion-textarea placeholder="一键定格美好瞬间" rows="9" [counter]="true" maxlength="30000">
+                <ion-textarea placeholder="每天5分钟" rows="9" [counter]="true" maxlength="30000">
                 </ion-textarea>
             </ion-item>
             <ion-item lines="full">
@@ -45,7 +45,7 @@
             </ion-item>
             <ion-item lines="none"><ion-label style="font-size: 0.9rem;">
                     参与话题:
-                    <ion-note class="viewTopic" button>#养猫日常</ion-note><ion-note class="viewTopic">#小狗日常</ion-note>...
+                    <ion-note class="viewTopic" button>#人性智慧</ion-note><ion-note class="viewTopic">#社交格局</ion-note>...
                     <ion-note button>更多</ion-note>
                 </ion-label>
             </ion-item>
@@ -67,16 +67,16 @@
                 <ion-icon name="image-outline" style="margin-right: 3px;"></ion-icon>添加封面
             </ion-item>
             <ion-item lines="none">
-                <ion-input placeholder="📛相册取名/标题" maxlength="5"></ion-input>
+                <ion-input placeholder="📛教程取名/标题" maxlength="5"></ion-input>
             </ion-item>
             <ion-item lines="none">
-                <ion-select label="关注类型" interface="popover">
-                    <ion-select-option value="小狗">小狗🐕-日记</ion-select-option>
-                    <ion-select-option value="小猫">小猫🐱-日常</ion-select-option>
+                <ion-select label="类型" interface="popover">
+                    <ion-select-option value="口才">口才-练习</ion-select-option>
+                    <ion-select-option value="礼仪">礼仪-分享</ion-select-option>
                 </ion-select>
             </ion-item>
             <ion-item lines="none">
-                <ion-textarea placeholder="记录爱宠日常" rows="9">
+                <ion-textarea placeholder="表达力提升" rows="9">
                 </ion-textarea>
             </ion-item>
             <ion-item lines="full">
@@ -85,8 +85,8 @@
             </ion-item>
             <ion-item lines="none"><ion-label style="font-size: 0.9rem;">
                     参与话题:
-                    <ion-note class="viewTopic" button>#哈基米🐶</ion-note>
-                    <ion-note class="viewTopic" button>#吸猫日记</ion-note>...
+                    <ion-note class="viewTopic" button>#演讲口才</ion-note>
+                    <ion-note class="viewTopic" button>#改变自己</ion-note>...
                     <ion-note button>更多</ion-note>
                 </ion-label>
             </ion-item>
@@ -108,16 +108,16 @@
                 <ion-icon name="image-outline" style="margin-right: 3px;"></ion-icon>添加封面
             </ion-item>
             <ion-item lines="none">
-                <ion-input placeholder="记录美好🏷️" maxlength="30"></ion-input>
+                <ion-input placeholder="表达力提升🏷️" maxlength="30"></ion-input>
             </ion-item>
             <ion-item lines="none">
                 <ion-select label="属于" interface="popover">
-                    <ion-select-option value="图文">图文</ion-select-option>
-                    <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 lines="none">
-                <ion-textarea placeholder="2023年关键帧🎬" rows="9" [counter]="true" maxlength="3000">
+                <ion-textarea placeholder="自我成长🎬" rows="9" [counter]="true" maxlength="3000">
                 </ion-textarea>
             </ion-item>
             <ion-item lines="full">
@@ -130,7 +130,7 @@
             </ion-item>
             <ion-item lines="none"><ion-label style="font-size: 0.9rem;">
                     参与/添加话题:
-                    <ion-note class="viewTopic" button>#小猫日记</ion-note><ion-note class="viewTopic">#狗狗日常</ion-note>...
+                    <ion-note class="viewTopic" button>#逻辑思维</ion-note><ion-note class="viewTopic">#人际关系</ion-note>...
                     <ion-note button>更多</ion-note>
                 </ion-label>
             </ion-item>

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

@@ -11,14 +11,13 @@
     </ion-toolbar>
 </ion-header>
 <div class="container">
-    <h1>关系网<br></h1>
-    <h2>Welcome to the Image Generator Page</h2>
+    <h1>目前的关系网🌟<br></h1>
   
     <!-- Display an example image -->
     <img src="assets/gxitu.png" alt="https://www.lddgo.net/chart/character-relationship" class="example-image">
   
     <!-- Button to navigate to the online generator page -->
-    <button (click)="redirectToExternalLink()" class="btn">Go to Online Generator</button>
+    <button (click)="redirectToExternalLink()" class="btn">在线编辑📝</button>
   
     <!-- Button to go back -->
     <!-- <button (click)="goBack()" class="btn">Back</button> -->