diff --git a/src/saas/AppConflictMediation/add.vue b/src/saas/AppConflictMediation/add.vue
index e1e113cc..1e746ba3 100644
--- a/src/saas/AppConflictMediation/add.vue
+++ b/src/saas/AppConflictMediation/add.vue
@@ -18,7 +18,7 @@
       <div class="form-item form-item__imgs">
         <div class="form-item__wrapper">
           <div class="form-item__title">
-            <i style="opacity: 0;">*</i>
+            <i style="opacity: 0">*</i>
             <h2>图片上传</h2>
             <span>(最多9张)</span>
           </div>
@@ -60,7 +60,7 @@
             <i>*</i>
             <h2>上报网格</h2>
           </div>
-          <div class="form-item__right" @click="showSelect= true">
+          <div class="form-item__right" @click="showSelect = true">
             <span v-if="form.girdName">{{ form.girdName }}</span>
             <i v-else>请选择</i>
             <u-icon name="arrow-right" color="#ddd" />
@@ -75,8 +75,8 @@
           </div>
         </div>
         <div class="flow-option">
-          <div class="byself" :class="!form.opts? 'current': ''" @click="form.opts = 0">自己办结</div>
-          <div class="report" :class="form.opts? 'current': ''" @click="form.opts = 1">上报处理</div>
+          <div class="byself" :class="!form.opts ? 'current' : ''" @click="form.opts = 0">自己办结</div>
+          <div class="report" :class="form.opts ? 'current' : ''" @click="form.opts = 1">上报处理</div>
         </div>
       </div>
     </div>
@@ -99,7 +99,7 @@
         <div class="form-item form-item__imgs">
           <div class="form-item__wrapper">
             <div class="form-item__title">
-              <i style="opacity: 0;">*</i>
+              <i style="opacity: 0">*</i>
               <h2>图片上传</h2>
               <span>(最多9张)</span>
             </div>
@@ -112,147 +112,149 @@
     </div>
     <div class="btn" @click="submit">上报</div>
 
-    <u-select v-model="showSelect" :list="girdList" label-name="girdName" value-name="id"  @confirm="confirmSelect"/>
-
+    <u-select v-model="showSelect" :list="girdList" label-name="girdName" value-name="id" @confirm="confirmSelect" />
   </div>
 </template>
 
 <script>
-  import { mapState } from 'vuex'
+import { mapState } from 'vuex'
 
