From 034d87937368a528dd332c0341c05486a27c448f Mon Sep 17 00:00:00 2001
From: panqihua <1029559041@qq.com>
Date: Thu, 23 Apr 2020 11:04:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=A4=B4=E5=83=8F=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/forum/forum/forum.component.html | 12 ++++++------
 src/app/forum/forum/forum.component.ts   |  5 +++++
 src/assets/i18n/en-US.json               |  2 +-
 src/assets/i18n/zh-CN.json               |  2 +-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/app/forum/forum/forum.component.html b/src/app/forum/forum/forum.component.html
index 7b82b20..5de3113 100644
--- a/src/app/forum/forum/forum.component.html
+++ b/src/app/forum/forum/forum.component.html
@@ -119,7 +119,7 @@
             <!--      发件人信息-->
             <div class="position-absolute sender">
               <!--    发帖人头像-->
-              <img [src]="getForum().info.headImg" alt="headimg" class="headimg mb-3"/>
+              <img [src]="getHeadImg(getForum().info.headImg)" alt="headimg" class="headimg mb-3"/>
               <!--    发帖人-->
               <div class="forum-label border-info mb-3 text-center">
                 {{getForum().username}}
@@ -141,7 +141,7 @@
               <!--    帖子底部-->
               <div class="forum-footer border-info p-3 mb-3">
                 <h3
-                  class="text-center">{{'forum.deadline'|translate:{date: getActive().registrationDeadline|date:dateFormat} }}</h3>
+                  class="text-center">{{'forum.deadline'|translate:{endDate: (getActive().registrationDeadline|date:dateFormat)} }}</h3>
                 <h3 class="text-center">{{ 'forum.active_date' | translate:{
                   startDate: getActive().activeStartTime|date:dateFormat,
                   endDate: getActive().activeEndTime|date:dateFormat
@@ -163,7 +163,7 @@
                   <div class="text-center">{{'forum.plaintiff'|translate}}</div>
                   <!--            头像-->
                   <div class="d-flex justify-content-center mb-3 m-headimg">
-                    <img [src]="getForum().info.headImg" alt="headimg" class="headimg">
+                    <img [src]="getHeadImg(getForum().info.headImg)" alt="headimg" class="headimg">
                   </div>
                   <div class="text-center border-info mb-3 l-label">{{getForum().username}}</div>
                   <div class="text-center border-info l-label">{{getForum().info.creditScore}}</div>
@@ -174,7 +174,7 @@
                   <div class="text-center">{{'forum.defendant'|translate}}</div>
                   <div class="d-flex justify-content-center mb-3 m-headimg">
                     <!--              头像-->
-                    <img [src]="getComplaint().info.headImg" alt="headimg" class="headimg">
+                    <img [src]="getHeadImg(getComplaint().info.headImg)" alt="headimg" class="headimg">
                   </div>
                   <div class="text-center border-info mb-3 l-label">{{getComplaint().complain}}</div>
                   <div class="text-center border-info l-label">{{getComplaint().info.creditScore}}</div>
@@ -202,7 +202,7 @@
             <!--      发件人信息-->
             <div class="position-absolute sender">
               <!--    发帖人头像-->
-              <img [src]="getForum().info.headImg" alt="headimg" class="headimg mb-3"/>
+              <img [src]="getHeadImg(getForum().info.headImg)" alt="headimg" class="headimg mb-3"/>
               <!--    发帖人-->
               <div class="forum-label border-info mb-3 text-center">
                 {{getForum().username}}
@@ -228,7 +228,7 @@
             <!--      发件人信息-->
             <div class="position-absolute sender">
               <!--    发帖人头像-->
-              <img [src]="getForum().info.headImg" alt="headimg" class="headimg mb-3"/>
+              <img [src]="getHeadImg(getForum().info.headImg)" alt="headimg" class="headimg mb-3"/>
               <!--    发帖人-->
               <div class="forum-label border-info mb-3 text-center">
                 {{getForum().username}}
diff --git a/src/app/forum/forum/forum.component.ts b/src/app/forum/forum/forum.component.ts
index 8942aa8..29266bd 100644
--- a/src/app/forum/forum/forum.component.ts
+++ b/src/app/forum/forum/forum.component.ts
@@ -9,6 +9,7 @@ import {NoticeService} from '../notice/notice.service';
 import {TranslateService} from '@ngx-translate/core';
 import {ForumNewResponse} from '../../interface/Response';
 import {AbstractRoute} from '../../AbstractRoute';
+import {environment} from '../../../environments/environment';
 
 /**
  * 论坛组件
@@ -91,6 +92,10 @@ export class ForumComponent implements OnInit, MessageInterface {
     });
   }
 
+  getHeadImg(url) {
+    return environment.apiServer + url;
+  }
+
   /**
    * 获取所有帖子
    */
diff --git a/src/assets/i18n/en-US.json b/src/assets/i18n/en-US.json
index 7463659..00c35fb 100644
--- a/src/assets/i18n/en-US.json
+++ b/src/assets/i18n/en-US.json
@@ -33,7 +33,7 @@
     "defendant": "defendant",
     "notice_title": "notice title",
     "notice_content": "notice content",
-    "deadline": "报名截止日期：{{date}}"
+    "deadline": "报名截止日期：{{endDate}}"
   },
   "visitor": {
     "name": "访客预约管理",
diff --git a/src/assets/i18n/zh-CN.json b/src/assets/i18n/zh-CN.json
index 4a2266f..3f66ee6 100644
--- a/src/assets/i18n/zh-CN.json
+++ b/src/assets/i18n/zh-CN.json
@@ -33,7 +33,7 @@
     "defendant": "被投诉人",
     "notice_title": "公告标题",
     "notice_content": "公告内容",
-    "deadline": "报名截止日期：{{date}}"
+    "deadline": "报名截止日期：{{endDate}}"
   },
   "visitor": {
     "name": "访客预约管理",