diff --git a/project/fengdu/app/AppIntegralStatistics/AppIntegralStatistics.vue b/project/fengdu/app/AppIntegralStatistics/AppIntegralStatistics.vue index 3a8b769e..056ac1d9 100644 --- a/project/fengdu/app/AppIntegralStatistics/AppIntegralStatistics.vue +++ b/project/fengdu/app/AppIntegralStatistics/AppIntegralStatistics.vue @@ -77,20 +77,9 @@ {{ row.integralRuleName || row.eventDesc}} - + - - - @@ -113,11 +102,8 @@ {{ details.eventDesc }} - - {{ details.changeIntegral | formatTime }} - - - {{ details.changeIntegral > 0 ? '+' : '-' }}{{ details.changeIntegral }} + + {{ details.integralCalcType == 0 ? '-' : '+' }}{{ details.changeIntegral }} @@ -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", }, diff --git a/project/pidu/app/AppSessionArchive/components/Detail.vue b/project/pidu/app/AppSessionArchive/components/Detail.vue index 3d76aeb1..d70c3e35 100644 --- a/project/pidu/app/AppSessionArchive/components/Detail.vue +++ b/project/pidu/app/AppSessionArchive/components/Detail.vue @@ -51,6 +51,32 @@ +
+
+
+

2023-04-26 16:11:43

+
+ +
+ +

{{item.content}}

+
+ +
+
+
+

2023-04-26 16:11:43

+
+ +
+ +

{{item.content}}

+
+ +
+
+
+
@@ -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; + } + } + } + } }