diff --git a/src/api/caseManagement/caseManagement.js b/src/api/caseManagement/caseManagement.js
index 2772d21..4a4aae8 100644
--- a/src/api/caseManagement/caseManagement.js
+++ b/src/api/caseManagement/caseManagement.js
@@ -34,7 +34,6 @@ export function getFileList(data) {
 }
 /** 批量上传证据 */
 export function batchUpload(data) {
-<<<<<<< HEAD
   return request({
     url: "/caseApplication/batchUpload",
     method: "post",
@@ -246,20 +245,4 @@ export function getIdType() {
     url: '/system/dict/data/type/id_type',
     method: 'get',
   })
-}
-=======
-    return request({
-        url: "/caseApplication/batchUpload",
-        method: "post",
-        data: data,
-    });
-}
-// 提交 
-export function submitCaseApply(data) {
-    return request({
-      url: '/caseApplication/submit',
-      method: 'post',
-      data: data
-    })
-  }
->>>>>>> 0ca62df (缴费，案件详情问题处理)
+}
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 7e36fb0..716f7e5 100644
--- a/src/main.js
+++ b/src/main.js
@@ -13,7 +13,6 @@ import router from './router'
 import directive from './directive' // directive
 import plugins from './plugins' // plugins
 import { download } from '@/utils/request'
-<<<<<<< HEAD
 import { Message } from 'element-ui'
 import NProgress from 'nprogress'
 import 'nprogress/nprogress.css'
@@ -23,11 +22,6 @@ import './assets/icons' // icon
 // 引入Iconfont 矢量图标库
 import './assets/icon/iconfont.css'
 // import './permission' // permission control
-=======
-
-import './assets/icon/iconfont.css'
-import './permission' // permission control
->>>>>>> 0ca62df (缴费，案件详情问题处理)
 import { getDicts } from "@/api/system/dict/data";
 import { getConfigKey } from "@/api/system/config";
 import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi";
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 5a24670..25299ca 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -47,8 +47,6 @@ export function checkRole(value) {
     console.error(`need roles! Like checkRole="['admin','editor']"`)
     return false
   }
