diff --git a/src/saas/AppConflictMediation/List.vue b/src/saas/AppConflictMediation/List.vue
index ffc08d8c..b91e8960 100644
--- a/src/saas/AppConflictMediation/List.vue
+++ b/src/saas/AppConflictMediation/List.vue
@@ -69,7 +69,6 @@ export default {
       current: 1,
       pages: 0,
       show: false,
-      // myGirdList: [],
       girdId: '',
       groupName: '',
       girdNameText: '所属网格',
@@ -112,15 +111,12 @@ export default {
   },
   mounted() {
     this.current = 1
-    // this.girdList()
     this.getList()
-    uni.$on('nextList', () => {
-      this.current++
-      this.getList()
-    })
-    uni.$on('getListInit', () => {
+    this.getStaticList()
+    uni.$on('update', () => {
       this.current = 1
       this.getList()
+      this.getStaticList()
     })
   },
   onShow() {
@@ -183,24 +179,6 @@ export default {
       uni.navigateTo({ url: './add' })
     },
 
-    // girdList() {
-    //   this.$http
-    //     .post(`/app/appgirdmemberinfo/queryMyGirdListWithOut01`, null, {
-    //       params: {
-    //         size: 9999,
-    //       },
-    //     })
-    //     .then((res) => {
-    //       if (res.code == 0) {
-    //         this.myGirdList = res.data
-    //         var all = {
-    //           id: '',
-    //           girdName: '全部',
-    //         }
-    //         this.myGirdList.unshift(all)
-    //       }
-    //     })
-    // },
 
     confirm(e) {
       if (this.show) {
diff --git a/src/saas/AppConflictMediation/add.vue b/src/saas/AppConflictMediation/add.vue
index 5f0e0955..a989e9a2 100644
--- a/src/saas/AppConflictMediation/add.vue
+++ b/src/saas/AppConflictMediation/add.vue
@@ -90,7 +90,7 @@
               <h2>办理结果</h2>
             </div>
             <div class="form-item__right">
-              <textarea v-model="form.result" :maxlength="500" placeholder="请输入办理结果信息"></textarea>
+              <textarea v-model="form.finishContent" :maxlength="500" placeholder="请输入办理结果信息"></textarea>
             </div>
           </div>
         </div>
@@ -104,7 +104,7 @@
               <span>(最多9张)</span>
             </div>
             <div class="form-item__right">
-              <AiUploader :def.sync="form.resultFiles" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader>
+              <AiUploader :def.sync="form.finishFiles" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader>
             </div>
           </div>
         </div>
@@ -133,8 +133,8 @@ export default {
         flow: '',
         girdId: '',
         flag: false,
-        result: '',
-        resultFiles: [],
+        finishContent: '',
+        finishFiles: [],
         opts: 1,
         name: '',
         lat: '',
@@ -236,14 +236,14 @@ export default {
       if (!this.form.groupId) {
         return this.$u.toast('请选择事件类型')
       }
-      if (!this.form.address) {
-        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) {
+        if (!this.form.finishContent) {
           return this.$u.toast('请输入事件办理结果')
         }
       }
@@ -254,7 +254,10 @@ export default {
       this.$http
         .post(`/app/appclapeventinfo/addOrUpdate?`, {
           ...this.form,
+          lat: '120',
+          lng: '80',
           files: this.form.files,
+          finishFiles: this.form.finishFiles,
           groupName: this.dictList.filter((v) => v.value === this.form.groupId)[0].label,
           eventStatus: this.form.opts == 0 ? '2' : '0',
         })
diff --git a/src/saas/AppConflictMediation/detail.vue b/src/saas/AppConflictMediation/detail.vue
index 4b903b70..d9fe91b0 100644
--- a/src/saas/AppConflictMediation/detail.vue
+++ b/src/saas/AppConflictMediation/detail.vue
@@ -80,7 +80,8 @@
           <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)"/>
+            <img :src="e.url" alt="" v-for="(e, index) in item.finishFiles" :key="index" @click="previewImage(item.finishFiles, e.url)" v-if="item.eventStatus=='2'" />
           </div>
         </div>
       </div>