From 96a7f2f6f8dc73a694d93b9f857eb283c9fb4360 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 14 Feb 2022 13:35:43 +0800
Subject: [PATCH] css

---
 src/saas/AppConflictMediation/Content.vue |  1 -
 src/saas/AppConflictMediation/List.vue    | 40 ++++++++++++++---------
 src/saas/AppConflictMediation/detail.vue  | 10 +-----
 src/saas/AppConflictMediation/myReply.vue | 11 ++++---
 4 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/src/saas/AppConflictMediation/Content.vue b/src/saas/AppConflictMediation/Content.vue
index c59cb65c..4ee0702d 100644
--- a/src/saas/AppConflictMediation/Content.vue
+++ b/src/saas/AppConflictMediation/Content.vue
@@ -67,7 +67,6 @@ export default {
     this.forms.groupName = option.groupName
     this.typeList()
     uni.$on('goback', (res) => {
-      console.log(res);
       this.selectUser = res
       if(res.name) {
         this.forms.name = res.name
diff --git a/src/saas/AppConflictMediation/List.vue b/src/saas/AppConflictMediation/List.vue
index 42569335..494c9dce 100644
--- a/src/saas/AppConflictMediation/List.vue
+++ b/src/saas/AppConflictMediation/List.vue
@@ -23,8 +23,8 @@
             <div class="titles">{{ item.content }}</div>
 
             <div class="types">
-              <span class="label label1">事件类型</span>
-              <span class="types-right">{{ item.groupName }}</span>
+              <div class="label label1">事件类型</div>
+              <div class="types-right">{{ item.groupName }}</div>
             </div>
 
             <div class="gards gird">
@@ -33,7 +33,7 @@
             </div>
           </div>
 
-          <div class="status" :class="item.eventStatus == 0 ? 'status1' : 'status2'" v-if="item.eventStatus">
+          <div class="status" :class="item.eventStatus == 0 ? 'status0' : item.eventStatus == 1 ? 'status1' : item.eventStatus == 2 ? 'status2' : 'status3'" v-if="item.eventStatus">
             <span class="icon"></span>
             <span>
               {{ $dict.getLabel('clapEventStatus', item.eventStatus) }}
@@ -328,15 +328,20 @@ uni-page-body {
         }
         .types,
         .gards {
+          display: flex;
           margin-top: 8px;
           font-size: 26px;
+          width: 100%;
           .types-right,
           .gards-right {
-            margin-left: 32px;
+            width: calc(100% - 120px);
             color: #333333;
           }
           .label1 {
-            margin-right: 12px;
+            width: 120px;
+          }
+          .label {
+            width: 120px;
           }
         }
       }
@@ -353,6 +358,13 @@ uni-page-body {
         }
       }
 
+      .status0 {
+        color: #ff883c;
+        .icon {
+          background: #ff883c;
+        }
+      }
+
       .status1 {
         color: #1aaaff;
         .icon {
@@ -366,20 +378,16 @@ uni-page-body {
           background: #42d784;
         }
       }
+
+      .status3 {
+        color: #ff4466;
+        .icon {
+          background: #ff4466;
+        }
+      }
     }
   }
 
-  .gird {
-    display: flex;
-    .label {
-      width: 120px;
-      vertical-align: top;
-    }
-
-    .gards-right {
-      width: calc(100% - 120px);
-    }
-  }
 
   .addbtn {
     position: fixed;
diff --git a/src/saas/AppConflictMediation/detail.vue b/src/saas/AppConflictMediation/detail.vue
index 0784c54a..81a881b3 100644
--- a/src/saas/AppConflictMediation/detail.vue
+++ b/src/saas/AppConflictMediation/detail.vue
@@ -244,10 +244,6 @@ uni-page-body {
       }
     }
 
-    // .card:last-child {
-    //   border-bottom: none;
-    // }
-
     .cards {
       padding: 34px 0;
     }
@@ -294,11 +290,7 @@ uni-page-body {
             border-radius: 50%;
             font-size: 28px;
             z-index: 9;
-            // img {
-            //   width: 100%;
-            //   height: 100%;
-            //   border-radius: 50%;
-            // }
+
             .avatarIcon {
               position: absolute;
               bottom: 0;
diff --git a/src/saas/AppConflictMediation/myReply.vue b/src/saas/AppConflictMediation/myReply.vue
index 929f1cd9..c59f3e6d 100644
--- a/src/saas/AppConflictMediation/myReply.vue
+++ b/src/saas/AppConflictMediation/myReply.vue
@@ -74,8 +74,7 @@ export default {
     },
 
     goDetail(item) {
-      console.log(item);
-      uni.navigateTo({ url: `./detail?id=${item.openId}` })
+      uni.navigateTo({ url: `./detail?id=${item.id}` })
     },
   },
 }
@@ -121,11 +120,15 @@ export default {
 
           .types-right,
           .gards-right {
-            margin-left: 32px;
             color: #333333;
+            width: calc(100% - 120px);
+          }
+
+          .label {
+            width: 120px;
           }
           .label1 {
-            margin-right: 12px;
+            width: 120px;
           }
         }
       }