diff --git a/src/components/AiMore.vue b/src/components/AiMore.vue
index 52298fd4..235796c7 100644
--- a/src/components/AiMore.vue
+++ b/src/components/AiMore.vue
@@ -1,7 +1,7 @@
 <template>
   <section class="AiMore">
     <u-icon :name="icon" color="#ddd" :label="value||placeholder" label-pos="left" :label-color="labelColor"
-            label-size="32"/>
+            :label-size="size" :size="size" @click="$emit('click')"/>
   </section>
 </template>
 
@@ -15,7 +15,8 @@ export default {
   props: {
     placeholder: {default: "请选择"},
     value: String,
-    icon: {default: "arrow-right"}
+    icon: {default: "arrow-right"},
+    size: {default: 30}
   },
   computed: {
     isEmpty() {
diff --git a/src/project/qujing/AppConflictMediation/AppConflictMediation.vue b/src/project/qujing/AppConflictMediation/AppConflictMediation.vue
new file mode 100644
index 00000000..2b4aafd5
--- /dev/null
+++ b/src/project/qujing/AppConflictMediation/AppConflictMediation.vue
@@ -0,0 +1,105 @@
+<template>
+  <div class="AppConflictMediation">
+    <component v-if="refresh && isGridMember" :is="component" @change="onChange" :params="params"> </component>
+    <div v-if="!isGridMember" class="empty">
+      <img src="./components/img/no-admin.png" alt="">
+      <p>没有网格员权限<br />无法查看矛盾调解信息哦~</p>
+    </div>
+  </div>
+</template>
+
+<script>
+import List from './List.vue'
+import {mapState} from "vuex";
+
+export default {
+  name: 'AppConflictMediation',
+  appName: '矛盾调解',
+  data() {
+    return {
+      component: 'List',
+      params: {},
+      refresh: true,
+      tabIndex: 0,
+      isTab: true,
+    }
+  },
+  components: {List},
+  computed:{
+    ...mapState(['user']),
+    isGridMember() {
+      return this.user.girdCheckType > 0
+    }
+  },
+  methods: {
+    onChange(e) {
+      this.params = e.params
+      this.component = e.type
+    },
+  },
+  onShow() {
+    document.title = '矛盾调解'
+    uni.$on('hideTab', () => {
+      this.isTab = false
+    })
+    uni.$on('showTab', () => {
+      this.isTab = true
+    })
+
+  },
+  onReachBottom() {
+    if(!this.tabIndex) {
+      uni.$emit('nextList')
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.AppConflictMediation {
+  height: 100%;
+}
+.tabs {
+  width: 100%;
+  height: 98px;
+  background: #fff;
+  border-top: 1px solid #ddd;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  display: flex;
+  .item {
+    flex: 1;
+    text-align: center;
+    img {
+      width: 56px;
+      height: 56px;
+      margin-top: 8px;
+    }
+    p {
+      font-size: 22px;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #c4cad4;
+      line-height: 8px;
+    }
+    .color-3267F0 {
+      color: #3267f0;
+    }
+  }
+}
+.empty{
+  text-align: center;
+  img{
+    width: 282px;
+    height: 306px;
+    margin: 136px auto 0;
+  }
+  p{
+    font-size: 28px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    color: #999;
+    line-height: 40px;
+  }
+}
+</style>
diff --git a/src/project/qujing/AppConflictMediation/Content.vue b/src/project/qujing/AppConflictMediation/Content.vue
new file mode 100644
index 00000000..25d6025c
--- /dev/null
+++ b/src/project/qujing/AppConflictMediation/Content.vue
@@ -0,0 +1,256 @@
+<template>
+  <div class="Transfer">
+    <div class="contents">
+      <u-form :model="forms" ref="uForm" label-width="auto" :border-bottom="false">
+        <u-form-item label="转交给" prop="status" required :border-bottom="false" class="first-form" v-if="status == 4">
+          <div flex class="flexEnd">
+            <AiPagePicker type="custom" :id="selectObject.id" @select="handleSelectObject"
+                          :ops="{url:'../AppGridManagement/selectGridMember',label: 'name'}">
+              <AiMore v-model="forms.name"/>
+            </AiPagePicker>
+          </div>
+        </u-form-item>
+        <u-form-item label="事件分类" prop="groupName" required :border-bottom="false" right-icon="arrow-right"
+                     v-if="status== 2">
+
+          <span @click="show = true" class="right-span"
+                :style="forms.groupName ? '' : 'color:#999;'">{{ forms.groupName || '请选择事件分类' }}</span>
+
+          <u-select v-model="show" :list="myList" value-name="id" label-name="groupName"
+                    @confirm="selectStatus"></u-select>
+        </u-form-item>
+
+        <u-form-item :label="status == 2 ? '办结意见':'办理意见'" prop="content" required :border-bottom="false"
+                     label-position="top" class="contents">
+          <u-input v-model="forms.content" :placeholder="status == 2 ? '请写下你的办结意见…' : '请写下你的办理意见...'" type="textarea"
+                   auto-height height="100" maxlength="200"/>
+        </u-form-item>
+
+        <div class="limit">{{ forms.content.length }}/200</div>
+
+        <div class="line"></div>
+
+        <u-form-item label="图片上传(最多9张)" prop="files" :border-bottom="false" class="avatars" label-position="top">
+          <AiUploader :def.sync="forms.files" multiple placeholder="上传图片" :limit="9"
+                      action="/admin/file/add2"></AiUploader>
+        </u-form-item>
+
+      </u-form>
+    </div>
+
+    <div class="btn" v-if="status == 4" @click="confirm">
+      <span>转交事件</span>
+    </div>
+
+    <div class="btn" v-if="status == 2" @click="confirm">
+      <span>确定</span>
+    </div>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'Content',
+  components: {},
+  props: {},
+  data() {
+    return {
+      forms: {
+        groupName: '',
+        groupId: '',
+        content: '',
+        files: [],
+        name: ''
+      },
+      flag: false,
+      show: false,
+      status: '',  //4转交  2我已办结
+      myList: [],
+      id: '',
+      selectObject: {},
+      titleList: ['', '', '事件处理', '', '事件转交'],
+    }
+  },
+  computed: {
+    isSelectGridMember() {
+      return this.selectObject.kind == "user"
+    }
+  },
+  onLoad(option) {
+    this.status = option.status
+    this.id = option.id
+    this.forms.groupId = option.groupId
+    this.forms.groupName = option.groupName
+    this.typeList()
+  },
+  onShow() {
+    document.title = this.titleList[this.status]
+  },
+  methods: {
+    typeList() {
+      this.$http.post(`/app/appconflicteventgroup/list`, null, {
+        params: {
+          size: 9999,
+        },
+      })
+      .then((res) => {
+        if (res.code == 0) {
+          this.myList = res.data.records
+          this.$forceUpdate()
+        }
+      })
+    },
+    confirm() {
+      if (this.status == 4 && !this.forms.name) {
+        return this.$u.toast('请选择转交对象')
+      }
+      if (this.status != 4 && !this.forms.groupName) {
+        return this.$u.toast('请选择分类')
+      }
+      if (this.status != 4 && !this.forms.content) {
+        return this.$u.toast('请输入意见')
+      }
+      this.submit()
+    },
+    submit() {  //status 4转交  2我已办结
+      var url = '', successText = '', params = ''
+      if (this.status == 4) {
+        url = `/app/appconflicteventinfo/transfer`
+        successText = '转交成功'
+        params = {
+          ...this.forms,
+          girdId: this.selectObject.id,
+          girdName: this.selectObject.girdName,
+        }
+        if (this.isSelectGridMember) { //选择的网格员
+          params.girdId = this.selectObject.girdId
+          params.girdMemberId = this.selectObject.wxUserId
+          params.girdMemberName = this.selectObject.name
+        }
+      }
+      if (this.status == 2) {
+        url = `/app/appconflicteventinfo/finishByGirdMember`
+        successText = '办结成功'
+        params = {...this.forms}
+      }
+      params.id = this.id
+      this.$http.post(url, params).then((res) => {
+        if (res?.code == 0) {
+          this.$u.toast(successText)
+          uni.$emit('update')
+          setTimeout(() => {
+            uni.navigateBack({delta: 2})
+          }, 600)
+        }
+      })
+    },
+    selectStatus(e) {
+      this.forms.groupName = e[0].label
+      this.forms.groupId = e[0].value
+    },
+    handleSelectObject(obj) {
+      this.selectObject = obj
+      this.forms.name = obj.name || obj.girdName
+    }
+  },
+}
+</script>
+
+<style scoped lang="scss">
+.Transfer {
+  height: 100%;
+
+  .contents {
+    padding-bottom: 140px;
+
+    ::v-deep .u-form {
+      .u-form-item {
+        padding: 0 45px !important;
+
+        .u-form-item__body {
+          .u-form-item--right__content__slot {
+            padding-bottom: 0;
+
+            .u-input {
+              text-align: right !important;
+            }
+          }
+        }
+      }
+
+      .u-form-item:first-child {
+        .u-form-item__body {
+          border-bottom: 1px solid #ddd;
+        }
+      }
+
+      .line {
+        height: 24px;
+        background: #f3f6f9;
+      }
+
+      .contents {
+        padding-bottom: 20px !important;
+
+        .u-form-item__body {
+          .u-form-item--right__content__slot {
+            .u-input {
+              text-align: left !important;
+            }
+          }
+        }
+      }
+
+      .avatars {
+        padding-bottom: 20px !important;
+
+        .u-form-item__body {
+          .default {
+            width: 160px;
+            height: 160px;
+          }
+        }
+      }
+    }
+  }
+
+  .limit {
+    text-align: right !important;
+    font-size: 28px;
+    background: #FFFFFF;
+    padding-right: 44px;
+    height: 60px;
+    line-height: 60px;
+    color: #999;
+  }
+
+  // ::v-deep u-input {
+  //   border-bottom: none;
+  // }
+
+  .btn {
+    position: fixed;
+    bottom: 0;
+    width: 100%;
+    box-sizing: border-box;
+    background: #3975c6;
+    padding: 34px 0;
+    text-align: center;
+    font-size: 32px;
+    font-weight: 500;
+    color: #ffffff;
+  }
+
+  .right-span {
+    display: inline-block;
+    width: 100%;
+    text-align: right;
+  }
+
+  .flexEnd {
+    width: 100%;
+    justify-content: flex-end;
+  }
+}
+</style>
diff --git a/src/project/qujing/AppConflictMediation/List.vue b/src/project/qujing/AppConflictMediation/List.vue
new file mode 100644
index 00000000..7a97cefe
--- /dev/null
+++ b/src/project/qujing/AppConflictMediation/List.vue
@@ -0,0 +1,386 @@
+<template>
+  <div class="list-content">
+    <!-- 统计 -->
+    <div class="content-box">
+      <div class="content-list">
+        <div class="list-item" v-for="(item, index) in staticName" :key="index">
+          <h3>{{ item.value }}</h3>
+          <p>{{ item.label }}</p>
+        </div>
+      </div>
+    </div>
+
+    <!-- 事件列表 -->
+    <div class="title">
+      <div class="title-name">事件列表</div>
+      <div class="title-type" @click="showGird = true">{{ status ? status : '全部类型' }}<u-icon name="arrow-down"></u-icon></div>
+    </div>
+
+    <template>
+      <AiCard v-for="(item, i) in datas" :key="i" @click.native="goDetail(item, 1)">
+        <template #custom>
+          <div class="card-top">
+            <div class="titles">{{ item.content }}</div>
+
+            <div class="types">
+              <div class="label label1">事件类型</div>
+              <div class="types-right">{{ item.groupName }}</div>
+            </div>
+
+            <div class="gards gird">
+              <div class="label">所属网格</div>
+              <div class="gards-right">{{ item.girdName }}</div>
+            </div>
+          </div>
+
+          <div class="status" :class="item.eventStatus == 0 ? 'status0' : 'status2'" v-if="item.eventStatus">
+            <span class="icon"></span>
+            <span>
+              {{ $dict.getLabel('clapEventStatus', item.eventStatus) }}
+            </span>
+          </div>
+        </template>
+      </AiCard>
+
+      <div class="addbtn">
+        <div class="myreport" @click="linkTo('./myReply')">我的上报</div>
+
+        <div class="add" @click="addEvent">新增事件</div>
+      </div>
+
+      <AiEmpty v-if="!datas.length"></AiEmpty>
+    </template>
+
+    <u-select v-model="showGird" :list="$dict.getDict('clapEventStatusAll')" label-name="dictName" value-name="dictValue" @confirm="changeType" />
+
+    <div class="pad-b120" v-if="datas.length"></div>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  props: {},
+  data() {
+    return {
+      datas: [],
+      currentTabs: 0,
+      current: 1,
+      pages: 0,
+      show: false,
+      girdId: '',
+      groupName: '',
+      girdNameText: '所属网格',
+      showType: false,
+      listType: [],
+      status: '',
+      eventStatus: '',
+      eventStatusText: '办件状态',
+      listTypeHistory: [],
+      listTypeAll: [],
+      groupType: [],
+      showGird: false,
+      staticName: [
+        {
+          label: '待处理',
+          value: 0,
+        },
+        {
+          label: '上报数',
+          value: 0,
+        },
+        {
+          label: '已办数',
+          value: 0,
+        },
+        {
+          label: '今日办结',
+          value: 0,
+        },
+      ],
+      statisticsList: [],
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+
+    loadmore() {
+      return this.pages <= this.current ? 'loading ' : 'nomore'
+    },
+  },
+  mounted() {
+    this.current = 1
+    this.getList()
+    this.getStaticList()
+    uni.$on('update', () => {
+      this.current = 1
+      this.getList()
+      this.getStaticList()
+    })
+  },
+  onShow() {
+    document.title = '矛盾调解'
+  },
+  created() {
+    this.$dict.load('clapEventStatus', 'clapEventStatusAll', 'clapEventStatusHistory').then(() => {
+      this.getList()
+      this.getStaticList()
+      this.listTypeAll = this.$dict.getDict('clapEventStatusAll')
+      this.listTypeHistory = this.$dict.getDict('clapEventStatusHistory')
+      this.listType = this.listTypeAll
+    })
+  },
+  methods: {
+    getList() {
+      this.$http
+        .post(`/app/appconflicteventinfo/listByGirdMember`, null, {
+          params: {
+            size: 10,
+            current: this.current,
+            searchType: this.currentTabs == 1 ? '1' : '0',
+            eventStatus: this.eventStatus,
+            girdId: this.girdId,
+          },
+        })
+        .then((res) => {
+          if (res?.data) {
+            this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records
+            this.pages = res.data.pages
+            this.$forceUpdate()
+          }
+        })
+    },
+    getStaticList() {
+      this.$http.post('/app/appconflicteventinfo/conflictEventStatisticByGirdMember').then((res) => {
+        if (res?.data) {
+          Object.keys(res.data).forEach(() => {
+            this.staticName[0].value = res.data['待处理']
+            this.staticName[1].value = res.data['上报数']
+            this.staticName[2].value = res.data['已办数']
+            this.staticName[3].value = res.data['今日办结']
+          })
+          this.$forceUpdate()
+        }
+      })
+    },
+    // 切换类型
+    changeType(e) {
+      this.status = e[0].label
+      this.eventStatus = e[0].value
+      this.current = 1
+      this.datas = []
+      this.getList()
+    },
+
+    // 新增事件
+    addEvent() {
+      uni.navigateTo({ url: './add' })
+    },
+
+    goDetail(item) {
+      uni.navigateTo({ url: `./detail?id=${item.id}` })
+    },
+
+    change(index) {
+      this.current = 1
+      this.datas = []
+      this.eventStatus = ''
+      this.girdId = ''
+      this.girdNameText = '所属网格'
+      this.eventStatusText = '办件状态'
+      this.currentTabs = index
+      if (index == 0) {
+        this.listType = this.listTypeAll
+      } else {
+        this.listType = this.listTypeHistory
+      }
+      this.getList()
+    },
+
+    linkTo(url) {
+      uni.navigateTo({ url })
+    },
+  },
+}
+</script>
+
+<style scoped lang="scss">
+uni-page-body {
+  height: 100%;
+}
+.list-content {
+  height: 100%;
+
+  .content-box {
+    padding: 32px 30px 0px;
+    box-sizing: border-box;
+    background: #fff;
+
+    .content-list {
+      display: flex;
+      background: #fff;
+      border-radius: 16px;
+      margin-bottom: 20px;
+      width: 100%;
+      height: 240px;
+
+      .list-item {
+        width: 25%;
+        height: 80px;
+        text-align: center;
+        padding-top: 50px;
+        box-sizing: border-box;
+
+        h3 {
+          font-size: 64px;
+          color: #1e88e8;
+        }
+
+        p {
+          font-size: 28px;
+          color: #999999;
+        }
+      }
+    }
+  }
+
+  .title {
+    display: flex;
+    justify-content: space-between;
+    height: 80px;
+    line-height: 80px;
+    padding: 0 30px;
+    .title-name {
+      font-size: 38px;
+      color: #333333;
+      font-weight: 800;
+    }
+
+    .title-type {
+      font-size: 26px;
+      color: #666666;
+      padding-left: 60px;
+    }
+  }
+
+  ::v-deep .AiTopFixed .content {
+    padding: 0;
+  }
+  ::v-deep .AiCard {
+    background: #f3f6f9;
+    padding: 24px 30px 0;
+
+    .start {
+      background: #fff;
+      border-radius: 16px;
+
+      .card-top {
+        padding: 32px;
+        .titles {
+          margin-bottom: 34px;
+          font-size: 32px;
+          font-weight: 500;
+          color: #333333;
+          line-height: 1.4;
+          word-break: break-all;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          display: -webkit-box;
+          -webkit-line-clamp: 2;
+          -webkit-box-orient: vertical;
+        }
+        .types,
+        .gards {
+          display: flex;
+          margin-top: 8px;
+          font-size: 26px;
+          width: 100%;
+          .types-right,
+          .gards-right {
+            width: calc(100% - 120px);
+            color: #333333;
+          }
+          .label1 {
+            width: 120px;
+          }
+          .label {
+            width: 120px;
+          }
+        }
+      }
+
+      .status {
+        padding: 32px;
+        border-top: 1px solid #dddddd;
+        .icon {
+          display: inline-block;
+          width: 8px;
+          height: 8px;
+          vertical-align: middle;
+          margin-right: 8px;
+        }
+      }
+
+      .status0 {
+        color: #ff883c;
+        .icon {
+          background: #ff883c;
+        }
+      }
+
+      .status1 {
+        color: #1aaaff;
+        .icon {
+          background: #1aaaff;
+        }
+      }
+
+      .status2 {
+        color: #42d784;
+        .icon {
+          background: #42d784;
+        }
+      }
+
+      .status3 {
+        color: #ff4466;
+        .icon {
+          background: #ff4466;
+        }
+      }
+    }
+  }
+
+
+  .addbtn {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    height: 120px;
+    line-height: 120px;
+    text-align: center;
+    font-size: 32px;
+    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 {
+    background-color: #f3f6f9;
+    padding-bottom: 140px;
+  }
+}
+</style>
diff --git a/src/project/qujing/AppConflictMediation/PercentageDetail.vue b/src/project/qujing/AppConflictMediation/PercentageDetail.vue
new file mode 100644
index 00000000..f7e76dbc
--- /dev/null
+++ b/src/project/qujing/AppConflictMediation/PercentageDetail.vue
@@ -0,0 +1,207 @@
+<template>
+  <div class="PercentageDetail">
+    <div class="header">
+      <div class="left">
+        <h2>小区管理</h2>
+        <p>共21条，已办结18条</p>
+      </div>
+      <div class="right">
+        <h4>86%</h4>
+        <p>办结率</p>
+      </div>
+    </div>
+    <div class="info-content">
+      <div class="title">分类统计</div>
+      <div class="percentage">
+        <div class="item">
+          <div class="mini-title">小区管理</div>
+          <div class="info">
+            <div class="line-bg"><div class="active-bg"></div></div>共11条 | 已办结9
+          </div>
+        </div>
+        <div class="item">
+          <div class="mini-title">小区管理</div>
+          <div class="info">
+            <div class="line-bg" style="width:44%;"><div class="active-bg"></div></div>共11条 | 已办结9
+          </div>
+        </div>
+        <div class="item">
+          <div class="mini-title">小区管理</div>
+          <div class="info">
+            <div class="line-bg" style="width:30%;"><div class="active-bg"></div></div>共11条 | 已办结9
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {},
+  data() {
+    return {
+      contents: [
+        {
+          label: '待受理',
+          num: 5
+        },
+        {
+          label: '办理中',
+          num: 5
+        },
+        {
+          label: '今日上报',
+          num: 5
+        },
+        {
+          label: '今日办结',
+          num: 5
+        }
+      ]
+    }
+  },
+  methods: {
+    getList() {
+      this.$http
+        .post('/app/appvisitvondolence/list', null, {
+          params: {
+            size: this.size,
+            current: this.current,
+            createUserId: this.currentTabs == 1 ? this.user.id : '',
+          },
+        })
+        .then((res) => {
+          if (res.code == 0) {
+            this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records
+            this.pages = res.data.pages
+          }
+        })
+    },
+
+    goDetail(item) {
+      uni.navigateTo({ url: `./Detail?id=${item.id}` })
+    },
+
+    change(index) {
+      this.currentTabs = index
+      this.getList()
+    },
+  },
+  onReachBottom() {
+    this.current = this.current + 1
+    this.getList()
+  },
+}
+</script>
+
+<style scoped lang="scss">
+.PercentageDetail {
+  background-color: #F3F7F8;
+  padding: 32px 30px 0;
+  .header{
+    width: 100%;
+    background: #FFF;
+    border-radius: 16px;
+    margin-bottom: 30px;
+    display: flex;
+    padding: 32px 32px 38px 24px;
+    box-sizing: border-box;
+    .left{
+      width: calc(100% - 112px);
+      h2{
+        font-size: 42px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        font-weight: 400;
+        color: #333;
+        line-height: 48px;
+        margin-bottom: 16px;
+      }
+      p{
+        font-size: 30px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        color: #999;
+        line-height: 42px;
+      }
+    }
+    .right{
+      width: 112px;
+      background: #E6FFF1;
+      border-radius: 8px;
+      text-align: center;
+      color: #42D784;
+      h4{
+        font-size: 36px;
+        font-family: DINAlternate-Bold, DINAlternate;
+        font-weight: bold;
+        line-height: 42px;
+        padding: 8px 0 4px 0;
+      }
+      p{
+        font-size: 24px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        line-height: 34px;
+      }
+    }
+  }
+  .info-content{
+    width: 100%;
+    background: #FFF;
+    border-radius: 16px;
+    margin-bottom: 24px;
+    .title{
+      font-size: 32px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      font-weight: 400;
+      color: #333;
+      line-height: 48px;
+      padding: 24px 16px 24px 24px;
+      img{
+        float: right;
+        width: 40px;
+        height: 40px;
+      }
+    }
+    .percentage{
+      padding: 16px 0 0 26px;
+      .item{
+        width: 100%;
+        padding-bottom: 32px;
+        .mini-title{
+          font-size: 30px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          color: #333;
+          line-height: 48px;
+          margin-bottom: 14px;
+        }
+        .info{
+          width: 100%;
+          font-size: 28px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          color: #999;
+          line-height: 48px;
+          .line-bg{
+            display: inline-block;
+            width: 56%;
+            height: 14px;
+            background: #D7D8D9;
+            border-radius: 8px;
+            margin-right: 12px;
+            .active-bg{
+              width: 80%;
+              height: 100%;
+              background: #257FF1;
+              border-radius: 8px;
+            }
+          }
+          img{
+            width: 32px;
+            height: 32px;
+            vertical-align: middle;
+          }
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/project/qujing/AppConflictMediation/SelectUser.vue b/src/project/qujing/AppConflictMediation/SelectUser.vue
new file mode 100644
index 00000000..19651faa
--- /dev/null
+++ b/src/project/qujing/AppConflictMediation/SelectUser.vue
@@ -0,0 +1,343 @@
+<template>
+  <div class="SelectUser">
+    <div class="header-middle">
+      <div class="hint">
+        <span v-for="(item, index) in slectList" :key="index"><span v-if="index" style="margin:0 4px;">/</span><span
+            style="color:#3F8DF5" @click="girdNameClick(item, index)">{{ item.girdName }}</span></span>
+      </div>
+
+      <div class="showTypes" v-if="!userList.length">
+        <div v-if="treeList.length > 0">
+          <div class="cards" v-for="(item, index) in treeList" :key="index" @click="itemClick(item)">
+            <div class="imges">
+              <img src="./components/img/xzh.png" alt="" class="imgselect" v-if="item.isChecked"
+                   @click.stop="girdClick(item, index)"/>
+              <img src="./components/img/xz.png" alt="" class="imgselect" v-else
+                   @click.stop="girdClick(item, index)"/>
+              <img src="./components/img/gird--select-icon.png" alt="" class="avatras"/>
+            </div>
+            <div class="rightes">
+              <div class="applicationNames">{{ item.girdName }}</div>
+              <img src="./components/img/right-icon.png" alt="" class="imgs"/>
+            </div>
+          </div>
+        </div>
+
+        <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
+      </div>
+
+      <div class="showUsers" v-else>
+        <div v-if="userList.length > 0">
+          <div class="cards" v-for="(e, index) in userList" :key="index">
+            <div class="imges">
+              <img src="./components/img/xzh.png" alt="" class="imgselect" v-if="e.isChecked"
+                   @click="userClick(e, index)"/>
+              <img src="./components/img/xz.png" alt="" class="imgselect" v-else @click="userClick(e, index)"/>
+
+              <img src="./components/img/tx@2x.png" alt="" class="avatras"/>
+            </div>
+
+            <div class="rights">
+              <div class="applicationNames" v-text="e.name"/>
+              <div class="idNumbers">{{ e.phone }}</div>
+            </div>
+          </div>
+        </div>
+
+        <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
+      </div>
+    </div>
+
+    <div class="subBtn" @click="submit">
+      <div>确定选择</div>
+    </div>
+
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'SelectUser',
+  data() {
+    return {
+      selectUser: {},
+      allData: null,
+      treeList: [],
+      slectList: [],
+      userList: [],
+    }
+  },
+  onLoad() {
+    this.selectUser.id = this.$route.query.id
+    this.getTree()
+  },
+  onShow() {
+    document.title = '选择人员'
+  },
+  methods: {
+    getTree() {
+      this.slectList = []
+      this.$http.post('/app/appgirdinfo/listAllByTop').then((res) => {
+        if (res?.data) {
+          this.allData = res.data
+          this.treeInit()
+        }
+      })
+    },
+
+    treeInit() {
+      this.treeList = this.allData.girdList
+      let obj = {
+        girdName: this.allData.girdName,
+        id: this.allData.id,
+      }
+      this.slectList.push(obj)
+    },
+
+    itemClick(row) {
+      var obj = {
+        girdName: row.girdName,
+        id: row.id,
+      }
+      this.slectList.push(obj)
+      this.searckGird(row)
+    },
+
+    searckGird(row) {
+      this.treeList = []
+      this.$http.post(`/app/appgirdinfo/list?parentGirdId=${row.id}&size=999`).then((res) => {
+        if (res?.data) {
+          this.treeList = res.data.records.map(e => ({...e, isChecked: e.id == this.selectUser.id}))
+        }
+      })
+      this.userList = []
+      this.$http.post(`/app/appgirdmemberinfo/listByGirdIdByThree?girdId=${row.id}`).then((res) => {
+        if (res?.data) {
+          this.userList = res.data
+          this.userList.map((item) => {
+            item.isChecked = item.id == this.selectUser.id
+          })
+        }
+      })
+    },
+
+    girdNameClick(row, index) {
+      this.userList = []
+      if (!index) { //第一级别
+        this.slectList = []
+        this.treeInit()
+      } else {
+        var list = []
+        this.slectList.map((item, i) => {
+          if (i <= index) {
+            list.push(item)
+          }
+        })
+        this.slectList = list
+        this.searckGird(row)
+      }
+    },
+
+
+    girdClick(row, index) {
+      if (this.treeList[index].isChecked) {//取消
+        this.treeList[index].isChecked = false
+        this.selectUser = {}
+      } else {
+        this.treeList.map((item, i) => {
+          item.isChecked = index == i
+        })
+        this.selectUser = row
+      }
+      this.$forceUpdate()
+    },
+
+    userClick(row, index) {
+      if (this.userList[index].isChecked) {//取消
+        this.userList[index].isChecked = false
+        this.selectUser = {}
+      } else {
+        this.userList.map((item, i) => {
+          item.isChecked = index == i
+        })
+        this.selectUser = row
+      }
+      this.$forceUpdate()
+    },
+
+    submit() {
+      if (this.selectUser.id != null) {
+        uni.$emit('goback', this.selectUser)
+        uni.navigateBack({})
+      } else {
+        return this.$u.toast('请选择网格或网格员')
+      }
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.SelectUser {
+  height: 100%;
+  background: #fff;
+
+  .header-top {
+    background: #fff;
+    padding: 20px 32px;
+  }
+
+  .header-middle {
+    padding-bottom: 140px;
+
+    .hint {
+      padding: 28px 20px 28px 32px;
+      line-height: 56px;
+      box-shadow: 0 1px 0 0 #e4e5e6;
+      font-size: 30px;
+      font-weight: 500;
+      // word-break: break-all;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+
+    .showTypes {
+      .empty-div {
+        height: 16px;
+        background: #f5f5f5;
+      }
+
+      .cards {
+        display: flex;
+        align-items: center;
+        height: 120px;
+        line-height: 120px;
+        padding: 0 0 0 32px;
+
+        .imges {
+          display: flex;
+          align-items: center;
+
+          .imgselect {
+            width: 48px;
+            height: 48px;
+            vertical-align: middle;
+          }
+
+          .avatras {
+            width: 74px;
+            height: 74px;
+            border-radius: 8px;
+            margin-left: 36px;
+          }
+        }
+
+        img {
+          width: 74px;
+          height: 74px;
+          border-radius: 8px;
+        }
+
+        .rightes {
+          width: calc(100% - 160px);
+          display: flex;
+          align-items: center;
+          margin-left: 32px;
+          border-bottom: 1px solid #e4e5e6;
+
+          .applicationNames {
+            flex: 1;
+            min-width: 0;
+            font-size: 36px;
+            font-weight: 500;
+            color: #333333;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+          }
+
+          .imgs {
+            width: 40px;
+            height: 40px;
+            margin-right: 20px;
+          }
+        }
+      }
+    }
+
+    .showUsers {
+      .cards {
+        display: flex;
+        align-items: center;
+        height: 120px;
+        line-height: 120px;
+        padding: 0 0 0 32px;
+
+        .imges {
+          display: flex;
+          align-items: center;
+          width: 200px;
+
+          .imgselect {
+            width: 48px;
+            height: 48px;
+          }
+
+          .avatras {
+            width: 74px;
+            height: 74px;
+            border-radius: 8px;
+            margin-left: 36px;
+          }
+        }
+
+        .rights {
+          width: 70%;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          margin-left: 32px;
+          border-bottom: 1px solid #e4e5e6;
+          padding-right: 40px;
+
+          .applicationNames {
+            font-size: 36px;
+            font-weight: 500;
+            color: #333333;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+          }
+
+          .idNumbers {
+            color: #666;
+          }
+        }
+      }
+    }
+  }
+
+  .subBtn {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 118px;
+    background: #f4f8fb;
+
+    div {
+      width: 192px;
+      height: 80px;
+      line-height: 80px;
+      text-align: center;
+      background: #1365dd;
+      border-radius: 4px;
+      font-size: 32px;
+      color: #fff;
+      margin: 20px 34px 0 0;
+      float: right;
+    }
+  }
+}
+</style>
diff --git a/src/project/qujing/AppConflictMediation/Set.vue b/src/project/qujing/AppConflictMediation/Set.vue
new file mode 100644
index 00000000..be5fe84c
--- /dev/null
+++ b/src/project/qujing/AppConflictMediation/Set.vue
@@ -0,0 +1,76 @@
+<template>
+  <div class="set">
+    <div class="info-content" @click="toSetList">
+      <img src="./components/img/setting-icon.png" alt="" class="set-icon">
+      <div class="info">
+        <h2>配置事件类别</h2>
+        <p>提交上报时选择事件类别，有助于管理上报和统计分析</p>
+      </div>
+      <img src="./components/img/right-icon.png" alt="" class="right-icon">
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {},
+  data() {
+    return {
+
+    }
+  },
+  methods: {
+    toSetList() {
+      uni.navigateTo({url: './SetList'})
+    }
+  },
+}
+</script>
+
+<style scoped lang="scss">
+uni-page-body {
+  height: 100%;
+}
+.set {
+  height: 100%;
+  padding: 32px 30px 0;
+  box-sizing: border-box;
+  background-color: #F3F7F8;
+  .info-content{
+    width: 100%;
+    background-color: #fff;
+    padding: 40px 8px 34px 40px;
+    box-sizing: border-box;
+    display: flex;
+    .set-icon{
+      width: 40px;
+      height: 40px;
+      margin-right: 44px;
+    }
+    .info{
+      display: inline-block;
+      width: calc(100% - 216px);
+      h2{
+        font-size: 36px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        color: #333;
+        line-height: 48px;
+        margin-bottom: 6px;
+      }
+      p{
+        width: 100%;
+        font-size: 28px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        color: #999;
+        line-height: 40px;
+        word-break: break-all;
+      }
+    }
+    .right-icon{
+      width: 56px;
+      height: 56px;
+      margin-left: 76px;
+    }
+  }
+}
+</style>
diff --git a/src/project/qujing/AppConflictMediation/SetList.vue b/src/project/qujing/AppConflictMediation/SetList.vue
new file mode 100644
index 00000000..895eb246
--- /dev/null
+++ b/src/project/qujing/AppConflictMediation/SetList.vue
@@ -0,0 +1,122 @@
+<template>
+  <div class="SetList">
+    <div class="header">
+      <div class="title">事件类别</div>
+      <p>成员上报时需要选择事件类别，上报会按照分类进行统计。</p>
+    </div>
+    <div class="set-list">
+      <div class="item">
+        <div class="title">小区管理</div>
+        <div class="tips-list">
+          <span class="tips">公共部位设置地桩锁</span>
+          <span class="tips">公共部位桩锁</span>
+          <span class="tips">地桩锁</span>
+          <span class="tips">公共部位设置地桩锁</span>
+          <span class="tips">公共部位桩锁</span>
+          <span class="tips">地桩锁</span>
+          <span class="tips">公共部位设置地桩锁</span>
+          <span class="tips">公共部位桩锁</span>
+          <span class="tips">地桩锁</span>
+        </div>
+        <img src="./components/img/right-icon.png" alt="">
+      </div>
+    </div>
+    <div class="btn" @click="toAddSet">新建分类</div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'SetList',
+  components: {},
+  props: {
+    dict: Object,
+    instance: Function,
+    params: Object,
+  },
+  data() {
+    return {}
+  },
+  methods: {
+    toAddSet() {
+      uni.navigateTo({url: './AddSet'})
+    }
+  },
+}
+</script>
+
+<style scoped lang="scss">
+.SetList {
+  height: 100%;
+  background-color: #fff;
+  .header{
+    padding: 40px 30px 74px;
+    .title{
+      font-size: 42px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #333;
+      line-height: 48px;
+      margin-bottom: 16px;
+    }
+    p{
+      width: 100%;
+      font-size: 30px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #999;
+      line-height: 42px;
+      word-break: break-all;
+    }
+  }
+  .set-list{
+    padding: 0 28px 120px;
+    .item{
+      width: 100%;
+      padding-bottom: 20px;
+      border-bottom: 1px solid #E9EAEB;
+      position: relative;
+      .title{
+        font-size: 34px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        color: #333;
+        line-height: 48px;
+        margin-bottom: 22px;
+      }
+      .tips-list{
+        width: calc(100% - 68px);
+      }
+      .tips{
+        display: inline-block;
+        line-height: 64px;
+        background: #F7F8F9;
+        border-radius: 8px;
+        padding: 0 20px;
+        font-size: 30px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        color: #999;
+        margin: 0 16px 24px 0;
+      }
+      img{
+        width: 40px;
+        height: 40px;
+        position: absolute;
+        top: 50%;
+        right: 20px;
+      }
+    }
+  }
+  .btn{
+    width: 100%;
+    line-height: 112px;
+    background: #3975C6;
+    box-shadow: inset 0px 1px 0px 0px #EEEEEE;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    text-align: center;
+    font-size: 32px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #FFF;
+  }
+}
+</style>
diff --git a/src/project/qujing/AppConflictMediation/UserList.vue b/src/project/qujing/AppConflictMediation/UserList.vue
new file mode 100644
index 00000000..fe31698a
--- /dev/null
+++ b/src/project/qujing/AppConflictMediation/UserList.vue
@@ -0,0 +1,60 @@
+<template>
+  <div class="UserList">
+    <div class="item">
+      <img src="./components/img/user-img.png" alt="">
+      <div class="info">
+        <h2>李毅</h2>
+        <p>共受理23条 | 已办结17条</p>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'UserList',
+  data() {
+    return {
+
+    }
+  },
+  methods: {
+
+  },
+}
+</script>
+
+<style scoped lang="scss">
+.UserList {
+  height: 100%;
+  .item{
+    padding: 24px 0 0 32px;
+    background-color: #fff;
+    img{
+      width: 80px;
+      height: 80px;
+      margin-right: 32px;
+    }
+    .info{
+      display: inline-block;
+      width: calc(100% - 112px);
+      padding-bottom: 24px;
+      border-bottom: 1px solid #E4E5E6;
+      h2{
+        font-size: 32px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #333;
+        line-height: 44px;
+        margin-bottom: 6px;
+      }
+      p{
+        font-size: 28px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        color: #666;
+        line-height: 40px;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/project/qujing/AppConflictMediation/add.vue b/src/project/qujing/AppConflictMediation/add.vue
new file mode 100644
index 00000000..3ea0e5eb
--- /dev/null
+++ b/src/project/qujing/AppConflictMediation/add.vue
@@ -0,0 +1,238 @@
+<template>
+  <div class="album">
+    <AiGroup>
+      <AiItem required label="事件描述" top-label labelBold :border="false">
+        <textarea v-model="form.content" :maxlength="200" placeholder="请简要描述事件…"></textarea>
+      </AiItem>
+    </AiGroup>
+    <AiGroup>
+      <AiItem label="图片上传" top-label labelBold :border="false">
+        <span class="color-999" slot="sub">(最多9张)</span>
+        <AiUploader :def.sync="form.files" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"/>
+      </AiItem>
+    </AiGroup>
+    <AiGroup>
+      <AiItem label="事件类型" required labelBold>
+        <AiSelect :list="dictList" v-model="form.groupId"/>
+      </AiItem>
+      <AiItem label="发生地点" required labelBold>
+        <AiMore placeholder="点击定位" v-model="form.address" @click="chooseAddress"/>
+      </AiItem>
+      <AiItem label="上报网格" required labelBold>
+        <AiPagePicker type="custom" @select="handleSelectGrid" self
+                      :ops="{url:'../AppGridManagement/SelectGird',label: 'girdName'}">
+          <AiMore v-model="form.girdName"/>
+        </AiPagePicker>
+      </AiItem>
+      <AiItem label="处理流程" required labelBold top-label>
+        <div class="flow-option">
+          <div class="fill" :class="{current:form.opts=='0'}" @click="form.opts=0">自己办结</div>
+          <div class="fill mar-l16" :class="{current:form.opts==1}" @click="form.opts=1">上报处理</div>
+        </div>
+      </AiItem>
+    </AiGroup>
+    <AiGroup v-if="form.opts==0">
+      <AiItem label="办理结果" required top-label labelBold>
+        <textarea v-model="form.finishContent" :maxlength="200" placeholder="请输入办理结果信息"/>
+      </AiItem>
+      <AiItem label="图片上传" top-label labelBold :border="false">
+        <span class="color-999" slot="sub">(最多9张)</span>
+        <AiUploader :def.sync="form.finishFiles" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"/>
+      </AiItem>
+    </AiGroup>
+    <div class="btn" @click="submit">上报</div>
+  </div>
+</template>
+
+<script>
+import {mapState} from 'vuex'
+import AiGroup from "../../../components/AiGroup";
+import AiItem from "../../../components/AiItem";
+import AiMore from "../../../components/AiMore";
+
+export default {
+  components: {AiMore, AiItem, AiGroup},
+  appName: '新增事件',
+  data() {
+    return {
+      isShowType: false,
+      form: {
+        content: '',
+        files: [],
+        groupId: '',
+        address: '',
+        girdName: '',
+        flow: '',
+        girdId: '',
+        flag: false,
+        finishContent: '',
+        finishFiles: [],
+        opts: 1,
+        name: '',
+        lat: '',
+        lng: '',
+      },
+      dictList: [],
+      arr: [],
+      girdList: [],
+    }
+  },
+
+  computed: {
+    ...mapState(['user']),
+  },
+  onShow() {
+    document.title = '新增事件'
+  },
+  onLoad() {
+    this.getDict()
+    this.form.phone = this.user.phone
+    this.form.name = this.user.name || ''
+    this.getGirdList()
+  },
+  methods: {
+    handleSelectGrid(v) {
+      this.form.girdId = v?.id
+      this.form.girdName = v?.girdName || ""
+    },
+    chooseAddress() {
+      uni.chooseLocation({
+        success: (res) => {
+          this.form.address = res.address
+          this.form.lat = res.latitude
+          this.form.lng = res.longitude
+        },
+      })
+    },
+
+    getDict() {
+      this.$http.post(`/app/appconflicteventgroup/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)
+      }
+    },
+
+    getGirdList() {
+      this.$http.post(`/app/appgirdmemberinfo/queryMyGirdListByLevel2AndUser`).then((res) => {
+        if (res.code == 0) {
+          this.arr = res.data
+          this.girdList = res.data
+        }
+      })
+    },
+
+    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.finishContent) {
+          return this.$u.toast('请输入事件办理结果')
+        }
+      }
+
+      if (this.flag) return
+      this.flag = true
+      this.$http.post(`/app/appconflicteventinfo/addOrUpdate`, {
+        ...this.form,
+        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',
+      })
+      .then((res) => {
+        this.$u.toast('上报成功')
+        this.flag = false
+        if (res.code == 0) {
+          uni.$emit('update')
+          this.$forceUpdate()
+          setTimeout(() => {
+            uni.navigateBack()
+          }, 600)
+        }
+      })
+    },
+  },
+}
+</script>
+
+<style lang="scss">
+.album {
+  padding-bottom: 140px;
+
+  .flow-option {
+    display: flex;
+    justify-content: space-between;
+
+    & > * {
+      height: 112px;
+      background: #f5f5f5;
+      line-height: 112px;
+      text-align: center;
+      font-size: 30px;
+      color: #333333;
+
+      &.current {
+        color: #1174fe;
+        background: #e7f1fe !important;
+      }
+    }
+  }
+
+  .btn {
+    position: fixed;
+    bottom: 0;
+    width: 100%;
+    height: 120px;
+    background: #3975c6;
+    line-height: 120px;
+    text-align: center;
+    color: #ffffff;
+  }
+
+  ::v-deep .ai-uploader .fileList .default {
+    width: 160px;
+    height: 160px;
+  }
+}
+</style>
diff --git a/src/project/qujing/AppConflictMediation/components/1.png b/src/project/qujing/AppConflictMediation/components/1.png
new file mode 100644
index 00000000..663b9263
Binary files /dev/null and b/src/project/qujing/AppConflictMediation/components/1.png differ
diff --git a/src/project/qujing/AppConflictMediation/components/22.png b/src/project/qujing/AppConflictMediation/components/22.png
new file mode 100644
index 00000000..7f6bc129
Binary files /dev/null and b/src/project/qujing/AppConflictMediation/components/22.png differ
diff --git a/src/project/qujing/AppConflictMediation/components/img/add-icon.png b/src/project/qujing/AppConflictMediation/components/img/add-icon.png
new file mode 100644
index 00000000..f751a7fa
Binary files /dev/null and b/src/project/qujing/AppConflictMediation/components/img/add-icon.png differ
diff --git a/src/project/qujing/AppConflictMediation/components/img/bg-1.png b/src/project/qujing/AppConflictMediation/components/img/bg-1.png
new file mode 100644
index 00000000..696022e9
Binary files /dev/null and b/src/project/qujing/AppConflictMediation/components/img/bg-1.png differ
diff --git a/src/project/qujing/AppConflictMediation/components/img/bg-2.png b/src/project/qujing/AppConflictMediation/components/img/bg-2.png
new file mode 100644
index 00000000..98fa31b8
Binary files /dev/null and b/src/project/qujing/AppConflictMediation/components/img/bg-2.png differ
diff --git a/src/project/qujing/AppConflictMediation/components/img/bg-3.png b/src/project/qujing/AppConflictMediation/components/img/bg-3.png
new file mode 100644
index 00000000..dc469567
Binary files /dev/null and b/src/project/qujing/AppConflictMediation/components/img/bg-3.png differ
diff --git a/src/project/qujing/AppConflictMediation/components/img/down-icon.png b/src/project/qujing/AppConflictMediation/components/img/down-icon.png
new file mode 100644
index 00000000..6ffcc7a2
Binary files /dev/null and b/src/project/qujing/AppConflictMediation/components/img/down-icon.png differ
diff --git a/src/project/qujing/AppConflictMediation/components/img/gird--select-icon.png b/src/project/qujing/AppConflictMediation/components/img/gird--select-icon.png
new file mode 100644
index 00000000..205144d2
Binary files /dev/null and b/src/project/qujing/AppConflictMediation/components/img/gird--select-icon.png differ
diff --git a/src/project/qujing/AppConflictMediation/components/img/gird-icon.png b/src/project/qujing/AppConflictMediation/components/img/gird-icon.png
new file mode 100644
index 00000000..f7f3e61f
Binary files /dev/null and b/src/project/qujing/AppConflictMediation/components/img/gird-icon.png differ
diff --git a/src/project/qujing/AppConflictMediation/components/img/handle-icon-active.png b/src/project/qujing/AppConflictMediation/components/img/handle-icon-active.png
new file mode 100644
index 00000000..1cb07503
Binary files /dev/null and b/src/project/qujing/AppConflictMediation/components/img/handle-icon-active.png differ
diff --git a/src/project/qujing/AppConflictMediation/components/img/handle-icon.png b/src/project/qujing/AppConflictMediation/components/img/handle-icon.png
new file mode 100644
index 00000000..ab2d20c2
Binary files /dev/null and b/src/project/qujing/AppConflictMediation/components/img/handle-icon.png differ
diff --git a/src/project/qujing/AppConflictMediation/components/img/jujue.png b/src/project/qujing/AppConflictMediation/components/img/jujue.png
new file mode 100644
index 00000000..ea7387ad
Binary files /dev/null and b/src/project/qujing/AppConflictMediation/components/img/jujue.png differ
diff --git a/src/project/qujing/AppConflictMediation/components/img/line-img.png b/src/project/qujing/AppConflictMediation/components/img/line-img.png
new file mode 100644
index 00000000..4d423855
Binary files /dev/null and b/src/project/qujing/AppConflictMediation/components/img/line-img.png differ
diff --git a/src/project/qujing/AppConflictMediation/components/img/local-icon.png b/src/project/qujing/AppConflictMediation/components/img/local-icon.png
new file mode 100644
index 00000000..3e23aff6
Binary files /dev/null and b/src/project/qujing/AppConflictMediation/components/img/local-icon.png differ
diff --git a/src/project/qujing/AppConflictMediation/components/img/no-admin.png b/src/project/qujing/AppConflictMediation/components/img/no-admin.png
new file mode 100644
index 00000000..3830c170
Binary files /dev/null and b/src/project/qujing/AppConflictMediation/components/img/no-admin.png differ
diff --git a/src/project/qujing/AppConflictMediation/components/img/remove-icon.png b/src/project/qujing/AppConflictMediation/components/img/remove-icon.png
new file mode 100644
index 00000000..971b39ef
Binary files /dev/null and b/src/project/qujing/AppConflictMediation/components/img/remove-icon.png differ
diff --git a/src/project/qujing/AppConflictMediation/components/img/right-icon.png b/src/project/qujing/AppConflictMediation/components/img/right-icon.png
new file mode 100644
index 00000000..e1c626b7
Binary files /dev/null and b/src/project/qujing/AppConflictMediation/components/img/right-icon.png differ
diff --git a/src/project/qujing/AppConflictMediation/components/img/search-icon.png b/src/project/qujing/AppConflictMediation/components/img/search-icon.png
new file mode 100644
index 00000000..e3cb75af
Binary files /dev/null and b/src/project/qujing/AppConflictMediation/components/img/search-icon.png differ
diff --git a/src/project/qujing/AppConflictMediation/components/img/set-icon-active.png b/src/project/qujing/AppConflictMediation/components/img/set-icon-active.png
new file mode 100644
index 00000000..c025cb79
Binary files /dev/null and b/src/project/qujing/AppConflictMediation/components/img/set-icon-active.png differ
diff --git a/src/project/qujing/AppConflictMediation/components/img/set-icon.png b/src/project/qujing/AppConflictMediation/components/img/set-icon.png
new file mode 100644
index 00000000..58651b64
Binary files /dev/null and b/src/project/qujing/AppConflictMediation/components/img/set-icon.png differ
diff --git a/src/project/qujing/AppConflictMediation/components/img/setting-icon.png b/src/project/qujing/AppConflictMediation/components/img/setting-icon.png
new file mode 100644
index 00000000..29e4b29f
Binary files /dev/null and b/src/project/qujing/AppConflictMediation/components/img/setting-icon.png differ
diff --git a/src/project/qujing/AppConflictMediation/components/img/statistics-icon-active.png b/src/project/qujing/AppConflictMediation/components/img/statistics-icon-active.png
new file mode 100644
index 00000000..81dbd3f7
Binary files /dev/null and b/src/project/qujing/AppConflictMediation/components/img/statistics-icon-active.png differ
diff --git a/src/project/qujing/AppConflictMediation/components/img/statistics-icon.png b/src/project/qujing/AppConflictMediation/components/img/statistics-icon.png
new file mode 100644
index 00000000..63b98d33
Binary files /dev/null and b/src/project/qujing/AppConflictMediation/components/img/statistics-icon.png differ
diff --git a/src/project/qujing/AppConflictMediation/components/img/tx@2x.png b/src/project/qujing/AppConflictMediation/components/img/tx@2x.png
new file mode 100644
index 00000000..d9620e08
Binary files /dev/null and b/src/project/qujing/AppConflictMediation/components/img/tx@2x.png differ
diff --git a/src/project/qujing/AppConflictMediation/components/img/user-img.png b/src/project/qujing/AppConflictMediation/components/img/user-img.png
new file mode 100644
index 00000000..ae49d85f
Binary files /dev/null and b/src/project/qujing/AppConflictMediation/components/img/user-img.png differ
diff --git a/src/project/qujing/AppConflictMediation/components/img/xz.png b/src/project/qujing/AppConflictMediation/components/img/xz.png
new file mode 100644
index 00000000..98f78cda
Binary files /dev/null and b/src/project/qujing/AppConflictMediation/components/img/xz.png differ
diff --git a/src/project/qujing/AppConflictMediation/components/img/xzh.png b/src/project/qujing/AppConflictMediation/components/img/xzh.png
new file mode 100644
index 00000000..967fa399
Binary files /dev/null and b/src/project/qujing/AppConflictMediation/components/img/xzh.png differ
diff --git a/src/project/qujing/AppConflictMediation/components/img/zhuanjiao.png b/src/project/qujing/AppConflictMediation/components/img/zhuanjiao.png
new file mode 100644
index 00000000..f6c932fa
Binary files /dev/null and b/src/project/qujing/AppConflictMediation/components/img/zhuanjiao.png differ
diff --git a/src/project/qujing/AppConflictMediation/components/yan.jpg b/src/project/qujing/AppConflictMediation/components/yan.jpg
new file mode 100644
index 00000000..bf6a5a2c
Binary files /dev/null and b/src/project/qujing/AppConflictMediation/components/yan.jpg differ
diff --git a/src/project/qujing/AppConflictMediation/detail.vue b/src/project/qujing/AppConflictMediation/detail.vue
new file mode 100644
index 00000000..59d4388d
--- /dev/null
+++ b/src/project/qujing/AppConflictMediation/detail.vue
@@ -0,0 +1,428 @@
+<template>
+  <div class="Detail" v-if="showPage">
+    <div class="header-top">
+      <div class="avatars">
+        {{ data.name.substring(data.name.length, data.name.length - 2) }}
+      </div>
+      <div class="right">
+        <div class="names">{{ data.name }}的上报</div>
+        <div class="times">{{ data.createTime }}</div>
+      </div>
+    </div>
+    <div class="header-middle">
+      <div class="titles">{{ data.content }}</div>
+      <span class="status status1" :class="data.eventStatus == 0 ? 'status1' : 'status2'" v-if="data.eventStatus"
+            v-text="$dict.getLabel('clapEventStatus', data.eventStatus)"/>
+      <div class="card">
+        <span class="card-left">事件类型</span>
+        <span class="card-right">{{ data.groupName }}</span>
+      </div>
+      <div class="card">
+        <span class="card-left">所属网格</span>
+        <span class="card-right">{{ data.girdName }}</span>
+      </div>
+      <div class="card">
+        <span class="card-left">上报地址</span>
+        <span class="card-right">
+          <span>{{ data.address }}</span>
+        </span>
+      </div>
+
+      <div class="cards">
+        <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)"/>
+    </div>
+
+    <div class="header-bottom">
+      <div class="line"/>
+      <div class="plan">
+        <div class="nav">
+          <span>办理进度</span>
+          <span v-text="$dict.getLabel('clapEventStatus', data.eventStatus)"/>
+        </div>
+        <div class="cards" v-for="(item, index) in data.processList" :key="index">
+          <div class="cardss">
+            <div class="cardss-left">
+              <div class="card-img">
+                <div v-text="transTxt(item.systemExplain)[1]" style="display: inline-block; font-size:12px;"/>
+                <img src="./components/1.png" class="avatarIcon" alt=""/>
+              </div>
+            </div>
+            <div class="cardss-right">
+              <div class="cardsss-right-left">
+                <div class="cardssss-right-left-top">
+                  <div v-text="transTxt(item.systemExplain)[1]"/>
+                  <div v-html="transTxt(item.systemExplain)[2]" style="display: inline-block;" v-if="transTxt(item.systemExplain).length < 5"/>
+                  <div v-if="transTxt(item.systemExplain).length>3" v-text="`转交给${transTxt(item.systemExplain)[3]}`"/>
+                  {{ $dict.getLabel('clapDoStatus', item.doStatus) }}
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="cardees-right-right" v-text="item.doTime"/>
+          <div class="lines"/>
+          <div class="cardes-msg-top" v-if="item.doExplain" v-text="item.doExplain"/>
+          <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.finishFiles" :key="index" @click="previewImage(item.finishFiles, e.url)"
+                 v-if="item.eventStatus=='2'"/>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="fixedBtn">
+      <div class="status00" v-if="data.eventStatus == 0 && isMine == 0">
+        <div class="columns border-r" @click="toContent(4)">
+          <span class="hint">转交事件</span>
+        </div>
+        <div class="doIt" @click="doItShow = true">事件处理</div>
+      </div>
+    </div>
+    <u-modal v-model="doItShow" :mask-close-able="true" z-index="99" content="确定受理该事件?" :show-cancel-button="true" @confirm="toContent(2)"/>
+  </div>
+</template>
+
+<script>
+import {mapState} from 'vuex'
+
+export default {
+  name: 'Detail',
+  data() {
+    return {
+      data: {},
+      id: '',
+      doItShow: false,
+      showPage: false,
+      isMine: 0,
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+
+  onLoad(o) {
+    this.$dict.load('realityStatus', 'clapDoStatus').then(() => {
+      this.id = o.id
+      this.getDetail()
+    })
+    if (o.isMine) {
+      this.isMine = o.isMine
+    }
+  },
+  onShow() {
+    document.title = '矛盾调解'
+  },
+  methods: {
+    transTxt(str) {
+      return str.split("$")
+    },
+
+    getDetail() {
+      this.$http.post(`/app/appconflicteventinfo/queryDetailById?id=${this.id}`).then((res) => {
+        if (res?.data) {
+          this.data = res.data
+          this.showPage = true
+        }
+      })
+    },
+
+    callPhone(phone) {
+      uni.makePhoneCall({phoneNumber: phone})
+    },
+
+    toContent(status) {
+      uni.navigateTo({url: `./Content?status=${status}&groupId=${this.data.groupId}&groupName=${this.data.groupName}&id=${this.id}`})
+    },
+    previewImage(images, img) {
+      uni.previewImage({
+        urls: images.map((v) => v.url),
+        current: img,
+      })
+    },
+  },
+}
+</script>
+
+<style scoped lang="scss">
+uni-page-body {
+  height: 100%;
+}
+
+.Detail {
+  height: 100%;
+  background: #fff;
+
+  .header-top {
+    display: flex;
+    margin: 26px 0 14px 0;
+    padding: 0 32px;
+
+    .avatars {
+      width: 80px;
+      height: 80px;
+      line-height: 80px;
+      background: #4e8eee;
+      border-radius: 50%;
+      color: #fff;
+      text-align: center;
+      font-size: 28px;
+      font-weight: 500;
+      margin-right: 16px;
+    }
+
+    .right {
+      .names {
+        font-size: 32px;
+        font-weight: 500;
+      }
+
+      .times {
+        margin-top: 10px;
+        font-size: 28px;
+        color: #999999;
+      }
+    }
+  }
+
+  .header-middle {
+    padding: 0 32px 10px 32px;
+
+    .titles {
+      margin: 32px 0;
+      line-height: 1.4;
+      word-break: break-all;
+      font-size: 40px;
+      font-weight: 600;
+    }
+
+    .status {
+      display: inline-block;
+      margin-bottom: 14px;
+      padding: 4px 8px;
+      font-size: 26px;
+      color: #ffffff;
+      border-radius: 8px;
+    }
+
+    .status1 {
+      background: #ff883c;
+    }
+
+    .status2 {
+      background: #42d784;
+    }
+
+    .card {
+      display: flex;
+      justify-content: space-between;
+      padding: 34px 0;
+      border-bottom: 1px solid #ddd;
+
+      .card-left {
+        width: 46%;
+        font-size: 32px;
+        color: #999999;
+      }
+
+      .card-right {
+        font-size: 32px;
+        width: 100%;
+        text-align: right;
+
+        .u-icon {
+          margin-left: 8px;
+        }
+      }
+    }
+
+    .cards {
+      padding: 34px 0;
+    }
+
+    img {
+      width: 220px;
+      height: 220px;
+      margin-right: 8px;
+    }
+
+    img:nth-child(3n) {
+      margin-right: 0;
+    }
+  }
+
+  .header-bottom {
+    padding-bottom: 80px;
+
+    .line {
+      height: 16px;
+      background: #f3f6f9;
+    }
+
+    .plan {
+      padding: 0 32px;
+
+      .nav {
+        padding: 26px 0;
+      }
+
+      .cards {
+        position: relative;
+        padding-bottom: 80px;
+
+        .cardss {
+          display: flex;
+          width: 100%;
+
+          .cardss-left {
+            width: 15%;
+
+            .card-img {
+              position: relative;
+              width: 80px;
+              height: 80px;
+              text-align: center;
+              line-height: 80px;
+              color: #fff;
+              background: #197df0;
+              border: 1px solid #dddddd;
+              border-radius: 50%;
+              font-size: 28px;
+              z-index: 9;
+
+              .avatarIcon {
+                position: absolute;
+                bottom: 0;
+                right: 0;
+                width: 38px;
+                height: 38px;
+              }
+            }
+          }
+
+          .cardss-right {
+            width: 60%;
+
+            .cardsss-right-left {
+              .cardssss-right-left-top {
+                overflow: hidden;
+                text-overflow: ellipsis;
+                font-size: 32px;
+              }
+
+              .cardssss-right-left-bottom {
+                margin-top: 10px;
+                font-size: 28px;
+                color: #666666;
+              }
+            }
+          }
+
+          .cardees-right-right {
+            width: 25%;
+            font-size: 28px;
+            color: #999999;
+          }
+
+          .lines {
+            position: absolute;
+            top: 0;
+            left: 40px;
+            width: 4px;
+            height: 100%;
+            background: #eeeeee;
+          }
+        }
+
+        .cardes-msg-top {
+          font-size: 28px;
+          color: #343d65;
+          margin-top: 10px;
+          margin-left: 110px;
+        }
+
+        .imgs {
+          margin-top: 10px;
+          margin-left: 110px;
+
+          img {
+            width: 136px;
+            height: 136px;
+            border-radius: 4px;
+            margin-right: 12px;
+          }
+
+          img:nth-child(4n) {
+            margin-right: 0;
+          }
+        }
+      }
+
+      .cards:last-child {
+        .lines {
+          width: 0;
+          height: 0;
+        }
+      }
+    }
+  }
+
+  .fixedBtn {
+    background: #fff;
+    position: fixed;
+    bottom: 0;
+    width: 100%;
+    box-sizing: border-box;
+    z-index: 999;
+
+    .status00 {
+      display: flex;
+
+      .columns {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        width: 40%;
+        padding: 16px 0;
+        border-top: 1px solid #ddd;
+
+        img {
+          width: 44px;
+          height: 42px;
+        }
+
+        .hint {
+          margin-top: 10px;
+          font-size: 36px;
+          color: #666666;
+        }
+      }
+
+      .border-r {
+        border-right: 1px solid #ddd;
+      }
+
+      .doIt {
+        width: 60%;
+        background: #3975c6;
+        text-align: center;
+        line-height: 112px;
+        font-size: 36px;
+        font-weight: 500;
+        color: #fff;
+      }
+    }
+
+    .endDoIt {
+      background: #3975c6;
+      text-align: center;
+      padding: 34px 0;
+
+      font-size: 32px;
+      font-weight: 500;
+      color: #ffffff;
+    }
+  }
+}
+</style>
diff --git a/src/project/qujing/AppConflictMediation/myReply.vue b/src/project/qujing/AppConflictMediation/myReply.vue
new file mode 100644
index 00000000..d181fb20
--- /dev/null
+++ b/src/project/qujing/AppConflictMediation/myReply.vue
@@ -0,0 +1,164 @@
+<template>
+  <div class="myReply">
+    <template>
+      <AiCard v-for="(item, i) in datas" :key="i" @click.native="goDetail(item)">
+        <template #custom>
+          <div class="card-top">
+            <div class="titles">{{ item.content }}</div>
+
+            <div class="types">
+              <span class="label label1">事件类型</span>
+              <span class="types-right">{{ item.groupName }}</span>
+            </div>
+
+            <div class="gards">
+              <div class="label">所属网格</div>
+              <div class="gards-right">{{ item.girdName }}</div>
+            </div>
+          </div>
+
+          <div class="status" :class="item.eventStatus == 0 ? 'status1':'status2'" v-if="item.eventStatus">
+            <span class="icon"></span>
+            <span>
+              {{ $dict.getLabel('clapEventStatus', item.eventStatus) }}
+            </span>
+          </div>
+        </template>
+      </AiCard>
+
+      <AiEmpty v-if="!datas.length"></AiEmpty>
+    </template>
+  </div>
+</template>
+
+<script>
+import {mapState} from 'vuex'
+
+export default {
+  name: 'myReply',
+  components: {},
+  props: {},
+  data() {
+    return {
+      datas: [],
+      current: 1,
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  watch: {},
+  onLoad() {
+    this.getList()
+  },
+  onShow() {
+    document.title = '我的上报'
+  },
+  methods: {
+    getList() {
+      this.$http.post(`/app/appconflicteventinfo/list`, null, {params: {size: 10, current: this.current}}).then((res) => {
+        if (res.code == 0) {
+          this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records
+          this.pages = res.data.pages
+          this.$forceUpdate()
+        }
+      })
+    },
+    goDetail(item) {
+      uni.navigateTo({url: `./detail?id=${item.id}&isMine=1`})
+    },
+  },
+}
+</script>
+
+<style scoped lang="scss">
+.uni-page-body {
+  height: 100%;
+}
+
+.myReply {
+  height: 100%;
+
+  ::v-deep .AiTopFixed .content {
+    padding: 0;
+  }
+
+  ::v-deep .AiCard {
+    background: none;
+    padding: 24px 30px 0;
+
+    .start {
+      background: #fff;
+      border-radius: 16px;
+
+      .card-top {
+        padding: 32px;
+
+        .titles {
+          margin-bottom: 34px;
+          font-size: 32px;
+          font-weight: 500;
+          color: #333333;
+          line-height: 1.4;
+          word-break: break-all;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          display: -webkit-box;
+          -webkit-line-clamp: 2;
+          -webkit-box-orient: vertical;
+        }
+
+        .types,
+        .gards {
+          margin-top: 8px;
+          font-size: 26px;
+          display: flex;
+
+          .types-right,
+          .gards-right {
+            color: #333333;
+            width: calc(100% - 120px);
+          }
+
+          .label {
+            width: 120px;
+          }
+
+          .label1 {
+            width: 120px;
+          }
+        }
+      }
+
+      .status {
+        padding: 32px;
+        border-top: 1px solid #dddddd;
+
+        .icon {
+          display: inline-block;
+          width: 8px;
+          height: 8px;
+          vertical-align: middle;
+          margin-right: 8px;
+        }
+      }
+
+      .status1 {
+        color: #ff883c;
+
+        .icon {
+          background: #ff883c;
+        }
+      }
+
+      .status2 {
+        color: #42d784;
+
+        .icon {
+          background: #42d784;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/styles/common.scss b/src/styles/common.scss
index 8c392c31..8f4a0506 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -32,7 +32,7 @@
   overflow: hidden;
 }
 
-div[flex] {
+div[flex],.flex {
   display: flex;
   align-items: center;