-<<<<<<< HEAD
-=======
 }
 
 /**
@@ -68,5 +66,4 @@ export function statusRole(value) {
   } else {
     return false
   }
->>>>>>> 0ca62df (缴费，案件详情问题处理)
 }
\ No newline at end of file
diff --git a/src/views/caseManagement/caseList.vue b/src/views/caseManagement/caseList.vue
index 04b321c..38f3a86 100644
--- a/src/views/caseManagement/caseList.vue
+++ b/src/views/caseManagement/caseList.vue
@@ -63,7 +63,6 @@
             <el-table-column label="创建时间" align="center" prop="createTime" :show-overflow-tooltip="true" />
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
-<<<<<<< HEAD
                     <el-button size="mini" @click="eidtNodeprocess(scope.row)" type="text" icon="el-icon-edit"
                         v-hasPermi="['caseManagement:list:edit']" v-if="scope.row.caseFlowId <= 1">修改</el-button>
                     <el-button size="mini" @click="checkDetail(scope.row)" type="text"
@@ -88,26 +87,6 @@
             scope.row.signButtonFlag != 1) && (scope.row.appOperatorFlag == 1 || scope.row.resOperatorFlag == 1 || scope.row.otherFlag == 1)
             ">{{ item.nodeName }}</el-button>
                     </div>
-=======
-                    <el-button size="mini" type="text" icon="el-icon-check" @click="onsubmitRow(scope.row)">提交</el-button>
-                    <el-button size="mini" @click="eidtNodeprocess(scope.row)" type="text"
-                        icon="el-icon-edit">修改</el-button>
-                    <el-button size="mini" @click="checkDetail(scope.row)" type="text" icon="el-icon-view">查看详情</el-button>
-                    <el-button size="mini" @click="consultantApplica(scope.row)" type="text"
-                        icon="el-icon-tickets">法律顾问用印申请</el-button>
-                    <el-button size="mini" @click="departmentApplica(scope.row)" type="text"
-                        icon="el-icon-edit-outline">部门长用印申请</el-button>
-                    <el-button size="mini" @click="caseFlow(scope.row)" type="text" icon="el-icon-zoom-in">查看流程</el-button>
-                    <el-button size="mini" @click="caseLog(scope.row)" type="text"
-                        icon="el-icon-edit-outline">案件日志</el-button>
-                    <el-button size="mini" @click="caseFiling(scope.row)" type="text"
-                        icon="el-icon-tickets">案件归档</el-button>
-                    <el-button size="mini" @click="signMediation(scope.row)" type="text"
-                        icon="el-icon-edit-outline">签收调解书</el-button>
-                    <el-button size="mini" type="text" icon="el-icon-edit"
-                        @click="evidenceUpload(scope.row)">证据修改</el-button>
-                    <el-button size="mini" type="text" icon="el-icon-tickets" @click="payStatus(scope.row)">缴费</el-button>
->>>>>>> 0ca62df (缴费，案件详情问题处理)
                 </template>
             </el-table-column>
         </el-table>
@@ -115,23 +94,15 @@
             :limit.sync="queryParams.pageSize" @pagination="getList(queryParams)" />
         <!-- 新增编辑详情 -->
         <addCase :addVisable="addVisable" :queryParams="queryParams" @cancelCaseAdd="cancelCaseAdd" @getList="getList"
-<<<<<<< HEAD
             :caseData="caseData" :caseDisabled="caseDisabled" :tabFlag="tabFlag" :addModifyData="addModifyData">
         </addCase>
-=======
-            :caseData="caseData" :caseDisabled="caseDisabled" :tabFlag="tabFlag"></addCase>
->>>>>>> 0ca62df (缴费，案件详情问题处理)
         <!-- 压缩包导入     -->
         <caseCompressionPackage :openCompressedPackages="openCompressedPackages" :queryParams="queryParams"
             @cancelCompreess="cancelCompreess" :getList="getList">
         </caseCompressionPackage>
         <!-- 案件详情 -->
-<<<<<<< HEAD
         <mediationCaseDetails :processVisable="processVisable" @cancelViewProcess="cancelViewProcess"
             :caseFlowNumber="caseFlowNumber">
-=======
-        <mediationCaseDetails :processVisable="processVisable" @cancelViewProcess="cancelViewProcess">
->>>>>>> 0ca62df (缴费，案件详情问题处理)
         </mediationCaseDetails>
         <!-- 案件日志 -->
         <mediationCaseLog :showcaseLog="showcaseLog" @cancelcaseLog="cancelcaseLog" :caselogDataArr="caselogDataArr"
@@ -141,7 +112,6 @@
             :evidenceData="evidenceData">
         </evidenceDialog>
         <!-- 缴费 -->
-<<<<<<< HEAD
         <payDialog :openPay="openPay" :payTitle="payTitle" :formPayDetail="formPayDetail" :payId="payId"
             :payForm="payForm" :queryParams="queryParams" @getList="getList" @paycancelRow="paycancelRow"
             :formPayDetailAffiliate="formPayDetailAffiliate"></payDialog>
@@ -178,15 +148,10 @@
         <caseFilingDetailsPage :showarchiveDetails="showarchiveDetails" :caseFilingData="caseFilingData"
             @cancelDetail="cancelDetail" :detailsAwardNum="detailsAwardNum" :flagLoadingS="flagLoadingS">
         </caseFilingDetailsPage>
-=======
-        <payDialog :openPay="openPay" :payTitle="payTitle" :formPayDetail="formPayDetail" :payId="payId" :payForm="payForm"
-            :queryParams="queryParams" @getList="getList" @paycancelRow="paycancelRow"></payDialog>
->>>>>>> 0ca62df (缴费，案件详情问题处理)
     </div>
 </template>
 
 <script>
-<<<<<<< HEAD
 import {
     caseApplicationList,
     caseApplicationSelectById,
@@ -219,17 +184,6 @@ import timeConfirm from "./components/timeConfirm.vue";
 import mediation from "./components/mediation.vue";
 import confirmMediation from "./components/confirmMediation.vue";
 import caseFilingDetailsPage from "./components/caseFilingDetailsPage.vue";
-=======
-import { caseApplicationList, caseApplicationSelectById,submitCaseApply } from '@/api/caseManagement/caseManagement.js'
-import { listDept } from '@/api/system/dept.js'
-import moment from "moment";
-import addCase from './components/addCase.vue'
-import evidenceDialog from './components/evidenceDialog.vue';
-import caseCompressionPackage from './components/caseCompressionPackage.vue';
-import mediationCaseDetails from './components/mediationCaseDetails.vue'
-import mediationCaseLog from './components/mediationCaseLog.vue'
-import payDialog from "./components/payDialog.vue";
->>>>>>> 0ca62df (缴费，案件详情问题处理)
 export default {
     name: "caseList",
     dicts: ["case_flow_node"],
@@ -240,7 +194,6 @@ export default {
         mediationCaseLog,
         evidenceDialog,
         payDialog,
-<<<<<<< HEAD
         paymentdetailsDialog,
         caseAcceptance,
         selectMediator, //调解员弹窗
@@ -251,8 +204,6 @@ export default {
         confirmMediation,
         caseFilingDetailsPage,
         respondentPay,
-=======
->>>>>>> 0ca62df (缴费，案件详情问题处理)
     },
     data() {
         return {
@@ -270,7 +221,6 @@ export default {
             // 校验表单
             rules: {},
             dataList: [],
-<<<<<<< HEAD
             addVisable: false, //新增弹窗
             openPay: false, //缴费弹框
             openResPay: false, //被申请人缴费弹窗
@@ -326,24 +276,6 @@ export default {
             isapplicant: true, //判断角色申请人或非申请人
             caseFilingData: {},
             applicant:""
-=======
-            addVisable: false,//新增弹窗
-            openCompressedPackages: false,//压缩包导入弹窗
-            processVisable: false,//案件详情
-            showcaseLog: false,//案件日志
-            evidenceVisable: false,//证据修改弹窗
-            openPay: false, //缴费弹框
-            formPayDetail: {},
-            payId: null,
-            payForm: {},
-            caseData: {},
-            evidenceData: {},
-            caseDisabled: false,
-            caseTime: '',
-            deptList: [],
-            payTitle: '',
-            tabFlag: false
->>>>>>> 0ca62df (缴费，案件详情问题处理)
         };
     },
     created() {
@@ -474,7 +406,6 @@ export default {
         /** 缴费 */
         payStatus(val) {
             this.getDetail({ id: val.id });
-<<<<<<< HEAD
             this.payTitle = "申请人缴费";
             this.payId = val.id;
             this.openPay = true;
@@ -545,33 +476,10 @@ export default {
                 resStr = this.formPayDetailAffiliate.res.map(item => item.res.name).join(',');
                 this.formPayDetailAffiliate.applicationName = applicantStr;
                 this.formPayDetailAffiliate.respondentName = resStr;
-=======
-            this.payTitle = "缴费";
-            this.payId = val.id;
-            this.openPay = true;
-        },
-        /** 列表提交立案 */
-        onsubmitRow(row) {
-            this.$modal
-                .confirm("是否提交立案申请？")
-                .then(function () {
-                    return submitCaseApply({ id: row.id,caseFlowId:row.caseFlowId });
-                })
-                .then(() => {
-                    this.getList(this.queryParams);
-                    this.$modal.msgSuccess("立案申请成功");
-                })
-                .catch(() => { });
-        },
-        getDetail(parms) {
-            caseApplicationSelectById(parms).then((res) => {
-                this.formPayDetail = res.data;
->>>>>>> 0ca62df (缴费，案件详情问题处理)
                 this.payForm.feePayable = res.data.feePayable;
                 this.payForm.caseId = res.data.id;
             });
         },
-<<<<<<< HEAD
         getResDetail(parms) {
             caseApplicationSelectById(parms).then((res) => {
                 this.formResPayDetail = res.data;
@@ -601,8 +509,6 @@ export default {
             this.timeConfirmVisable = true;
             this.timeConfirmData = val;
         },
-=======
->>>>>>> 0ca62df (缴费，案件详情问题处理)
         /** 时间改变处理 */
         caseTimeChange() {
             if (this.caseTime) {
@@ -644,7 +550,6 @@ export default {
         paycancelRow(row) {
             this.openPay = false;
         },
-<<<<<<< HEAD
         /**被申请人取消缴费*/
         paycancelRes(row) {
             this.openResPay = false;
@@ -677,8 +582,6 @@ export default {
         cancelTimeConfirm() {
             this.timeConfirmVisable = false;
         },
-=======
->>>>>>> 0ca62df (缴费，案件详情问题处理)
         /** 搜索按钮操作 */
         handleQuery() {
             this.queryParams.pageNum = 1;
@@ -716,7 +619,6 @@ export default {
                 .catch(() => { });
         },
         // 部门长用印申请
-<<<<<<< HEAD
         departmentApplica(row) {
             this.$modal
                 .confirm("你确定要用印确认吗？")
@@ -891,40 +793,6 @@ export default {
         },
         cancelDetail() {
             this.showarchiveDetails = false;
-=======
-        departmentApplica() {
-
-        },
-        //案件流程
-        caseFlow(row) {
-            this.processVisable = true
-        },
-        cancelViewProcess() {
-            this.processVisable = false
-        },
-        //案件日志
-        caseLog() {
-            this.showcaseLog = true
-        },
-        cancelcaseLog() {
-            this.showcaseLog = false
-        },
-        // 案件归档
-        caseFiling() {
-            this.$modal.confirm("你确定要案件归档吗？").then((res) => {
-
-            }).catch(() => {
-
-            })
-        },
-        //签收调解书
-        signMediation() {
-            this.$modal.confirm("你确定要签收调解书吗？").then((res) => {
-
-            }).catch(() => {
-
-            })
->>>>>>> 0ca62df (缴费，案件详情问题处理)
         },
     },
 };
diff --git a/src/views/caseManagement/components/addCase.vue b/src/views/caseManagement/components/addCase.vue
index 171afbd..53e8022 100644
--- a/src/views/caseManagement/components/addCase.vue
+++ b/src/views/caseManagement/components/addCase.vue
@@ -1,5 +1,4 @@
 <template>
-<<<<<<< HEAD
   <div>
     <el-dialog :title="title" :visible="addVisable" v-if="addVisable" @close="cancel" width="1000px" center
       :distroy-on-close="true">
@@ -102,349 +101,6 @@
             <div style="display: inline-flex">
               <div class="infoIcon"></div>
               <div class="caseInfo" style="margin-right: 20px;">双方信息：</div>
-=======
-    <div>
-        <el-dialog :title="title" :visible="addVisable" v-if="addVisable" @close="cancel" width="1000px" center
-            :distroy-on-close="true">
-            <el-tabs v-model="activeName">
-                <el-tab-pane label="案件信息" name="first">
-
-                </el-tab-pane>
-                <el-tab-pane label="证据清单" name="second" v-if="tabFlag">
-                    
-                </el-tab-pane>
-            </el-tabs>
-            <el-form v-if="activeName == 'first'" :disabled="caseDisabled" :model="formData" ref="ruleForm" label-width="130px" class="demo-ruleForm">
-                <el-row>
-                    <div style="display: inline-flex">
-                        <div class="infoIcon"></div>
-                        <div class="caseInfo">案件信息：</div>
-                    </div>
-                    <el-divider></el-divider>
-                    <el-col :span="24">
-                        <el-form-item label="申请人仲裁请求" prop="arbitratClaims" :rules="[
-                            {
-                                required: true,
-                                message: '申请人仲裁请求不能为空',
-                                trigger: 'blur',
-                            },
-                        ]">
-                            <el-input v-model="formData.arbitratClaims" placeholder="请输入申请人仲裁诉求" type="textarea"
-                                :autosize="{ minRows: 4, maxRows: 8 }" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                        <el-form-item label="事实和理由" prop="facts" :rules="[
-                            {
-                                required: true,
-                                message: '事实和理由不能为空',
-                                trigger: 'blur',
-                            },
-                        ]">
-                            <el-input v-model="formData.facts" placeholder="请输入事实和理由" type="textarea"
-                                :autosize="{ minRows: 4, maxRows: 8 }" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                        <el-form-item label="申请人请求仲裁庭裁决" prop="requestRule">
-                            <el-input v-model="formData.requestRule" placeholder="请输入申请人请求仲裁庭裁决" type="textarea"
-                                :autosize="{ minRows: 4, maxRows: 8 }" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                        <el-form-item label="案件描述" prop="caseDescribe">
-                            <el-input v-model="formData.caseDescribe" placeholder="请输入案件描述" type="textarea"
-                                :autosize="{ minRows: 4, maxRows: 8 }" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="案件标的" prop="caseSubjectAmount" :rules="[
-                            {
-                                required: true,
-                                message: '案件标的不能为空',
-                                trigger: 'blur',
-                            },
-                        ]">
-                            <el-input v-model="formData.caseSubjectAmount" placeholder="请输入案件标的" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                        <el-form-item label="裁决书模板" prop="templateId" :rules="[
-                            {
-                                required: true,
-                                message: '裁决书模板',
-                                trigger: 'blur',
-                            },
-                        ]">
-                            <el-select placeholder="请选择裁决书模板" v-model="formData.templateId">
-                                <el-option v-for="item in templateList" :label="item.temName" :key="item.id"
-                                    :value="item.id"></el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="申请人案件证据资料上传：" prop="applicantEvidence">
-                            <el-upload class="upload-demo" ref="fileupload" accept=".png,.jpg,.doc,.docx,.txt,.pdf"
-                                :action="UploadUrl()" :on-success="handlSuccess" :on-remove="handleRemove"
-                                :on-preview="handlePreview" :before-remove="beforeRemove" :data="filedata"
-                                :headers="headers" multiple :limit="50" :on-exceed="handleExceed" :file-list="fileList">
-                                <el-button size="small" type="primary">点击上传</el-button>
-                                <div slot="tip" class="el-upload__tip">
-                                    文件支持上传.jpg，png，.doc，docx，.txt，.pdf文件
-                                </div>
-                            </el-upload>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="24" v-if="modelFlag">
-                        <el-form-item label="证据">
-                            <div v-for="(item, index) in formData.caseAttachList" :key="index">
-                                <div style="color: blue;cursor: pointer;" @click="fileDetil(item.annexPath)">{{
-                                    item.annexName }}</div>
-                            </div>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                        <div style="display: inline-flex">
-                            <div class="infoIcon"></div>
-                            <div class="caseInfo">双方信息：</div>
-                        </div>
-                        <el-divider></el-divider>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="申请机构名称" prop="affiliate.applicationOrganName" :rules="[
-                            {
-                                required: true,
-                                message: '申请机构名称不能为空',
-                                trigger: 'blur',
-                            },
-                        ]">
-                            <el-input v-model="formData.affiliate.applicationOrganName" placeholder="请输入申请机构名称" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="统一社会信用代码" prop="affiliate.creditCode" :rules="[
-                            {
-                                required: true,
-                                message: '统一社会信用代码不能为空',
-                                trigger: 'blur',
-                            },
-                        ]">
-                            <el-input v-model="formData.affiliate.creditCode" placeholder="请输入统一社会信用代码" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="法定代表人" prop="affiliate.compLegalPerson" :rules="[
-                            {
-                                required: true,
-                                message: '法定代表人不能为空',
-                                trigger: 'blur',
-                            },
-                        ]">
-                            <el-input v-model="formData.affiliate.compLegalPerson" placeholder="请输入法定代表人" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="申请人住所" prop="affiliate.applicantHome" :rules="[
-                            {
-                                required: true,
-                                message: '申请人住所不能为空',
-                                trigger: 'blur',
-                            },
-                        ]">
-                            <el-input v-model="formData.affiliate.applicantHome" placeholder="请输入申请人住所" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="申请人联系地址" prop="affiliate.applicantAddress" :rules="[
-                            {
-                                required: true,
-                                message: '申请人联系地址不能为空',
-                                trigger: 'blur',
-                            },
-                        ]">
-                            <el-input v-model="formData.affiliate.applicantAddress" placeholder="请输入申请人联系地址" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="代理人联系电话" prop="affiliate.contactTelphoneAgent" :rules="[
-                            {
-                                required: true,
-                                message: '代理人联系电话不能为空',
-                                trigger: 'blur',
-                            },
-                            {
-                                pattern: /^[1][3,4,5,6,7,8,9][0-9]{9}$/,
-                                message: '请输入正确的手机号码',
-                                trigger: 'blur',
-                            },
-                        ]">
-                            <el-input v-model="formData.affiliate.contactTelphoneAgent" placeholder="请输入代理人联系电话" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="委托代理人姓名" prop="affiliate.nameAgent" :rules="[
-                            {
-                                required: true,
-                                message: '委托代理人姓名不能为空',
-                                trigger: 'blur',
-                            },
-                        ]">
-                            <el-input v-model="formData.affiliate.nameAgent" placeholder="请输入委托代理人姓名" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="代理人邮箱" prop="affiliate.agentEmail" :rules="[
-                            {
-                                required: true,
-                                message: '代理人邮箱不能为空',
-                                trigger: 'blur',
-                            },
-                            {
-                                pattern:
-                                    /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/,
-                                message: '请输入正确的邮箱地址',
-                                trigger: 'blur',
-                            },
-                        ]">
-                            <el-input v-model="formData.affiliate.agentEmail" placeholder="请输入代理人邮箱" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="被申请人姓名" prop="affiliate.respondentName" :rules="[
-                            {
-                                required: true,
-                                message: '被申请人姓名不能为空',
-                                trigger: 'blur',
-                            },
-                        ]">
-                            <el-input v-model="formData.affiliate.respondentName" placeholder="请输入被申请人姓名" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="被申请人联系电话" prop="affiliate.respondentPhone" :rules="[
-                            {
-                                required: true,
-                                message: '被申请人联系电话不能为空',
-                                trigger: 'blur',
-                            },
-                            {
-                                pattern: /^[1][3,4,5,6,7,8,9][0-9]{9}$/,
-                                message: '请输入正确的手机号码',
-                                trigger: 'blur',
-                            },
-                        ]">
-                            <el-input v-model="formData.affiliate.respondentPhone" placeholder="请输入被申请人联系电话" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="被申请人身份证号" prop="affiliate.respondentIdentityNum" :rules="[
-                            {
-                                required: true,
-                                message: '被申请人身份证号不能为空',
-                                trigger: 'blur',
-                            },
-                            {
-                                pattern:
-                                    /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
-                                message: '请输入正确的身份证号码',
-                                trigger: 'blur',
-                            },
-                        ]">
-                            <el-input v-model="formData.affiliate.respondentIdentityNum" placeholder="请输入被申请人身份证号" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="被申请人性别：" prop="affiliate.respondentSex" :rules="[
-                            {
-                                required: true,
-                                message: '请选择性别'
-                            },
-                        ]">
-                            <el-radio-group v-model="formData.affiliate.respondentSex">
-                                <el-radio label="0">男</el-radio>
-                                <el-radio label="1">女</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="被申请人出生年月日：" prop="affiliate.respondentBirth" :rules="[
-                            {
-                                required: true,
-                                message: '被申请人出生年月日不能为空',
-                                trigger: 'blur',
-                            },
-                        ]">
-                            <el-date-picker v-model="formData.affiliate.respondentBirth" type="date"
-                                placeholder="被申请人出生年月日">
-                            </el-date-picker>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="被申请人申请人住所" prop="affiliate.respondentHome" :rules="[
-                            {
-                                required: true,
-                                message: '被申请人申请人住所不能为空',
-                                trigger: 'blur',
-                            },
-                        ]">
-                            <el-input v-model="formData.affiliate.respondentHome" placeholder="请输入被申请人申请人住所" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="被申请人邮箱" prop="affiliate.respondentEmail" :rules="[
-                            {
-                                required: true,
-                                message: '代理人邮箱不能为空',
-                                trigger: 'blur',
-                            },
-                            {
-                                pattern:
-                                    /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/,
-                                message: '请输入正确的邮箱地址',
-                                trigger: 'blur',
-                            },
-                        ]">
-                            <el-input v-model="formData.affiliate.respondentEmail" placeholder="请输入被申请人邮箱" />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-col :span="24" v-if="modelFlag">
-                    <div style="display: inline-flex">
-                        <div class="infoIcon"></div>
-                        <div class="caseInfo">抓取规则设置</div>
-                    </div>
-                    <el-divider></el-divider>
-                </el-col>
-                <el-col :span="24" v-if="modelFlag">
-                    <el-form-item v-for="(item) in formData.columnValueList" :label="item.name" :key="item.id">
-                        <el-input type="textarea" v-model="item.value"></el-input>
-                    </el-form-item>
-                </el-col>
-            </el-form>
-            <div v-if="activeName == 'second'">
-                <el-card class="box-card" style="margin-bottom: 30px;">
-                    <div slot="header" class="clearfix">
-                        <span>申请人证据清单</span>
-                    </div>
-                    <div v-for="(item, index) in applicantEvidence" :key="index" class="text item"
-                        style="color: blue;cursor: pointer;" @click="toPreview(item.annexPath)">
-                        {{ item.annexName }}
-                    </div>
-                </el-card>
-                <el-card class="box-card">
-                    <div slot="header" class="clearfix">
-                        <span>被申请人证据清单</span>
-                    </div>
-                    <div v-for="(item, index) in respondentEvidence" :key="index" class="text item"
-                        style="color: blue;cursor: pointer;" @click="toPreview(item.annexPath)">
-                        {{ item.annexName }}
-                    </div>
-                </el-card>
-            </div>
-            <div slot="footer" class="dialog-footer">
-                <el-button @click="cancel" class="endbutton"><span>取 消</span></el-button>
-                <el-button type="primary" @click="submitForm" class="endbutton"><span>确认</span></el-button>
->>>>>>> 0ca62df (缴费，案件详情问题处理)
             </div>
             <el-divider></el-divider>
           </el-col>
