Merge commit '2e376fb'

app-angular/src/modules/lesson/attention-detail/attention-detail.component.html

@@ -15,19 +15,19 @@
     <ion-card>
         <img alt="角色图" [src]="role?.get('img')" />
         <ion-card-header>
-            <ion-card-title>{{role?.get('name')}}</ion-card-title>
-            <ion-card-subtitle>作者：{{role?.get('user')?.get('name')||"无名"}}</ion-card-subtitle>
-            <ion-card-subtitle>{{role?.get('type')||"角色类型"}}</ion-card-subtitle>
-            <ion-card-subtitle>{{role?.get('createdAt')| date: 'YYYY/MM/dd/HH:mm'||"发布时间"}}</ion-card-subtitle>
+            <ion-card-title>{{attention?.get('name')}}</ion-card-title>
+            <ion-card-subtitle>作者：{{attention?.get('user')?.get('name')||"某某某"}}</ion-card-subtitle>
+            <ion-card-subtitle>{{attention?.get('type')||""}}</ion-card-subtitle>
+            <ion-card-subtitle>{{attention?.get('createdAt')| date: 'YYYY/MM/dd/HH:mm'||"发布时间"}}</ion-card-subtitle>
         </ion-card-header>
         <ion-card-content>
-            {{role?.get('cueword')||"角色生成的提示词..."}}
+            {{attention?.get('cueword')||"#爱宠之家"}}
         </ion-card-content>
     </ion-card>
     <!-- 评论区 ，-->
     <ion-list [inset]="true">
         <ion-item>
-            <ion-textarea label="评论一下吧" labelPlacement="floating" rows="5" [(ngModel)]="comment">
+            <ion-textarea label="留下你的想法吧" labelPlacement="floating" rows="5" [(ngModel)]="comment">
             </ion-textarea>
         </ion-item>
         <ion-item>
@@ -50,8 +50,8 @@
         </ng-container>
         <ion-item class="comment-list">
             <ion-label>
-                <p class="commentator">邱依依</p>
-                <ion-note class="comment-content">好看 ♥</ion-note>
+                <p class="commentator">momo</p>
+                <ion-note class="comment-content">救命这也太可爱了吧啊啊 ♥</ion-note>
             </ion-label>
             <div class="comment-time">
                 <ion-note color="medium">03:44</ion-note>
@@ -59,8 +59,8 @@
         </ion-item>
         <ion-item class="comment-list">
             <ion-label>
-                <p class="commentator">秦酒</p>
-                <ion-note class="comment-content">也想试试</ion-note>
+                <p class="commentator">苏格拉没有底</p>
+                <ion-note class="comment-content">我也想养只哈基米，感觉会很治愈呢！</ion-note>
             </ion-label>
             <div class="comment-time">
                 <ion-note color="medium">Yesterday</ion-note>
@@ -68,8 +68,8 @@
         </ion-item>
         <ion-item class="comment-list">
             <ion-label>
-                <p class="commentator">文斯斯</p>
-                <ion-note class="comment-content">更想吃=。=</ion-note>
+                <p class="commentator">是CC呀</p>
+                <ion-note class="comment-content">它喜欢什么颜色的麻袋，我今晚就扛麻袋去偷=。=</ion-note>
             </ion-label>
             <div class="comment-time">
                 <ion-note color="medium">Yesterday</ion-note>
@@ -77,4 +77,4 @@
         </ion-item>
     </ion-list>
 
-</ion-content>
+</ion-content>

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

@@ -100,7 +100,7 @@
                     <ion-label>关注</ion-label>
                 </ion-segment-button>
                 <ion-segment-button value="科普" (click)="cate='科普'">
-                    <ion-icon name="fast-science-outline"></ion-icon>
+                    <ion-icon name="fast-food-outline"></ion-icon>
                     <ion-label>笔记</ion-label>
                 </ion-segment-button>
             </ion-segment>

app-angular/src/modules/lesson/recommend-detail/recommend-detail.component.html

@@ -16,9 +16,9 @@
     <ion-card>
         <img alt="美景图" [src]="view?.get('img')" />
         <ion-card-header>
-            <ion-card-title>{{view?.get('name')}}</ion-card-title>
-            <ion-card-subtitle>作者：{{view?.get('user')?.get('name')||"无名"}}</ion-card-subtitle>
-            <ion-card-subtitle>{{view?.get('createdAt')| date: 'YYYY/MM/dd/HH:mm'||"发布时间"}}</ion-card-subtitle>
+            <ion-card-title>{{recommend?.get('name')}}</ion-card-title>
+            <ion-card-subtitle>作者：{{recommend?.get('user')?.get('name')||"某某某"}}</ion-card-subtitle>
+            <ion-card-subtitle>{{recommend?.get('createdAt')| date: 'YYYY/MM/dd/HH:mm'||"发布时间"}}</ion-card-subtitle>
             <div class="metadata-end-wrapper">
                 <ion-button fill="clear" color="dark" size="small" class="see">
                     <ion-icon name="eye-outline" size="small"></ion-icon>
@@ -33,7 +33,7 @@
     <!-- 评论区 -->
     <ion-list [inset]="true">
         <ion-item>
-            <ion-textarea label="评论一下吧" labelPlacement="floating" rows="5" [(ngModel)]="comment">
+            <ion-textarea label="留下你的想法吧" labelPlacement="floating" rows="5" [(ngModel)]="comment">
             </ion-textarea>
         </ion-item>
         <ion-item>
