From 4cd0fa249c208a5f647737e4a39e2da2fecb5d93 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 16 Jan 2023 13:56:50 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=AB=E9=83=BD=E7=BD=91=E6=A0=BC=E5=91=98?=
 =?UTF-8?q?=E7=A7=AF=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/gridScoreDetail.vue                 | 14 ++++++--------
 .../components/gridScoreStatistics.vue             | 10 ++++++++--
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/project/pidu/app/AppGridMemberScore/components/gridScoreDetail.vue b/project/pidu/app/AppGridMemberScore/components/gridScoreDetail.vue
index 6e9f23d3..512075e0 100644
--- a/project/pidu/app/AppGridMemberScore/components/gridScoreDetail.vue
+++ b/project/pidu/app/AppGridMemberScore/components/gridScoreDetail.vue
@@ -49,25 +49,23 @@
         <ai-table :tableData="tableData" :total="total" :current.sync="search.current" :size.sync="search.size"
                   @getList="getIntegralChange" :col-configs="colConfigs" :dict="dict">
           <el-table-column slot="changeIntegral" label="变动积分" align="center">
-            <!-- <template slot-scope="{ row }">
-              <span v-if="row.integralType == 3">{{ row.changeIntegral | formatTime }}</span>
-              <span v-if="row.integralType == 0">{{ row.integralCalcType == 0 ? '-' : '+' }}{{ row.changeIntegral }}</span>
-            </template> -->
             <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 == 3">{{ row.changeIntegral | formatTime }}</span>
-              <span v-if="row.integralType == 0 || row.integralType == 2">{{ row.integralCalcType == 0 ? '-' : '+' }}{{ row.changeIntegral }}</span>
             </template>
           </el-table-column>
           <el-table-column slot="integralType" label="类型" align="center">
             <template slot-scope="{ row }">
               <span v-if="row.integralType == 0">积分调整</span>
-              <span v-else>{{ row.eventType }}</span>
+              <span v-if="row.integralType == 1">积分消费</span>
+              <span v-if="row.integralType == 2">积分申请</span>
+              <span v-if="row.integralType == 4">{{ row.eventType }}</span>
             </template>
           </el-table-column>
           <el-table-column slot="eventDesc" label='事件' align="center" width="400px" show-overflow-tooltip>
             <template slot-scope="{ row }">
-              <!-- <span v-if="row.integralType == 0">{{ row.eventDesc }}</span>
-              <span v-else>{{ row.eventName }}</span> -->
               <span>{{ row.integralRuleName || row.eventDesc}}</span>
             </template>
           </el-table-column>
diff --git a/project/pidu/app/AppGridMemberScore/components/gridScoreStatistics.vue b/project/pidu/app/AppGridMemberScore/components/gridScoreStatistics.vue
index add41884..297f285d 100644
--- a/project/pidu/app/AppGridMemberScore/components/gridScoreStatistics.vue
+++ b/project/pidu/app/AppGridMemberScore/components/gridScoreStatistics.vue
@@ -79,13 +79,19 @@
           </el-table-column>
           <el-table-column slot="integralType" label="类型" align="center">
             <template slot-scope="{ row }">
-              <span>{{ row.eventType || row.integralRuleName}}</span>
+              <!-- <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>
             </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 == 3">{{ row.changeIntegral | formatTime }}</span>
-              <span v-if="row.integralType == 0 || row.integralType == 2">{{ row.integralCalcType == 0 ? '-' : '+' }}{{ row.changeIntegral }}</span>
             </template>
           </el-table-column>
           <el-table-column slot="options" label="操作"  align="center">