From bea1f26c0affd7dbc7020054f8b9c1fc2f6d9aba Mon Sep 17 00:00:00 2001
From: panqihua <1029559041@qq.com>
Date: Sun, 19 Apr 2020 17:05:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BF=A1=E7=94=A8=E5=88=86?=
 =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/account/score/score.component.html | 29 +++++++++++++++++++++-
 src/app/account/score/score.component.ts   |  8 ++++--
 src/app/forum/notice/notice.component.html |  2 +-
 src/assets/i18n/en-US.json                 |  5 +++-
 src/assets/i18n/zh-CN.json                 |  5 +++-
 5 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/src/app/account/score/score.component.html b/src/app/account/score/score.component.html
index 5ec5134..cd6eba1 100644
--- a/src/app/account/score/score.component.html
+++ b/src/app/account/score/score.component.html
@@ -2,7 +2,7 @@
 <div class="">
   <form [formGroup]="scoreFrom">
     <!--    用户名-->
-    <div class="input-group mb-3 mx-auto col-4">
+    <div class="input-group mb-3 mx-auto col-6">
       <div class="input-group-prepend">
         <span class="input-group-text">{{ prefix('username') | translate }}</span>
       </div>
@@ -13,6 +13,33 @@
         <option value="true">{{prefix('search_is_like')|translate}}</option>
         <option value="false">{{prefix('search_is_not_like')|translate}}</option>
       </select>
+
+      <div class="input-group-prepend">
+        <span
+          class="input-group-text bg-transparent">{{ prefix('orderScore') | translate:{order: scoreFrom.get('desc').value ? (prefix('desc')|translate) : (prefix('asc')|translate)} }}</span>
+      </div>
+      <div class="input-group-prepend">
+        <div class="input-group-text">
+          <input type="checkbox" formControlName="orderScore">
+        </div>
+      </div>
+      <ng-container *ngIf="scoreFrom.get('orderScore').value">
+        <div class="input-group-prepend">
+          <div class="input-group-text">
+            {{prefix('desc')|translate}}
+          </div>
+          <div class="input-group-text">
+            <input type="radio" formControlName="desc" [value]="true">
+          </div>
+          <div class="input-group-text">
+            {{prefix('asc')|translate}}
+          </div>
+          <div class="input-group-text">
+            <input type="radio" formControlName="desc" [value]="false">
+          </div>
+        </div>
+      </ng-container>
+
       <div class="input-group-prepend">
         <button class="btn btn-outline-secondary" type="button" [disabled]="form().invalid"
                 (click)="loadAll(1)">{{'button.search'|translate}}</button>
diff --git a/src/app/account/score/score.component.ts b/src/app/account/score/score.component.ts
index 5373df1..33352ef 100644
--- a/src/app/account/score/score.component.ts
+++ b/src/app/account/score/score.component.ts
@@ -15,9 +15,13 @@ export class ScoreComponent extends Commons implements OnInit, MessageInterface
 
   scoreFrom = this.fb.group({
     // 用户名
-    username: this.fb.control('', [Validators.required]),
+    username: this.fb.control(''),
     // 是否模糊查询
-    like: this.fb.control(true, [Validators.required]),
+    like: this.fb.control(true),
+    // 是否按照信用分排行
+    orderScore: this.fb.control(true),
+    // 是否降序
+    desc: this.fb.control(true)
   });
 
   editForm = this.fb.group({
diff --git a/src/app/forum/notice/notice.component.html b/src/app/forum/notice/notice.component.html
index e832937..f2cf5bd 100644
--- a/src/app/forum/notice/notice.component.html
+++ b/src/app/forum/notice/notice.component.html
@@ -17,7 +17,7 @@
     <!--  公告内容-->
     <div class="input-group mb-3 mx-auto col-7">
       <div class="input-group-prepend">
-        <span class="input-group-text">{{ 'forum.notice_title' | translate }}</span>
+        <span class="input-group-text">{{ 'forum.notice_content' | translate }}</span>
       </div>
       <textarea class="form-control" [class.is-invalid]="getValue('content').invalid"
                 [placeholder]="'tip.input' | translate:{value:'forum.notice_content'|translate}"
diff --git a/src/assets/i18n/en-US.json b/src/assets/i18n/en-US.json
index 666285e..7463659 100644
--- a/src/assets/i18n/en-US.json
+++ b/src/assets/i18n/en-US.json
@@ -94,7 +94,10 @@
     "notes": "备注信息",
     "edit_ok": "修改成功",
     "edit_fail": "修改失败",
-    "score_tip": "当前用户信用分{{beforeScore}}，预计变为{{afterScore}}分"
+    "score_tip": "当前用户信用分{{beforeScore}}，预计变为{{afterScore}}分",
+    "orderScore": "按照信用分排行",
+    "asc": "正序",
+    "desc": "降序"
   },
   "server": {
     "login": {
diff --git a/src/assets/i18n/zh-CN.json b/src/assets/i18n/zh-CN.json
index c240f4d..4a2266f 100644
--- a/src/assets/i18n/zh-CN.json
+++ b/src/assets/i18n/zh-CN.json
@@ -94,7 +94,10 @@
     "notes": "备注信息",
     "edit_ok": "修改成功",
     "edit_fail": "修改失败",
-    "score_tip": "当前用户信用分{{beforeScore}}，预计变为{{afterScore}}分"
+    "score_tip": "当前用户信用分{{beforeScore}}，预计变为{{afterScore}}分",
+    "orderScore": "按照信用分{{order}}排行",
+    "asc": "正序",
+    "desc": "降序"
   },
   "server": {
     "login": {