From 00ee02ccb9910af7f681d9e0e1f4877787ce274c Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 16 Jan 2023 14:06:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=AD=A3=E8=B4=9F=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/AppGridMemberScore/components/gridScoreDetail.vue  | 6 +++---
 .../AppGridMemberScore/components/gridScoreStatistics.vue  | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/project/pidu/app/AppGridMemberScore/components/gridScoreDetail.vue b/project/pidu/app/AppGridMemberScore/components/gridScoreDetail.vue
index 512075e0..3753b260 100644
--- a/project/pidu/app/AppGridMemberScore/components/gridScoreDetail.vue
+++ b/project/pidu/app/AppGridMemberScore/components/gridScoreDetail.vue
@@ -51,8 +51,8 @@
           <el-table-column slot="changeIntegral" label="变动积分" align="center">
             <template slot-scope="{ row }">
               <span v-if="row.integralType == 0">{{ row.integralCalcType == 0 ? '-' : '+' }}{{ row.changeIntegral }}</span>
-              <span v-if="row.integralType == 1">{{ row.integralCalcType == 1 ? '-' : '' }}{{ row.changeIntegral }}</span>
-              <span v-if="row.integralType == 2">{{ row.integralCalcType == 2 ? '+' : '' }}{{ row.changeIntegral }}</span>
+              <span v-if="row.integralType == 1">-{{ row.changeIntegral }}</span>
+              <span v-if="row.integralType == 2">+{{ row.changeIntegral }}</span>
               <span v-if="row.integralType == 3">{{ row.changeIntegral | formatTime }}</span>
             </template>
           </el-table-column>
@@ -61,7 +61,7 @@
               <span v-if="row.integralType == 0">积分调整</span>
               <span v-if="row.integralType == 1">积分消费</span>
               <span v-if="row.integralType == 2">积分申请</span>
-              <span v-if="row.integralType == 4">{{ row.eventType }}</span>
+              <span v-if="row.integralType == 3">{{ row.eventType }}</span>
             </template>
           </el-table-column>
           <el-table-column slot="eventDesc" label='事件' align="center" width="400px" show-overflow-tooltip>
diff --git a/project/pidu/app/AppGridMemberScore/components/gridScoreStatistics.vue b/project/pidu/app/AppGridMemberScore/components/gridScoreStatistics.vue
index 297f285d..c6df3fd0 100644
--- a/project/pidu/app/AppGridMemberScore/components/gridScoreStatistics.vue
+++ b/project/pidu/app/AppGridMemberScore/components/gridScoreStatistics.vue
@@ -79,18 +79,17 @@
           </el-table-column>
           <el-table-column slot="integralType" label="类型" align="center">
             <template slot-scope="{ row }">
-              <!-- <span>{{ row.eventType || row.integralRuleName}}</span> -->
               <span v-if="row.integralType == 0">积分调整</span>
               <span v-if="row.integralType == 1">积分消费</span>
               <span v-if="row.integralType == 2">积分申请</span>
-              <span v-if="row.integralType == 4">{{ row.eventType }}</span>
+              <span v-if="row.integralType == 3">{{ row.eventType }}</span>
             </template>
           </el-table-column>
           <el-table-column slot="changeIntegral" label="积分变动" align="center">
             <template slot-scope="{ row }">
               <span v-if="row.integralType == 0">{{ row.integralCalcType == 0 ? '-' : '+' }}{{ row.changeIntegral }}</span>
-              <span v-if="row.integralType == 1">{{ row.integralCalcType == 1 ? '-' : '' }}{{ row.changeIntegral }}</span>
-              <span v-if="row.integralType == 2">{{ row.integralCalcType == 2 ? '+' : '' }}{{ row.changeIntegral }}</span>
+              <span v-if="row.integralType == 1">-{{ row.changeIntegral }}</span>
+              <span v-if="row.integralType == 2">+{{ row.changeIntegral }}</span>
               <span v-if="row.integralType == 3">{{ row.changeIntegral | formatTime }}</span>
             </template>
           </el-table-column>