@@ -57,8 +57,8 @@
 
         <ion-item class="comment-list">
             <ion-label>
-                <p class="commentator">肖哈哈</p>
-                <ion-note class="comment-content">666！</ion-note>
+                <p class="commentator">啾啾啾啾~</p>
+                <ion-note class="comment-content">啊啊好漂亮好喜欢好心动！这也太可爱了吧</ion-note>
             </ion-label>
             <div class="comment-time">
                 <ion-note color="medium">06:11</ion-note>
@@ -66,8 +66,8 @@
         </ion-item>
         <ion-item class="comment-list">
             <ion-label>
-                <p class="commentator">邱依依</p>
-                <ion-note class="comment-content">精彩的旅程 ♥</ion-note>
+                <p class="commentator">我一直很幸福</p>
+                <ion-note class="comment-content">好可爱，看着就想撸一撸，给姨姨吸两口 ♥</ion-note>
             </ion-label>
             <div class="comment-time">
                 <ion-note color="medium">03:44</ion-note>
@@ -75,8 +75,8 @@
         </ion-item>
         <ion-item class="comment-list">
             <ion-label>
-                <p class="commentator">秦酒</p>
-                <ion-note class="comment-content">很想去！！</ion-note>
+                <p class="commentator">如南怀瑾</p>
+                <ion-note class="comment-content">@子熹 快看这个！</ion-note>
             </ion-label>
             <div class="comment-time">
                 <ion-note color="medium">Yesterday</ion-note>
@@ -84,12 +84,12 @@
         </ion-item>
         <ion-item class="comment-list">
             <ion-label>
-                <p class="commentator">文斯斯</p>
-                <ion-note class="comment-content">下次一定要试试！！</ion-note>
+                <p class="commentator">裹着心的光</p>
+                <ion-note class="comment-content">哇好可爱啊，帮我问问它喜欢什么颜色的麻袋！！</ion-note>
             </ion-label>
             <div class="comment-time">
                 <ion-note color="medium">Yesterday</ion-note>
             </div>
         </ion-item>
     </ion-list>
-</ion-content>
+</ion-content>

app-angular/src/modules/lesson/science-detail/science-detail.component.html

@@ -16,7 +16,7 @@
         <img alt="科普图" [src]="science?.get('img')" />
         <ion-card-header>
             <ion-card-title>{{science?.get('name')}}</ion-card-title>
-            <ion-card-subtitle>作者：{{science?.get('user')?.get('name')||"无名"}}</ion-card-subtitle>
+            <ion-card-subtitle>作者：{{science?.get('user')?.get('name')||"爱宠之家FavorPet"}}</ion-card-subtitle>
             <ion-card-subtitle>{{science?.get('type')||"科普类别"}}</ion-card-subtitle>
             <ion-card-subtitle>{{science?.get('createdAt')| date: 'YYYY/MM/dd/HH:mm'||"发布时间"}}</ion-card-subtitle>
         </ion-card-header>
@@ -27,7 +27,7 @@
     <!-- 评论区 -->
     <ion-list [inset]="true">
         <ion-item>
-            <ion-textarea label="评论一下吧" labelPlacement="floating" rows="5" [(ngModel)]="comment">
+            <ion-textarea label="留下你的想法吧" labelPlacement="floating" rows="5" [(ngModel)]="comment">
             </ion-textarea>
 
         </ion-item>
@@ -52,8 +52,8 @@
 
         <ion-item class="comment-list">
             <ion-label>
-                <p class="commentator">肖哈哈</p>
-                <ion-note class="comment-content">大神指教O.O</ion-note>
+                <p class="commentator">小懒猫</p>
+                <ion-note class="comment-content">这个科普太及时啦，对我很有帮助O.O</ion-note>
             </ion-label>
             <div class="comment-time">
                 <ion-note color="medium">06:11</ion-note>
@@ -61,8 +61,8 @@
         </ion-item>
         <ion-item class="comment-list">
             <ion-label>
-                <p class="commentator">邱依依</p>
-                <ion-note class="comment-content"> ♥</ion-note>
+                <p class="commentator">绵绵冰</p>
+                <ion-note class="comment-content"> ♥♥♥♥♥♥</ion-note>
             </ion-label>
             <div class="comment-time">
                 <ion-note color="medium">03:44</ion-note>
@@ -70,8 +70,8 @@
         </ion-item>
         <ion-item class="comment-list">
             <ion-label>
-                <p class="commentator">秦酒</p>
-                <ion-note class="comment-content">很好吃的亚子！！</ion-note>
+                <p class="commentator">Sunrise</p>
+                <ion-note class="comment-content">这份攻略适合新手养宠！！</ion-note>
             </ion-label>
             <div class="comment-time">
                 <ion-note color="medium">Yesterday</ion-note>
@@ -79,8 +79,8 @@
         </ion-item>
         <ion-item class="comment-list">
             <ion-label>
-                <p class="commentator">文斯斯</p>
-                <ion-note class="comment-content">下次一定要试试！！</ion-note>
+                <p class="commentator">不吃香菜</p>
+                <ion-note class="comment-content">很不错，求推荐驱虫药！！</ion-note>
             </ion-label>
             <div class="comment-time">
                 <ion-note color="medium">Yesterday</ion-note>