Browse Source

Merge branch 'master' of http://git.fmode.cn:3000/ai/app-gift

flowaaa 4 months ago
parent
commit
59de9ed5ef

+ 0 - 0
app-angular/src/assets/27.png → app-angular/src/assets/7489e32e5ff41e1835c09bc798fe3b8.png


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

@@ -1,7 +1,7 @@
 <ion-menu side="end" content-id="main-content">
     <ion-header>
       <ion-toolbar>
-        <ion-title>Menu Content</ion-title>
+        <ion-title>设置</ion-title>
       </ion-toolbar>
     </ion-header>
     <ion-content class="ion-padding"> 
@@ -21,8 +21,20 @@
                 </ion-item>
 
                 <ion-item [button]="true">
-                    <ion-icon name="settings-outline" size="small"></ion-icon>
-                    <ion-text>设置</ion-text>
+                    <ion-icon name="list-circle-outline" size="small"></ion-icon>
+                    <ion-text>用户条款</ion-text>
+                </ion-item>
+                <ion-item [button]="true">
+                    <ion-icon name="glasses-outline" size="small"></ion-icon>
+                    <ion-text>隐私政策</ion-text>
+                </ion-item>
+                <ion-item [button]="true">
+                    <ion-icon name="logo-whatsapp" size="small"></ion-icon>
+                    <ion-text>意见反馈</ion-text>
+                </ion-item>
+                <ion-item [button]="true">
+                    <ion-icon name="logo-npm" 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>
@@ -118,7 +130,6 @@
           <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" />

+ 7 - 4
app-angular/src/modules/lesson/me/me.component.scss

@@ -113,12 +113,15 @@ ion-avatar img {
 }
 
 .card {
-    background-color: #fff;
+    background-color: #ffffff;
     padding: 20px;
-    border-radius: 10px;
-    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+    border-radius: 5px;
+    box-shadow: 0 4px 6px rgba(236, 166, 36, 0.5); /* 橙色阴影效果 */
+   
+
 }
 
+
 .profile {
     text-align: center;
     display: flex;    
@@ -128,4 +131,4 @@ ion-avatar img {
 
 ion-avatar {
     margin-bottom: 10px; /* 头像和名字之间的间距 */
-}
+}

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

@@ -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>
     <!--课程卡片区-->

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

@@ -12,10 +12,10 @@
     <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>
@@ -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="每天5分钟" rows="9" [counter]="true" maxlength="30000">
+                <ion-textarea placeholder="写下你的所见所思..." rows="9" [counter]="true" maxlength="30000">
                 </ion-textarea>
             </ion-item>
             <ion-item lines="full">