diff --git a/src/assets/image/mediate/mediatefail.png b/src/assets/image/mediate/mediatefail.png
new file mode 100644
index 0000000..2d83051
Binary files /dev/null and b/src/assets/image/mediate/mediatefail.png differ
diff --git a/src/assets/image/mediate/mediatesuccess.png b/src/assets/image/mediate/mediatesuccess.png
new file mode 100644
index 0000000..1d543e1
Binary files /dev/null and b/src/assets/image/mediate/mediatesuccess.png differ
diff --git a/src/pages/event-tracing/components/voideDialog.vue b/src/pages/event-tracing/components/voideDialog.vue
index 6c3fe3f..2d26493 100644
--- a/src/pages/event-tracing/components/voideDialog.vue
+++ b/src/pages/event-tracing/components/voideDialog.vue
@@ -88,7 +88,7 @@
               <template slot-scope="scope">
                 <div class="flex-row align-items-center">
                   <!-- 只有进行中  快开始的时候才能进入视频间 -->
-                  <el-button size="mini" v-if="scope.row.status.code == 1 || scope.row.status.code == 2" @click="handleDelete(scope.row)">进入视频间</el-button>
+                  <el-button size="mini" v-if="scope.row.status.code == 0 || scope.row.status.code == 1 " @click="handleDelete(scope.row)">进入视频间</el-button>
                   <el-button size="mini" v-if="scope.row.status.code == 0" @click="VideoDialog={id:scope.row.id, bookingTime:scope.row.bookingTime}">修改</el-button>
                   <el-button size="mini" v-if="scope.row.status.code == 0" @click="handleBackCase(scope.row)">取消</el-button>
                 </div>
diff --git a/src/pages/mediation-page/components/LayoutContentNew.vue b/src/pages/mediation-page/components/LayoutContentNew.vue
index 739258a..52b7f8c 100644
--- a/src/pages/mediation-page/components/LayoutContentNew.vue
+++ b/src/pages/mediation-page/components/LayoutContentNew.vue
@@ -44,6 +44,10 @@
           <!-- 债务信息 -->
           <div v-if="leftActive == 1" class="case-debt-info">
             <div class="descriptions-t">
+              <div class="mediate-status-log">
+                <img v-if="baseInfo.mediateStatus == 4" src="../../../assets/image/mediate/mediatefail.png" />
+                <img v-if="baseInfo.mediateStatus == 5" src="../../../assets/image/mediate/mediatesuccess.png" />
+              </div>
               <div class="f16 f-weight600 descriptions-t-title">基本信息</div>
               <div class="flex-row descriptions-t-item">
                 <div class="descriptions-t-item-l color-86909C">案件包名称:</div>
@@ -311,6 +315,15 @@ export default {
     coobligationInfo: () => import('./coobligationInfo.vue'),//共债
     singleRemarkPopover: () => import('./singleRemarkPopover.vue'),//个人调解备注
   },
