From 6a3f3b10f87232275f16151f347580b81ac11b40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Wed, 23 Feb 2022 14:43:03 +0800
Subject: [PATCH 1/2] 27618

---
 .../AppIntegralApply/AppIntegralApply.vue     |  9 +++++-
 src/mods/AppIntegralApply/detail.vue          | 32 +++++++++----------
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/mods/AppIntegralApply/AppIntegralApply.vue b/src/mods/AppIntegralApply/AppIntegralApply.vue
index d960f79..5dc9ba3 100644
--- a/src/mods/AppIntegralApply/AppIntegralApply.vue
+++ b/src/mods/AppIntegralApply/AppIntegralApply.vue
@@ -25,7 +25,14 @@
           </div>
 
           <div class="card">
-            <span :class="item.auditStatus == 0 ? 'status0' : item.auditStatus == 1 ? 'status1' : 'status2'" class="status status0">{{ $dict.getLabel('auditStatus', item.auditStatus) }}</span>
+            <span :class="item.auditStatus == 0 ? 'status2' : item.auditStatus == 1 ? 'status0' : 'status1'" class="status">
+              <span>{{ $dict.getLabel('auditStatus', item.auditStatus) }}</span>
+
+              <span v-if="item.auditStatus == 1">
+                <span v-if="item.auditIntegral * 1 > 0">+</span>
+                <span>{{ item.auditIntegral }}分</span>
+              </span>
+            </span>
           </div>
         </div>
       </template>
diff --git a/src/mods/AppIntegralApply/detail.vue b/src/mods/AppIntegralApply/detail.vue
index 6a67aff..ca111c4 100644
--- a/src/mods/AppIntegralApply/detail.vue
+++ b/src/mods/AppIntegralApply/detail.vue
@@ -37,53 +37,51 @@
     <div class="middle">
       <div class="img-title">审核详情</div>
 
-      <div class="cards">
+      <div class="cards" v-if="detail.auditStatus == 1 || detail.auditStatus == 2">
         <div class="cards-left">审核结果</div>
-        <div class="cards-right" :style="{ class: detail.auditStatus == 0 ? 'status0' : detail.auditStatus == 1 ? 'status1' : 'status2' }">
+        <div class="cards-right" :class="detail.auditStatus == 0 ? 'status2' : detail.auditStatus == 1 ? 'status0' : detail.auditStatus == 2 ? 'status1' : ''">
           {{ $dict.getLabel('auditStatus', detail.auditStatus) }}
         </div>
       </div>
 
-      <div class="cards">
+      <div class="cards" v-if="detail.auditStatus == 1">
         <div class="cards-left">积分规则类型</div>
         <div class="cards-right">
-          <span style="color: #1c6bdf">
+          <span>
             {{ $dict.getLabel('atWillReportType', detail.applyIntegralType) }}
           </span>
         </div>
       </div>
 
-      <div class="cards">
+      <div class="cards" v-if="detail.auditStatus == 1">
         <div class="cards-left">积分规则事项</div>
-        <div class="cards-right" style="width: 75%; text-align: right">{{ detail.areaName }}</div>
+        <div class="cards-right" style="width: 75%; text-align: right">{{ detail.auditRuleName }}</div>
       </div>
 
-      <div class="cards">
+      <div class="cards" v-if="detail.auditStatus == 1">
         <div class="cards-left">积分调整</div>
-        <div class="cards-right" style="width: 75%; text-align: right">{{ detail.auditIntegral }}</div>
+        <div class="cards-right" style="width: 75%; text-align: right">
+          <span v-if="detail.auditIntegral * 1 > 0">+</span>
+          <span>{{ detail.auditIntegral }}分</span>
+        </div>
       </div>
 
-      <div class="cards">
+      <div class="cards" v-if="detail.auditStatus == 1 || detail.auditStatus == 2">
         <div class="cards-left">审核人</div>
         <div class="cards-right" style="width: 75%; text-align: right">{{ detail.auditUserName }}</div>
       </div>
 
-      <div class="cards">
+      <div class="cards" v-if="detail.auditStatus == 1 || detail.auditStatus == 2">
         <div class="cards-left">审核时间</div>
         <div class="cards-right" style="width: 75%; text-align: right">{{ detail.auditTime }}</div>
       </div>
     </div>
 
-    <div class="bottom">
-      <div class="cards">
-        <div class="cards-left">审核结果备份</div>
-        <div class="cards-right">{{ detail.beginTime }}</div>
-      </div>
-
+    <div class="bottom" v-if="detail.auditStatus == 2">
       <div class="cards">
         <div class="cards-left">驳回理由</div>
         <div class="cards-right">
-          <span style="color: #1c6bdf">{{ detail.realNum }}</span>
+          <span>{{ detail.auditOpinion }}</span>
         </div>
       </div>
     </div>

From fc65a3a481a39684c47a07a39d6d9216d6071de9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Wed, 23 Feb 2022 14:49:07 +0800
Subject: [PATCH 2/2] 27619

---
 src/mods/AppIntegralApply/AppIntegralApply.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mods/AppIntegralApply/AppIntegralApply.vue b/src/mods/AppIntegralApply/AppIntegralApply.vue
index 5dc9ba3..d093235 100644
--- a/src/mods/AppIntegralApply/AppIntegralApply.vue
+++ b/src/mods/AppIntegralApply/AppIntegralApply.vue
@@ -102,7 +102,7 @@ export default {
             residentId: this.user.residentId,
             description: this.searchObj,
             applyIntegralType: this.value,
-            auditStatus: this.currentTab == '0' ? '' : this.currentTab == '1' ? '0' : this.currentTab == 2 ? '1|2' : '',
+            auditType: this.currentTab == '0' ? '' : this.currentTab == '1' ? '0' : this.currentTab == 2 ? '1|2' : '',
           },
         })
         .then((res) => {