Merge remote-tracking branch 'origin/master'

src/app/forum/forum/forum.component.html

@@ -136,7 +136,7 @@
               <h1 class="text-info col-12 text-center mb-3 forum-title">{{getForum().title}}</h1>
               <!--    帖子正文-->
               <div class="forum-content border-info overflow-auto col-9 offset-2 mb-3">
-                {{getForum().content}}
+                {{getContent().content}}
               </div>
               <!--    帖子底部-->
               <div class="forum-footer border-info p-3 mb-3">
@@ -189,7 +189,7 @@
                 <h1 class="text-center">{{getForum().title}}</h1>
                 <!--          投诉内容-->
                 <div class="forum-content border-info overflow-auto mb-3">
-                  {{getForum().content}}
+                  {{getContent().content}}
                 </div>
                 <!--          投诉时间-->
                 <h1
@@ -219,7 +219,7 @@
               <h1 class="text-info col-12 text-center mb-3 forum-title">{{getForum().title}}</h1>
               <!--    帖子正文-->
               <div class="forum-content border-info overflow-auto col-9 offset-2 mb-3">
-                {{getForum().content}}
+                {{getContent().content}}
               </div>
             </div>
           </ng-container>
@@ -246,7 +246,7 @@
               <h1 class="text-info col-12 text-center mb-3 forum-title">{{getForum().title}}</h1>
               <!--    帖子正文-->
               <div class="forum-content border-info overflow-auto col-9 offset-2 mb-3">
-                {{getForum().content}}
+                {{getContent().content}}
               </div>
             </div>
 

src/app/forum/forum/forum.component.ts

@@ -2,7 +2,7 @@ import {Component, OnInit} from '@angular/core';
 import {Router} from '@angular/router';
 import {ForumService} from '../forum.service';
 import {Result} from '../../interface/Result';
-import {Active, Complaint, Forum, Score} from '../../interface/ForumType';
+import {Active, Complaint, Forum, ForumContent, Score} from '../../interface/ForumType';
 import {Notice} from '../../interface/Notice';
 import {MessageInterface, MessageUtil} from '../../message/message.service';
 import {NoticeService} from '../notice/notice.service';
@@ -68,6 +68,10 @@ export class ForumComponent implements OnInit, MessageInterface {
     return this.posts.forumList.list[this.currentIndex];
   }
 
+  getContent(): ForumContent {
+    return this.getForum().detailContent;
+}
+
   getActive(): Active {
     return this.getForum().activeDto;
   }

src/app/interface/ForumType.ts

@@ -12,6 +12,10 @@ export enum ForumStatus {
   ok = 'ok',
   fail = 'fail'
 }
+export interface ForumContent {
+  // 正文
+  content: string;
+}
 
 export interface Forum {
   // 帖子
@@ -36,6 +40,8 @@ export interface Forum {
   score: Score;
   // 发帖人详情信息
   info: Info;
+  // 1楼信息
+  detailContent: ForumContent;
 }
 
 

src/assets/i18n/en-US.json

@@ -1,40 +1,40 @@
 {
   "APP_TITLE": "PocketCommunityAdmin",
   "language": "language",
-  "chinese": "chinese",
-  "english": "english",
+  "chinese": "Chinese",
+  "english": "English",
   "login": {
-    "manager_name": "manager name",
-    "password": "password"
+    "manager_name": "Manager Name",
+    "password": "Password"
   },
   "register": {
-    "confirm_pwd": "confrim password",
-    "mobile": "mobile",
-    "email": "email",
-    "emailType": "email type"
+    "confirm_pwd": "Confrim Password",
+    "mobile": "Mobile",
+    "email": "Email",
+    "emailType": "Email Type"
   },
   "reset_pwd": {
-    "code": "verification code",
-    "new_pwd": "password",
-    "confirm_pwd": "confirm password"
+    "code": "Verification Code",
+    "new_pwd": "Password",
+    "confirm_pwd": "Confirm Password"
   },
   "forum": {
-    "name": "forum",
-    "notice": "notice",
-    "check": "check",
-    "sender": "sender",
-    "time": "time",
+    "name": "Forum",
+    "notice": "NOTICE",
+    "check": "CHECK",
+    "sender": "Sender",
+    "time": "Time",
     "active_date": "Active Date：From {{startDate}} To {{endDate}}",
     "active_score": "Active Score：{{score}}",
-    "approve": "approve",
-    "reject": "reject",
-    "complaint": "time：{{time}}",
-    "plaintiff": "plaintiff",
-    "defendant": "defendant",
-    "notice_title": "notice title",
-    "notice_content": "notice content",
+    "approve": "Approve",
+    "reject": "Reject",
+    "complaint": "Time：{{time}}",
+    "plaintiff": "Plaintiff",
+    "defendant": "Defendant",
+    "notice_title": "Notice Title",
+    "notice_content": "Notice Content",
     "deadline": "Deadline：{{endDate}}",
-    "add_more_notice": "添加更多公告"
+    "add_more_notice": "ADD MORE ANNOUNCEMENTS"
   },
   "visitor": {
     "name": "Visitor Appointment Management",
@@ -50,33 +50,33 @@
     "status": "Status"
   },
   "tip": {
-    "input": "please input {{value}}",
+    "input": "Please input {{value}}",
     "HELLO": "Hello <span style='color:red'>{{value}}</span> welcome to you",
     "notnull": "The {{value}} cannot be empty",
     "password_diff": "The passwords do not match",
     "mobile_error": "The phone number is illegal",
-    "select": "please choose an {{value}}"
+    "select": "Please choose an {{value}}"
   },
   "button": {
-    "login": "login",
-    "register": "register",
-    "forget_pwd": "forget password?",
-    "backLogin": "back",
-    "send_code": "send verification code",
-    "reset_pwd": "reset password",
-    "logout": "logout",
-    "next": "next",
-    "prev": "prev",
+    "login": "Login",
+    "register": "Register",
+    "forget_pwd": "Forget Password?",
+    "backLogin": "Back",
+    "send_code": "Send Verification Code",
+    "reset_pwd": "Reset Password",
+    "logout": "Logout",
+    "next": "Next",
+    "prev": "Prev",
     "next_page": "Next",
     "prev_page": "Previous",
-    "first_page": "first page",
-    "last_page": "last page",
-    "check_code": "check_code",
-    "notice": "submit",
-    "back": "back",
-    "search": "search",
-    "jump": "jump",
-    "submit": "submit",
+    "first_page": "First page",
+    "last_page": "Last page",
+    "check_code": "Check_code",
+    "notice": "Submit",
+    "back": "Back",
+    "search": "Search",
+    "jump": "Jump",
+    "submit": "Submit",
     "total_page": "Total pages：{{totalPage}},Total records：{{count}}"
   },
   "score": {
@@ -115,7 +115,7 @@
       "mobie": "Phone numbers cannot be empty",
       "email": "Email cannot be empty",
       "username": "User already exists",
-      "ok": "register succeeded"
+      "ok": "Register succeeded"
     },
     "logout": {
       "ok": "Logout successful",