-  export default {
-    appName: '矛盾调解',
-    data () {
-      return {
-        isShowType: false,
-        form: {
-          content: '',
-          files: [],
-          groupId: '',
-          address: '',
-          girdName: '',
-          flow: '',
-          girdId: '',
-          flag: false,
-          result: '',
-          resultFiles: [],
-          opts: 1,
-          name: '',
-          lat: '',
-          lng: ''
+export default {
+  appName: '矛盾调解',
+  data() {
+    return {
+      isShowType: false,
+      form: {
+        content: '',
+        files: [],
+        groupId: '',
+        address: '',
+        girdName: '',
+        flow: '',
+        girdId: '',
+        flag: false,
+        result: '',
+        resultFiles: [],
+        opts: 1,
+        name: '',
+        lat: '',
+        lng: '',
+      },
+      dictList: [],
+      arr: [],
+      showSelect: false,
+      girdList: [],
+    }
+  },
+
+  computed: {
+    ...mapState(['user']),
+  },
+
+  onLoad() {
+    this.getDict()
+    this.form.phone = this.user.phone
+    this.form.name = this.user.name || ''
+    this.getGirdList()
+  },
+
+  methods: {
+    chooseAddress() {
+      uni.chooseLocation({
+        success: (res) => {
+          this.form.address = res.address
+          this.form.lat = res.latitude
+          this.form.lng = res.longitude
         },
-        dictList: [],
-        arr: [],
-        showSelect: false,
-        girdList: [],
+      })
+    },
+
+    confirmSelect(e) {
+      this.form.girdId = e[0].value
+      this.girdList.map((item) => {
+        if (item.id == this.form.girdId) {
+          this.form.girdName = item.girdName
+        }
+      })
+    },
+
+    getDict() {
+      this.$http.post(`/app/appclapeventgroup/list`).then((res) => {
+        if (res.code == 0) {
+          this.dictList = res.data.records.map((v) => {
+            return {
+              value: v.id,
+              label: v.groupName,
+            }
+          })
+        }
+      })
+    },
+
+    getGirdData(x) {
+      if (x > -1) {
+        this.$set(this.gridList, '1', this.arr[0].girdList[x].girdList)
       }
     },
 
-    computed: {
-      ...mapState(['user'])
+    getGirdList() {
+      this.$http.post(`/app/appgirdmemberinfo/queryMyGirdListByLevel2AndUser`).then((res) => {
+        if (res.code == 0) {
+          this.arr = res.data
+          this.girdList = res.data
+        }
+      })
     },
 
-    onLoad () {
-      this.getDict()
-      this.form.phone = this.user.phone
-      this.form.name = this.user.name || ''
-      this.getGirdList()
+    onColumnChange(e) {
+      const column = e.detail.column
+      const value = e.detail.value
+
+      if (column === column) {
+        this.getGirdData(value)
+      }
     },
 
-    methods: {
-      chooseAddress () {
-        uni.chooseLocation({
-          success:  (res) => {
-            this.form.address = res.address
-            this.form.lat = res.latitude
-            this.form.lng = res.longitude
-          }
-        });
-      },
+    onChange(e) {
+      const v = e.detail.value[1]
+      if (this.gridList[1][v]) {
+        this.form.girdName = this.gridList[1][v].girdName
+        this.form.girdId = this.gridList[1][v].id
+      } else {
+        return this.$u.toast('所属网格必须选第三级网格')
+      }
+    },
 
-      confirmSelect(e) {
-        this.form.girdId = e[0].value
-        this.girdList.map((item) => {
-          if(item.id == this.form.girdId) {
-            this.form.girdName = item.girdName
-          }
-        })
-      },
-
-      getDict () {
-        this.$http.post(`/app/appclapeventgroup/list`).then(res => {
-          if (res.code == 0) {
-            this.dictList = res.data.records.map(v => {
-              return {
-                value: v.id,
-                label: v.groupName
-              }
-            })
-          }
-        })
-      },
-
-      getGirdData (x) {
-        if (x > -1) {
-          this.$set(this.gridList, '1', this.arr[0].girdList[x].girdList)
+    submit() {
+      if (!this.form.content) {
+        return this.$u.toast('请输入事件描述')
+      }
+      if (!this.form.groupId) {
+        return this.$u.toast('请选择事件类型')
+      }
+      if (!this.form.address) {
+        return this.$u.toast('请选择发生地点')
+      }
+      if (!this.form.girdName) {
+        return this.$u.toast('请选择上报网格')
+      }
+      if (this.form.opts == 0) {
+        if (!this.form.result) {
+          return this.$u.toast('请输入事件办理结果')
         }
-      },
+      }
 
-      getGirdList () {
-        this.$http.post(`/app/appgirdmemberinfo/queryMyGirdListByLevel2AndUser`).then(res => {
-          if (res.code == 0) {
-            this.arr = res.data
-            this.girdList = res.data
-          }
-        })
-      },
+      if (this.flag) return
+      this.flag = true
 
-      onColumnChange (e) {
-        const column = e.detail.column
-        const value = e.detail.value
-
-        if (column === column) {
-          this.getGirdData(value)
-        }
-      },
-
-      onChange (e) {
-        const v = e.detail.value[1]
-        if (this.gridList[1][v]) {
-          this.form.girdName = this.gridList[1][v].girdName
-          this.form.girdId = this.gridList[1][v].id
-        } else {
-          return this.$u.toast('所属网格必须选第三级网格')
-        }
-      },
-
-      submit () {
-        if (!this.form.content) {
-          return this.$u.toast('请输入事件描述')
-        }
-        if (!this.form.groupId) {
-          return this.$u.toast('请选择事件类型')
-        }
-        if (!this.form.address) {
-          return this.$u.toast('请选择发生地点')
-        }
-        if (!this.form.girdName) {
-          return this.$u.toast('请选择上报网格')
-        }
-        if (this.form.opts == 0) {
-          if (!this.form.result) {
-            return this.$u.toast('请输入事件办理结果')
-          }
-        }
-
-        if(this.flag) return
-        this.flag = true
-
-        this.$http.post(`/app/appclapeventinfo/addOrUpdate?`, {
+      this.$http
+        .post(`/app/appclapeventinfo/addOrUpdate?`, {
           ...this.form,
           files: this.form.files,
-          groupName: this.dictList.filter(v => v.value === this.form.groupId)[0].label
-        }).then(res => {
+          groupName: this.dictList.filter((v) => v.value === this.form.groupId)[0].label,
+          eventStatus: this.form.opts == 0 ? '2' : '0',
+        })
+        .then((res) => {
           this.$u.toast('上报成功')
           this.flag = false
           if (res.code == 0) {
@@ -262,154 +264,153 @@
             }, 600)
           }
         })
-      }
-    }
-  }
+    },
+  },
+}
 </script>
 
 <style lang="scss">
-  .album {
-    padding-bottom: 140px;
+.album {
+  padding-bottom: 140px;
 
-    .form-item__group {
-      margin-bottom: 24px;
-      background: #fff;
-    }
+  .form-item__group {
+    margin-bottom: 24px;
+    background: #fff;
+  }
 
-    .limit {
-      text-align: right;
-      font-size: 28px;
-      color: #999;
-    }
+  .limit {
+    text-align: right;
+    font-size: 28px;
+    color: #999;
+  }
 
-    .form-item {
-      padding-left: 32px;
+  .form-item {
+    padding-left: 32px;
 
-      .form-item__wrapper {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        height: 128px;
-        padding-right: 28px;
-        border-bottom: 1px solid #DDDDDD;
+    .form-item__wrapper {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      height: 128px;
+      padding-right: 28px;
+      border-bottom: 1px solid #dddddd;
 
-        input {
-          flex: 1;
-          height: 100%;
-          text-align: right;
-          padding-right: 10px;
-        }
-
-        .form-item__right {
-          display: flex;
-          align-items: center;
-          font-size: 32px;
-
-
-          span {
-            max-width: 400px;
-            margin-right: 8px;
-            color: #333333;
-            overflow: hidden;
-            white-space: nowrap;
-            text-overflow: ellipsis;
-          }
-
-          i {
-            font-style: normal;
-            margin-right: 8px;
-            color: #999999;
-            font-size: 30px;
-          }
-        }
+      input {
+        flex: 1;
+        height: 100%;
+        text-align: right;
+        padding-right: 10px;
       }
 
-      &:last-child {
-        .form-item__wrapper {
-          border-bottom: none;
+      .form-item__right {
+        display: flex;
+        align-items: center;
+        font-size: 32px;
+
+        span {
+          max-width: 400px;
+          margin-right: 8px;
+          color: #333333;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
         }
+
+        i {
+          font-style: normal;
+          margin-right: 8px;
+          color: #999999;
+          font-size: 30px;
+        }
+      }
+    }
+
+    &:last-child {
+      .form-item__wrapper {
+        border-bottom: none;
+      }
+    }
+
+    .form-item__title {
+      display: flex;
+      align-items: center;
+
+      i {
+        font-size: 30px;
+        color: #ff4466;
+      }
+
+      span {
+        font-size: 28px;
+        color: #999999;
+      }
+
+      h2 {
+        padding: 0 4px;
+        font-weight: 600;
+        font-size: 32px;
+        color: #333333;
+      }
+    }
+
+    &.form-item__imgs,
+    &.form-item__textarea {
+      .form-item__wrapper {
+        display: block;
+        height: auto;
+        padding-bottom: 32px;
+      }
+
+      textarea {
+        width: 100%;
+        height: 160px;
       }
 
       .form-item__title {
-        display: flex;
-        align-items: center;
-
-        i {
-          font-size: 30px;
-          color: #FF4466;
-        }
-
-        span {
-          font-size: 28px;
-          color: #999999;
-        }
-
-        h2 {
-          padding: 0 4px;
-          font-weight: 600;
-          font-size: 32px;
-          color: #333333;
-        }
+        padding: 32px 0;
       }
 
-  
-      &.form-item__imgs, &.form-item__textarea {
-        .form-item__wrapper {
-          display: block;
-          height: auto;
-          padding-bottom: 32px;
-        }
-
-        textarea {
-          width: 100%;
-          height: 160px;
-        }
-
-        .form-item__title {
-          padding: 32px 0;
-        }
-
-        .form-item__right {
-          padding-left: 18px;
-        }
+      .form-item__right {
+        padding-left: 18px;
       }
     }
-
-    .form-flow {
-      height: 280px;
-      padding-right: 40px;
-    }
-
-    .flow-option {
-      display: flex;
-      justify-content: space-between;
-
-      .byself,
-      .report {
-        height: 112px;
-        width: 45%;
-        background: #F5F5F5;
-        line-height: 112px;
-        text-align: center;
-        font-size: 30px;
-        color: #333333;
-      }
-      .current {
-        color: #1174fe;
-        background: #e7f1fe !important;
-        position: relative;
-}
-    }
-
-    .btn {
-      position: fixed;
-      bottom: 0;
-      width: 100%;
-      height: 120px;
-      background: #3975C6;
-      line-height: 120px;
-      text-align: center;
-      color: #FFFFFF;
-    }
   }
+
+  .form-flow {
+    height: 280px;
+    padding-right: 40px;
+  }
+
+  .flow-option {
+    display: flex;
+    justify-content: space-between;
+
+    .byself,
+    .report {
+      height: 112px;
+      width: 45%;
+      background: #f5f5f5;
+      line-height: 112px;
+      text-align: center;
+      font-size: 30px;
+      color: #333333;
+    }
+    .current {
+      color: #1174fe;
+      background: #e7f1fe !important;
+      position: relative;
+    }
+  }
+
+  .btn {
+    position: fixed;
+    bottom: 0;
+    width: 100%;
+    height: 120px;
+    background: #3975c6;
+    line-height: 120px;
+    text-align: center;
+    color: #ffffff;
+  }
+}
 </style>
diff --git a/src/saas/AppConflictMediation/detail.vue b/src/saas/AppConflictMediation/detail.vue
index a6ba2b0d..1c597090 100644
--- a/src/saas/AppConflictMediation/detail.vue
+++ b/src/saas/AppConflictMediation/detail.vue
@@ -5,7 +5,7 @@
 
       <div class="right">
         <!-- {{ data.name }} -->
-        <div class="names"><AiOpenData v-if="data.name" type="userName" :openid="data.name"/>的上报</div>
+        <div class="names"><AiOpenData v-if="data.name" type="userName" :openid="data.name" />的上报</div>
 
         <div class="times">{{ data.createTime }}</div>
       </div>
@@ -42,10 +42,10 @@
       </div>
 
       <div class="cards">
-        <span class="card-left" style="color:#999">照片</span>
+        <span class="card-left" style="color: #999">照片</span>
       </div>
 
-      <img :src="item.url" alt="" v-for="(item, i) in data.files" :key="i"  @click="previewImage(data.files, item.url)" />
+      <img :src="item.url" alt="" v-for="(item, i) in data.files" :key="i" @click="previewImage(data.files, item.url)" />
     </div>
 
     <div class="header-bottom">
@@ -72,7 +72,7 @@
               <div class="cardsss-right-left">
                 <div class="cardssss-right-left-top">
                   <!-- <span>{{ item.systemExplain }}</span> -->
-                  <AiOpenData v-if="item.systemExplain" type="userName" :openid="item.systemExplain"/>
+                  <AiOpenData v-if="item.systemExplain" type="userName" :openid="item.systemExplain" />
                   <div style="color: #2ea222; font-size: 16px; margin-top: 5px">
                     {{ $dict.getLabel('clapDoStatus', item.doStatus) }}
                   </div>
@@ -88,7 +88,7 @@
           <div class="cardes-msg-top" v-if="item.doExplain">{{ item.doExplain }}</div>
 
           <div class="imgs">
-            <img :src="e.url" alt="" v-for="(e, index) in item.files" :key="index"  @click="previewImage(item.files, e.url)" />
+            <img :src="e.url" alt="" v-for="(e, index) in item.files" :key="index" @click="previewImage(item.files, e.url)" />
           </div>
         </div>
       </div>
@@ -110,6 +110,8 @@
 </template>
 
 <script>
+import { mapState } from 'vuex'
+
 export default {
   name: 'Detail',
   components: {},
@@ -122,7 +124,9 @@ export default {
       showPage: false,
     }
   },
-  computed: {},
+  computed: {
+    ...mapState(['user']),
+  },
   watch: {},
   onLoad(o) {
     this.$dict.load('realityStatus', 'clapDoStatus').then(() => {
@@ -156,8 +160,8 @@ export default {
     },
     previewImage(images, img) {
       uni.previewImage({
-        urls: images.map(v => v.url),
-        current: img
+        urls: images.map((v) => v.url),
+        current: img,
       })
     },
   },
diff --git a/src/saas/AppConflictMediation/myReply.vue b/src/saas/AppConflictMediation/myReply.vue
new file mode 100644
index 00000000..9415f77c
--- /dev/null
+++ b/src/saas/AppConflictMediation/myReply.vue
@@ -0,0 +1,25 @@
+<template>
+  <div class="myReply">1</div>
+</template>
+
+<script>
+export default {
+  name: 'myReply',
+  components: {},
+  props: {},
+  data() {
+    return {}
+  },
+  computed: {},
+  watch: {},
+  onLoad() {},
+  onShow() {},
+  methods: {},
+}
+</script>
+
+<style scoped lang="scss">
+.myReply {
+  height: 100%;
+}
+</style>