积分统计

project/fengdu/app/AppIntegralStatistics/AppIntegralStatistics.vue

@@ -77,20 +77,9 @@
               <span>{{ row.integralRuleName || row.eventDesc}}</span>
             </template>
           </el-table-column>
-          <el-table-column slot="integralType" label="类型" align="center">
+          <el-table-column slot="changeIntegral" label="变动积分" align="center">
             <template slot-scope="{ row }">
-              <span v-if="row.integralType == 0">积分调整</span>
+              <span>{{ row.integralCalcType == 0 ? '-' : '+' }}{{ row.changeIntegral }}</span>
-              <span v-if="row.integralType == 1">积分兑换</span>
-              <span v-if="row.integralType == 2">积分申请</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.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>
           <el-table-column slot="options" label="操作"  align="center">
@@ -113,11 +102,8 @@
               <span v-else>{{ details.eventDesc }}</span>
             </ai-info-item>
             <ai-info-item label="时间" isLine :value="details.createTime"/>
-            <ai-info-item label="积分变动" v-if="details.integralType == 3">
+            <ai-info-item label="积分变动">
-              {{ details.changeIntegral | formatTime }}
+              {{ details.integralCalcType == 0 ? '-' : '+' }}{{ details.changeIntegral }}
-            </ai-info-item>
-            <ai-info-item label="积分变动" v-if="details.integralType == 0">
-              {{ details.changeIntegral > 0 ? '+' : '-' }}{{ details.changeIntegral }}
             </ai-info-item>
             <ai-info-item label="积分余额" :value="details.nowIntegral"/>
             <ai-info-item label="凭证" isLine v-if="fileDownLoad.length">
@@ -203,7 +189,7 @@ export default {
         { prop: "integralUserName", label: '姓名', align: "left", width: "200px" },
         { prop: "girdName", label: '所属网格', align: "center", width: "180px" },
         { slot: "eventDesc"},
-        { slot: "integralType", label: '类型' },
+        { prop: "integralType", label: '类型', align: "center", dict: "integralType"},
         { slot: "changeIntegral", label: '积分变动', align: "center", },
         { prop: "nowIntegral", label: '剩余积分', align: "center", },
         { prop: "createTime", label: '时间', align: "center", },

project/pidu/app/AppSessionArchive/components/Detail.vue

@@ -51,6 +51,32 @@
           </ai-download>
         </div>
       </div>
+      <div class="content-right-info">
+        <div v-for="(item, index) in list" :key="index">
+          <div class="item item-left" v-if="item.type">
+            <p class="time">2023-04-26 16:11:43</p>
+            <div class="item-content-flex">
+              <img src="https://img1.baidu.com/it/u=413643897,2296924942&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=500" alt="" class="user-img">
+              <div class="content">
+                <span></span>
+                <p>{{item.content}}</p>
+              </div>
+              <i class="el-icon-warning"></i>
+            </div>
+          </div>
+          <div class="item item-right" v-else>
+            <p class="time">2023-04-26 16:11:43</p>
+            <div class="item-content-flex">
+              <img src="https://img1.baidu.com/it/u=413643897,2296924942&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=500" alt="" class="user-img">
+              <div class="content">
+                <span></span>
+                <p>{{item.content}}</p>
+              </div>
+              <i class="el-icon-warning"></i>
+            </div>
+          </div>
+        </div>
+      </div>
     </template>
   </ai-list>
 </template>
@@ -90,7 +116,14 @@
         search: {
           name: ''
         },
-        current: 1
+        current: 1,
+        list: [
+          {type: 0, content: '123全部全部全部全部全部全部全部全部全部全部全部全部'},
+          {type: 1, content: '123'},
+          {type: 0, content: '456'},
+          {type: 0, content: '123'},
+          {type: 1, content: '123'},
+        ]
       }
     },
 
@@ -287,6 +320,75 @@
         }
       }
     }
+    .content-right-info {
+      padding: 24px 16px;
+      .item {
+        margin-bottom: 48px;
+        .time {
+          color: #999;
+          font-size: 14px;
+          line-height: 44px;
+        }
+        .item-content-flex {
+          display: flex;
+          .user-img {
+            width: 44px;
+            height: 44px;
+            margin-right: 8px;
+          }
+          .content {
+            max-width: calc(100% - 144px);
+            position: relative;
+            span {
+              width: 0px;
+              height: 0px;
+              border: 10px solid transparent;
+              position: absolute;
+              top: 20px;
+            }
+            p {
+              display: inline-block;
+              padding: 14px 54px 14px 32px;
+              background-color: #fff;
+              font-family: PingFangSC-Regular;
+              font-size: 32px;
+              color: #333;
+              word-break: break-all;
+            }
+          }
+          .fail-icon {
+            width: 32px;
+            height: 32px;
+            margin: auto 0 auto 24px;
+          }
+        }
+      }
+      .item-left {
+        .content {
+          span {
+            left: -18px;
+            border-right-color: #fff;
+          }
+        }
+      }
+      .item-right {
+        width: 100%;
+        justify-content: right;
+        .user-img {
+          margin: 0 0 0 20px;
+        }
+        .content {
+          span {
+            border-left-color: #C7E7FE;
+            right: -18px;
+          }
+          p {
+            background-color: #C7E7FE;
+            padding: 14px 32px 14px 54px;
+          }
+        }
+      }
+    }
   }
 
 </style>