+  props: {
+    caseId: {
+      type: String,
+      default: () => {
+        return ''
+      },
+    },
+    
+  },
   data() {
     return {
       singleremarkvisible:false,
@@ -324,7 +337,6 @@ export default {
       mediationRecord: [],//调解记录
       baseInfo: {},//基本信息
       obligorInfo: [],//债务人信息
-      caseId: '',//案件id
       communicationRecord: [],
 
       mediaterecordpm:{
@@ -347,7 +359,6 @@ export default {
     },
   },
   async created() {
-    this.caseId = this.$route.query.caseId
     this.mediaterecordpm.caseId = this.caseId
     this.eventDialog.caseId = this.caseId
     
@@ -550,6 +561,12 @@ export default {
 
 
         .case-debt-info{
+          .mediate-status-log{
+            position: absolute;
+            top: 50px;
+            left: 270px;
+            img{width: 130px;}
+          }
           .descriptions-t{
             .descriptions-t-title{
               //margin-bottom: 5px;
diff --git a/src/pages/mediation-page/components/MediationRoom.vue b/src/pages/mediation-page/components/MediationRoom.vue
index 11eb788..5d782dd 100644
--- a/src/pages/mediation-page/components/MediationRoom.vue
+++ b/src/pages/mediation-page/components/MediationRoom.vue
@@ -72,12 +72,12 @@
       <div class="ml-24 mr-24 btn-group-interval"></div>
       <div class="flex-row justify-content-between align-items-center btn-group-processing-event">
 
-        <div class="flex-row justify-content-between align-items-center cursor-pointer" @click="visiblePopover={caseId: caseId}">
+        <div class="flex-row justify-content-between align-items-center cursor-pointer bottom-case-btn" @click="visiblePopover={caseId: caseId}">
           <i class="f24 el-icon-video-camera color-4E5969"></i>
           <div class="pl-4 f14">预约</div>
         </div>
 
-        <div class="flex-row justify-content-between align-items-center cursor-pointer">
+        <div class="flex-row justify-content-between align-items-center cursor-pointer bottom-case-btn">
           <i class="f24 el-icon-document color-4E5969"></i>
           <div class="pl-4 f14">协议</div>
         </div>
@@ -89,7 +89,7 @@
             title="发起签字"
             trigger="click">
             <singleofficeWritPopover :caseId="caseId" :singleofficevisible.sync="singleofficevisible"/>
-            <span slot="reference" class="flex-row justify-content-between align-items-center cursor-pointer">
+            <span slot="reference" class="flex-row justify-content-between align-items-center cursor-pointer bottom-case-btn">
               <i class="f24 el-icon-document-remove color-4E5969"></i>
               <a class="pl-4 f14">签字</a>
             </span>
@@ -103,7 +103,7 @@
             title="发起签章"
             trigger="click">
             <singleofficeSealPopover :caseId="caseId" :singlesealvisible.sync="singlesealvisible"/>
-            <span slot="reference" class="flex-row justify-content-between align-items-center cursor-pointer">
+            <span slot="reference" class="flex-row justify-content-between align-items-center cursor-pointer bottom-case-btn">
               <i class="f24 el-icon-s-check color-4E5969"></i>
               <a class="pl-4 f14">签章</a>
             </span>
@@ -116,26 +116,30 @@
             title="发起送达"
             trigger="click">
             <singleofficeDeliveryPopover :caseId="caseId" :singledeliveryvisible.sync="singledeliveryvisible"/>
-            <span slot="reference" class="flex-row justify-content-between align-items-center cursor-pointer">
+            <span slot="reference" class="flex-row justify-content-between align-items-center cursor-pointer bottom-case-btn">
               <i class="f24 el-icon-s-claim color-4E5969"></i>
               <a class="pl-4 f14">送达</a>
             </span>
         </el-popover>
         
         
-        <div class="flex-row justify-content-between align-items-center cursor-pointer">
+        <div class="flex-row justify-content-between align-items-center cursor-pointer bottom-case-btn">
           <i class="f24 el-icon-wallet color-4E5969"></i>
           <div class="pl-4 f14">类案</div>
         </div>
-        <div class="flex-row justify-content-between align-items-center cursor-pointer">
+        <div class="flex-row justify-content-between align-items-center cursor-pointer bottom-case-btn">
           <i class="f24 el-icon-document-checked color-4E5969"></i>
           <div class="pl-4 f14">办结</div>
         </div>
-        <div class="flex-row justify-content-between align-items-center cursor-pointer">
+        <div class="flex-row justify-content-between align-items-center cursor-pointer bottom-case-btn" @click="handleChangeMediation(4)">
           <i class="f24 el-icon-document-delete color-4E5969"></i>
           <div class="pl-4 f14">失败</div>
         </div>
-        <div class="flex-row justify-content-between align-items-center cursor-pointer">
+        <div class="flex-row justify-content-between align-items-center cursor-pointer bottom-case-btn" @click="handleChangeMediation(5)">
+          <i class="f24 el-icon-bangzhu color-4E5969"></i>
+          <div class="pl-4 f14">成功</div>
+        </div>
+        <div class="flex-row justify-content-between align-items-center cursor-pointer bottom-case-btn">
           <i class="f24 el-icon-user-solid color-4E5969"></i>
           <div class="pl-4 f14">帮扶</div>
         </div>
@@ -147,7 +151,7 @@
             title="案件协办"
             trigger="click">
             <singleJointlyPopover :caseId="caseId" :singlejointlyvisible.sync="singlejointlyvisible" @handleSubmit="getCaseInfoById()"/>
-            <span slot="reference" class="flex-row justify-content-between align-items-center cursor-pointer">
+            <span slot="reference" class="flex-row justify-content-between align-items-center cursor-pointer bottom-case-btn">
               <i class="f24 el-icon-s-management color-4E5969"></i>
               <a class="pl-4 f14">协办</a>
             </span>
@@ -185,10 +189,9 @@ export default {
       singledeliveryvisible:false,
       singlesealvisible:false,
       singleofficevisible:false,
-      eventDialog: {caseId: this.$route.query.caseId},
+      eventDialog: {caseId: ''},
       leftActive: 1,
       rightActive: 1,
-      fileList: [],
       mediationRecord: [],//调解记录
       baseInfo: {},//基本信息
       obligorInfo: [],//债务人信息
@@ -252,7 +255,7 @@ export default {
       visiblePopover: null,
       VideoCallDialog: null,
       mediaterecordpm:{
-        caseId:this.$route.query.caseId,
+        caseId:'',
         linkedWay:''
       },
       materialTypeOptions: [
@@ -289,9 +292,13 @@ export default {
     },
   },
   async created() {
-    this.caseId = this.$route.query.caseId
-    this.getCaseInfoById();//获取详情
-    this.getmediate_record()
+    
+    if(this.$route.query.caseId != null && this.$route.query.caseId != undefined)
+    {
+      await this.getCaseInfoById();//获取详情
+    }
+    
+    
   },
   beforeDestroy() {
     // if(this.timer) { //如果定时器还在运行 或者直接关闭，不用判断
@@ -315,19 +322,23 @@ export default {
       return {cardNo: datacardno.substring(0, len), phone: dataphone.substring(0, len)};
     },
     // 获取详情
-    getCaseInfoById() {
-      let _that = this
-      api.getCaseInfoById(this.caseId).then(res => {
+    async getCaseInfoById() {
+      await api.getCaseInfoById(this.$route.query.caseId).then(res => {
         if (!res.code) {
           this.baseInfo = res
-          // 材料
-          // console.log('获取图片',res.caseFileEntityList)
-          let caseFileEntityList = []
-          res.caseFileEntityList.forEach((item) => {
-            caseFileEntityList.push({name: item.name, fileName: item.name, url: item.url})
-          })
-          _that.fileList = caseFileEntityList
+          
+          if(res.jointDebt == 1){
+            // 有共债 mainCaseId
+            this.caseId = res.mainCaseId
+          }
+          else
+          {
+            this.caseId = res.id
+          }
+          
         }
+        this.eventDialog.caseId = this.caseId
+        this.getmediate_record()
       })
     },
     // 获取上一件案件
@@ -359,12 +370,38 @@ export default {
     },
     // 获取调解记录
     getmediate_record() {
+      this.mediaterecordpm.caseId = this.caseId
       api.mediate_record_list(this.mediaterecordpm).then(res => {
         if (!res.code) {
           this.communicationRecord = res
         }
       })
     },
+    // 调解成功或者失败
+    handleChangeMediation(resultStatus){
+      let data={
+          id:this.caseId,
+          resultStatus:resultStatus
+      }
+      let resultmsg = '成功'
+      if(resultStatus == 4){resultmsg = '失败'}
+      this.$confirm("请确定是否将案件标记为"+resultmsg+"?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+      }).then(() => {
+          if(!this.$clickThrottle()) { return }//防止重复点击
+          api.updateResultStatus(data).then(res => {
+            this.getCaseInfoById()
+              this.$message({message: '案件标记成功', type: "success",customClass:'messageZindex'})
+              thiis.getCaseInfoById()
+          })
+
+      }).catch(() => {});
+
+
+      
+  },
   }
 };
 </script>
@@ -399,6 +436,10 @@ export default {
   }
   .btn-group-processing-event{
     width: calc(100% - 64px - 1px - 48px);
+    .bottom-case-btn:hover{
+      color: #BC6F60;
+      i{color: #BC6F60;}
+    }
   }
 }