diff --git a/src/saas/AppConflictMediation/List.vue b/src/saas/AppConflictMediation/List.vue
index cf6a74ca..ee08e0a9 100644
--- a/src/saas/AppConflictMediation/List.vue
+++ b/src/saas/AppConflictMediation/List.vue
@@ -41,7 +41,13 @@
-
新增事件
+
+
+
@@ -140,7 +146,6 @@ export default {
searchType: this.currentTabs == 1 ? '1' : '0',
eventStatus: this.eventStatus,
girdId: this.girdId,
- openId: this.eventStatus == 4 ? this.user.openId : '',
},
})
.then((res) => {
@@ -407,9 +412,21 @@ uni-page-body {
height: 120px;
line-height: 120px;
text-align: center;
- background-color: #3975c6;
font-size: 32px;
- color: #ffffff;
+ display: flex;
+ align-items: center;
+ box-shadow: inset 0px 1px 0px 0px #dddddd;
+ z-index: 999;
+ .myreport {
+ background-color: #ffffff;
+ width: 40%;
+ color: #333;
+ }
+ .add {
+ background-color: #3975c6;
+ width: 60%;
+ color: #ffffff;
+ }
}
.pad-b120 {
diff --git a/src/saas/AppConflictMediation/myReply.vue b/src/saas/AppConflictMediation/myReply.vue
index 9415f77c..258dabba 100644
--- a/src/saas/AppConflictMediation/myReply.vue
+++ b/src/saas/AppConflictMediation/myReply.vue
@@ -1,25 +1,172 @@
- 1
+
+
+
+
+
+
{{ item.content }}
+
+
+ 事件类型
+ {{ item.groupName }}
+
+
+
+
所属网格
+
{{ item.girdName }}
+
+
+
+
+
+
+ {{ $dict.getLabel('clapEventStatus', item.eventStatus) }}
+
+
+
+
+
+
+
+