From 2c3366feb01b62f41ba3e16a158508339813c060 Mon Sep 17 00:00:00 2001 From: panqihua <1029559041@qq.com> Date: Wed, 19 Feb 2020 23:24:04 +0800 Subject: [PATCH] =?UTF-8?q?=20=E6=9B=B4=E6=96=B0=E8=AE=BA=E5=9D=9B?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/forum/forum.component.html | 126 +++++++++++++++++++++-------- src/app/forum/forum.component.scss | 46 ++++++++--- src/assets/i18n/en-US.json | 7 +- src/assets/i18n/zh-CN.json | 5 +- 4 files changed, 136 insertions(+), 48 deletions(-) diff --git a/src/app/forum/forum.component.html b/src/app/forum/forum.component.html index aab696d..93e99eb 100644 --- a/src/app/forum/forum.component.html +++ b/src/app/forum/forum.component.html @@ -23,8 +23,11 @@

{{ 'forum.check' | translate }}

+
+ -
+ -
-
- - - -
- 发帖人 +
+ + + + + +
+ + + +
+ 发帖人 +
+ +
+ 信用分 +
- -
- 信用分 + + +
+ +

活动名

+ +
+ 帖子正文帖子正文帖子正文帖子正文帖子正文帖子正文帖子正文帖子正文帖子正文帖子正文帖子正文帖子正文帖子正文帖子正文帖子正文帖子正文帖子正文 +
+ +
-
- -

活动名

- -
- 帖子正文帖子正文帖子正文帖子正文帖子正文帖子正文帖子正文帖子正文帖子正文帖子正文帖子正文帖子正文帖子正文帖子正文帖子正文帖子正文帖子正文 -
- - - + +
+ + +
+ +
+ + +
+ +
+ +
+
投诉人
+
信用分
+
+ + +
+
+ + +
+
投诉人
+
信用分
+
+ +
+ + + +
+ +

投诉项

+ +
+ 投诉内容投诉内容投诉内容投诉内容投诉内容投诉内容投诉内容投诉内容投诉内容投诉内容投诉内容投诉内容投诉内容投诉内容投诉内容投诉内容投诉内容 +
+ +

{{ 'forum.complaint_time' | translate:{time:'2020-01-01'} }}

+
+
+
+ +
- -
diff --git a/src/app/forum/forum.component.scss b/src/app/forum/forum.component.scss index 723e6b1..78cb1ce 100644 --- a/src/app/forum/forum.component.scss +++ b/src/app/forum/forum.component.scss @@ -33,11 +33,28 @@ border-width: 3px; } + +//帖子内容 +.forum-content{ + border-style: solid; + border-width: 3px; + height: 300px; + max-height: 300px; +} + +//活动贴start // 帖子标题 .forum-title{ z-index: 0; } + +//发帖人信息 +.sender{ + margin-top: 65px; + margin-left: 45px; +} + //头像 .headimg{ height: 100px; @@ -45,14 +62,6 @@ z-index: 1; } -//帖子内容 -.forum-content{ - border-style: solid; - border-width: 3px; - height: 300px; - max-height: 300px; -} - //发帖人信息 .forum-label{ border-style: solid; @@ -60,10 +69,29 @@ width: 100px; height: 30px; } - +//帖子底部 .forum-footer{ border-style: solid; border-width: 3px; height: 100px; } +//活动贴end + +//投诉帖start +.complaint{ + height: 460px; +} + +//名称边框 +.l-label{ + border-style: solid; + border-width: 3px; +} + +//头像顶部距离 +.m-headimg{ + margin-top: 50px; +} + +//投诉帖end diff --git a/src/assets/i18n/en-US.json b/src/assets/i18n/en-US.json index 15bbaf6..4766399 100644 --- a/src/assets/i18n/en-US.json +++ b/src/assets/i18n/en-US.json @@ -21,10 +21,11 @@ "check": "check", "sender": "sender", "time": "time", - "active_date": "Active Date:From:{startDate} To {endDate}", - "active_score": "Active Score:{score}", + "active_date": "Active Date:From {{startDate}} To {{endDate}}", + "active_score": "Active Score:{{score}}", "approve": "approve", - "reject": "reject" + "reject": "reject", + "complaint": "time:{{time}}" }, "tip":{ "input": "please input ", diff --git a/src/assets/i18n/zh-CN.json b/src/assets/i18n/zh-CN.json index ea06281..6effabd 100644 --- a/src/assets/i18n/zh-CN.json +++ b/src/assets/i18n/zh-CN.json @@ -23,8 +23,9 @@ "time": "公告时间", "active_date": "活动起止时间:{{startDate}}到{{endDate}}", "active_score": "参与活动奖励信用分:{{score}}", - "approve": "通过", - "reject": "拒绝" + "approve": "审核通过", + "reject": "审核不通过", + "complaint_time": "投诉时间:{{time}}" }, "tip":{ "input": "请输入",