@@ -1023,7 +679,6 @@ import {
 import { getTemplate } from "@/api/officialSeal/officialSeal.js";
 import { getToken } from "@/utils/auth";
 export default {
-<<<<<<< HEAD
   props: [
     "addVisable",
     "queryParams",
@@ -1204,116 +859,6 @@ export default {
             affiliate:
             {
               applicant: [
-=======
-    props: ["addVisable", "queryParams", "caseData", "caseDisabled","tabFlag"],
-    dicts: ["case_built_type"],
-    data() {
-        return {
-            activeName: 'first',
-            title: "新增案件",
-            formData: {
-                affiliate: {
-                    respondentSex: 0
-                },
-                columnValueList: [],
-                caseAttachList: []
-            },
-            templateList: [],
-            modelFlag: false,
-            fileURL: window.location.origin + "/API",
-            fileList: [],
-            filedata: {
-                annexType: 2,
-            },
-            headers: {
-                Authorization: "Bearer " + getToken(),
-            },
-            applicantEvidence: [],//申请人证据
-            respondentEvidence: [],//被申请人证据
-        };
-    },
-    watch: {
-        caseData: {
-            deep: true,
-            handler(val) {
-                this.getTemplateFn();
-                if (val.id && !val.flag) {
-                    this.modelFlag = true;
-                    this.title = '修改案件';
-                    this.caseApplicationSelectByIdFn(val.id)
-                } else if (!val.id && !val.flag) {
-                    this.modelFlag = false;
-                    this.title = '新增案件';
-                    this.formData = {
-                        affiliate: {
-                            respondentSex: 0
-                        },
-                        columnValueList: [],
-                        caseAttachList: []
-                    };
-                } else if (val.id && val.flag == 1) {
-                    this.modelFlag = true;
-                    this.title = '案件详情';
-                    this.caseApplicationSelectByIdFn(val.id);
-                }
-            },
-        },
-        addVisable(val){
-            if(val){
-                this.activeName = 'first';
-            }
-        }
-    },
-    created() {
-
-    },
-    methods: {
-        /** 根据案件id获取对应信息 */
-        caseApplicationSelectByIdFn(data) {
-            this.applicantEvidence = [];
-            this.respondentEvidence = [];
-            caseApplicationSelectById({ id: data }).then((res => {
-                this.formData = res.data;
-                this.formData.caseAttachList.forEach(item => {
-                    if (item.annexType == 2) {
-                        this.applicantEvidence.push(item)
-                    } else if (item.annexType == 6) {
-                        this.respondentEvidence.push(item)
-                    }
-                })
-            }))
-        },
-        // 新增案件
-        insertFn(data) {
-            caseApplicationInsert(data).then(res => {
-                this.$modal.msgSuccess("新增成功！");
-                this.$emit("cancelCaseAdd");
-                this.$emit('getList', this.queryParams);
-            })
-        },
-        /** 获取裁决书模板 */
-        getTemplateFn(data) {
-            getTemplate(data).then(res => {
-                console.log(res)
-                this.templateList = res.rows;
-            })
-        },
-        /** 查看证据 */
-        fileDetil(val) {
-            window.open(this.fileURL + val)
-        },
-        /** 查看证据 */
-        toPreview(val) {
-            window.open(this.fileURL + val)
-        },
-        /** 文件上传地址 */
-        UploadUrl() {
-            return window.location.origin + "/API/common/upload";
-        },
-        /**文件上传成功*/
-        handlSuccess(res, file) {
-            this.formData.caseAttachList.push(
->>>>>>> 0ca62df (缴费，案件详情问题处理)
                 {
                   applicant: {
                     roleType: 1,
diff --git a/src/views/caseManagement/components/payDialog.vue b/src/views/caseManagement/components/payDialog.vue
index 4d4290b..d4111bc 100644
--- a/src/views/caseManagement/components/payDialog.vue
+++ b/src/views/caseManagement/components/payDialog.vue
@@ -7,7 +7,6 @@
           formPayDetail.caseNum
         }}</el-descriptions-item>
         <el-descriptions-item label="申请人">{{
-<<<<<<< HEAD
           formPayDetailAffiliate.applicationName || ''
         }}</el-descriptions-item>
         <!-- <el-descriptions-item label="案件标的">{{
@@ -29,24 +28,6 @@
             {{ formPayDetail.reason }}
           </el-tag>
         </el-descriptions-item>
-=======
-          formPayDetail.affiliate.applicationOrganName || ''
-        }}</el-descriptions-item>
-        <el-descriptions-item label="案件标的">{{
-          formPayDetail.caseSubjectAmount
-        }}</el-descriptions-item>
-        <el-descriptions-item label="案件应缴费用">{{
-          formPayDetail.feePayable
-        }}</el-descriptions-item>
-        <el-descriptions-item label="被申请人">{{
-          formPayDetail.affiliate.respondentName
-        }}</el-descriptions-item>
-        <!-- <el-descriptions-item label="案件状态">
-          <el-tag size="mini" type='danger' effect="dark">
-            {{ formPayDetail.caseStatusName }}
-          </el-tag>
-        </el-descriptions-item> -->
->>>>>>> 0ca62df (缴费，案件详情问题处理)
       </el-descriptions>
       <div class="paySelectType">
         <el-radio-group v-model="paySelect" @input="changPayType">
@@ -76,13 +57,8 @@
       </div>
       <div class="payTitle">{{ payMain }}</div>
       <div slot="footer" class="dialog-footer">
-<<<<<<< HEAD
         <el-button @click="payCancel" round><span>取 消</span></el-button>
         <el-button @click="submitUpload" type="primary" :disabled="payFlagSubmit" round><span>确认缴费</span></el-button>
-=======
-        <el-button @click="payCancel" class="endbutton"><span>取 消</span></el-button>
-        <el-button @click="submitUpload" class="endbutton"><span>确认缴费</span></el-button>
->>>>>>> 0ca62df (缴费，案件详情问题处理)
       </div>
     </el-dialog>
   </div>
@@ -93,11 +69,7 @@ import { casePay, confirmPayDig } from "@/api/pay/pay";
 import QRCode from "qrcodejs2";
 import { getToken } from "@/utils/auth";
 export default {
-<<<<<<< HEAD
   props: ["openPay", "payTitle", "formPayDetail", "payForm", "queryParams","payId","formPayDetailAffiliate"],
-=======
-  props: ["openPay", "payTitle", "formPayDetail", "payForm", "queryParams","payId"],
->>>>>>> 0ca62df (缴费，案件详情问题处理)
   data() {
     return {
       // key: value
@@ -110,22 +82,14 @@ export default {
         Authorization: "Bearer " + getToken(),
       },
       filedata: {
-<<<<<<< HEAD
         annexType: 4,
-=======
-        annexType: 8,
->>>>>>> 0ca62df (缴费，案件详情问题处理)
       },
       submitForm:{
         payType:1,
         payOrderList:[],
         caseId:null
-<<<<<<< HEAD
       },
       payFlagSubmit:true
-=======
-      }
->>>>>>> 0ca62df (缴费，案件详情问题处理)
     };
   },
   methods: {
@@ -149,10 +113,7 @@ export default {
         annexId: res.annexId,
         annexName:res.annexName
       });
-<<<<<<< HEAD
       this.payFlagSubmit = false;
-=======
->>>>>>> 0ca62df (缴费，案件详情问题处理)
     },
     submitUpload() {
       if (this.fileList.length < 1) {
@@ -169,11 +130,7 @@ export default {
     handleRemove(file, fileList) {
       (this.submitForm.payOrderList = []),
       fileList.forEach((item) => {
-<<<<<<< HEAD
           this.submitForm.payOrderList.push({ annexId:item.response.annexId,annexName:item.response.annexName });
-=======
-          this.submitForm.payOrderList.push({ annexId:item.response.data.annexId,annexName:item.response.data.annexName });
->>>>>>> 0ca62df (缴费，案件详情问题处理)
         });
     },
     handlePreview(file) {
@@ -232,11 +189,7 @@ export default {
       this.submitForm.caseId = this.payId;
       }
     }
-<<<<<<< HEAD
   },
-=======
-  }
->>>>>>> 0ca62df (缴费，案件详情问题处理)
 };
 </script>
 
diff --git a/vue.config.js b/vue.config.js
index a7d1973..c4fc8c2 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -12,19 +12,12 @@ const name = process.env.VUE_APP_TITLE || '调解系统' // 网页标题
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 
 // const API = 'http://121.40.189.20:7001'  //生产
-const API = 'http://121.40.189.20:6001'  //测试
+// const API = 'http://121.40.189.20:6001'  //测试
 // const API = 'http://192.168.3.18:6001'  //B
-<<<<<<< HEAD
 // const API = 'http://172.16.0.237:6001' //Q
-// const API = 'http://172.16.1.26:6001' //w
+const API = 'http://172.16.1.26:6001' //w
 
 // vue.config.js 配置说明 
-=======
-// const API = 'http://192.168.3.77:9001' //Q
-// const API = 'http://172.16.1.14:6001' //w
-
-// vue.config.js 配置说明
->>>>>>> 0ca62df (缴费，案件详情问题处理)
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
 // 这里只列一部分，具体配置参考文档
 module.exports = {