diff --git a/scripts/webpack.dev.js b/scripts/webpack.dev.js
index f251a53..8c53632 100644
--- a/scripts/webpack.dev.js
+++ b/scripts/webpack.dev.js
@@ -12,7 +12,7 @@ let _devConfig = {
     proxy: {
       "/PMS": {
         // target: "http://192.168.8.7:3001/mock/3247",
-        target: "http://10.10.128.65:3001/mock/11",
+        target: "http://10.10.128.65:3001/mock/18",
         pathRewrite: {
           "^/PMS": "",
         },
diff --git a/src/assets/images/status_err.png b/src/assets/images/status_err.png
deleted file mode 100644
index cebba9a..0000000
Binary files a/src/assets/images/status_err.png and /dev/null differ
diff --git a/src/assets/images/status_normal.png b/src/assets/images/status_normal.png
deleted file mode 100644
index b1d1085..0000000
Binary files a/src/assets/images/status_normal.png and /dev/null differ
diff --git a/src/assets/images/warningIcon.png b/src/assets/images/warningIcon.png
deleted file mode 100644
index f14056c..0000000
Binary files a/src/assets/images/warningIcon.png and /dev/null differ
diff --git a/src/components/form/FormInput/index.jsx b/src/components/form/FormInput/index.jsx
index 855b1c7..dcc5578 100644
--- a/src/components/form/FormInput/index.jsx
+++ b/src/components/form/FormInput/index.jsx
@@ -28,7 +28,6 @@ export default function FormInput(props) {
   } = props;
 
   const setValue = (e)=>{
-
     if(isReceive){
       onChange(e)
     }else{
@@ -36,7 +35,6 @@ export default function FormInput(props) {
         const val = e.target.value.split('，').map( function (curr) {
           return curr.replace(/[\!\@\#\$\%\^\&\*\?\？\！\_\——]/g, "");
         }).join('')
-
         e.target.value=val
       }
       onChange(e)
@@ -59,7 +57,7 @@ export default function FormInput(props) {
         </div>
       )}
       <div className={`cc-form-content`}>
-
+        
         {isPassword ?
           <Input.Password
             placeholder={placeholder}
@@ -100,7 +98,7 @@ export default function FormInput(props) {
         }
           </>
         }
-
+        
         {isPassword && error?
           <>
           <Alert message={alertText} type="error" showIcon />
diff --git a/src/components/form/FormSelect/index.jsx b/src/components/form/FormSelect/index.jsx
index 6cffa5f..173b6f8 100644
--- a/src/components/form/FormSelect/index.jsx
+++ b/src/components/form/FormSelect/index.jsx
@@ -34,7 +34,7 @@ function FormSelectSingle(props) {
     hasUnlimited = true,
     tagRender,
     labelPosition = "left",
-    getPopupContainer = () => document.body
+    getPopupContainer=()=>document.body
   } = props
   const [value, setValue] = useState(defaultValue)
   const handleChange = (e, option) => {
@@ -92,18 +92,13 @@ function FormSelectSingle(props) {
             </Option>
           )
         })} */}
-
-        {
-          yisaData?.map(({ value, label, disabled = false }, index) => {
-            return (
-              <Option key={index} disabled={disabled} value={value}>
-                {label ? label : " "}
-              </Option>
-            )
-          })
-        }
-
-
+        {yisaData.map(({ value, label, disabled = false }, index) => {
+          return (
+            <Option key={index} disabled={disabled} value={value}>
+              {label ? label : " "}
+            </Option>
+          )
+        })}
       </Select>
     </div>
   )
diff --git a/src/components/form/FormSelectionBox/index.jsx b/src/components/form/FormSelectionBox/index.jsx
index b7ff44d..879f2df 100644
--- a/src/components/form/FormSelectionBox/index.jsx
+++ b/src/components/form/FormSelectionBox/index.jsx
@@ -64,7 +64,7 @@ function FormSelectionBox(props) {
     <div className={className ? `${className} cc-form-selection-box` : 'cc-form-selection-box'}>
       {
         yisaLabel ?
-          <label className="form-selection-box-name"><p style={{color:"red",display:"inline"}}>{required ? <em>*</em> : ''}</p>{yisaLabel}</label>
+          <label className="form-selection-box-name">{required ? <em>*</em> : ''}{yisaLabel}</label>
           :
           null
       }
diff --git a/src/pages/MerchantMgm/FunctionMgm/index.scss b/src/pages/MerchantMgm/FunctionMgm/index.scss
index b5fc842..1838f71 100644
--- a/src/pages/MerchantMgm/FunctionMgm/index.scss
+++ b/src/pages/MerchantMgm/FunctionMgm/index.scss
@@ -3,219 +3,3 @@ $color-container-bg : var(--color-container-bg);
 $color-user-list-bg : var(--color-user-list-bg);
 $color-text : var(--color-text);
 $color-primary : var(--color-primary);
-
-#FunctionMgm{
-  .panel {
-    width: 100%;
-    padding-top: 20px;
-    padding-left: 10px;
-    background: none;
-
-    .search-form{
-      margin-left: 10px;
-    }
-
-    .label {
-      width: 90px;
-      text-align-last: end;
-    }
-
-
-    .yisa-select {
-      width: 190px;
-
-      .ant-select-selector {
-        background: transparent;
-        border-color: var(--color-border);
-      }
-
-    }
-
-    .form-input {
-      width: 190px;
-      background: transparent;
-      border-color: var(--color-border);
-    }
-
-    .ant-select-arrow {
-      background: none !important;
-    }
-
-    .ant-input {
-      background: transparent;
-      border-color: var(--color-border);
-    }
-
-
-    .panel-1 {
-      display: flex;
-    }
-    .btnBox {
-      display: flex;
-      align-items: center;
-      margin-left: 30px;
-
-      .btn {
-        margin: 0 5px;
-        border-radius: 5px;
-        border: none;
-      }
-
-      .search-btn {
-        background-color: #409EFF;
-      }
-
-      .reset-btn {
-        color: #000;
-        background-color: #fff;
-      }
-
-      .create-btn {
-        background-color: #67C23A;
-
-      }
-    }
-
-  }
-
-  .table {
-    width: 98%;
-    margin: 15px 10px 10px 15px;
-
-
-    .ant-table-thead {
-      th {
-        padding: 0px 16px;
-        height: 50px;
-      }
-
-      .ant-table-cell {
-        background: var(--color-table-header-bg) !important;
-        font-weight: 700;
-
-        &::before {
-          display: none;
-        }
-      }
-    }
-
-    .ant-table-tbody {
-      tr {
-        &:nth-child(2n) {
-          td {
-            background: #3E4557 !important;
-          }
-        }
-
-        &:hover {
-          td {
-            background: #3E4557 !important;
-          }
-        }
-
-        td {
-          background: #3E4557 !important;
-          border-bottom-color: #f2f2f2;
-        }
-      }
-    }
-
-    .ant-pagination-options {
-      .ant-select {
-        &:hover {
-          .ant-select-selector {
-            border-color: #f5f6f9;
-            box-shadow: none;
-          }
-        }
-      }
-
-      .ant-select-selector {
-        border-color: #f5f6f9;
-      }
-
-      .ant-select-focused {
-        .ant-select-selector {
-          box-shadow: none !important;
-          border-color: #f5f6f9 !important;
-        }
-      }
-
-      .ant-pagination-options-quick-jumper {
-        input {
-          background: #3E4557;
-          border-color: #f5f6f9;
-
-          &:focus {
-            box-shadow: none;
-          }
-        }
-      }
-    }
-  }
-
-  .table-status-normal {
-    width: 20px;
-    height: 20px;
-    border-radius: 50%;
-    border: 1px solid #67C23A;
-  }
-
-  .table-status-err {
-    width: 20px;
-    height: 20px;
-    border-radius: 50%;
-    border: 1px solid red;
-  }
-
-  .scheduleBtn {
-    background: #409eff;
-    border: none;
-    width: 50px;
-    border-radius: 4px;
-    cursor: pointer;
-  }
-
-  .updateCard{
-    padding: 20px;
-    .title {
-      display: flex;
-      align-items: center;
-      font-size: 18px;
-      color: #fff;
-      font-weight: 500;
-
-      &::before {
-        content: '';
-        display: inline-block;
-        margin-right: 10px;
-        width: 5px;
-        height: 20px;
-        border-radius: 10px;
-        background-color: #409eff;
-      }
-    }
-    .form-note{
-      margin: 20px 0 0 30px;
-      .ant-form-item-label{
-        width: 100px;
-        text-align-last: right;
-      }
-      .ant-input{
-        background: transparent;
-        border-color: var(--color-border);
-      }
-      .btns{
-        margin-left: 96px;
-
-        .btn{
-          margin: 0 8px;
-          background-color: #fff;
-          color: #606266;
-          border: none;
-          border-radius: 4px;
-        }
-      }
-    }
-  }
-}
diff --git a/src/pages/MerchantMgm/FunctionMgm/loadable.jsx b/src/pages/MerchantMgm/FunctionMgm/loadable.jsx
index 6323541..a91372b 100644
--- a/src/pages/MerchantMgm/FunctionMgm/loadable.jsx
+++ b/src/pages/MerchantMgm/FunctionMgm/loadable.jsx
@@ -1,1402 +1,15 @@
-import React, { useState, useRef, useEffect, createContext } from "react";
-import { Input, Select, message, Popover, Pagination, Table,Tree, DatePicker, Form, Radio, Upload, Space, Modal, Cascader, Button } from "antd";
+import React, { useState, useRef, useEffect } from "react";
+// import {  message, Pagination, Table, Space, Modal, } from "antd";
 // import { dictionary, utils } from "@/config/common";
-import { pageSizeOptions } from '@/config/character.config.js'
-import { LoadingOutlined, PlusOutlined } from '@ant-design/icons';
-import moment from 'moment'
-import { FormInput, FormSelect, ImgUpload, SystemSearch, FormDatePicker, Icon, ResultFlow, ExportBtn, SearchTabs } from "@/components"
-import { useSessionStorageState, useUpdateEffect, useSize, useUpdate, useSetState } from 'ahooks';
-import ajax from "@/services"
-import "./index.scss";
-import status_normal from '@/assets/images/status_normal.png'
-import status_err from '@/assets/images/status_err.png'
-import warningIcon from "@/assets/images/warningIcon.png";
-import { SearchOutlined, DeleteOutlined } from '@ant-design/icons';
-import { assign } from "lodash";
-
+// import moment from 'moment'
+// import {   useSessionStorageState, useUpdateEffect, useSize, useUpdate } from 'ahooks';
+// import ajax from "@/services"
+// import {  FormInput, FormSelect, OptionPanel, ResultPanel, FormSliderPicker, AreaCascader, ImgResize, ImgZoom, } from "@/components"
+// import "./index.scss";
+// import errorImg from "@/assets/images/layout/error.png"
+// import {  useLocation } from "react-router-dom";
 function FunctionMgm() {
-  //默认
-  const parameter = {
-    tenantName: "",
-    manage_type: "",
-    note: "",
-    updateAt: "",
-    manage_type_name: "",
-    pn: 1,
-    page_size: Number(pageSizeOptions[0]),  // 每页条数
-  }
-  //等待状态
-  const [loading, setLoading] = useState(false) // 等待状态
-  //表格数据
-  const [tableData, setTableData] = useState([])
-  //表头
-  const columns = [
-    {
-      title: '序号',
-      dataIndex: 'id',
-      key: 'id',
-      align: "center",
-    },
-    {
-      title: '商户名称',
-      key: 'tenantName',
-      dataIndex: 'tenantName',
-      align: "center",
-    },
-    {
-      title: '经营业务类型',
-      key: 'manage_type_name',
-      dataIndex: 'manage_type_name',
-      align: "center",
-    },
-    {
-      title: '备注',
-      key: 'note',
-      dataIndex: 'note',
-      align: "center",
-    },
-    {
-      title: '创建时间',
-      key: 'updateAt',
-      dataIndex: 'updateAt',
-      align: "center",
-    },
-    {
-      title: '操作',
-      key: 'operation',
-      dataIndex: 'operation',
-      align: "center",
-      render: (text, record, index) => {
-        return <>
-          <div onClick={() => { updateBtn(record) }} trigger="hover" style={{ color: '#409EFF', cursor: "pointer" }}>编辑</div>
-        </>
-      },
-    },
-  ]
-  //检索表单
-  const [formData, setFormData] = useSetState(parameter)
-  const [lastFormData, setLastFormData] = useState(formData)
-  const lastFormDataRef = useRef(formData)
-
-  const [searchForm]=Form.useForm()
-  //是否第一次检索表单
-  const [isFirst,setIsFirst]=useState(false)
-  //商户名称下拉
-  const [tenantPull, setTenantPull] = useState([])
-  //总条数
-  const [total, setTotal] = useState()
-  //编辑开关
-  const [updateVisible, setUpdateVisible] = useState(false)
-  //更新表单
-  const [updateForm]=Form.useForm()
-  //绑定功能
-  const treeData = [
-    {
-      title: '路内停车管理系统',
-      key: '0',
-      children: [
-        {
-          title: '停车场管理',
-          key: '0-0',
-          children: [
-            {
-              title: '停车场管理',
-              key: '0-0-0',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '0-0-0-0',
-                },
-                {
-                  title: '【按钮】添加',
-                  key: '',
-                },
-                {
-                  title: '【按钮】编辑',
-                  key: '',
-                },
-                {
-                  title: '【按钮】查看',
-                  key: '',
-                },
-                {
-                  title: '【按钮】停车场配置',
-                  key: '',
-                },
-              ]
-            },
-            {
-              title: '停车记录查询',
-              key: '0-0-1',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】详情',
-                  key: '',
-                },
-              ]
-            },
-            {
-              title: '泊位列表',
-              key: '0-0-0-1',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】查看',
-                  key: '',
-                },
-              ]
-            },
-          ],
-        },
-        {
-          title: '业务管理',
-          key: '0-0-1',
-          children: [
-            {
-              title: '计费规则管理',
-              key: '',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】添加',
-                  key: '',
-                },
-                {
-                  title: '【按钮】编辑',
-                  key: '',
-                },
-                {
-                  title: '【按钮】查看',
-                  key: '',
-                },
-              ]
-            },
-            {
-              title: '白名单管理',
-              key: '',
-              children: [
-                {
-                  title: '白名单记录',
-                  key: '',
-                  children: [
-                    {
-                      title: '【按钮】查询',
-                      key: '',
-                    },
-                    {
-                      title: '【按钮】导出',
-                      key: '',
-                    },
-                    {
-                      title: '【按钮】查看',
-                      key: '',
-                    },
-                    {
-                      title: '【按钮】修改',
-                      key: '',
-                    },
-                    {
-                      title: '【按钮】启用',
-                      key: '',
-                    },
-                  ]
-                },
-                {
-                  title: '白名单申请',
-                  key: '',
-                  children: [
-                    {
-                      title: '【按钮】查询',
-                      key: '',
-                    },
-                    {
-                      title: '【按钮】创建申请',
-                      key: '',
-                    },
-                    {
-                      title: '【按钮】查看',
-                      key: '',
-                    },
-                    {
-                      title: '【按钮】修改',
-                      key: '',
-                    },
-                    {
-                      title: '【按钮】删除',
-                      key: '',
-                    },
-                  ]
-                },
-                {
-                  title: '白名单审核',
-                  key: '',
-                  children: [
-                    {
-                      title: '【按钮】查询',
-                      key: '',
-                    },
-                    {
-                      title: '【按钮】审核',
-                      key: '',
-                    },
-                  ]
-                },
-              ]
-            },
-          ],
-        },
-        {
-          title: '人员管理',
-          key: '0-0-1',
-          children: [
-            {
-              title: '人员管理',
-              key: '',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】添加',
-                  key: '',
-                },
-                {
-                  title: '【按钮】编辑',
-                  key: '',
-                },
-                {
-                  title: '【按钮】离职/在职',
-                  key: '',
-                },
-              ]
-            },
-            {
-              title: '人员考勤',
-              key: '',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】添加',
-                  key: '',
-                },
-              ]
-            },
-          ],
-        },
-        {
-          title: '设备管理',
-          key: '0-0-0-1',
-          children: [
-            {
-              title: '路内车场设备监控',
-              key: '',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】详情',
-                  key: '',
-                },
-              ]
-            },
-            {
-              title: '路外车场设备监控',
-              key: '',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】详情',
-                  key: '',
-                },
-              ]
-            },
-            {
-              title: '视频监控设备管理',
-              key: '',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】添加',
-                  key: '',
-                },
-                {
-                  title: '【按钮】编辑',
-                  key: '',
-                },
-                {
-                  title: '【按钮】删除',
-                  key: '',
-                },
-                {
-                  title: '【按钮】查看监控',
-                  key: '',
-                },
-              ]
-            },
-            {
-              title: '杆位管理',
-              key: '',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】查看',
-                  key: '',
-                },
-                {
-                  title: '【按钮】导入',
-                  key: '',
-                },
-                {
-                  title: '【按钮】导出',
-                  key: '',
-                },
-              ]
-            },
-            {
-              title: 'PDA管理',
-              key: '',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】添加',
-                  key: '',
-                },
-                {
-                  title: '【按钮】编辑',
-                  key: '',
-                },
-                {
-                  title: '【按钮】删除',
-                  key: '',
-                },
-              ]
-            },
-            {
-              title: '品牌管理',
-              key: '',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】添加',
-                  key: '',
-                },
-                {
-                  title: '【按钮】编辑',
-                  key: '',
-                },
-              ]
-            },
-          ]
-        },
-        {
-          title: '运营统计',
-          key: '0-0-1',
-          children: [
-            {
-              title: '停车场数据分析',
-              key: '',
-              children: [
-                {
-                  title: '停车场实况数据',
-                  key: '',
-                  children: [
-                    {
-                      title: '【按钮】查询',
-                      key: '',
-                    },
-                  ]
-                },
-                {
-                  title: '停车场运营分析',
-                  key: '',
-                  children: [
-                    {
-                      title: '【按钮】查询',
-                      key: '',
-                    },
-                  ]
-                },
-
-              ]
-            },
-          ],
-        },
-        {
-          title: '财务管理',
-          key: '0-0-1',
-          children: [
-            {
-              title: '停车场欠费订单',
-              key: '',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】导出',
-                  key: '',
-                },
-              ]
-            },
-            {
-              title: '欠费追缴查询',
-              key: '',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】导出',
-                  key: '',
-                },
-              ]
-            },
-            {
-              title: '停车场收入报表',
-              key: '',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】导出',
-                  key: '',
-                },
-              ]
-            },
-            {
-              title: '营收总报表',
-              key: '',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】导出',
-                  key: '',
-                },
-              ]
-            },
-            {
-              title: '收费员收入统计',
-              key: '',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】导出',
-                  key: '',
-                },
-              ]
-            },
-            {
-              title: '支付渠道统计',
-              key: '',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                }
-              ]
-            },
-            {
-              title: '发票记录',
-              key: '',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】冲红重开',
-                  key: '',
-                },
-              ]
-            },
-            {
-              title: '停车支付订单',
-              key: '',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】导出',
-                  key: '',
-                },
-              ]
-            },
-          ],
-        },
-      ],
-    },
-    {
-      title: '路外停车管理系统',
-      key: '0-0',
-      children: [
-        {
-          title: '停车场管理',
-          key: '0-0-0',
-          children: [
-            {
-              title: '停车场管理',
-              key: '0-0-0-0',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】添加',
-                  key: '',
-                },
-                {
-                  title: '【按钮】编辑',
-                  key: '',
-                },
-                {
-                  title: '【按钮】查看',
-                  key: '',
-                },
-                {
-                  title: '【按钮】二维码下载',
-                  key: '',
-                },
-                {
-                  title: '【按钮】保存并同步',
-                  key: '',
-                },
-                {
-                  title: '【按钮】停车场配置',
-                  key: '',
-                },
-              ]
-            },
-            {
-              title: '计费规则管理',
-              key: '0-0-0-1',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】添加',
-                  key: '',
-                },
-                {
-                  title: '【按钮】编辑',
-                  key: '',
-                },
-                {
-                  title: '【按钮】删除',
-                  key: '',
-                },
-                {
-                  title: '【按钮】查看',
-                  key: '',
-                },
-              ]
-            },
-            {
-              title: '停车记录查询',
-              key: '0-0-0-1',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】详情',
-                  key: '',
-                },
-              ]
-            },
-          ],
-        },
-        {
-          title: '人员管理',
-          key: '0-0-1',
-          children: [
-            {
-              title: '交接班报表',
-              key: '',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】查看',
-                  key: '',
-                },
-              ]
-            },
-            {
-              title: 'MS收费员管理',
-              key: '',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】添加',
-                  key: '',
-                },
-                {
-                  title: '【按钮】编辑',
-                  key: '',
-                },
-                {
-                  title: '【按钮】在职/离职',
-                  key: '',
-                },
-              ]
-            },
-          ],
-        },
-        {
-          title: '设备管理',
-          key: '0-0-0-1',
-          children: [
-            {
-              title: '视频监控设备管理',
-              key: '',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】添加',
-                  key: '',
-                },
-                {
-                  title: '【按钮】编辑',
-                  key: '',
-                },
-                {
-                  title: '【按钮】删除',
-                  key: '',
-                },
-                {
-                  title: '【按钮】查看监控',
-                  key: '',
-                },
-              ]
-            },
-            {
-              title: '路外设备管理',
-              key: '',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】查看',
-                  key: '',
-                }
-              ]
-            }
-          ]
-        },
-        {
-          title: '运营统计',
-          key: '0-0-1',
-          children: [
-            {
-              title: '停车场数据分析',
-              key: '',
-              children: [
-                {
-                  title: '停车场实况数据',
-                  key: '',
-                  children: [
-                    {
-                      title: '【按钮】查询',
-                      key: '',
-                    },
-                  ]
-                },
-                {
-                  title: '停车场运营分析',
-                  key: '',
-                  children: [
-                    {
-                      title: '【按钮】查询',
-                      key: '',
-                    },
-                  ]
-                },
-
-              ]
-            },
-          ],
-        },
-        {
-          title: '异常管理',
-          key: '0-0-1',
-          children: [
-            {
-              title: '抬杆记录',
-              key: '',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】导出',
-                  key: '',
-                },
-              ]
-            },
-            {
-              title: '特殊放行记录',
-              key: '',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】导出',
-                  key: '',
-                },
-              ]
-            },
-            {
-              title: '车牌修正记录',
-              key: '',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】导出',
-                  key: '',
-                },
-              ]
-            }
-          ],
-        },
-        {
-          title: '财务管理',
-          key: '0-0-1',
-          children: [
-            {
-              title: '停车场支付订单',
-              key: '',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】导出',
-                  key: '',
-                },
-              ]
-            },
-            {
-              title: '营收总报表',
-              key: '',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】导出',
-                  key: '',
-                },
-              ]
-            },
-            {
-              title: '停车场收入报表',
-              key: '',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】导出',
-                  key: '',
-                },
-              ]
-            },
-            {
-              title: '支付渠道统计',
-              key: '',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-              ]
-            },
-          ],
-        },
-      ],
-    },
-    {
-      title: '充电管理系统',
-      key: '0-0',
-      children: [
-        {
-          title: '实时监控',
-          key: '0-0-0',
-          children: [
-            {
-              title: '电桩监控',
-              key: '0-0-0-0',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】查看详情',
-                  key: '',
-                },
-                {
-                  title: '【按钮】远程监控',
-                  key: '',
-                },
-                {
-                  title: '【按钮】状态变更记录',
-                  key: '',
-                },
-              ]
-            },
-            {
-              title: '充电监控',
-              key: '0-0-0-1',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】查看详情',
-                  key: '',
-                },
-              ]
-            },
-            {
-              title: '地锁监控',
-              key: '0-0-0-1',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】查看详情',
-                  key: '',
-                },
-              ]
-            },
-            {
-              title: '充电泊位监控',
-              key: '0-0-0-1',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】查看详情',
-                  key: '',
-                },
-              ]
-            },
-          ],
-        },
-        {
-          title: '记录查询',
-          key: '0-0-1',
-          children: [
-            {
-              title: '充电订单',
-              key: '',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】导出',
-                  key: '',
-                },
-                {
-                  title: '【按钮】查看详情',
-                  key: '',
-                },
-              ]
-            },
-            {
-              title: '开锁记录',
-              key: '',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                }
-              ]
-            },
-            {
-              title: '预约订单',
-              key: '',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】导出',
-                  key: '',
-                },
-                {
-                  title: '【按钮】查看',
-                  key: '',
-                },
-              ]
-            },
-            {
-              title: '违规行为记录',
-              key: '',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】详情',
-                  key: '',
-                },
-              ]
-            },
-          ],
-        },
-      ]
-    },
-    {
-      title: '系统管理',
-      key: '0-0',
-      children: [
-        {
-          title: '商户信息查看',
-          key: '0-0-0',
-          children: [
-            {
-              title: '【按钮】查询',
-              key: '0-0-0-0',
-            },
-            {
-              title: '【Tab】商户信息',
-              key: '',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-              ]
-            },
-            {
-              title: '【Tab】发票配置',
-              key: '',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-              ]
-            },
-            {
-              title: '计费规则管理',
-              key: '0-0-0-1',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】添加',
-                  key: '',
-                },
-                {
-                  title: '【按钮】编辑',
-                  key: '',
-                },
-                {
-                  title: '【按钮】删除',
-                  key: '',
-                },
-                {
-                  title: '【按钮】查看',
-                  key: '',
-                },
-              ]
-            },
-            {
-              title: '停车记录查询',
-              key: '0-0-0-1',
-              children: [
-                {
-                  title: '【按钮】查询',
-                  key: '',
-                },
-                {
-                  title: '【按钮】详情',
-                  key: '',
-                },
-              ]
-            },
-          ],
-        },
-        {
-          title: '管理员管理',
-          key: '0-0-1',
-          children: [
-            {
-              title: '【按钮】查询',
-              key: '',
-            },
-            {
-              title: '【按钮】添加',
-              key: '',
-            },
-            {
-              title: '【按钮】编辑',
-              key: '',
-            },
-            {
-              title: '【按钮】离职',
-              key: '',
-            },
-          ],
-        },
-        {
-          title: '角色管理',
-          key: '0-0-1',
-          children: [
-            {
-              title: '【按钮】查询',
-              key: '',
-            },
-            {
-              title: '【按钮】添加',
-              key: '',
-            },
-            {
-              title: '【按钮】编辑',
-              key: '',
-            },
-            {
-              title: '【按钮】删除',
-              key: '',
-            },
-          ],
-        },
-        {
-          title: '组织架构',
-          key: '0-0-1',
-          children: [
-            {
-              title: '【按钮】查询',
-              key: '',
-            },
-            {
-              title: '【按钮】添加',
-              key: '',
-            },
-            {
-              title: '【按钮】编辑',
-              key: '',
-            },
-            {
-              title: '【按钮】删除',
-              key: '',
-            },
-          ],
-        },
-        {
-          title: '系统日志',
-          key: '0-0-1',
-          children: [
-            {
-              title: '【按钮】查询',
-              key: '',
-            },
-            {
-              title: '【按钮】查看',
-              key: '',
-            }
-          ],
-        },
-      ],
-    },
-  ];
-  //获取商户名称的下拉
-  const getTenantNamePull = () => {
-    ajax.getTenantPull().then(
-      res => {
-        if (res.status == 20000) {
-          setTenantPull(res.data)
-        } else {
-          message.error(res.message)
-        }
-      }
-    ).catch(
-      err => { console.log(err); }
-    )
-  }
-  //获取表格数据
-  const getTable = () => {
-    const value=searchForm.getFieldsValue(['shop_name'])
-    setLoading(true)
-    ajax.getFunctionMgmTable(value).then(
-      res => {
-        if (res.status == 20000) {
-          setTableData(res.data.list)
-          setTotal(res.data.total_records)
-          setIsFirst(true)
-        } else {
-          message.error(res.message)
-        }
-        setLoading(false)
-      }
-    ).catch(
-      (err) => {
-        console.log(err)
-      }
-    )
-  }
-  //搜索数据
-  const getSearchData = () => {
-    getTable()
-  }
-
-  //切换分页
-  const changePn = (pn, length) => {
-    if (lastFormData.page_size === length) {
-      setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
-      lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn })
-      getTable(Object.assign({}, lastFormData, { pn: pn }))
-    }
-  }
-  //切换每页条数
-  const changeLength = (pn, length) => {
-    setFormData(Object.assign({}, formData, { pn: 1, page_size: length }))
-    setLastFormData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
-    lastFormDataRef.current = Object.assign({}, lastFormData, { pn: 1, page_size: length })
-    getTable(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
-  }
-
-  //重置数据
-  const getResetData = () => {
-    searchForm.setFieldsValue({
-      shop_name:""
-    })
-    if(isFirst){
-      getTable()
-    }
-  }
-
-  //编辑
-  const updateBtn = (record) => {
-    setUpdateVisible(true)
-    updateForm.setFieldsValue(
-      {
-        shop_name:record.tenantName,
-        note:record.note
-      }
-    )
-    setFormData(record)
-  }
-  //点击取消-返回上一层
-  const createOncancel = () => {
-    setUpdateVisible(false)
-  }
-  //编辑后提交
-  const submitUpdate=()=>{
-
-  }
-
-  const onSelect = (selectedKeys, info) => {
-    console.log('selected', selectedKeys, info);
-  };
-  const onCheck = (checkedKeys, info) => {
-    console.log('onCheck', checkedKeys, info);
-  };
-
-  useEffect(
-    () => {
-      getTenantNamePull()
-    }, []
-  )
-  return (
-    <div id="FunctionMgm" >
-      {
-        !updateVisible ?
-          <>
-            <div className="panel">
-              <div className="panel-1">
-                <Form
-                  layout="inline"
-                  form={searchForm}
-                >
-                  <Form.Item
-                    label="商户名称："
-                    name="shop_name"
-                    className="search-form"
-                  >
-                  <Select
-                    className="yisa-select"
-                    options={tenantPull}
-                    placeholder="请选择"
-                  />
-                  </Form.Item>
-                  <Form.Item
-                  className="btnBox"
-                  >
-                  <Button type="primary" className="search-btn btn" icon={<SearchOutlined />} onClick={() => { getSearchData() }}>
-                    查询
-                  </Button>
-                  <Button type="primary" className="reset-btn btn" onClick={() => { getResetData() }}>
-                    清空
-                  </Button>
-                  </Form.Item>
-                </Form>
-              </div>
-            </div>
-
-            <Table
-              columns={columns}
-              className="table"
-              pagination={false}
-              dataSource={tableData}
-              loading={loading}
-            ></Table>
-            <Pagination
-              className="pagination-common"
-              showSizeChanger
-              showQuickJumper
-              showTotal={() => {
-                if (total) {
-                  return `共 ${total} 条`
-                }
-                else return `共 0 条`
-              }
-              }
-              total={total}
-              current={formData.pn}
-              pageSize={formData.page_size}
-              pageSizeOptions={pageSizeOptions}
-              onChange={changePn}
-              onShowSizeChange={changeLength}
-            />
-          </> : ''
-      }
-
-      {
-        updateVisible ?
-          <div className="updateCard">
-            <div className="title">商户功能管理</div>
-            <div>
-              <div className="form-note">
-                <Form
-                  form={updateForm}
-                >
-                  <Form.Item
-                    label="商户名称"
-                    name="tenantName"
-                  >
-                    {formData.tenantName}
-                  </Form.Item>
-                  <Form.Item
-                    label="备注"
-                    name="note"
-                  >
-                    <Input></Input>
-                  </Form.Item>
-
-                  <Form.Item className="btns">
-                    <Button type="primary" className="btn">全部选择</Button>
-                    <Button type="primary" className="btn">全部取消</Button>
-                  </Form.Item>
-
-                  <Form.Item
-                    label="绑定功能"
-                    name="bind"
-                  >
-                    {/* <Tree
-                      checkable
-                      defaultExpandedKeys={['0-0-0', '0-0-1']}
-                      defaultSelectedKeys={['0-0-0', '0-0-1']}
-                      defaultCheckedKeys={['0-0-0', '0-0-1']}
-                      onSelect={onSelect}
-                      onCheck={onCheck}
-                      treeData={treeData}
-                    /> */}
-                  </Form.Item>
-
-                  <Form.Item>
-                  <Button className="btn-1 btn" onClick={submitUpdate} type="primary" htmlType="submit">保存</Button>
-                    <Button className="btn-2 btn" onClick={createOncancel}>取消</Button>
-                  </Form.Item>
-                </Form>
-              </div>
-
-            </div>
-          </div> : ''
-      }
-
-    </div>
-  )
+    return <div>FunctionMgm</div>
 }
 
-export default FunctionMgm;
+export default FunctionMgm;
\ No newline at end of file
diff --git a/src/pages/MerchantMgm/InvoiceConf/index.scss b/src/pages/MerchantMgm/InvoiceConf/index.scss
index 31e8667..1838f71 100644
--- a/src/pages/MerchantMgm/InvoiceConf/index.scss
+++ b/src/pages/MerchantMgm/InvoiceConf/index.scss
@@ -3,340 +3,3 @@ $color-container-bg : var(--color-container-bg);
 $color-user-list-bg : var(--color-user-list-bg);
 $color-text : var(--color-text);
 $color-primary : var(--color-primary);
-
-.invoiceConf {
-  .panel {
-    width: 100%;
-    height: 100px;
-    padding-top: 20px;
-    padding-left: 0.625rem;
-    background: none;
-
-    .btn {
-      margin: 5px 5px;
-      border-radius: 5px;
-      border: none;
-    }
-    .reset-btn {
-      color: #000;
-      background-color: #fff;
-    }
-
-    .create-btn {
-      background-color: #67C23A;
-
-    }
-
-    .search-btn {
-      background-color: #409EFF;
-    }
-    .panel-1 {
-      display: flex;
-      align-items: center;
-
-      .ant-input{
-        background: transparent;
-        border-color: var(--color-border);
-      }
-
-      .form-item{
-        margin: 5px 40px;
-      }
-
-
-      .ant-select-arrow {
-          background: none !important;
-        }
-
-
-        .yisa-cascader {
-          width: 8rem;
-          background: transparent;
-          border-color: var(--color-border);
-        }
-
-        .yisa-select {
-          width: 11.875rem;
-
-          .ant-select-selector {
-            background: transparent;
-            border-color: var(--color-border);
-          }
-
-        }
-
-      .search-group-item {
-        margin-right: 0.625rem;
-        width: 16.875rem;
-        background: transparent;
-        border-color: var(--color-border);
-
-      }
-    }
-
-
-  }
-
-  .table {
-    width: 98%;
-    margin: 15px 10px 10px 15px;
-
-
-    .ant-table-thead {
-      th {
-        padding: 0px 16px;
-        height: 50px;
-      }
-
-      .ant-table-cell {
-        background: var(--color-table-header-bg) !important;
-        font-weight: 700;
-
-        &::before {
-          display: none;
-        }
-      }
-    }
-
-    .ant-table-tbody {
-      tr {
-        &:nth-child(2n) {
-          td {
-            background: #3E4557 !important;
-          }
-        }
-
-        &:hover {
-          td {
-            background: #3E4557 !important;
-          }
-        }
-
-        td {
-          background: #3E4557 !important;
-          border-bottom-color: #f2f2f2;
-        }
-      }
-    }
-
-    .ant-pagination-options {
-      .ant-select {
-        &:hover {
-          .ant-select-selector {
-            border-color: #f5f6f9;
-            box-shadow: none;
-          }
-        }
-      }
-
-      .ant-select-selector {
-        border-color: #f5f6f9;
-      }
-
-      .ant-select-focused {
-        .ant-select-selector {
-          box-shadow: none !important;
-          border-color: #f5f6f9 !important;
-        }
-      }
-
-      .ant-pagination-options-quick-jumper {
-        input {
-          background: #3E4557;
-          border-color: #f5f6f9;
-
-          &:focus {
-            box-shadow: none;
-          }
-        }
-      }
-    }
-  }
-
-  .scheduleBtn {
-    background: #409eff;
-    border: none;
-    width: 50px;
-    border-radius: 4px;
-    cursor: pointer;
-  }
-
-  #create {
-    height: 800px;
-    overflow-y: scroll;
-
-    .create-form {
-      .btns {
-        display: flex;
-        justify-content: end;
-        margin-right: 20px;
-        margin-top: 10px;
-
-        .btn {
-          width: 70px;
-          height: 36px;
-          border: none;
-          border-radius: 4px;
-          text-align: center;
-          cursor: pointer;
-        }
-
-        .btn-1 {
-          color: #fff;
-          background-color: #409EFF;
-          margin-right: 10px;
-        }
-
-        .btn-2 {
-          background-color: #fff;
-          color: #000;
-        }
-      }
-
-      .container {
-        padding: 20px 20px;
-        display: flex;
-
-        .left {
-          width: 50%;
-          margin-right: 20px;
-
-          .left-1 {
-            width: 500px;
-          }
-
-          .left-2 {
-            width: 500px;
-            background-color: #3E4557;
-          }
-
-          .left-3 {
-            width: 500px;
-          }
-
-          .cc-form-input {
-            margin: 10px 5px 20px 30px;
-
-            .cc-form-name {
-              width: 100px;
-              text-align: right;
-            }
-          }
-
-          .select {
-            margin: 10px 5px 20px 30px;
-
-            .form-select-single-name {
-              width: 100px;
-              text-align: right;
-            }
-          }
-
-          .selectionBox {
-            margin-left: 64px;
-          }
-
-
-        }
-
-        .right {
-          width: 50%;
-
-          .right-wrap {
-            width: 500px;
-
-            .cc-form-input {
-              margin: 10px 5px 20px 30px;
-
-              .cc-form-name {
-                width: 110px;
-                text-align: right;
-              }
-            }
-          }
-
-        }
-
-      }
-    }
-  }
-
-  #check {
-    height: 800px;
-    overflow-y: scroll;
-
-    .check-form {
-      .btns {
-        display: flex;
-        justify-content: end;
-        margin-right: 20px;
-        margin-top: 10px;
-
-        .btn {
-          width: 70px;
-          height: 36px;
-          border: none;
-          border-radius: 4px;
-          text-align: center;
-          cursor: pointer;
-          background-color: #fff;
-          color: #000;
-        }
-
-
-      }
-
-      .container {
-        padding: 20px 20px;
-        display: flex;
-
-        .left {
-          width: 50%;
-          margin: 0 20px;
-          display: flex;
-          flex-direction: column;
-
-          .left-wrap {
-            width: 300px;
-            margin-bottom: 40px;
-
-            .item {
-              margin: 15px;
-
-              .item-title {
-                display: inline-block;
-                width: 100px;
-                text-align-last: end;
-                white-space: nowrap;
-              }
-            }
-
-
-          }
-
-        }
-
-        .right {
-          width: 50%;
-
-          .right-wrap {
-            width: 500px;
-            .item {
-              margin: 15px;
-
-              .item-title {
-                display: inline-block;
-                width: 100px;
-                text-align-last: end;
-                white-space: nowrap;
-              }
-            }
-
-          }
-
-        }
-
-      }
-    }
-  }
-}
diff --git a/src/pages/MerchantMgm/InvoiceConf/loadable.jsx b/src/pages/MerchantMgm/InvoiceConf/loadable.jsx
index 2ec92a2..51cf4c1 100644
--- a/src/pages/MerchantMgm/InvoiceConf/loadable.jsx
+++ b/src/pages/MerchantMgm/InvoiceConf/loadable.jsx
@@ -1,1024 +1,15 @@
 import React, { useState, useRef, useEffect } from "react";
-import { Input, Select, Cascader, DatePicker, Button, message, Pagination, Table, Popover, Form, Radio, Space, Modal, } from "antd";
-import { dictionary, utils } from "@/config/common";
-import moment from 'moment'
-import { pageSizeOptions } from '@/config/character.config.js'
-import { useSessionStorageState, useUpdateEffect, useSize, useUpdate, useSetState } from 'ahooks';
-import ajax from "@/services"
-import { FormInput, FormSelect, FormSelectionBox, OptionPanel, ResultPanel, FormSliderPicker, AreaCascader, ImgResize, ImgZoom, } from "@/components"
-import "./index.scss";
-import errorImg from "@/assets/images/layout/error.png"
-import { useLocation } from "react-router-dom";
-import { SearchOutlined, DeleteOutlined } from '@ant-design/icons';
-
-const { RangePicker } = DatePicker;
-
-
+// import {  message, Pagination, Table, Space, Modal, } from "antd";
+// import { dictionary, utils } from "@/config/common";
+// import moment from 'moment'
+// import {   useSessionStorageState, useUpdateEffect, useSize, useUpdate } from 'ahooks';
+// import ajax from "@/services"
+// import {  FormInput, FormSelect, OptionPanel, ResultPanel, FormSliderPicker, AreaCascader, ImgResize, ImgZoom, } from "@/components"
+// import "./index.scss";
+// import errorImg from "@/assets/images/layout/error.png"
+// import {  useLocation } from "react-router-dom";
 function InvoiceConf() {
-  //默认
-  const parameter = {
-    info_id: '',//发票ID
-    tenantName: '',
-    receipt_type: 0,//发票平台
-    receipt_type_name: '',
-    invoice_item: '',//开票项目
-    sell_name: '',
-    sell_num: '',//销货方识别号
-    drawer_name: '',
-    updatePerson: '',
-    updateAt: '',
-    type: 1,
-    status: 0,
-    status_name: '',
-    start: moment().subtract(90, 'days').startOf('day').format('YYYY-MM-DD HH:mm:ss'),
-    end: moment().format('YYYY-MM-DD HH:mm:ss'),
-
-    tax_way: '',//计税方式
-    tax_type: '',//含税标志
-    tax_rate: '',//税率
-    code: "",
-    auth_code: "",
-    request_url: "",
-    request_code: "",
-    request_func: '',
-    namespace: "",
-    tax_name: "",
-    tax_num: "",
-    sell_name: "",
-    sell_num: '',//销货方识别号
-    sell_address: "",
-    sell_phone: '',
-    sell_bank_name: '',
-    sell_bank_num: '',
-    pay_name: '',
-    check_name: '',
-    mini_amount: '',
-    max_amount: '',
-    order_type: '',//订单类型
-    pn: 1,
-    page_size: Number(pageSizeOptions[0]),  // 每页条数
-  }
-
-  //检索表单
-  const [formData, setFormData] = useSetState(parameter)
-  const [lastFormData, setLastFormData] = useState(formData)
-  const lastFormDataRef = useRef(formData)
-  const [records, setRecords] = useState({})
-
-  const [searchForm] = Form.useForm()
-  //是否第一次检索表单
-  const [isFirst,setIsFirst]=useState(false)
-  //表格数据
-  const [tableData, setTableData] = useState([])
-  //等待状态
-  const [loading, setLoading] = useState(false) // 等待状态
-  //总条数
-  const [total, setTotal] = useState()
-
-  //商户名称下拉
-  const [tenantPull, setTenantPull] = useState([])
-  //计税方式下拉
-  const [taxWay, setTaxWay] = useState([])
-  //税率下拉
-  const [taxRate, setTaxRate] = useState([])
-  //含税标志下拉
-  const [taxType, setTaxType] = useState([])
-  //开票项目下拉
-  const [invoiceItem, setInvoiceItem] = useState([])
-  //新增开关
-  const [createVisible, setCreateVisible] = useState(false)
-  //查看开关
-  const [checkVisible, setCheckVisible] = useState(false)
-
-  //商户类型选择
-  const tenantOption = [
-    {
-      label: '商户名称',
-      value: 1,
-    },
-    {
-      label: '销货方名称',
-      value: 2,
-    },
-    {
-      label: '销货放识别号',
-      value: 3,
-    },
-  ]
-  //发票平台
-  const invoicePlat = [
-    {
-      label: '全部',
-      value: 0,
-    },
-    {
-      label: '航信',
-      value: 1,
-    },
-    {
-      label: '航信诺诺',
-      value: 2,
-    },
-    {
-      label: '百旺',
-      value: 3,
-    },
-  ]
-  //发票平台单选
-  const invoicePlatSelection = [
-    {
-      label: '航信',
-      value: 1,
-    },
-    {
-      label: '航信诺诺',
-      value: 2,
-    },
-    {
-      label: '百旺',
-      value: 3,
-    },
-  ]
-  //订单类型的复选
-  const orderType = [
-    {
-      label: '停车支付订单',
-      value: 1,
-    },
-    {
-      label: '停车卡订单',
-      value: 2,
-    },
-  ]
-
-  //状态
-  const statusType = [
-    {
-      label: '全部',
-      value: 0,
-    },
-    {
-      label: '已启用',
-      value: 1,
-    },
-    {
-      label: '已停用',
-      value: 2,
-    },
-  ]
-
-  //表头
-  const columns = [
-    {
-      title: '配置ID',
-      dataIndex: 'info_id',
-      key: 'info_id',
-      align: "center",
-    },
-    {
-      title: '商户名称',
-      key: 'tenantName',
-      dataIndex: 'tenantName',
-      align: "center",
-    },
-    {
-      title: '发票平台',
-      key: 'receipt_type_name',
-      dataIndex: 'receipt_type_name',
-      align: "center",
-    },
-    {
-      title: '开票项目',
-      key: 'invoice_item',
-      dataIndex: 'invoice_item',
-      align: "center",
-    },
-    {
-      title: '销货方名称',
-      key: 'sell_name',
-      dataIndex: 'sell_name',
-      align: "center",
-    },
-    {
-      title: '销货方识别号',
-      key: 'sell_num',
-      dataIndex: 'sell_num',
-      align: "center",
-    },
-    {
-      title: '开票人',
-      key: 'drawer_name',
-      dataIndex: 'drawer_name',
-      align: "center",
-    },
-    {
-      title: '状态',
-      key: 'status',
-      dataIndex: 'status',
-      align: "center",
-      render: (value, row, index) => {
-        return (
-          <>
-            {
-              row.status == 1 ?
-                <div style={{ color: '#67C23A' }}>已启用</div> :
-                <div style={{ color: 'red' }}>已停用</div>
-            }
-          </>
-        )
-      }
-    },
-    {
-      title: '最后操作人',
-      key: 'updatePerson',
-      dataIndex: 'updatePerson',
-      align: "center",
-    },
-    {
-      title: '最后修改时间',
-      key: 'updateAt',
-      dataIndex: 'updateAt',
-      align: "center",
-    },
-    {
-      title: '操作',
-      key: 'operation',
-      dataIndex: 'operation',
-      align: "center",
-      render: (text, record, index) => {
-        return <>
-          <Popover content={
-            <div className="operateBtn" style={{ cursor: "pointer" }} trigger="hover">
-              <div onClick={() => { checkBtn(index) }}>详情</div>
-              {
-                record.status == 2 ?
-                  <>
-                    <div onClick={() => { updateBtn(index) }}>编辑</div>
-                    <div onClick={() => { stopBtn(index) }}>启用</div>
-                  </> : <div onClick={() => { stopBtn(index) }}>停用</div>
-              }
-
-            </div>}>
-            <button className="scheduleBtn">操作</button>
-          </Popover>
-        </>
-      },
-    },
-  ]
-
-  //获取表格数据
-  const getTable = () => {
-    const value = searchForm.getFieldsValue(["info_id", "type_name", "type", "receipt_type", "status"])
-    const value1 = searchForm.getFieldValue("last_time")
-    const start = moment(value1[0]?._d).subtract(90, 'days').startOf('day').format('YYYY-MM-DD HH:mm:ss')
-    const end = moment(value1[0]?._d).format('YYYY-MM-DD HH:mm:ss')
-    setLoading(true)
-    ajax.getInvoiceTable({ ...value, start, end }).then(
-      res => {
-        if (res.status == 20000) {
-          setTableData(res.data.list)
-          setTotal(res.data.total_records)
-          setIsFirst(true)
-        } else {
-          message.error(res.message)
-        }
-        setLoading(false)
-      }
-    ).catch(
-      (err) => {
-        console.log(err)
-      }
-    )
-  }
-  //获取商户名称的下拉
-  const getTenantNamePull = () => {
-    ajax.getTenantPull().then(
-      res => {
-        if (res.status == 20000) {
-          setTenantPull(res.data)
-        } else {
-          message.error(res.message)
-        }
-      }
-    ).catch(
-      err => { console.log(err); }
-    )
-  }
-  //获取计税方式下拉
-  const getTaxWayPull = () => {
-    ajax.getTaxWayPull().then(
-      res => {
-        if (res.status = 20000) {
-          setTaxWay(res.data)
-        } else {
-          message.error(res.message)
-        }
-      }
-    ).catch(
-      err => {
-        console.log(err);
-      }
-    )
-  }
-
-  //获取税率的下拉
-  const getTaxRatePull = () => {
-    ajax.getTaxRatePull().then(
-      res => {
-        if (res.status == 20000) {
-          setTaxRate(res.data)
-        } else {
-          message.error(res.error)
-        }
-      }
-    ).catch(
-      err => {
-        console.log(err);
-      }
-    )
-  }
-  //获取含税标志的下拉
-  const getTaxTypePull = () => {
-    ajax.getTaxTypePull().then(
-      res => {
-        if (res.status == 20000) {
-          setTaxType(res.data)
-        } else {
-          message.error(res.message)
-        }
-      }
-    ).catch(
-      err => {
-        console.log(err);
-      }
-    )
-  }
-  //获取开票项目的下拉
-  const getInvoiceItemPull = () => {
-    ajax.getInvoiceItemPull().then(
-      res => {
-        if (res.status == 20000) {
-          setInvoiceItem(res.data)
-        } else {
-          message.error(res.message)
-        }
-      }
-    ).catch(
-      err => {
-        console.log(err);
-      }
-    )
-  }
-
-  //搜索
-  const getSearchData = () => {
-    getTable()
-  }
-  //新增
-  const createData = () => {
-    setCreateVisible(true)
-  }
-  //编辑
-  const updateBtn = (index) => {
-    setCreateVisible(true)
-    ajax.checkForm(index).then(
-      res => {
-        if (res.status == 20000) {
-          setFormData(res.data)
-        } else {
-          message.error(res.message)
-        }
-      }
-    ).catch(
-      err => {
-        console.log(err);
-      }
-    )
-  }
-  //查看详情
-  const checkBtn = (index) => {
-    setCheckVisible(true)
-    ajax.checkForm(index).then(
-      res => {
-        if (res.status == 20000) {
-          setRecords(res.data)
-        } else {
-          message.error(res.message)
-        }
-      }
-    ).catch(
-      err => {
-        console.log(err);
-      }
-    )
-  }
-
-  //启用/停用
-  function stopBtn(index) {
-    ajax.updateInvoiceStatus(index).then(
-      res => {
-        if (res.status == 20000) {
-          getTable()
-        } else {
-          message.error(res.message)
-        }
-      }
-    ).catch(
-      err => {
-        console.log(err);
-      }
-    )
-  }
-
-
-  //切换分页
-  const changePn = (pn, length) => {
-    if (lastFormData.page_size === length) {
-      setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
-      lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn })
-      getTable(Object.assign({}, lastFormData, { pn: pn }))
-    }
-  }
-  //切换每页条数
-  const changeLength = (pn, length) => {
-    setFormData(Object.assign({}, formData, { pn: 1, page_size: length }))
-    setLastFormData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
-    lastFormDataRef.current = Object.assign({}, lastFormData, { pn: 1, page_size: length })
-    getTable(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
-  }
-
-
-  //取消
-  const createOncancel = () => {
-    setCreateVisible(false)
-    setCheckVisible(false)
-  }
-  //保存
-  const createTenant = () => {
-    console.log(formData);
-    ajax.createForm(formData).then(
-      res => {
-        if (res.status == 20000) {
-          message.success("已保存", 2.5)
-          setCreateVisible(false)
-        } else {
-          message.error(res.message)
-        }
-      }
-    ).catch(err => console.log(err))
-  }
-
-  //重置数据
-  const getResetData = () => {
-    searchForm.setFieldsValue({
-      info_id: "",
-      type_name: '',
-      type: 1,
-      receipt_type: 0,
-      status: 0,
-      last_time: ''
-    })
-    if(isFirst){
-      getTable()
-    }
-  }
-
-
-  useEffect(
-    () => {
-      getTenantNamePull()
-      getTaxWayPull()
-      getTaxRatePull()
-      getTaxTypePull()
-      getInvoiceItemPull()
-    }, []
-  )
-
-
-  return (
-    <div className="invoiceConf">
-
-      {
-        !createVisible && !checkVisible ?
-          <>
-            <div className="panel">
-              <div className="panel-1">
-
-                <Form
-                  form={searchForm}
-                  layout="inline"
-                  initialValues={{
-                    type: tenantOption[0].value,
-                    receipt_type: invoicePlat[0].value,
-                    status: statusType[0].value,
-                  }}
-                >
-                  <Form.Item
-                    label="配置ID："
-                    name="info_id"
-                    labelAlign="left"
-                    className="form-item"
-                  >
-                    <Input placeholder="请输入准确信息"></Input>
-                  </Form.Item>
-
-                  <Form.Item
-                    name="type_name"
-                    className="form-item"
-                  >
-                    <Input
-                      addonBefore={
-                        <Form.Item
-                          name="type"
-                        >
-                          <Cascader
-                            className="yisa-cascader"
-                            options={tenantOption}
-                          /></Form.Item>
-                      }
-                      placeholder="请输入"
-                    />
-                  </Form.Item>
-
-                  <Form.Item
-                    label="发票平台："
-                    name="receipt_type"
-                    labelAlign="left"
-                    className="form-item"
-                  >
-                    <Select
-                      className="yisa-select"
-                      options={invoicePlat}
-                      placeholder="请选择"
-                    />
-                  </Form.Item>
-
-                  <Form.Item
-                    label="状态："
-                    name="status"
-                    labelAlign="left"
-                    className="form-item"
-                  >
-                    <Select
-                      className="yisa-select"
-                      options={statusType}
-                      placeholder="请选择"
-                    />
-                  </Form.Item>
-
-                  <Form.Item
-                    label="最近修改时间："
-                    name="last_time"
-                    labelAlign="left"
-                    className="form-item"
-                  >
-                    <RangePicker
-                      value={[moment(formData.start), moment(formData.end)]}
-                      className="search-group-item"
-                      limit={90}
-                      showTime={false}
-                    />
-                  </Form.Item>
-
-                  <Form.Item>
-                    <Button type="primary" className="search-btn btn" icon={<SearchOutlined />} onClick={() => { getSearchData() }}>
-                      搜索
-                    </Button>
-                  </Form.Item>
-                  <Form.Item>
-                    <Button type="primary" className="reset-btn btn" onClick={() => { getResetData() }}>
-                      条件重置
-                    </Button>
-                  </Form.Item>
-                  <Form.Item>
-                    <Button type="primary" className="create-btn btn" onClick={() => { createData() }}>
-                      创建用户
-                    </Button>
-                  </Form.Item>
-                </Form>
-              </div>
-            </div>
-            <Table
-              columns={columns}
-              className="table"
-              pagination={false}
-              dataSource={tableData}
-              loading={loading}
-            ></Table>
-            <Pagination
-              className="pagination-common"
-              showSizeChanger
-              showQuickJumper
-              showTotal={() => {
-                if (total) {
-                  return `共 ${total} 条`
-                }
-                else return `共 0 条`
-              }
-              }
-              total={total}
-              current={formData.pn}
-              pageSize={formData.page_size}
-              pageSizeOptions={pageSizeOptions}
-              onChange={changePn}
-              onShowSizeChange={changeLength}
-            />
-          </> :
-          ''
-      }
-
-      {
-        createVisible ?
-          <>
-            <div id="create">
-              <div className="create-form">
-                <div className="btns">
-                  <button className="btn-1 btn" onClick={createTenant}>保存</button>
-                  <button className="btn-2 btn" onClick={createOncancel}>取消</button>
-                </div>
-                <div className="container">
-                  <div className="left">
-                    <div className="left-1">
-                      <FormSelectionBox
-                        yisaLabel="发票平台"
-                        multi={false}
-                        required={true}
-                        yisaData={invoicePlatSelection}
-                        defaultValue={invoicePlatSelection[1].value}
-                        onChange={e => {
-                          setFormData({ receipt_type: e })
-                        }}
-                        className="selectionBox"
-                      ></FormSelectionBox>
-                      <FormSelect
-                        yisaLabel="商户名称:"
-                        yisaData={tenantPull}
-                        defaultValue={null}
-                        value={formData.tenantName}
-                        placeholder="请选择"
-                        required={true}
-                        className="select"
-                        onChange={e => {
-                          setFormData({ tenantName: e })
-                        }}
-                      />
-                    </div>
-                    <div className="left-2">
-                      <FormSelect
-                        yisaLabel="开票项目:"
-                        yisaData={invoiceItem}
-                        value={formData.invoice_item}
-                        defaultValue={invoiceItem[0].value}
-                        placeholder="请选择"
-                        hasUnlimited={false}
-                        required={true}
-                        className="select"
-                        onChange={e => {
-                          setFormData({ invoice_item: e })
-                        }}
-                      />
-                      {/* 复选 */}
-                      <FormSelectionBox
-                        yisaLabel="订单类型"
-                        multi={true}
-                        yisaData={orderType}
-                        required={true}
-                        onChange={e => {
-                          setFormData({ order_type: e })
-                        }}
-                        className="selectionBox"
-                      ></FormSelectionBox>
-                      <FormSelect
-                        yisaLabel="计税方式:"
-                        yisaData={taxWay}
-                        defaultValue={null}
-                        value={formData.tax_way}
-                        placeholder="请选择"
-                        hasUnlimited={false}
-                        required={true}
-                        className="select"
-                        onChange={e => {
-                          setFormData({ tax_way: e })
-                        }}
-                      />
-                      <FormSelect
-                        yisaLabel="税率(%):"
-                        yisaData={taxRate}
-                        defaultValue={null}
-                        value={formData.tax_rate}
-                        placeholder="请选择"
-                        hasUnlimited={false}
-                        required={true}
-                        className="select"
-                        onChange={e => {
-                          setFormData({ tax_rate: e })
-                        }}
-                      />
-                      <FormSelect
-                        yisaLabel="含税标志:"
-                        yisaData={taxType}
-                        defaultValue={null}
-                        value={formData.tax_type}
-                        placeholder="请选择"
-                        hasUnlimited={false}
-                        required={true}
-                        className="select"
-                        onChange={e => {
-                          setFormData({ tax_type: e })
-                        }}
-                      />
-                    </div>
-                    <div className="left-3">
-                      <FormInput
-                        yisaLabel="平台编码:"
-                        labelPosition="left"
-                        placeholder="请输入平台编码"
-                        isRequired={true}
-                        className="form-item"
-                        value={formData.code}
-                        maxLength={30}
-                        onChange={e => {
-                          setFormData({ code: e.target.value })
-                        }}
-                      />
-                      <FormInput
-                        yisaLabel="授权码:"
-                        labelPosition="left"
-                        placeholder="请输入授权码"
-                        isRequired={true}
-                        className="form-item"
-                        value={formData.auth_code}
-                        maxLength={36}
-                        onChange={e => {
-                          setFormData({ auth_code: e.target.value })
-                        }}
-                      />
-                      <FormInput
-                        yisaLabel="请求地址:"
-                        labelPosition="left"
-                        placeholder="请输入请求地址"
-                        isRequired={true}
-                        className="form-item"
-                        value={formData.request_url}
-                        maxLength={200}
-                        onChange={e => {
-                          setFormData({ request_url: e.target.value })
-                        }}
-                      />
-                      <FormInput
-                        yisaLabel="请求码:"
-                        labelPosition="left"
-                        placeholder="请输入请求码"
-                        isRequired={true}
-                        className="form-item"
-                        value={formData.request_code}
-                        showClose={true}
-                        maxLength={36}
-                        onChange={e => {
-                          setFormData({ request_code: e.target.value })
-                        }}
-                      />
-                      <FormInput
-                        yisaLabel="请求函数:"
-                        labelPosition="left"
-                        placeholder="请输入请求函数"
-                        isRequired={true}
-                        className="form-item"
-                        value={formData.request_func}
-                        showClose={true}
-                        maxLength={40}
-                        onChange={e => {
-                          setFormData({ request_func: e.target.value })
-                        }}
-                      />
-                      <FormInput
-                        yisaLabel="目标命名空间:"
-                        labelPosition="left"
-                        placeholder="请输入平台编码"
-                        isRequired={true}
-                        className="form-item"
-                        value={formData.namespace}
-                        showClose={true}
-                        maxLength={200}
-                        onChange={e => {
-                          setFormData({ namespace: e.target.value })
-                        }}
-                      />
-                    </div>
-
-                  </div>
-                  <div className="right">
-                    <div className="right-wrap">
-                      <FormInput
-                        yisaLabel="纳税人名称:"
-                        labelPosition="left"
-                        placeholder="请输入纳税人名称"
-                        isRequired={true}
-                        value={formData.tax_name}
-                        showClose={true}
-                        onChange={e => {
-                          setFormData({ tax_name: e.target.value })
-                        }}
-                      />
-                      <FormInput
-                        yisaLabel="纳税人识别号:"
-                        labelPosition="left"
-                        placeholder="请输入纳税人识别号"
-                        isRequired={true}
-                        value={formData.tax_num}
-                        showClose={true}
-                        onChange={e => {
-                          setFormData({ tax_num: e.target.value })
-                        }}
-                      />
-                      <FormInput
-                        yisaLabel="销贷方名称:"
-                        labelPosition="left"
-                        placeholder="请输入销贷方名称"
-                        isRequired={true}
-                        value={formData.sell_name}
-                        showClose={true}
-                        onChange={e => {
-                          setFormData({ sell_name: e.target.value })
-                        }}
-                      />
-                      <FormInput
-                        yisaLabel="销贷方识别号:"
-                        labelPosition="left"
-                        placeholder="请输入销贷方识别号"
-                        isRequired={true}
-                        value={formData.sell_num}
-                        showClose={true}
-                        onChange={e => {
-                          setFormData({ sell_num: e.target.value })
-                        }}
-                      />
-                      <FormInput
-                        yisaLabel="销贷方地址:"
-                        labelPosition="left"
-                        placeholder="请输入销贷方地址"
-                        isRequired={true}
-                        value={formData.sell_address}
-                        showClose={true}
-                        onChange={e => {
-                          setFormData({ sell_address: e.target.value })
-                        }}
-                      />
-                      <FormInput
-                        yisaLabel="销贷方电话:"
-                        labelPosition="left"
-                        placeholder="请输入销贷方电话"
-                        isRequired={true}
-                        value={formData.sell_phone}
-                        showClose={true}
-                        onChange={e => {
-                          setFormData({ sell_phone: e.target.value })
-                        }}
-                      />
-                      <FormInput
-                        yisaLabel="销贷方银行名称:"
-                        labelPosition="left"
-                        placeholder="请输入销贷方银行名称"
-                        isRequired={true}
-                        value={formData.sell_bank_name}
-                        showClose={true}
-                        onChange={e => {
-                          setFormData({ sell_bank_name: e.target.value })
-                        }}
-                      />
-                      <FormInput
-                        yisaLabel="销贷方银行账号:"
-                        labelPosition="left"
-                        placeholder="请输入贷方银行账号"
-                        isRequired={true}
-                        value={formData.sell_bank_num}
-                        showClose={true}
-                        onChange={e => {
-                          setFormData({ sell_bank_num: e.target.value })
-                        }}
-                      />
-                      <FormInput
-                        yisaLabel="收款人:"
-                        labelPosition="left"
-                        placeholder="请输入收款人"
-                        isRequired={true}
-                        value={formData.pay_name}
-                        showClose={true}
-                        onChange={e => {
-                          setFormData({ pay_name: e.target.value })
-                        }}
-                      />
-                      <FormInput
-                        yisaLabel="复核:"
-                        labelPosition="left"
-                        placeholder="请输入复核"
-                        isRequired={true}
-                        value={formData.check_name}
-                        showClose={true}
-                        onChange={e => {
-                          setFormData({ check_name: e.target.value })
-                        }}
-                      />
-                      <FormInput
-                        yisaLabel="开票人:"
-                        labelPosition="left"
-                        placeholder="请输入开票人"
-                        isRequired={true}
-                        value={formData.drawer_name}
-                        showClose={true}
-                        onChange={e => {
-                          setFormData({ drawer_name: e.target.value })
-                        }}
-                      />
-                      <FormInput
-                        yisaLabel="最小开票金额:"
-                        labelPosition="left"
-                        placeholder="请输入最小开票金额（0.01~1000）"
-                        value={formData.mini_amount}
-                        showClose={true}
-                        onChange={e => {
-                          setFormData({ mini_amount: e.target.value })
-                        }}
-                      />
-                      <FormInput
-                        yisaLabel="最大开票金额:"
-                        labelPosition="left"
-                        placeholder="请输入最大开票金额（0.01~1000）"
-                        value={formData.max_amount}
-                        onChange={e => {
-                          setFormData({ max_amount: e.target.value })
-                        }}
-                      />
-                    </div>
-
-                  </div>
-                </div>
-              </div>
-
-            </div>
-          </> : ''
-      }
-
-      {
-        checkVisible ?
-
-          <div id="check">
-            <div className="check-form">
-              <div className="btns">
-                <button className="btn" onClick={createOncancel}>返回</button>
-              </div>
-              <div className="container">
-                <div className="left">
-                  <div className="left-wrap">
-                    <div className="item"><div className="item-title">配置ID：</div>{records.info_id}</div>
-                    <div className="item"><div className="item-title">状态：</div>{records.status_name}</div>
-                    <div className="item"><div className="item-title">商户名称：</div>{records.tenantName}</div>
-                    <div className="item"><div className="item-title">发票平台：</div>{records.receipt_type_name}</div>
-                  </div>
-                  <div className="left-wrap">
-                    <div className="item"><div className="item-title">开票项目：</div>{records.invoice_item}</div>
-                    <div className="item"><div className="item-title">计税方式：</div>{records.tax_way}</div>
-                    <div className="item"><div className="item-title">税率（%）：</div>{records.tax_rate}</div>
-                    <div className="item"><div className="item-title">含税标志：</div>{records.tax_type}</div>
-                  </div>
-                  <div className="left-wrap">
-                    <div className="item"><div className="item-title">平台编码：</div>{records.code}</div>
-                    <div className="item"><div className="item-title">授权码：</div>{records.auth_code}</div>
-                    <div className="item"><div className="item-title">请求地址：</div>{records.request_url}</div>
-                    <div className="item"><div className="item-title">请求码：</div>{records.request_code}</div>
-                    <div className="item"><div className="item-title">请求函数：</div>{records.request_func}</div>
-                    <div className="item"><div className="item-title">目标命名空间：</div>{records.namespace}</div>
-                  </div>
-
-                </div>
-                <div className="right">
-                  <div className="right-wrap">
-                    <div className="item"><div className="item-title">纳税人名称：</div>{records.tax_name}</div>
-                    <div className="item"><div className="item-title">纳税人识别号：</div><span>{records.tax_num}</span></div>
-                    <div className="item"><div className="item-title">销货方名称：</div>{records.sell_name}</div>
-                    <div className="item"><div className="item-title">销货放识别号：</div>{records.sell_num}</div>
-                    <div className="item"><div className="item-title">销贷方地址：</div>{records.sell_address}</div>
-                    <div className="item"><div className="item-title">销贷方电话：</div>{records.sell_phone}</div>
-                    <div className="item"><div className="item-title">销贷方银行名称：</div>{records.sell_bank_name}</div>
-                    <div className="item"><div className="item-title">销贷方银行账号：</div>{records.sell_bank_num}</div>
-                    <div className="item"><div className="item-title">收款人：</div>{records.pay_name}</div>
-                    <div className="item"><div className="item-title">复核：</div>{records.check_name}</div>
-                    <div className="item"><div className="item-title">开票人：</div>{records.drawer_name}</div>
-                    <div className="item"><div className="item-title">最小开票金额：</div>{records.mini_amount}</div>
-                    <div className="item"><div className="item-title">最大开票金额：</div>{records.max_amount}</div>
-                    <div className="item"><div className="item-title">最后操作人：</div>{records.updatePerson}</div>
-                    <div className="item"><div className="item-title">最后修改时间：</div>{records.updateAt}</div>
-                    <div className="item"><div className="item-title">初始创建时间：</div>{records.create_time}</div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-          : ""
-      }
-
-    </div>
-  )
+    return <div>InvoiceConf</div>
 }
 
-export default InvoiceConf;
+export default InvoiceConf;
\ No newline at end of file
diff --git a/src/pages/MerchantMgm/MerchantAdmin/index.scss b/src/pages/MerchantMgm/MerchantAdmin/index.scss
index c1af0db..1838f71 100644
--- a/src/pages/MerchantMgm/MerchantAdmin/index.scss
+++ b/src/pages/MerchantMgm/MerchantAdmin/index.scss
@@ -3,320 +3,3 @@ $color-container-bg : var(--color-container-bg);
 $color-user-list-bg : var(--color-user-list-bg);
 $color-text : var(--color-text);
 $color-primary : var(--color-primary);
-
-#MerchantAdmin {
-  .panel {
-    width: 100%;
-    padding-top: 20px;
-    padding-left: 10px;
-    background: none;
-
-    .search-form {
-      margin: 5px 20px;
-
-      label {
-        // width: 82px;
-        width: 100%;
-        text-align-last: end;
-      }
-    }
-
-    .yisa-select {
-      width: 190px;
-
-      .ant-select-selector {
-        background: transparent;
-        border-color: var(--color-border);
-      }
-    }
-
-    .form-input {
-      width: 190px;
-      background: transparent;
-      border-color: var(--color-border);
-    }
-
-    .ant-select-arrow {
-      background: none !important;
-    }
-
-    .ant-input {
-      background: transparent;
-      border-color: var(--color-border);
-    }
-
-    .btnBox {
-      display: flex;
-      align-items: center;
-      // margin-left: 20px;
-
-      .btn {
-        margin: 5px 5px;
-        border-radius: 5px;
-        border: none;
-      }
-
-      .search-btn {
-        background-color: #409EFF;
-      }
-
-      .reset-btn {
-        color: #000;
-        background-color: #fff;
-      }
-
-      .create-btn {
-        background-color: #67C23A;
-
-      }
-    }
-
-
-    .panel-1 {
-      display: flex;
-    }
-
-    .panel-2 {
-      margin-top: 10px;
-      display: flex;
-      align-items: center;
-    }
-  }
-
-  .table {
-    width: 98%;
-    margin: 15px 10px 10px 15px;
-
-
-    .ant-table-thead {
-      th {
-        padding: 0px 16px;
-        height: 50px;
-      }
-
-      .ant-table-cell {
-        background: var(--color-table-header-bg) !important;
-        font-weight: 700;
-
-        &::before {
-          display: none;
-        }
-      }
-    }
-
-    .ant-table-tbody {
-      tr {
-        &:nth-child(2n) {
-          td {
-            background: #3E4557 !important;
-          }
-        }
-
-        &:hover {
-          td {
-            background: #3E4557 !important;
-          }
-        }
-
-        td {
-          background: #3E4557 !important;
-          border-bottom-color: #f2f2f2;
-        }
-      }
-    }
-
-    .ant-pagination-options {
-      .ant-select {
-        &:hover {
-          .ant-select-selector {
-            border-color: #f5f6f9;
-            box-shadow: none;
-          }
-        }
-      }
-
-      .ant-select-selector {
-        border-color: #f5f6f9;
-      }
-
-      .ant-select-focused {
-        .ant-select-selector {
-          box-shadow: none !important;
-          border-color: #f5f6f9 !important;
-        }
-      }
-
-      .ant-pagination-options-quick-jumper {
-        input {
-          background: #3E4557;
-          border-color: #f5f6f9;
-
-          &:focus {
-            box-shadow: none;
-          }
-        }
-      }
-    }
-  }
-
-  .table-status-normal {
-    width: 20px;
-    height: 20px;
-    border-radius: 50%;
-    border: 1px solid #67C23A;
-  }
-
-  .table-status-err {
-    width: 20px;
-    height: 20px;
-    border-radius: 50%;
-    border: 1px solid red;
-  }
-
-  .scheduleBtn {
-    background: #409eff;
-    border: none;
-    width: 50px;
-    border-radius: 4px;
-    cursor: pointer;
-  }
-
-  .warning {
-    span {
-      color: #fff;
-    }
-
-    img {
-      margin: 0 10px;
-    }
-  }
-
-
-  #create {
-    .create-form {
-      margin: 0px 20px;
-      border-radius: 5px;
-      border: 1px solid #C0CCDA;
-
-      .btns {
-        display: flex;
-        margin: 10px 0 20px 200px;
-
-        .btn {
-          width: 70px;
-          height: 36px;
-          border: none;
-          border-radius: 4px;
-          text-align: center;
-          cursor: pointer;
-        }
-
-        .btn-1 {
-          color: #fff;
-          background-color: #409EFF;
-          margin-right: 30px;
-        }
-
-        .btn-2 {
-          background-color: #fff;
-          color: #000;
-        }
-      }
-
-      .container {
-        padding: 20px 20px;
-        display: flex;
-
-        .ant-select-selector {
-          border-color: #666d7d;
-        }
-
-        .ant-select-arrow {
-          background: none !important;
-        }
-
-        .ant-input {
-          border-color: #666d7d;
-        }
-
-        .form-wrap {
-          margin: 30px 0 0 30px;
-        }
-
-        .ant-form-item-label {
-          width: 100px;
-          text-align-last: end;
-        }
-
-
-      }
-    }
-  }
-
-
-  #check {
-    .check-form {
-      .btns {
-        display: flex;
-        justify-content: end;
-        margin-right: 20px;
-        margin-top: 10px;
-
-        .btn {
-          width: 70px;
-          height: 36px;
-          border: none;
-          border-radius: 4px;
-          text-align: center;
-          cursor: pointer;
-          background-color: #fff;
-          color: #000;
-        }
-
-      }
-
-      .container {
-        padding: 20px 20px;
-        margin: 10px 20px;
-        border: 1px solid #C0CCDA;
-        border-radius: 5px;
-
-        .title {
-          display: flex;
-          align-items: center;
-          font-size: 18px;
-          color: #fff;
-          font-weight: 500;
-
-
-          &::before {
-            content: '';
-            display: inline-block;
-            margin-right: 10px;
-            width: 5px;
-            height: 20px;
-            border-radius: 10px;
-            background-color: #409eff;
-          }
-        }
-
-        .item {
-          display: flex;
-          margin: 20px;
-          line-height: 34px;
-          font-size: 16px;
-
-          .item-title {
-            display: inline-block;
-            margin-right: 10px;
-            width: 100px;
-            text-align-last: end;
-            white-space: nowrap;
-          }
-        }
-
-      }
-    }
-  }
-
-}
diff --git a/src/pages/MerchantMgm/MerchantAdmin/loadable.jsx b/src/pages/MerchantMgm/MerchantAdmin/loadable.jsx
index 1d2f7d5..0891693 100644
--- a/src/pages/MerchantMgm/MerchantAdmin/loadable.jsx
+++ b/src/pages/MerchantMgm/MerchantAdmin/loadable.jsx
@@ -1,866 +1,15 @@
 import React, { useState, useRef, useEffect } from "react";
-import { Input, Select, message, Popover, Pagination, Table,  Form, Radio, Modal, Button } from "antd";
-import { pageSizeOptions } from '@/config/character.config.js'
-import moment from 'moment'
-import { useSetState } from 'ahooks';
-import ajax from "@/services"
-import "./index.scss";
-import status_normal from '@/assets/images/status_normal.png'
-import status_err from '@/assets/images/status_err.png'
-import warningIcon from "@/assets/images/warningIcon.png";
-import { SearchOutlined} from '@ant-design/icons';
-
+// import {  message, Pagination, Table, Space, Modal, } from "antd";
+// import { dictionary, utils } from "@/config/common";
+// import moment from 'moment'
+// import {   useSessionStorageState, useUpdateEffect, useSize, useUpdate } from 'ahooks';
+// import ajax from "@/services"
+// import {  FormInput, FormSelect, OptionPanel, ResultPanel, FormSliderPicker, AreaCascader, ImgResize, ImgZoom, } from "@/components"
+// import "./index.scss";
+// import errorImg from "@/assets/images/layout/error.png"
+// import {  useLocation } from "react-router-dom";
 function MerchantAdmin() {
-  //默认
-  const parameter = {
-    id: 1,
-    operatorid: '',//商户ID
-    shop_name: '',//商户名称
-    manage_type: '',//经营业务类型
-    manage_type_name: "",//经营业务类型
-    account: "",//管理员账号
-    username: "",//姓名
-    phone: "",//电话
-    email: "",//邮箱
-    sex: "",//性别
-    status: 0,//状态
-    create_time: "",//创建时间
-    start: moment().subtract(90, 'days').startOf('day').format('YYYY-MM-DD HH:mm:ss'),
-    end: moment().format('YYYY-MM-DD HH:mm:ss'),
-    pn: 1,
-    page_size: Number(pageSizeOptions[0]),  // 每页条数
-  }
-  //商户名称下拉
-  const [tenantPull, setTenantPull] = useState([])
-  //等待状态
-  const [loading, setLoading] = useState(false) // 等待状态
-  //表格数据
-  const [tableData, setTableData] = useState([])
-  //检索表单
-  const [formData, setFormData] = useSetState(parameter)
-  const [lastFormData, setLastFormData] = useState(formData)
-  const lastFormDataRef = useRef(formData)
-
-  const [searchForm] = Form.useForm()
-  //是否第一次检索表单
-  const [isFirst,setIsFirst]=useState(false)
-  //查看表单记录
-  const [records, setRecords] = useState({})
-  //总条数
-  const [total, setTotal] = useState()
-  //创建管理员开关
-  const [createVisible, setCreateVisible] = useState(false)
-  //编辑开关
-  const [updateVisible, setUpdateVisible] = useState(false)
-  //查看开关
-  const [checkVisible, setCheckVisible] = useState(false)
-  //编辑表单
-  const [updateForm] = Form.useForm()
-  //性别单选
-  const [sexValue, setSexValue] = useState(1);
-  //重置密码确认框
-  const [confirm, setConfirm] = useState(false)
-  //禁用确认框
-  const [banBtn, setBanBtn] = useState(false)
-  //启用确认框
-  const [startBtn, setStartBtn] = useState(false)
-  //id
-  const [ID, setID] = useState()
-  //表头
-  const columns = [
-    {
-      title: '序号',
-      dataIndex: 'id',
-      key: 'id',
-      align: "center",
-    },
-    {
-      title: '商户名称',
-      key: 'shop_name',
-      dataIndex: 'shop_name',
-      align: "center",
-    },
-    {
-      title: '经营业务类型',
-      key: 'manage_type_name',
-      dataIndex: 'manage_type_name',
-      align: "center",
-    },
-    {
-      title: '管理员账号',
-      key: 'account',
-      dataIndex: 'account',
-      align: "center",
-    },
-    {
-      title: '管理员姓名',
-      key: 'username',
-      dataIndex: 'username',
-      align: "center",
-    },
-    {
-      title: '手机号',
-      key: 'phone',
-      dataIndex: 'phone',
-      align: "center",
-    },
-    {
-      title: '邮箱',
-      key: 'email',
-      dataIndex: 'email',
-      align: "center",
-    },
-    {
-      title: '性别',
-      key: 'sex_status_name',
-      dataIndex: 'sex_status_name',
-      align: "center",
-    },
-    {
-      title: '添加时间',
-      key: 'create_time',
-      dataIndex: 'create_time',
-      align: "center",
-    },
-    {
-      title: '状态',
-      key: 'user_status_name',
-      dataIndex: 'user_status_name',
-      align: "center",
-      render: (value, row, index) => {
-        return (
-          <>
-            {
-              row.user_status == 1 ?
-                <img src={status_normal}></img> :
-                <img src={status_err}></img>
-            }
-          </>
-        )
-      }
-    },
-    {
-      title: '操作',
-      key: 'operation',
-      dataIndex: 'operation',
-      align: "center",
-      render: (text, record, index) => {
-        return <>
-          <Popover content={
-            <div className="operateBtn" style={{ cursor: "pointer" }} trigger="hover">
-              <div onClick={() => { checkBtn(index) }}>详情</div>
-              <div onClick={() => { resetPassWordBtn(index) }}>重置密码</div>
-              {
-                record.user_status == 2 ?
-                  <>
-                    <div onClick={() => { updateBtn(record) }}>编辑</div>
-                    <div onClick={() => { stopBtn(record) }}>启用</div>
-                  </> : <div onClick={() => { stopBtn(record) }}>停用</div>
-              }
-            </div>}>
-            <button className="scheduleBtn">操作</button>
-          </Popover>
-        </>
-      },
-    },
-  ]
-
-  //状态类型下拉框
-  const statusType = [
-    {
-      label: "全部",
-      value: 0
-    },
-    {
-      label: "启用",
-      value: 1
-    },
-    {
-      label: "禁用",
-      value: 2
-    },
-  ]
-
-  //获取商户名称的下拉
-  const getTenantNamePull = () => {
-    ajax.getTenantPull().then(
-      res => {
-        if (res.status == 20000) {
-          setTenantPull(res.data)
-        } else {
-          message.error(res.message)
-        }
-      }
-    ).catch(
-      err => { console.log(err); }
-    )
-  }
-
-  //获取表格数据
-  const getTable = () => {
-    const value =searchForm.getFieldsValue(["shop_name","phone","username","account","status"])
-    console.log(value);
-    setLoading(true)
-    ajax.getMerchantAdminTable(value).then(
-      res => {
-        if (res.status == 20000) {
-          setTableData(res.data.list)
-          setTotal(res.data.total_records)
-          setIsFirst(true)
-          if (banBtn) {
-            setTimeout(
-              () => {
-                message.success("禁用成功", 2.5)
-              }, 1000
-            )
-            setBanBtn(false)
-          }
-          if (startBtn) {
-            setTimeout(
-              () => {
-                message.success("启用成功", 2.5)
-              }, 1000
-            )
-            setStartBtn(false)
-          }
-        } else {
-          message.error(res.message)
-        }
-        setLoading(false)
-      }
-    ).catch(
-      (err) => {
-        console.log(err)
-      }
-    )
-  }
-
-  //搜索数据
-  const getSearchData = () => {
-    getTable()
-  }
-
-  //重置数据
-  const getResetData = () => {
-    searchForm.setFieldsValue(
-      {
-        shop_name: '',
-        phone: '',
-        account: '',
-        username: '',
-        status: 0
-      }
-    )
-    if(isFirst){
-      getTable()
-    }
-  }
-
-  //切换分页
-  const changePn = (pn, length) => {
-    if (lastFormData.page_size === length) {
-      setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
-      lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn })
-      getTable(Object.assign({}, lastFormData, { pn: pn }))
-    }
-  }
-  //切换每页条数
-  const changeLength = (pn, length) => {
-    setFormData(Object.assign({}, formData, { pn: 1, page_size: length }))
-    setLastFormData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
-    lastFormDataRef.current = Object.assign({}, lastFormData, { pn: 1, page_size: length })
-    getTable(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
-  }
-
-  //创建管理员
-  const createData = () => {
-    setCreateVisible(true)
-    updateForm.setFieldsValue(
-      {
-        shop_name: '',
-        phone: '',
-        account: '',
-        _name: '',
-        email: '',
-        sex_status: ''
-      }
-    )
-  }
-  //点击取消-返回上一层
-  const createOncancel = () => {
-    setCreateVisible(false)
-    setUpdateVisible(false)
-    setCheckVisible(false)
-  }
-
-  //编辑管理员-提交按钮
-  const submitUpdate = () => {
-    const value = updateForm.getFieldsValue(['shop_name', 'phone', 'name', 'account', 'email', 'sex_status'])
-    ajax.updateMerchantAdmin(value).then(
-      res => {
-        if (res.status == 20000) {
-          setCreateVisible(false)
-          setUpdateVisible(false)
-          message.success("已提交", 2.5)
-        } else {
-          message.error(res.message)
-        }
-      }
-    ).catch(
-      err => {
-        console.log(err);
-      }
-    )
-
-  }
-  //创建新管理员-提交按钮
-  const submitAdd = () => {
-    const value = updateForm.getFieldsValue(['shop_name', 'phone', '_name', 'account', 'email', 'sex_status'])
-    ajax.addMerchantAdmin(value).then(
-      res => {
-        if (res.status == 20000) {
-          setCreateVisible(false)
-          setUpdateVisible(false)
-          message.success("已提交", 2.5)
-        } else {
-          message.error(res.message)
-        }
-      }
-    ).catch(
-      err => {
-        console.log(err);
-      }
-    )
-
-  }
-  //编辑
-  function updateBtn(record) {
-    setUpdateVisible(true)
-    setFormData(record)
-    //数据回显
-    updateForm.setFieldsValue(
-      {
-        shop_name: record.shop_name,
-        phone: record.phone,
-        account: record.account,
-        _name: record.username,
-        email: record.email,
-        sex_status: parseInt(record.sex_status)
-      }
-    )
-
-  }
-  //查看
-  function checkBtn(index) {
-    setCheckVisible(true)
-    ajax.checkMerchantAdmin(index).then(
-      res => {
-        if (res.status == 20000) {
-          setRecords(res.data)
-        } else {
-          message.error(res.message)
-        }
-      }
-    ).catch(
-      err => { console.log(err); }
-    )
-  }
-  //启用/停用
-  function stopBtn(record) {
-    if (record.user_status == 1) {
-      //禁用
-      setBanBtn(true)
-    } else {
-      //启用
-      setStartBtn(true)
-    }
-    setID(record.id)
-  }
-
-  const handleAdminStatus = () => {
-    ajax.updateAdminStatus(ID).then(
-      res => {
-        if (res.status == 20000) {
-          getTable()
-        } else {
-          message.error(res.message)
-        }
-      }
-    ).catch(
-      err => {
-        console.log(err);
-      }
-    )
-  }
-  //重置密码
-  const resetPassWordBtn = (index) => {
-    setConfirm(true)
-    setID(index)
-  }
-
-  const handleReset = () => {
-    ajax.resetPassWord(ID).then(
-      res => {
-        if (res.status == 20000) {
-          getTable()
-          setConfirm(false)
-          message.success("重置成功", 2.5)
-        } else {
-          message.error(res.message)
-        }
-      }
-    ).catch(
-      err => { console.log(err); }
-    )
-  }
-  //关闭重置密码确认框,关闭禁用确认框
-  const handleCancel = () => {
-    setConfirm(false)
-    setBanBtn(false)
-    setStartBtn(false)
-    message.warning("已取消操作", 2.5)
-  }
-
-  //性别单选框改变
-  const onChange = (e) => {
-    setSexValue(e.target.value);
-  };
-  //新增--商户名选择搜索框
-  const filterOption = (input, option) =>
-    (option?.label ?? '').toLowerCase().includes(input.toLowerCase());
-
-  useEffect(
-    () => {
-      getTenantNamePull()
-    }, []
-  )
-  return (
-    <div id="MerchantAdmin" >
-      {
-        !createVisible && !updateVisible && !checkVisible ?
-          <>
-            <div className="panel">
-              <div className="panel-1">
-                <Form
-                  form={searchForm}
-                  layout="inline"
-                >
-                  <Form.Item
-                    label="商户名称："
-                    name="shop_name"
-                    className="search-form"
-                  >
-                    <Select
-                      className="yisa-select"
-                      options={tenantPull}
-                      placeholder="请选择"
-                    />
-                  </Form.Item>
-                  <Form.Item
-                    label="手机号："
-                    name="phone"
-                    className="search-form"
-                    rules={[
-                      {
-                        validator: (rule, value) => {
-                          let reg = new RegExp(/^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/);
-                          if (!reg.test(value)) {
-                            return Promise.reject('手机号码不合法');
-                          }  else {
-                            return Promise.resolve();
-                          }
-                        }
-                      },
-                    ]}
-                  >
-                    <Input
-                      placeholder="请输入手机号"
-                    />
-                  </Form.Item>
-                  <Form.Item
-                    label="姓名："
-                    name="username"
-                    className="search-form"
-                  >
-                    <Input
-                      placeholder="请输入姓名"
-                    />
-                  </Form.Item>
-                </Form>
-              </div>
-              <div className="panel-2">
-                <Form
-                form={searchForm}
-                layout="inline"
-                initialValues={{
-                  status: statusType[0].value,
-                }}
-                >
-                  <Form.Item
-                    label="管理员账号："
-                    name="account"
-                    className="search-form"
-                    rules={[
-                      {
-                        validator: (rule, value) => {
-                          let reg = new RegExp(/^[0-9]+$/);
-                          if (!reg.test(value)) {
-                            return Promise.reject('管理员账号不合法');
-                          } else {
-                            return Promise.resolve();
-                          }
-                        }
-                      },
-                    ]}
-                  >
-                    <Input
-                      className="form-input"
-                      placeholder="请输入管理员账号"
-                      // onBlur={handleBlurNumber}
-                    />
-                  </Form.Item>
-                  <Form.Item
-                    label="状态："
-                    name="status"
-                    className="search-form"
-                  >
-                    <Select
-                      className="yisa-select"
-                      options={statusType}
-                      placeholder="请选择"
-                    />
-                  </Form.Item>
-                  <Form.Item
-                  className="btnBox"
-                  >
-                    <Button type="primary" className="search-btn btn" icon={<SearchOutlined />} onClick={() => { getSearchData() }}>
-                      搜索
-                    </Button>
-                    <Button type="primary" className="reset-btn btn" onClick={() => { getResetData() }}>
-                      条件重置
-                    </Button>
-                    <Button type="primary" className="create-btn btn" onClick={() => { createData() }}>
-                      创建用户
-                    </Button>
-                  </Form.Item>
-                </Form>
-              </div>
-            </div>
-
-            <Table
-              columns={columns}
-              className="table"
-              pagination={false}
-              dataSource={tableData}
-              loading={loading}
-            ></Table>
-            <Pagination
-              className="pagination-common"
-              showSizeChanger
-              showQuickJumper
-              showTotal={() => {
-                if (total) {
-                  return `共 ${total} 条`
-                }
-                else return `共 0 条`
-              }
-              }
-              total={total}
-              current={formData.pn}
-              pageSize={formData.page_size}
-              pageSizeOptions={pageSizeOptions}
-              onChange={changePn}
-              onShowSizeChange={changeLength}
-            />
-            {
-              confirm ?
-                <Modal
-                  title="提示"
-                  open={confirm}
-                  onCancel={handleCancel}
-                  width={400}
-                  getContainer={document.getElementById('MerchantAdmin')}
-                  footer={
-                    [
-                      <Button key="back" onClick={handleCancel} style={{ color: "#3f3d3d" }}>
-                        取消
-                      </Button>,
-                      <Button key="submit" type="primary" onClick={handleReset} style={{ background: "#409EFF", color: "#fff" }}>
-                        确定
-                      </Button>,
-                    ]
-                  }
-                >
-                  <div className="warning">
-                    <img src={warningIcon}></img>
-                    <span>此操作将重置该用户密码, 是否继续?</span>
-                  </div>
-                </Modal>
-                : ''
-            }
-            {
-              banBtn ?
-                <Modal
-                  title="提示"
-                  open={banBtn}
-                  onCancel={handleCancel}
-                  width={400}
-                  getContainer={document.getElementById('MerchantAdmin')}
-                  footer={
-                    [
-                      <Button key="back" onClick={handleCancel} style={{ color: "#3f3d3d" }}>
-                        取消
-                      </Button>,
-                      <Button key="submit" type="primary" onClick={handleAdminStatus} style={{ background: "#409EFF", color: "#fff" }}>
-                        确定
-                      </Button>,
-                    ]
-                  }
-                >
-                  <div className="warning">
-                    <img src={warningIcon}></img>
-                    <span>此操作将禁用该用户, 是否继续?</span>
-                  </div>
-                </Modal> : ''
-            }
-            {
-              startBtn ?
-                <Modal
-                  title="提示"
-                  open={startBtn}
-                  onCancel={handleCancel}
-                  width={400}
-                  getContainer={document.getElementById('MerchantAdmin')}
-                  footer={
-                    [
-                      <Button key="back" onClick={handleCancel} style={{ color: "#3f3d3d" }}>
-                        取消
-                      </Button>,
-                      <Button key="submit" type="primary" onClick={handleAdminStatus} style={{ background: "#409EFF", color: "#fff" }}>
-                        确定
-                      </Button>,
-                    ]
-                  }
-                >
-                  <div className="warning">
-                    <img src={warningIcon}></img>
-                    <span>此操作将启用该用户, 是否继续?</span>
-                  </div>
-                </Modal> : ''
-            }
-          </> : ''
-      }
-
-      {
-        createVisible || updateVisible ?
-          <div id="create">
-            <div className="create-form">
-              <div className="container">
-                {
-                  createVisible ?
-                    <Form
-                      form={updateForm}
-                      labelAlign='left'
-                      labelCol={{ span: 8 }}
-                      wrapperCol={{ span: 16 }}
-                      style={{ width: 400 }}
-                      initialValues={{ sex_status: '1' }}
-                      className="form-wrap"
-                    >
-                      <Form.Item
-                        label="商户："
-                        name="shop_name"
-                        required={true}
-                        rules={[{ required: true }]}
-                      >
-                        <Select
-                          filterOption={filterOption}
-                          optionFilterProp="label"
-                          showSearch
-                          options={tenantPull}
-                        >
-                        </Select>
-                      </Form.Item>
-
-                      <Form.Item
-                        label="手机号码"
-                        name="phone"
-                        required={true}
-                        validateFirst={true} // 出错时两个校验分别生效
-                        rules={[
-                          {
-                            validator: (rule, value) => {
-                              let reg = new RegExp(/^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/);
-                              if (!reg.test(value)) {
-                                return Promise.reject('手机号码不合法');
-                              } else if (value = '') {
-                                return Promise.reject('手机号码不能为空');
-                              } else {
-                                return Promise.resolve();
-                              }
-                            }
-                          },
-                        ]}
-
-                      >
-                        <Input placeholder="请输入手机号码" />
-                      </Form.Item>
-
-                      <Form.Item
-                        label="登录名"
-                        name="account"
-                        required={true}
-                        rules={[{ required: true }]}
-                      >
-                        <Input placeholder="请输入登录名" />
-                      </Form.Item>
-
-                      <Form.Item
-                        label="姓名"
-                        name="_name"
-                        required={true}
-                        rules={[{ required: true }]}
-                      >
-                        <Input placeholder="请输入姓名" />
-                      </Form.Item>
-
-                      <Form.Item
-                        label="邮箱"
-                        name="email"
-                      >
-                        <Input placeholder="请输入邮箱" />
-                      </Form.Item>
-
-                      <Form.Item
-                        label="性别"
-                        name="sex_status"
-                      >
-                        <Radio.Group onChange={onChange} value={sexValue}>
-                          <Radio value={1}>男</Radio>
-                          <Radio value={2}>女</Radio>
-                        </Radio.Group>
-                      </Form.Item>
-
-                    </Form> :
-                    <Form
-                      form={updateForm}
-                      labelAlign='left'
-                      labelCol={{ span: 8 }}
-                      wrapperCol={{ span: 16 }}
-                      style={{ width: 400 }}
-                      initialValues={{ sex_status: '1' }}
-                      className="form-wrap"
-                    >
-                      <Form.Item
-                        label="商户："
-                        name="shop_name"
-                      >
-                        {formData.shop_name}
-                      </Form.Item>
-
-                      <Form.Item
-                        label="手机号码"
-                        name="phone"
-                        required={true}
-                        validateFirst={true} // 出错时两个校验分别生效
-                        rules={[
-                          {
-                            validator: (rule, value) => {
-                              let reg = new RegExp(/^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/);
-                              if (!reg.test(value)) {
-                                return Promise.reject('手机号码不合法');
-                              } else if (value = '') {
-                                return Promise.reject('手机号码不能为空');
-                              } else {
-                                return Promise.resolve();
-                              }
-                            }
-                          },
-                        ]}
-
-                      >
-                        <Input placeholder="请输入手机号码" />
-                      </Form.Item>
-
-                      <Form.Item
-                        label="登录名"
-                        name="account"
-                        required={true}
-                        rules={[{ required: true }]}
-                      >
-                        {formData.account}
-                      </Form.Item>
-
-                      <Form.Item
-                        label="姓名"
-                        name="_name"
-                        required={true}
-                        rules={[{ required: true }]}
-                      >
-                        <Input placeholder="请输入姓名" />
-                      </Form.Item>
-
-                      <Form.Item
-                        label="邮箱"
-                        name="email"
-                      >
-                        <Input placeholder="请输入邮箱" />
-                      </Form.Item>
-
-                      <Form.Item
-                        label="性别"
-                        name="sex_status"
-                      >
-                        <Radio.Group onChange={onChange} value={sexValue}>
-                          <Radio value={1}>男</Radio>
-                          <Radio value={2}>女</Radio>
-                        </Radio.Group>
-                      </Form.Item>
-
-                    </Form>
-                }
-              </div>
-              {
-                createVisible && !updateVisible ?
-                  <div className="btns">
-                    <Button className="btn-1 btn" onClick={submitAdd} type="primary" htmlType="submit">提交</Button>
-                    <Button className="btn-2 btn" onClick={createOncancel}>取消</Button>
-                  </div> :
-                  <div className="btns">
-                    <Button className="btn-1 btn" onClick={submitUpdate} type="primary" htmlType="submit">提交</Button>
-                    <Button className="btn-2 btn" onClick={createOncancel}>取消</Button>
-                  </div>
-              }
-
-            </div>
-
-          </div>
-          : ''
-      }
-
-      {
-        checkVisible ?
-          <div id="check">
-            <div className="check-form">
-              <div className="btns">
-                <button className="btn" onClick={createOncancel}>返回</button>
-              </div>
-              <div className="container">
-                <div className="title">系统管理员详情</div>
-                <div className="item"><div className="item-title">商户：</div><span>{records.shop_name}</span></div>
-                <div className="item"><div className="item-title">手机号：</div><span>{records.phone}</span></div>
-                <div className="item"><div className="item-title">登录名：</div><span>{records.account}</span></div>
-                <div className="item"><div className="item-title">姓名：</div><span>{records.username}</span></div>
-                <div className="item"><div className="item-title">邮箱：</div><span>{records.email}</span></div>
-                <div className="item"><div className="item-title">性别：</div><span>{records.sex_status}</span></div>
-              </div>
-            </div>
-          </div>
-          : ''
-      }
-
-    </div>
-  )
+    return <div>MerchantAdmin</div>
 }
 
-export default MerchantAdmin;
+export default MerchantAdmin;
\ No newline at end of file
diff --git a/src/pages/MerchantMgm/MerchantInfo/index.scss b/src/pages/MerchantMgm/MerchantInfo/index.scss
index b98d489..2f5baaa 100644
--- a/src/pages/MerchantMgm/MerchantInfo/index.scss
+++ b/src/pages/MerchantMgm/MerchantInfo/index.scss
@@ -9,7 +9,7 @@ $color-primary : var(--color-primary);
     width: 100%;
     height: 100px;
     padding-top: 20px;
-    padding-left: 20px;
+    padding-left: 10px;
     background: none;
 
     .panel-1 {
@@ -56,7 +56,7 @@ $color-primary : var(--color-primary);
     }
 
     .panel-2 {
-      margin-top: 15px;
+      margin-top: 10px;
       display: flex;
       align-items: center;
 
@@ -250,16 +250,7 @@ $color-primary : var(--color-primary);
                   text-align: right;
                 }
               }
-              .businessType{
-                margin-left: 30px;
-                .ant-select-selector{
-                  background-color: #3E4557;
-                  border-color: var(--color-border);
-                }
-                .ant-select-selection-item{
-                  border: none;
-                }
-              }
+
               .select {
                 margin: 10px 5px 20px 30px;
 
@@ -273,6 +264,8 @@ $color-primary : var(--color-primary);
                 display: flex;
                 align-items: center;
                 margin: 10px 5px 20px 30px;
+                // position: relative;
+                // left: 18%;
 
                 label {
                   color: #fff;
@@ -299,7 +292,7 @@ $color-primary : var(--color-primary);
 
           .accountInformation {
             padding: 10px 5px 5px 10px;
-            height: 540px;
+            height: 510px;
             background-color: #3E4557;
 
             .account {
@@ -353,11 +346,6 @@ $color-primary : var(--color-primary);
                   }
                 }
 
-                .select-form-item {
-                  width: 270px;
-                  margin-left: auto;
-                }
-
                 .license {
                   display: flex;
                   position: relative;
@@ -392,14 +380,10 @@ $color-primary : var(--color-primary);
             margin-bottom: 10px;
 
             .business {
-              display: flex;
-              flex-direction: column;
-              .business-wrap{
-                width: 420px;
-                margin-left: 83px;
-              }
               .cc-form-input {
                 margin: 20px 5px 40px 30px;
+                position: relative;
+                left: -37%;
               }
 
             }
@@ -407,34 +391,32 @@ $color-primary : var(--color-primary);
 
           .clearinformation {
             padding: 10px 5px 5px 10px;
-            // height: 550px;
+            height: 550px;
             background-color: #3E4557;
 
             .clear {
               .cc-form-input {
                 margin: 20px 5px 40px 30px;
+                position: relative;
+                left: -37%;
               }
-              .clear-wrap{
-                margin-bottom: 40px;
-                width: 420px;
-                margin-left: 83px;
 
-                .select {
-                  margin: 10px 5px 20px 30px;
-                }
-              }
               .clear-select {
                 margin-bottom: 40px;
-                width: 420px;
+                position: relative;
+                left: -37%;
 
                 .select {
                   margin: 10px 5px 20px 30px;
                 }
               }
-              .form-item{
-                width: 420px;
-                margin-left: 83px;
+
+              .form-item {
+                position: relative;
+                left: -37%;
+
               }
+
               .special {
                 display: grid;
                 grid-template-columns: 60% 40%;
@@ -458,7 +440,11 @@ $color-primary : var(--color-primary);
                 }
               }
             }
+
+
           }
+
+
         }
 
         .title {
@@ -482,199 +468,4 @@ $color-primary : var(--color-primary);
     }
   }
 
-  #check {
-    height: 800px;
-    overflow-y: scroll;
-
-    .check-form {
-      .btns {
-        display: flex;
-        justify-content: end;
-        margin-right: 20px;
-        margin-top: 10px;
-
-        .btn {
-          width: 70px;
-          height: 36px;
-          border: none;
-          border-radius: 4px;
-          text-align: center;
-          cursor: pointer;
-          background-color: #fff;
-          color: #000;
-        }
-
-      }
-
-      .container {
-        padding: 20px 20px;
-        display: flex;
-
-        .left {
-          width: 50%;
-          margin-right: 20px;
-
-          .systemInformation {
-            padding: 10px 5px 5px 10px;
-            height: 310px;
-            background-color: #3E4557;
-            margin-bottom: 20px;
-
-            .system {
-              display: flex;
-              flex-direction: column;
-
-              .system-wrap {
-                width: 300px;
-
-                .item {
-                  margin: 15px;
-
-                  .item-title {
-                    display: inline-block;
-                    width: 100px;
-                    text-align-last: end;
-                    white-space: nowrap;
-                  }
-                }
-
-                .text-green {
-                  color: #67C23A;
-                }
-
-                .text-red {
-                  color: red;
-                }
-              }
-
-            }
-          }
-
-          .accountInformation {
-            padding: 10px 5px 5px 10px;
-            height: 370px;
-            background-color: #3E4557;
-
-            .account {
-              display: flex;
-              flex-direction: column;
-
-              .account-wrap {
-                width: 300px;
-
-                .item {
-                  margin: 20px;
-                  line-height: 45px;
-
-                  .item-title {
-                    display: inline-block;
-                    width: 100px;
-                    text-align-last: end;
-                    white-space: nowrap;
-                  }
-                }
-              }
-            }
-          }
-        }
-
-        .right {
-          width: 50%;
-
-          .businessInformation {
-            padding: 10px 5px 5px 10px;
-            height: 170px;
-            background-color: #3E4557;
-            margin-bottom: 10px;
-
-            .business {
-              display: flex;
-              flex-direction: column;
-
-              .business-wrap {
-                width: 300px;
-
-                .item {
-                  margin: 20px;
-
-                  .item-title {
-                    display: inline-block;
-                    width: 100px;
-                    text-align-last: end;
-                    white-space: nowrap;
-                  }
-                }
-              }
-
-            }
-          }
-
-          .clearInformation {
-            padding: 10px 5px 5px 10px;
-            height: 450px;
-            background-color: #3E4557;
-            margin-bottom: 10px;
-
-            .clear {
-              display: flex;
-              flex-direction: column;
-
-              .clear-wrap {
-                width: 300px;
-
-                .item {
-                  margin: 20px;
-                  line-height: 45px;
-
-                  .item-title {
-                    display: inline-block;
-                    width: 100px;
-                    text-align-last: end;
-                    white-space: nowrap;
-                  }
-                }
-              }
-            }
-
-          }
-
-          .operationInformation {
-            padding: 10px 5px 5px 10px;
-            height: 200px;
-            background-color: #3E4557;
-
-            .operation {
-              display: flex;
-              flex-direction: column;
-
-              .operation-wrap {
-                width: 300px;
-
-                .item {
-                  margin: 20px;
-
-                  .item-title {
-                    display: inline-block;
-                    width: 100px;
-                    text-align-last: end;
-                    white-space: nowrap;
-                  }
-                }
-              }
-            }
-          }
-
-        }
-
-        .title {
-          font-size: 18px;
-          color: #fff;
-          font-weight: 500;
-        }
-
-
-      }
-    }
-  }
-
 }
diff --git a/src/pages/MerchantMgm/MerchantInfo/loadable.jsx b/src/pages/MerchantMgm/MerchantInfo/loadable.jsx
index 2037ddd..3aebc6e 100644
--- a/src/pages/MerchantMgm/MerchantInfo/loadable.jsx
+++ b/src/pages/MerchantMgm/MerchantInfo/loadable.jsx
@@ -1,11 +1,11 @@
 import React, { useState, useRef, useEffect } from "react";
-import { Input, Select, message, Popover, Pagination, Table, DatePicker, Upload, TreeSelect, Modal, Cascader, Button, Form } from "antd";
+import { Input, Select, message, Popover, Pagination, Table, DatePicker, Upload, Space, Modal, Cascader, Button } from "antd";
 // import { dictionary, utils } from "@/config/common";
 import { pageSizeOptions } from '@/config/character.config.js'
 import { LoadingOutlined, PlusOutlined } from '@ant-design/icons';
 import moment from 'moment'
 import { FormInput, FormSelect, ImgUpload, SystemSearch, FormDatePicker, Icon, ResultFlow, ExportBtn, SearchTabs } from "@/components"
-import { useSessionStorageState, useUpdateEffect, useSize, useUpdate, useSetState } from 'ahooks';
+import { useSessionStorageState, useUpdateEffect, useSize, useUpdate } from 'ahooks';
 import ajax from "@/services"
 import "./index.scss";
 import { SearchOutlined, DeleteOutlined } from '@ant-design/icons';
@@ -15,6 +15,7 @@ import { assign } from "lodash";
 
 const { RangePicker } = DatePicker;
 function MerchantInfo() {
+  const [messageApi, contextHolder] = message.useMessage()
   //默认
   const parameter = {
     tenantId: '',//商户ID
@@ -22,11 +23,9 @@ function MerchantInfo() {
     tenantCode: '',//商户编码
     tenantType: '',//商户类型1234
     shop_type_name: '',//平台
-    type: 1,//商户下拉框
-    type_name: '',//商户下拉后的输入值
-    businessType: [],
+    tenantNamePull: '',//商户下拉框
+    businessType: '',
     status: '',
-    status_name: '',
     start: moment().subtract(90, 'days').startOf('day').format('YYYY-MM-DD HH:mm:ss'),
     end: moment().format('YYYY-MM-DD HH:mm:ss'),
     pn: 1,
@@ -49,9 +48,7 @@ function MerchantInfo() {
   const [formData, setFormData] = useState(parameter)
   const [lastFormData, setLastFormData] = useState(formData)
   const lastFormDataRef = useRef(formData)
-
-  const [selectForm] = Form.useForm()
-  //查看表单记录
+  //表单记录
   const [records, setRecords] = useState({})
   //增加商户表单
   const defaultCreate = {
@@ -59,7 +56,7 @@ function MerchantInfo() {
     tenantCode: '',//商户编码
     tenantType: '',//商户类型1234
     shop_type_name: '',//平台
-    businessType: [],
+    businessType: '',
     city: '',
     address: '',
     connect_name: '',
@@ -137,6 +134,8 @@ function MerchantInfo() {
   //支付宝生活号及小程序
   const [zhiMiniVisible2, setZhiMiniVisible2] = useState(false)
 
+  //上传图片的地址
+  const [imageUrl, setImageUrl] = useState();
   //表头
   const columns = [
     {
@@ -212,7 +211,7 @@ function MerchantInfo() {
     },
     {
       title: '最后操作人',
-      key: 'updatePerson',
+      key: 'updatePerpson',
       dataIndex: 'updatePerson',
       align: "center",
     },
@@ -227,18 +226,17 @@ function MerchantInfo() {
       key: 'operation',
       dataIndex: 'operation',
       align: "center",
-      render: (text, record, index) => {
+      render: (text, record) => {
         return <>
           <Popover content={
-            <div className="operateBtn" style={{ cursor: "pointer" }} trigger="hover">
-              <div onClick={() => { checkBtn(index) }}>详情</div>
+            <div className="operateBtn" style={{ cursor: "pointer" }}>
+              <div onClick={() => { CheckBtn(record) }}>详情</div>
               {
                 record.status == 2 ?
-                  <>
-                    <div onClick={() => { updateBtn(index) }}>编辑</div>
-                    <div onClick={() => { stopBtn(index) }}>启用</div>
-                  </> : <div onClick={() => { stopBtn(index) }}>停用</div>
+                  <div onClick={() => { translateBtn(record) }}>编辑</div> : ""
               }
+
+              <div onClick={() => { deleteBtn(record) }}>停用/启用</div>
             </div>}>
             <button className="scheduleBtn">操作</button>
           </Popover>
@@ -265,8 +263,6 @@ function MerchantInfo() {
       label: '车务业务'
     },
   ]
-
-
   //公司地址
   const COMPANY_ADRESS = [
     {
@@ -339,9 +335,8 @@ function MerchantInfo() {
 
   //获取表格数据
   const getTable = (data = formData) => {
-    console.log(data);
     setLoading(true)
-    ajax.getMerchantInfoTable(data).then(
+    ajax.getTable(data).then(
       res => {
         if (res.status == 20000) {
           setTableData(res.data.list)
@@ -388,41 +383,35 @@ function MerchantInfo() {
   //创建商户
   const createData = () => {
     setCreateVisible(true)
-    setFormCreate({ ...parameter })
   }
   //关闭创建商户-点击取消
   const createOncancel = () => {
     setCreateVisible(false)
     setUpdateVisible(false)
-    setCheckVisible(false)
-    setSingleVisible(false)
-    setQingDaoVisible(false)
-    setSpecialVisible(false)
-    getTable()
   }
 
   //经营业务类型多选框改变
   const onHandleChange = (v) => {
     console.log('已选择：' + v)
-    let _formCreate = { ...formCreate }
-    _formCreate.businessType = v
-    setFormCreate(_formCreate)
+    let _formData = { ...formData }
+    _formData.businessType = v
+    setFormCreate(_formData)
   }
 
-  //点击启用-提交表单
+  //点击启用
   const createTenant = () => {
-    const value = selectForm.getFieldValue("business_type")
-    setFormCreate({ businessType: value })
+    let _formCreate = { ...formCreate }
+    console.log("formCreate", _formCreate);
+    console.log("formCreateModal", formCreateModal);
 
-    ajax.addTenant( {...formCreate, ...formCreateModal}).then(
+    ajax.addTenant({ _formCreate, formCreateModal }).then(
       res => {
         if (res.status == 20000) {
-          message.success("已启用", 2.5)
+          messageApi.open({
+            type: 'success',
+            content: '已启用',
+          });
           setCreateVisible(false)
-          setUpdateVisible(false)
-          setSingleVisible(false)
-          setSpecialVisible(false)
-          setQingDaoVisible(false)
         } else {
           message.error(res.message)
         }
@@ -434,58 +423,15 @@ function MerchantInfo() {
     )
   }
   //编辑
-  function updateBtn(index) {
+  function translateBtn(record) {
     setUpdateVisible(true)
-    ajax.checkTenant(index).then(
-      res => {
-        if (res.status == 20000) {
-          setFormCreate(res.data)
-          setRecords(res.data)
-        } else {
-          message.error(res.message)
-        }
-      }
-    ).catch(
-      err => {
-        console.log(err);
-      }
-    )
-    selectForm.setFieldsValue(
-      {
-        business_type: records.businessType
-      }
-    )
+    setRecords(record)
+    console.log(record);
   }
   //查看
-  function checkBtn(index) {
+  function CheckBtn(record) {
     setCheckVisible(true)
-    ajax.checkTenant(index).then(
-      res => {
-        if (res.status == 20000) {
-          setRecords(res.data)
-        } else {
-          message.error(res.message)
-        }
-      }
-    ).catch(
-      err => { console.log(err); }
-    )
-  }
-  //启用/停用
-  function stopBtn(index) {
-    ajax.updateStatus(index).then(
-      res => {
-        if (res.status == 20000) {
-          getTable()
-        } else {
-          message.error(res.message)
-        }
-      }
-    ).catch(
-      err => {
-        console.log(err);
-      }
-    )
+    setRecords(record)
   }
 
   /* 独立账户 3*/
@@ -579,18 +525,11 @@ function MerchantInfo() {
     console.log(imgList);
   };
 
-  //判断输入框为数字
-  const handleBlurNumber = (e) => {
-    var value = /^[0-9]+$/
-    if (!value.test(e.target.value)) {
-      message.success("输入有误，请重新输入", 2.5)
-    }
-  }
-
 
   useEffect(
     () => {
       getPullList()
+      // getTable()
     }, []
   )
   return (
@@ -606,13 +545,10 @@ function MerchantInfo() {
                     className="form-input"
                     placeholder="请输入商户ID"
                     showCount={false}
-                    defaultValue=""
-                    value={formData.tenantId}
-                    onBlur={handleBlurNumber}
+                    defaultValue={null}
                     onChange={e => {
-                      setFormData(Object.assign({ ...formData, tenantId: e.target.value }))
+                      setFormData(Object.assign(formData, { tenantId: e.target.value }))
                     }}
-
                   />
                 </div>
                 <div className="yisa-search">
@@ -622,16 +558,20 @@ function MerchantInfo() {
                         className="yisa-cascader"
                         placeholder="商户名称"
                         options={tenantNamePull}
-                        value={formData?.type}
                         onChange={e => {
-                          setFormData(Object.assign({ ...formData, type: e }))
+                          setFormData(Object.assign(formData, { tenantNamePull: e }))
+                          setTenantNamePull(e)
                         }}
                       />
                     }
                     placeholder="请输入"
-                    value={formData.type_name}
                     onChange={e => {
-                      setFormData(Object.assign({ ...formData, type_name: e.target.value }))
+                      if (tenantNamePull == 1) {
+                        setFormData(Object.assign(formData, { tenantCode: e.target.value }))
+                      }
+                      else {
+                        setFormData(Object.assign(formData, { tenantName: e.target.value }))
+                      }
                     }}
                   />
                 </div>
@@ -641,10 +581,11 @@ function MerchantInfo() {
                     className="yisa-select"
                     options={tenantType}
                     placeholder="请选择"
-                    value={formData?.tenantType}
+                    hasUnlimited={false}
                     onChange={
                       e => {
-                        setFormData(Object.assign({ ...formData, tenantType: e }))
+                        setFormData(Object.assign(formData, { tenantType: e }))
+                        console.log(e);
                       }
                     }
                   />
@@ -655,8 +596,9 @@ function MerchantInfo() {
                     className="yisa-select"
                     options={businessType}
                     placeholder="请选择"
-                    value={formData.businessType}
-                    onChange={e => { setFormData(Object.assign({ ...formData, businessType: e })) }}
+                    hasUnlimited={false}
+                    showClose={true}
+                    onChange={e => { setFormData(Object.assign(formData, { businessType: e })) }}
                   />
                 </div>
                 <div className="yisa-search">
@@ -665,8 +607,9 @@ function MerchantInfo() {
                     className="yisa-select"
                     options={status}
                     placeholder="请选择"
-                    value={formData.status}
-                    onChange={e => { setFormData(Object.assign({ ...formData, status: e })) }}
+                    hasUnlimited={false}
+                    showClose={true}
+                    onChange={e => { setFormData(Object.assign(formData, { status: e })) }}
                   />
                 </div>
               </div>
@@ -754,8 +697,8 @@ function MerchantInfo() {
                               labelPosition="left"
                               placeholder="请输入商户名称"
                               isRequired={true}
-                                className="form-item"
-                              value={formCreate.tenantName}
+                              className="form-item"
+                              value={records.tenantName}
                               showClose={true}
                               onChange={e => {
                                 setFormCreate(Object.assign({ ...formCreate, tenantName: e.target.value }))
@@ -766,8 +709,8 @@ function MerchantInfo() {
                               labelPosition="left"
                               placeholder="请输入商户编码"
                               isRequired={true}
-                                className="form-item"
-                              value={formCreate.tenantCode}
+                              className="form-item"
+                              value={records.tenantCode}
                               showClose={true}
                               onChange={e => {
                                 setFormCreate({ ...formCreate, tenantCode: e.target.value })
@@ -777,55 +720,33 @@ function MerchantInfo() {
                               yisaLabel="商户类型:"
                               yisaData={tenantType}
                               defaultValue={tenantType || null}
-                              value={formCreate.tenantType}
+                              value={records.tenantType}
                               placeholder="请选择"
                               hasUnlimited={false}
                               showClose={true}
-                                required={true}
+                              required={true}
                               className="select"
                               onChange={e => {
                                 setFormCreate(Object.assign({ ...formCreate, tenantType: e }))
                               }}
                             />
-                            <div className="businessType">
-                              <Form
-                                form={selectForm}
-                              >
-                              <Form.Item
-                                  name="business_type"
-                                  label="经营业务类型："
-                                  labelAlign="left"
-                                  required={true}
-                                >
-                                  <Select
-                                    mode="tags"
-                                    placeholder="请选择"
-                                    maxTagCount={2}
-                                    onChange={e=>setFormCreate(Object.assign({ ...formCreate, businessType: e }))}
-                                    style={{
-                                      width: '100%',
-                                    }}
-                                    options={businessMul}
-                                  />
-                                </Form.Item>
-                              </Form>
-                            </div>
-                            {/* <FormSelect
+                            <FormSelect
                               yisaLabel="经营业务类型:"
                               yisaData={businessMul}
-                              defaultValue={[formCreate.manage_type_name]}
+                              defaultValue="不限"
+                              value={businessMul}
                               placeholder="请选择"
                               mode='multiple'
                               hasUnlimited={false}
                               showClose={true}
-                                required={true}
+                              required={true}
                               className="select"
                               onChange={onHandleChange}
-                            /> */}
+                            />
                             <div className="modal-time">
                               <label>商户有效期:</label>
-                                <RangePicker
-                                value={[moment(formCreate.start), moment(formCreate.end)]}
+                              <RangePicker
+                                value={[moment(records.start), moment(records.end)]}
                                 onChange={(value, dateString) => {
                                   setFormCreate({
                                     ...formCreate,
@@ -873,7 +794,7 @@ function MerchantInfo() {
                             <FormSelect
                               yisaLabel="商户类型:"
                               yisaData={tenantType}
-                              defaultValue={null}
+                              defaultValue={tenantType || null}
                               placeholder="请选择"
                               hasUnlimited={false}
                               showClose={true}
@@ -886,30 +807,31 @@ function MerchantInfo() {
                             <FormSelect
                               yisaLabel="经营业务类型:"
                               yisaData={businessMul}
-                              defaultValue={null}
+                              defaultValue="不限"
                               placeholder="请选择"
                               mode='multiple'
                               hasUnlimited={false}
+                              // showClose={true}
                               required={true}
                               className="select"
                               onChange={onHandleChange}
                             />
                             <div className="modal-time">
-                              <label>商户有效期:</label>
-                              <RangePicker
-                                value={[moment(formCreate.start), moment(formCreate.end)]}
-                                onChange={(value, dateString) => {
-                                  setFormCreate({
-                                    ...formCreate,
-                                    start: dateString[0],
-                                    end: dateString[1],
-                                  })
-                                }}
-                                className="search-group-item"
-                                limit={90}
-                                showTime={false}
-                              />
-                            </div>
+                            <label>商户有效期:</label>
+                            <RangePicker
+                              value={[moment(formCreate.start), moment(formCreate.end)]}
+                              onChange={(value, dateString) => {
+                                setFormCreate({
+                                  ...formCreate,
+                                  start: dateString[0],
+                                  end: dateString[1],
+                                })
+                              }}
+                              className="search-group-item"
+                              limit={90}
+                              showTime={false}
+                            />
+                          </div>
                           </div>
 
 
@@ -927,9 +849,9 @@ function MerchantInfo() {
                           placeholder="请输入公司名称"
                           isRequired={true}
                           className="form-item"
-                          value={formCreate.companyName}
+                          value={formCreate.tenantName}
                           showClose={true}
-                          onChange={e => { setFormCreate({ ...formCreate, companyName: e.target.value }) }}
+                          onChange={e => { setFormCreate({ ...formCreate, tenantName: e.target.value }) }}
                         />
                         <div className="account-select">
                           <label>公司地址:</label>
@@ -939,10 +861,11 @@ function MerchantInfo() {
                             onChange={e => { setFormCreate({ ...formCreate, city: e }) }}
                             className="select-item"
                           />
-                        </div>
-                        <FormInput
+                          </div>
+                          <FormInput
+                          // labelPosition="left"
                           placeholder="请输入 街道/门牌 详细地址"
-                          className="select-form-item"
+                          className="select-form-item stree"
                           value={formCreate.address}
                           showClose={true}
                           onChange={e => { setFormCreate({ ...formCreate, address: e.target.value }) }}
@@ -1002,42 +925,39 @@ function MerchantInfo() {
                   <div className="businessInformation">
                     <div className="title"><span>账户信息</span></div>
                     <div className="business">
-                      <div className="business-wrap">
-                        <FormInput
-                          yisaLabel="开户行名称:"
-                          labelPosition="left"
-                          placeholder="请输入开户行名称"
-                          isRequired={true}
-                          value={formCreate.bank_name}
-                          showClose={true}
-                          onChange={e => { setFormCreate({ ...formCreate, bank_name: e.target.value }) }}
-                        />
-                        <FormInput
-                          yisaLabel="开户行地址:"
-                          labelPosition="left"
-                          placeholder="请输入开户行地址"
-                          isRequired={true}
-                          value={formCreate.bank_address}
-                          showClose={true}
-                          onChange={e => { setFormCreate({ ...formCreate, bank_address: e.target.value }) }}
-                        />
-                        <FormInput
-                          yisaLabel="对公账户号:"
-                          labelPosition="left"
-                          placeholder="请输入对公账户号"
-                          isRequired={true}
-                          value={formCreate.bank_num}
-                          showClose={true}
-                          onChange={e => { setFormCreate({ ...formCreate, bank_num: e.target.value }) }}
-                        />
-                      </div>
-
+                      <FormInput
+                        yisaLabel="开户行名称:"
+                        labelPosition="left"
+                        placeholder="请输入开户行名称"
+                        isRequired={true}
+                        value={formCreate.bank_name}
+                        showClose={true}
+                        onChange={e => { setFormCreate({ ...formCreate, bank_name: e.target.value }) }}
+                      />
+                      <FormInput
+                        yisaLabel="开户行地址:"
+                        labelPosition="left"
+                        placeholder="请输入开户行地址"
+                        isRequired={true}
+                        value={formCreate.bank_address}
+                        showClose={true}
+                        onChange={e => { setFormCreate({ ...formCreate, bank_address: e.target.value }) }}
+                      />
+                      <FormInput
+                        yisaLabel="对公账户号:"
+                        labelPosition="left"
+                        placeholder="请输入对公账户号"
+                        isRequired={true}
+                        value={formCreate.bank_num}
+                        showClose={true}
+                        onChange={e => { setFormCreate({ ...formCreate, bank_num: e.target.value }) }}
+                      />
                     </div>
                   </div>
                   <div className="clearinformation">
                     <div className="title"><span>清结算信息</span></div>
                     <div className="clear">
-                      <div className="clear-wrap">
+                      <div className="clear-select">
                         <FormSelect
                           yisaLabel="支付收款账户:"
                           yisaData={PAY}
@@ -1068,45 +988,48 @@ function MerchantInfo() {
 
                       {
                         qingDaoVisible ?
-                          <div className="form-item">
+                          <>
                             <FormInput
                               yisaLabel="清分比例(%):"
                               labelPosition="left"
                               placeholder="请输入清分给商户的资金比例(0.01-1000)"
                               isRequired={true}
+                              className="form-item"
                               value={formCreate.sort_percent}
                               showClose={true}
-                              onChange={e => { setFormCreate({...formCreate, sort_percent: e.target.value }) }}
+                              onChange={e => { setFormCreate({ sort_percent: e.target.value }) }}
                             />
                             <FormInput
                               yisaLabel="清分周期(T+):"
                               labelPosition="left"
                               placeholder="请输入清分周期"
                               isRequired={true}
+                              className="form-item"
                               value={formCreate.sort_cycle}
                               showClose={true}
-                              onChange={e => { setFormCreate({ ...formCreate,sort_cycle: e.target.value }) }}
+                              onChange={e => { setFormCreate({ sort_cycle: e.target.value }) }}
                             />
                             <FormInput
                               yisaLabel="结算费率(%):"
                               labelPosition="left"
                               placeholder="请输入结算给商户的资金费率(0.01-1000)"
                               isRequired={true}
+                              className="form-item"
                               value={formCreate.sell_rate}
                               showClose={true}
-                              onChange={e => { setFormCreate({ ...formCreate,sell_rate: e.target.value }) }}
+                              onChange={e => { setFormCreate({ sell_rate: e.target.value }) }}
                             />
                             <div className="clear-select">
                               <FormSelect
                                 yisaLabel="手续费承担方:"
                                 yisaData={CHARGE_TYPE}
-                                defaultValue={null}
+                                defaultValue="请选择"
                                 placeholder="请选择"
                                 hasUnlimited={false}
                                 showClose={true}
                                 required={true}
                                 className="select"
-                                onChange={e => { setFormCreate({...formCreate, charge_type: e }) }}
+                                onChange={e => { setFormCreate({ charge_type: e }) }}
                               />
                             </div>
                             <FormInput
@@ -1114,11 +1037,12 @@ function MerchantInfo() {
                               labelPosition="left"
                               placeholder="请输入结算周期"
                               isRequired={true}
+                              className="form-item"
                               value={formCreate.sell_cycle}
                               showClose={true}
-                              onChange={e => { setFormCreate({ ...formCreate,sell_cycle: e.target.value }) }}
+                              onChange={e => { setFormCreate({ sell_cycle: e.target.value }) }}
                             />
-                          </div>
+                          </>
                           : ''
                       }
 
@@ -1171,7 +1095,7 @@ function MerchantInfo() {
                         <Button key="submit" type="primary" onClick={save} style={{ background: "#409EFF" }}>
                           保存
                         </Button>,
-                        <Button key="back" onClick={handleCancelWei} style={{ color: "#3f3d3d" }}>
+                        <Button key="back" onClick={handleCancelWei}>
                           取消
                         </Button>,
                       ]
@@ -1228,7 +1152,7 @@ function MerchantInfo() {
                         <Button key="submit" type="primary" onClick={save} style={{ background: "#409EFF" }}>
                           保存
                         </Button>,
-                        <Button key="back" onClick={handleCancelZhi} style={{ color: "#3f3d3d" }}>
+                        <Button key="back" onClick={handleCancelZhi}>
                           取消
                         </Button>,
                       ]
@@ -1285,7 +1209,7 @@ function MerchantInfo() {
                         <Button key="submit" type="primary" onClick={save} style={{ background: "#409EFF" }}>
                           保存
                         </Button>,
-                        <Button key="back" onClick={handleCancelWeiMini} style={{ color: "#3f3d3d" }}>
+                        <Button key="back" onClick={handleCancelWeiMini}>
                           取消
                         </Button>,
                       ]
@@ -1342,7 +1266,7 @@ function MerchantInfo() {
                         <Button key="submit" type="primary" onClick={save} style={{ background: "#409EFF" }}>
                           保存
                         </Button>,
-                        <Button key="back" onClick={handleCancelZhiMini} style={{ color: "#3f3d3d" }}>
+                        <Button key="back" onClick={handleCancelZhiMini}>
                           取消
                         </Button>,
                       ]
@@ -1404,7 +1328,7 @@ function MerchantInfo() {
                         <Button key="submit" type="primary" onClick={save} style={{ background: "#409EFF" }}>
                           保存
                         </Button>,
-                        <Button key="back" onClick={handleCancelWei2} style={{ color: "#3f3d3d" }}>
+                        <Button key="back" onClick={handleCancelWei2}>
                           取消
                         </Button>,
                       ]
@@ -1435,7 +1359,7 @@ function MerchantInfo() {
                         <Button key="submit" type="primary" onClick={save} style={{ background: "#409EFF" }}>
                           保存
                         </Button>,
-                        <Button key="back" onClick={handleCancelZhi2} style={{ color: "#3f3d3d" }}>
+                        <Button key="back" onClick={handleCancelZhi2}>
                           取消
                         </Button>,
                       ]
@@ -1492,7 +1416,7 @@ function MerchantInfo() {
                         <Button key="submit" type="primary" onClick={save} style={{ background: "#409EFF" }}>
                           保存
                         </Button>,
-                        <Button key="back" onClick={handleCancelWeiMini2} style={{ color: "#3f3d3d" }}>
+                        <Button key="back" onClick={handleCancelWeiMini2}>
                           取消
                         </Button>,
                       ]
@@ -1522,7 +1446,7 @@ function MerchantInfo() {
                         <Button key="submit" type="primary" onClick={save} style={{ background: "#409EFF" }}>
                           保存
                         </Button>,
-                        <Button key="back" onClick={handleCancelZhiMini2} style={{ color: "#3f3d3d" }}>
+                        <Button key="back" onClick={handleCancelZhiMini2}>
                           取消
                         </Button>,
                       ]
@@ -1576,83 +1500,9 @@ function MerchantInfo() {
 
       {
         checkVisible ?
-          <div id="check">
-            <div className="check-form">
-              <div className="btns">
-                <button className="btn" onClick={createOncancel}>返回</button>
-              </div>
-              <div className="container">
-                <div className="left">
-                  <div className="systemInformation">
-                    <div className="title"><span>系统信息</span></div>
-                    <div className="system">
-                      <div className="system-wrap">
-                        <div className="item"><span className="item-title">商户ID：</span>{records.tenantId}</div>
-                        <div className="item"><div className="item-title">商户编码：</div><span>{records.tenantId}</span></div>
-                        <div className="item"><div className="item-title">状态：</div><span className={records.status == 1 ? "text-green" : "text-red"}>{records.status_name}</span></div>
-                        <div className="item"><div className="item-title">商户名称：</div>{records.tenantName}</div>
-                        <div className="item"><div className="item-title">商户类型：</div>{records.shop_type_name}</div>
-                        <div className="item"><div className="item-title">经营业务类型：</div>{records.manage_type_name}</div>
-                        <div className="item"><div className="item-title">商户有效期：</div>{records.updateAt}</div>
-                      </div>
-                    </div>
-                  </div>
-                  <div className="accountInformation">
-                    <div className="title"><span>工商信息</span></div>
-                    <div className="account">
-                      <div className="account-wrap">
-                        <div className="item"><span className="item-title">公司名称：</span>{records.companyName}</div>
-                        <div className="item"><div className="item-title">公司地址：</div><span>{records.address}</span></div>
-                        <div className="item"><div className="item-title">联系人：</div><span>{records.connect_name}</span></div>
-                        <div className="item"><div className="item-title">联系电话：</div>{records.connect_phone}</div>
-                        <div className="item"><div className="item-title">邮箱：</div>{records.email}</div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div className="right">
-                  <div className="businessInformation">
-                    <div className="title"><span>账户信息</span></div>
-                    <div className="business">
-                      <div className="business-wrap">
-                        <div className="item"><span className="item-title">开户行名称：</span>{records.bank_name}</div>
-                        <div className="item"><div className="item-title">开户行地址：</div><span>{records.bank_address}</span></div>
-                        <div className="item"><div className="item-title">对公账户号：</div><span>{records.bank_num}</span></div>
-                      </div>
-                    </div>
-                  </div>
-                  <div className="clearInformation">
-                    <div className="title"><span>清结算信息</span></div>
-                    <div className="clear">
-                      <div className="clear-wrap">
-                        <div className="item"><span className="item-title">支付收款账户：</span>{records.pay_type}</div>
-                        <div className="item"><div className="item-title">清分比例(%)：</div><span>{records.sort_percent}</span></div>
-                        <div className="item"><div className="item-title">清分周期(T)：</div><span>{records.sort_cycle}</span></div>
-                        <div className="item"><div className="item-title">结算费率(%)：</div>{records.sell_rate}</div>
-                        <div className="item"><div className="item-title">手续费承担方：</div>{records.charge_type}</div>
-                        <div className="item"><div className="item-title">结算周期(T)：</div>{records.sell_cycle}</div>
-                      </div>
-                    </div>
-
-
-                  </div>
-
-                  <div className="operationInformation">
-                    <div className="title"><span>操作信息</span></div>
-                    <div className="operation">
-                      <div className="operation-wrap">
-                        <div className="item"><span className="item-title">最后操作人：</span>{records.updatePerson}</div>
-                        <div className="item"><div className="item-title">最后修改时间：</div><span>{records.update_time}</span></div>
-                        <div className="item"><div className="item-title">初始创建时间：</div><span>{records.create_time}</span></div>
-                      </div>
-                    </div>
-
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-          : ''
+          <>
+            {records.tenantName}
+          </> : ''
       }
 
     </div>
diff --git a/src/router/menu-bk.js b/src/router/menu-bk.js
index b430e9a..cf5832e 100644
--- a/src/router/menu-bk.js
+++ b/src/router/menu-bk.js
@@ -812,7 +812,7 @@
                     "icon": "zongshujuliang",
                     "children": [
                         {
-                            "text": "业务配置",
+                            "text": "业务配置",   
                             "name": "businessConf",
                             "icon": "",
                             "path": "/systemMgm/businessConf",
@@ -832,13 +832,7 @@
                     "name": "invoiceConf",
                     "icon": "zongshujuliang",
                     "path": "/merchantMgm/invoiceConf",
-                },
-                {
-                  "text": "商户管理员",
-                  "name": "merchantAdmin",
-                  "icon": "zongshujuliang",
-                  "path": "/merchantMgm/merchantAdmin",
-              }
+                }
             ],
             "financialMgm":[
                 {
@@ -859,7 +853,7 @@
                         }
                     ]
                 }
-
+                
             ],
             "outRoad": [
                 {
@@ -959,4 +953,4 @@
             ]
         }
     }
-  }
+  }
\ No newline at end of file
diff --git a/src/router/menu.js b/src/router/menu.js
index ae85c96..c649263 100644
--- a/src/router/menu.js
+++ b/src/router/menu.js
@@ -188,26 +188,26 @@ let menu = {
                         "path": "/inRoad/stuffMgm",
                         "text": "物品管理",
                         "name": "stuffMgm",
-
+                        
                     },
                     {
                         "path": "/inRoad/stuffStat",
                         "text": "物品统计",
                         "name": "stuffStat",
-
+                        
                     },
                     {
                         "path": "/inRoad/categroyConf",
                         "text": "类型配置",
                         "name": "categroyConf",
-
+                        
                     },
                     {
                         "path": "/inRoad/modelConf",
                         "text": "型号配置",
                         "name": "modelConf",
-
-                    },
+                        
+                    },  
                     ]
                 },
                 {
@@ -218,58 +218,58 @@ let menu = {
                         "path": "/inRoad/specialRecord",
                         "text": "白名单管理",
                         "name": "specialRecord",
-
+                        
                         },
-                        {
+                        { 
                             "path": "/inRoad/blacklist",
                             "text": "黑名单管理",
                             "name": "blacklist",
-
+                            
                         },
-                        {
+                        { 
                             "path": "/inRoad/chargeRules",
                             "text": "计费规则",
                             "name": "chargeRules",
-
+                            
                         },
-                        {
+                        { 
                             "path": "/inRoad/preChargeRules",
                             "text": "预付费规则",
                             "name": "preChargeRules",
-
+                            
                         },
-                        {
+                        { 
                             "path": "/inRoad/selfParkingRules",
                             "text": "自主停车规则",
                             "name": "selfParkingRules",
-
+                            
                         },
-                        {
+                        { 
                             "path": "/inRoad/freeRule",
                             "text": "免费规则",
                             "name": "freeRule",
-
+                            
                         },{
                             "text": "异常停车",
                             "icon": "",
                             "name": "abnormalParking",
                             "children":[
-                                {
+                                { 
                                     "path": "/inRoad/exceptionParkReport",
                                     "text": "上报记录查询", // 异常停车
                                     "name": "exceptionParkReport",
-
+                                    
                                 },
-                                {
+                                { 
                                     "path": "/inRoad/exceptionParkStat",
                                     "text": "异常停车统计", // 异常停车
                                     "name": "exceptionParkStat",
-
-                                },
+                                    
+                                },    
                             ]
                         }
                     ]
-                },
+                },           
                 {
                     "text": "设备管理",
                     "icon": "zongshujuliang",
@@ -278,32 +278,32 @@ let menu = {
                             "path": "/inRoad/equipmentStatus",
                             "text": "设备状态",
                             "name": "equipmentStatus",
-
+                            
                         },
-                        {
+                        { 
                             "path": "/inRoad/barMgm",
                             "text": "杆位管理",
                             "name": "barMgm",
-
+                            
                         },
-                        {
+                        { 
                             "path": "/inRoad/nvrMgm",
                             "text": "NVR管理",
                             "name": "nvrMgm",
-
+                            
                         },
-                        {
+                        { 
                             "path": "/inRoad/monitorEquipment",
                             "text": "监控设备",
                             "name": "monitorEquipment",
-
+                            
                         },
-                        {
+                        { 
                             "path": "/inRoad/equipmentBrand",
                             "text": "设备品牌",
                             "name": "equipmentBrand",
-
-                        },
+                            
+                        },  
                     ]
                 },
                 {
@@ -314,25 +314,25 @@ let menu = {
                             "path": "/inRoad/deviceAlarm",
                             "text": "设备报警",
                             "name": "deviceAlarm",
-
+                            
                         },
-                        {
+                        { 
                             "path": "/inRoad/deviceOrder",
                             "text": "设备工单",
                             "name": "deviceOrder",
-
+                            
                         },
-                        {
+                        { 
                             "path": "/inRoad/realtimeStat",
                             "text": "实时统计",
                             "name": "realtimeStat",
-
+                            
                         },
-                        {
+                        { 
                             "path": "/inRoad/historyStat",
                             "text": "历史统计",
                             "name": "historyStat",
-
+                            
                         },
                     ]
                 }
@@ -343,7 +343,7 @@ let menu = {
                     "text": "停车业务概览",
                     "name": "parkingOverview",
                     "icon":"zongshujuliang",
-                },
+                },	  
                 {
                     "text": "停车业务分析",
                     "icon": "zongshujuliang",
@@ -352,67 +352,67 @@ let menu = {
                             "path": "/dataAlyPrediction/parkingAnalysisOverview",
                             "text": "停车总分析",
                             "name": "parkingAnalysisOverview",
-
+                            
                         },
-                        {
+                        { 
                             "path": "/dataAlyPrediction/parkingAlyReport",
                             "text": "停车场分析报表",
                             "name": "parkingAlyReport",
-
+                            
                         },
-                        {
+                        { 
                             "path": "/dataAlyPrediction/parkingAlyDuration",
                             "text": "停车时长分析",
                             "name": "parkingAlyDuration",
-
+                            
                         },
-                        {
+                        { 
                             "path": "/dataAlyPrediction/parkingAlyPeriod",
                             "text": "停车时段分析",
                             "name": "parkingAlyPeriod",
-
+                            
                         },
-                        {
+                        { 
                             "path": "/dataAlyPrediction/temporaryParkStat",
                             "text": "临时停车统计",
                             "name": "temporaryParkStat",
-
+                            
                         },
-                        {
+                        { 
                             "path": "/dataAlyPrediction/nightParkStat",
                             "text": "夜间停车统计",
                             "name": "nightParkStat",
-
+                            
                         },
-                        {
+                        { 
                             "path": "/dataAlyPrediction/parkingLivedata",
                             "text": "停车实况数据",
                             "name": "parkingLivedata",
-
+                            
                         },
-                        {
+                        { 
                             "path": "/dataAlyPrediction/parkUsageAly",
                             "text": "泊位利用分析",
                             "name": "parkUsageAly",
-
+                            
                         },
-                        {
+                        { 
                             "path": "/dataAlyPrediction/ParkTurnoverAly",
                             "text": "泊位周转分析",
                             "name": "parkTurnoverAly",
-
+                            
                         },
-                        {
+                        { 
                             "path": "/dataAlyPrediction/carTypeAly",
                             "text": "车辆类型分析",
                             "name": "carTypeAly",
-
+                            
                         },
-                        {
+                        { 
                             "path": "/dataAlyPrediction/parkBerthAly",
                             "text": "停车泊位分析",
                             "name": "parkBerthAly",
-
+                            
                         },
                     ]
                 },
@@ -424,44 +424,44 @@ let menu = {
                             "path": "/dataAlyPrediction/arrearageAly",
                             "text": "欠费总分析",
                             "name": "arrearageAly",
-
+                            
                         },
-                        {
+                        { 
                             "path": "/dataAlyPrediction/orderArrearageAly",
                             "text": "订单欠费分析",
                             "name": "orderArrearageAly",
-
+                            
                         },
-                        {
+                        { 
                             "path": "/dataAlyPrediction/cityArrearageAly",
                             "text": "城市欠费分析",
                             "name": "cityArrearageAly",
-
+                            
                         },
-                        {
+                        { 
                             "path": "/dataAlyPrediction/arrearageRecoverAly",
                             "text": "欠费追缴分析",
                             "name": "arrearageRecoverAly",
-
+                            
                         },
-                        {
+                        { 
                             "path": "/dataAlyPrediction/cityIncomeStat",
                             "text": "城市收入统计",
                             "name": "cityIncomeStat",
-
+                            
                         },
-                        {
+                        { 
                             "path": "/dataAlyPrediction/cityIncomeAly",
                             "text": "城市收入分析",
                             "name": "cityIncomeAly",
-
+                            
                         },
-                        {
+                        { 
                             "path": "/dataAlyPrediction/priceAly",
                             "text": "客单价分析",
                             "name": "priceAly",
-
-                        },
+                            
+                        },   
                     ]
                 },
                 {
@@ -472,22 +472,22 @@ let menu = {
                             "path": "/dataAlyPrediction/parkingAly",
                             "text": "停车分析",
                             "name": "parkingAly",
-
+                            
                         },
-                        {
+                        { 
                             "path": "/dataAlyPrediction/registerAly",
                             "text": "注册分析",
                             "name": "registerAly",
-
+                            
                         },
-                        {
+                        { 
                             "path": "/dataAlyPrediction/payAly",
                             "text": "支付分析",
                             "name": "payAly",
-
+                            
                         },
                     ]
-                },
+                }, 
                 {
                     "text": "设备分析",
                     "icon": "zongshujuliang",
@@ -496,7 +496,7 @@ let menu = {
                             "path": "/dataAlyPrediction/equipmentRunningStat",
                             "text": "设备运行统计",
                             "name": "equipmentRunningStat",
-
+                            
                         },
                     ]
                 }
@@ -514,17 +514,17 @@ let menu = {
                     "icon": "zongshujuliang",
                     "name": "userMgm",
                     "children":[
-                        {
+                        { 
                             "path": "/operationCenter/userInfo",
                             "text": "用户信息",
                             "name": "userInfo"
-                        },
-                        {
+                        },   
+                        { 
                             "path": "/operationCenter/userAuth",
                             "text": "用户认证",
                             "name": "userAuth"
                         },
-                        {
+                        { 
                             "path": "/operationCenter/userTag",
                             "text": "用户标签",
                             "name": "userTag"
@@ -535,12 +535,12 @@ let menu = {
                     "text": "车辆管理",
                     "icon": "zongshujuliang",
                     "children":[
-                        {
+                        { 
                             "path": "/operationCenter/carInfo",
                             "text": "车辆信息",
                             "name": "carInfo"
                         },
-                        {
+                        { 
                             "path": "/operationCenter/carAuth",
                             "text": "车辆认证",
                             "name": "carAuth"
@@ -551,7 +551,7 @@ let menu = {
                     "text": "欠费追缴",
                     "icon": "zongshujuliang",
                     "children":[
-                        {
+                        { 
                             "path": "/operationCenter/arrearsCar",
                             "text": "欠费车辆",
                             "name": "arrearsCar"
@@ -566,54 +566,54 @@ let menu = {
                             "text": "优惠券管理",
                             "icon": "",
                             "children":[
-                                {
+                                { 
                                     "path": "/operationCenter/couponRules",
                                     "text": "优惠券规则",
                                     "name": "couponRules"
                                 },
-                                {
+                                { 
                                     "path": "/operationCenter/activitySpecificTopic",
                                     "text": "活动专题",
                                     "name": "activitySpecificTopic"
                                 },
-                                {
+                                { 
                                     "path": "/operationCenter/couponDistribute",
                                     "text": "手动派发",
                                     "name": "couponDistribute"
                                 },
-                                {
+                                { 
                                     "path": "/operationCenter/writeOffDetail",
                                     "text": "核销明细",
                                     "name": "writeOffDetail"
                                 },
-                                {
+                                { 
                                     "path": "/operationCenter/writeOffStat",
                                     "text": "核销统计",
                                     "name": "writeOffStat"
                                 },
                             ]
                         },
-                        {
+                        { 
                             "path": "/operationCenter/yardDiscount",
                             "text": "车场折扣",
                             "name": "yardDiscount"
                         },
-                        {
+                        { 
                             "path": "/operationCenter/adsMgm",
                             "text": "广告管理",
                             "name": "adsMgm"
                         },
-                        {
+                        { 
                             "path": "/operationCenter/informationMgm",
                             "text": "资讯管理",
                             "name": "informationMgm"
                         },
-                        {
+                        { 
                             "path": "/operationCenter/appPushMgm",
                             "text": "推送管理",
                             "name": "appPushMgm"
                         },
-                        {
+                        { 
                             "path": "/operationCenter/shortMessageMgm",
                             "text": "短信管理",
                             "name": "shortMessageMgm"
@@ -628,17 +628,17 @@ let menu = {
                             "text": "停车卡",
                             "icon": "",
                             "children":[
-                                {
+                                { 
                                     "path": "/operationCenter/parkingCardMgm",
                                     "text": "停车卡管理",
                                     "name": "parkingCardMgm"
                                 },
-                                {
+                                { 
                                     "path": "/operationCenter/parkingCardOrder",
                                     "text": "停车卡订单",
                                     "name": "parkingCardOrder"
                                 },
-                                {
+                                { 
                                     "path": "/operationCenter/parkingCardStat",
                                     "text": "停车卡统计",
                                     "name": "parkingCardStat"
@@ -649,17 +649,17 @@ let menu = {
                             "text": "错峰停车",
                             "icon": "",
                             "children":[
-                                {
+                                { 
                                     "path": "/operationCenter/staggeredManage",
                                     "text": "错峰管理",
                                     "name": "staggeredManage"
                                 },
-                                {
+                                { 
                                     "path": "/operationCenter/staggeredOrder",
                                     "text": "错峰订单",
                                     "name": "staggeredOrder"
                                 },
-                                {
+                                { 
                                     "path": "/operationCenter/staggeredStat",
                                     "text": "错峰统计",
                                     "name": "staggeredStat"
@@ -672,38 +672,38 @@ let menu = {
                     "text": "客服管理",
                     "icon": "",
                     "children": [
-                        {
+                        { 
                             "path": "/operationCenter/callbackSuggestion",
                             "text": "反馈建议",
                             "name": "callbackSuggestion"
                         },
-                        {
+                        { 
                             "path": "/operationCenter/complaintMgm",
                             "text": "申诉管理",
                             "name": "complaintMgm"
                         },
-                        {
+                        { 
                             "path": "/operationCenter/errorCorrection",
                             "text": "车场纠错",
                             "name": "errorCorrection"
                         },
-                        {
+                        { 
                             "path": "/operationCenter/complainManage",
                             "text": "客诉工单",
                             "name": "complainManage"
                         },
-                        {
+                        { 
                             "path": "/operationCenter/complainStat",
                             "text": "客诉统计",
                             "name": "complainStat",
                         },
-                        {
+                        { 
                             "path": "/operationCenter/complainWorkStat",
                             "text": "工作统计",
                             "name": "complainWorkStat"
                         }
                     ]
-                }
+                }   
             ],
             "financialMgm": [
                 {
@@ -715,7 +715,7 @@ let menu = {
                             "text": "发起异常处理",
                             "name": "startExceptionDeal"
                         }
-                    ]
+                    ] 
                 }
             ],
             "systemMgm": [
@@ -742,13 +742,13 @@ let menu = {
                         "path": "/inRoad/ParkList",
                         "text": "泊位列表",
                         "name": "parkList"
-
+            
                     },
                     {
                         "path": "/inRoad/RoadConf",
                         "text": "路段配置",
                         "name": "roadConf"
-
+                        
                     }
                 ]
             },
@@ -761,55 +761,55 @@ let menu = {
                         "path": "/inRoad/ArrearsInquiries",
                         "text": "欠费追缴查询",
                         "name": "arrearsInquiries"
-
+                        
                     },
                     {
                         "path": "/inRoad/ArrearsRecordTotal",
                         "text": "停车欠费订单",
                         "name": "arrearsRecordTotal"
-
+                        
                     },
                     {
                         "path": "/inRoad/DisabledCarParkRecordTotal",
                         "text": "残疾车停车记录查询",
                         "name": "disabledCarParkRecordTotal"
-
+                        
                     },
                     {
                         "path": "/inRoad/EntryExitOptPDA",
                         "text": "PDA操作记录",
                         "name": "entryExitOptPDA"
-
+                        
                     },
                     {
                         "path": "/inRoad/GeomagneticSignalMgm",
                         "text": "地磁信号记录",
                         "name": "geomagneticSignalMgm"
-
+                        
                     },
                     {
                         "path": "/inRoad/ParkRecordTotal",
                         "text": "停车记录查询",
                         "name": "parkRecordTotal"
-
+                        
                     },
                     {
                         "path": "/inRoad/PayRecordQuery",
-                        "text": "停车支付订单",
+                        "text": "停车支付订单", 
                         "name": "payRecordQuery"
-
+                        
                     },
                     {
                         "path": "/inRoad/PreOrderRecord",
                         "text": "停车预付订单",
                         "name": "preOrderRecord"
-
+                        
                     },
                     {
                         "path": "/inRoad/UnRecordOrder",
                         "text": "未登记订单查询",
                         "name": "unRecordOrder"
-
+                        
                     }
                 ]
             },
@@ -818,7 +818,7 @@ let menu = {
             "icon": "xinxijiansuo",
             "name": "personMgm",
             "children": [
-
+                
                 {
                 "text": "人员信息",
                 "icon": "",
@@ -916,26 +916,26 @@ let menu = {
                     "path": "/inRoad/stuffMgm",
                     "text": "物品管理",
                     "name": "stuffMgm",
-
+                    
                 },
                 {
                     "path": "/inRoad/stuffStat",
                     "text": "物品统计",
                     "name": "stuffStat",
-
+                    
                 },
                 {
                     "path": "/inRoad/categroyConf",
                     "text": "类型配置",
                     "name": "categroyConf",
-
+                    
                 },
                 {
                     "path": "/inRoad/modelConf",
                     "text": "型号配置",
                     "name": "modelConf",
-
-                },
+                    
+                },  
                 ]
             },
             {
@@ -946,58 +946,58 @@ let menu = {
                     "path": "/inRoad/specialRecord",
                     "text": "白名单管理",
                     "name": "specialRecord",
-
+                    
                     },
-                    {
+                    { 
                         "path": "/inRoad/blacklist",
                         "text": "黑名单管理",
                         "name": "blacklist",
-
+                        
                     },
-                    {
+                    { 
                         "path": "/inRoad/chargeRules",
                         "text": "计费规则",
                         "name": "chargeRules",
-
+                        
                     },
-                    {
+                    { 
                         "path": "/inRoad/preChargeRules",
                         "text": "预付费规则",
                         "name": "preChargeRules",
-
+                        
                     },
-                    {
+                    { 
                         "path": "/inRoad/selfParkingRules",
                         "text": "自主停车规则",
                         "name": "selfParkingRules",
-
+                        
                     },
-                    {
+                    { 
                         "path": "/inRoad/freeRule",
                         "text": "免费规则",
                         "name": "freeRule",
-
+                        
                     },{
                         "text": "异常停车",
                         "icon": "",
                         "name": "abnormalParking",
                         "children":[
-                            {
+                            { 
                                 "path": "/inRoad/exceptionParkReport",
                                 "text": "上报记录查询", // 异常停车
                                 "name": "exceptionParkReport",
-
+                                
                             },
-                            {
+                            { 
                                 "path": "/inRoad/exceptionParkStat",
                                 "text": "异常停车统计", // 异常停车
                                 "name": "exceptionParkStat",
-
-                            },
+                                
+                            },    
                         ]
                     }
                 ]
-            },
+            },           
             {
                 "text": "设备管理",
                 "icon": "zongshujuliang",
@@ -1006,32 +1006,32 @@ let menu = {
                         "path": "/inRoad/equipmentStatus",
                         "text": "设备状态",
                         "name": "equipmentStatus",
-
+                        
                     },
-                    {
+                    { 
                         "path": "/inRoad/barMgm",
                         "text": "杆位管理",
                         "name": "barMgm",
-
+                        
                     },
-                    {
+                    { 
                         "path": "/inRoad/nvrMgm",
                         "text": "NVR管理",
                         "name": "nvrMgm",
-
+                        
                     },
-                    {
+                    { 
                         "path": "/inRoad/monitorEquipment",
                         "text": "监控设备",
                         "name": "monitorEquipment",
-
+                        
                     },
-                    {
+                    { 
                         "path": "/inRoad/equipmentBrand",
                         "text": "设备品牌",
                         "name": "equipmentBrand",
-
-                    },
+                        
+                    },  
                 ]
             },
             {
@@ -1042,25 +1042,25 @@ let menu = {
                         "path": "/inRoad/deviceAlarm",
                         "text": "设备报警",
                         "name": "deviceAlarm",
-
+                        
                     },
-                    {
+                    { 
                         "path": "/inRoad/deviceOrder",
                         "text": "设备工单",
                         "name": "deviceOrder",
-
+                        
                     },
-                    {
+                    { 
                         "path": "/inRoad/realtimeStat",
                         "text": "实时统计",
                         "name": "realtimeStat",
-
+                        
                     },
-                    {
+                    { 
                         "path": "/inRoad/historyStat",
                         "text": "历史统计",
                         "name": "historyStat",
-
+                        
                     },
                 ]
             },
@@ -1069,7 +1069,7 @@ let menu = {
                 "text": "停车业务概览",
                 "name": "parkingOverview",
                 "icon":"zongshujuliang",
-            },
+            },	  
             {
                 "text": "停车业务分析",
                 "icon": "zongshujuliang",
@@ -1078,67 +1078,67 @@ let menu = {
                         "path": "/dataAlyPrediction/parkingAnalysisOverview",
                         "text": "停车总分析",
                         "name": "parkingAnalysisOverview",
-
+                        
                     },
-                    {
+                    { 
                         "path": "/dataAlyPrediction/parkingAlyReport",
                         "text": "停车场分析报表",
                         "name": "parkingAlyReport",
-
+                        
                     },
-                    {
+                    { 
                         "path": "/dataAlyPrediction/parkingAlyDuration",
                         "text": "停车时长分析",
                         "name": "parkingAlyDuration",
-
+                        
                     },
-                    {
+                    { 
                         "path": "/dataAlyPrediction/parkingAlyPeriod",
                         "text": "停车时段分析",
                         "name": "parkingAlyPeriod",
-
+                        
                     },
-                    {
+                    { 
                         "path": "/dataAlyPrediction/temporaryParkStat",
                         "text": "临时停车统计",
                         "name": "temporaryParkStat",
-
+                        
                     },
-                    {
+                    { 
                         "path": "/dataAlyPrediction/nightParkStat",
                         "text": "夜间停车统计",
                         "name": "nightParkStat",
-
+                        
                     },
-                    {
+                    { 
                         "path": "/dataAlyPrediction/parkingLivedata",
                         "text": "停车实况数据",
                         "name": "parkingLivedata",
-
+                        
                     },
-                    {
+                    { 
                         "path": "/dataAlyPrediction/parkUsageAly",
                         "text": "泊位利用分析",
                         "name": "parkUsageAly",
-
+                        
                     },
-                    {
+                    { 
                         "path": "/dataAlyPrediction/ParkTurnoverAly",
                         "text": "泊位周转分析",
                         "name": "parkTurnoverAly",
-
+                        
                     },
-                    {
+                    { 
                         "path": "/dataAlyPrediction/carTypeAly",
                         "text": "车辆类型分析",
                         "name": "carTypeAly",
-
+                        
                     },
-                    {
+                    { 
                         "path": "/dataAlyPrediction/parkBerthAly",
                         "text": "停车泊位分析",
                         "name": "parkBerthAly",
-
+                        
                     },
                 ]
             },
@@ -1150,44 +1150,44 @@ let menu = {
                         "path": "/dataAlyPrediction/arrearageAly",
                         "text": "欠费总分析",
                         "name": "arrearageAly",
-
+                        
                     },
-                    {
+                    { 
                         "path": "/dataAlyPrediction/orderArrearageAly",
                         "text": "订单欠费分析",
                         "name": "orderArrearageAly",
-
+                        
                     },
-                    {
+                    { 
                         "path": "/dataAlyPrediction/cityArrearageAly",
                         "text": "城市欠费分析",
                         "name": "cityArrearageAly",
-
+                        
                     },
-                    {
+                    { 
                         "path": "/dataAlyPrediction/arrearageRecoverAly",
                         "text": "欠费追缴分析",
                         "name": "arrearageRecoverAly",
-
+                        
                     },
-                    {
+                    { 
                         "path": "/dataAlyPrediction/cityIncomeStat",
                         "text": "城市收入统计",
                         "name": "cityIncomeStat",
-
+                        
                     },
-                    {
+                    { 
                         "path": "/dataAlyPrediction/cityIncomeAly",
                         "text": "城市收入分析",
                         "name": "cityIncomeAly",
-
+                        
                     },
-                    {
+                    { 
                         "path": "/dataAlyPrediction/priceAly",
                         "text": "客单价分析",
                         "name": "priceAly",
-
-                    },
+                        
+                    },   
                 ]
             },
             {
@@ -1198,22 +1198,22 @@ let menu = {
                         "path": "/dataAlyPrediction/parkingAly",
                         "text": "停车分析",
                         "name": "parkingAly",
-
+                        
                     },
-                    {
+                    { 
                         "path": "/dataAlyPrediction/registerAly",
                         "text": "注册分析",
                         "name": "registerAly",
-
+                        
                     },
-                    {
+                    { 
                         "path": "/dataAlyPrediction/payAly",
                         "text": "支付分析",
                         "name": "payAly",
-
+                        
                     },
                 ]
-            },
+            }, 
             {
                 "text": "设备分析",
                 "icon": "zongshujuliang",
@@ -1222,7 +1222,7 @@ let menu = {
                         "path": "/dataAlyPrediction/equipmentRunningStat",
                         "text": "设备运行统计",
                         "name": "equipmentRunningStat",
-
+                        
                     },
                 ]
             },
@@ -1283,16 +1283,16 @@ let menu = {
                 "text": "物品查询",
                 "name": "itemRetrieval"
                 },
-                {
-                "path": "/search/fileSearch",
+                { 
+                "path": "/search/fileSearch", 
                 "text": "文件查询",
                 "name": "fileSearch",
                 },
-                {
-                "path": "/search/analysisRule",
+                { 
+                "path": "/search/analysisRule", 
                 "text": "分析规则查询",
                 "name": "analysisRule",
-                },
+                },  
                 {
                 "path":"/search/tagsSearch",
                 "text":"标签查询",
@@ -1315,7 +1315,7 @@ let menu = {
                 "text": "布控任务",
                 "name": "deployTask",
                 },
-
+                
             ]
             },
             {
@@ -1363,7 +1363,7 @@ let menu = {
                 "text": "级联管理",
                 "name": "systemConnect"
                 },
-
+                
             ]
             },
             {
@@ -1487,15 +1487,11 @@ let menu = {
             "equipmentRunningStat",
             "merchantAdmin",
             "userInfo" ,
-            "startExceptionDeal",
+            "startExceptionDeal", 
             "areaManage"
         ]
-
-  ]
+    }
 }
-      ]
-    },
-
 
 {
     "status": 20000,
@@ -1550,4 +1546,4 @@ let menu = {
         "is_disable": 0
       }
     ]
-}
+}
\ No newline at end of file
diff --git a/src/router/router.config.js b/src/router/router.config.js
index de1b642..89bc7bc 100644
--- a/src/router/router.config.js
+++ b/src/router/router.config.js
@@ -804,7 +804,7 @@ let routes = [
         component: pages.ComplainWorkStat,
       },
       {
-        path: "/operationCenter/geoSignalIgnoreAudit", //
+        path: "/operationCenter/geoSignalIgnoreAudit", //        
         text: "地磁信号忽略审核",
         name: "geoSignalIgnoreAudit",
         component: pages.GeoSignalIgnoreAudit,
@@ -836,7 +836,7 @@ let routes = [
       },
       {
         path: "/financialMgm/payRepeat",
-        text: "重复支付",
+        text: "重复支付", 
         name: "payRepeat",
         component: pages.PayRepeat,
       },
@@ -863,93 +863,93 @@ let routes = [
         path: "/systemMgm/roleMgm",
         text: "角色管理",
         name: "roleMgm",
-        component: pages.RoleMgm,
+        component: pages.RoleMgm, 
       },
       {
         path: "/systemMgm/businessConf",
         text: "业务配置",
         name: "businessConf",
-        component: pages.BusinessConf,
+        component: pages.BusinessConf, 
       },
       {
         // -------------------------------商户管理系统
-        path: "/merchantMgm/merchantInfo",
+        path: "/merchantMgm/merchantInfo",  
         text: "商户信息",
         name: "merchantInfo",
         component: pages.MerchantInfo,
       },
       {
-        path: "/merchantMgm/invoiceConf",
+        path: "/merchantMgm/invoiceConf", 
         text: "发票配置",
         name: "invoiceConf",
-        component: pages.InvoiceConf,
+        component: pages.InvoiceConf, 
       },
       {
         // -------------------------------路外停车管理系统
-        path: "/outRoad/outRoadOverview",
+        path: "/outRoad/outRoadOverview",  
         text: "概览",
         name: "outRoadOverview",
         component: pages.OutRoadOverview,
       },
       { // --------------路段管理
-        path: "/outRoad/chargeRulesMgm",
+        path: "/outRoad/chargeRulesMgm", 
         text: "计费规则管理",
         name: "chargeRulesMgm",
-        component: pages.ChargeRulesMgm,
+        component: pages.ChargeRulesMgm,  
       },
       {
-        path: "/outRoad/outSegment",
+        path: "/outRoad/outSegment", 
         text: "路段管理",
         name: "outSegment",
-        component: pages.OutSegment,
+        component: pages.OutSegment,  
       },
       {
-        path: "/outRoad/zombieCarMgm",
+        path: "/outRoad/zombieCarMgm", 
         text: "僵尸车管理",
         name: "zombieCarMgm",
-        component: pages.ZombieCarMgm,
+        component: pages.ZombieCarMgm,  
       },
       { // ----------------异常管理
-        path: "/outRoad/liftUpPoleRecord",
+        path: "/outRoad/liftUpPoleRecord", 
         text: "抬杆记录",
         name: "liftUpPoleRecord",
-        component: pages.LiftUpPoleRecord,
+        component: pages.LiftUpPoleRecord,  
       },
       {
-        path: "/outRoad/zombieCarCleanRecord",
+        path: "/outRoad/zombieCarCleanRecord", 
         text: "僵尸车清理记录",
         name: "zombieCarCleanRecord",
-        component: pages.ZombieCarCleanRecord,
+        component: pages.ZombieCarCleanRecord,  
       },
       { //----------------业务记录
-        path: "/outRoad/outParkingRecordInquiry",
+        path: "/outRoad/outParkingRecordInquiry", 
         text: "停车记录查询",
         name: "outParkingRecordInquiry",
-        component: pages.OutParkingRecordInquiry,
+        component: pages.OutParkingRecordInquiry,  
       },
       {
-        path: "/outRoad/outPayOrders",
+        path: "/outRoad/outPayOrders", 
         text: "停车支付订单",
         name: "outPayOrders",
-        component: pages.OutPayOrders,
+        component: pages.OutPayOrders,  
       },
       { //----------------设备管理
-        path: "/outRoad/outDevice",
+        path: "/outRoad/outDevice", 
         text: "路外设备管理",
         name: "outDevice",
-        component: pages.OutDevice,
+        component: pages.OutDevice,  
       },
       {
-        path: "/outRoad/outMonitorMgm",
+        path: "/outRoad/outMonitorMgm", 
         text: "视频监控设备管理",
         name: "outMonitorMgm",
-        component: pages.OutMonitorMgm,
+        component: pages.OutMonitorMgm,  
       },
       {
-        path: "/outRoad/outNvrMgm",
+        path: "/outRoad/outNvrMgm", 
         text: "NVR管理",
         name: "outNvrMgm",
-        component: pages.OutNvrMgm,
+        component: pages.OutNvrMgm,  
       },
     ],
   },
diff --git a/src/services/MerchantMgm/InvoiceConf/index.js b/src/services/MerchantMgm/InvoiceConf/index.js
deleted file mode 100644
index 8d651c8..0000000
--- a/src/services/MerchantMgm/InvoiceConf/index.js
+++ /dev/null
@@ -1,90 +0,0 @@
-import ajax from "@/config/ajax"
-
-//获取表格数据
-const getInvoiceTable=(p)=>{
-  return ajax({
-    url:"/api/bpm/merchantreceipt/get_all_receipt",
-    type:"post",
-    data:p
-  })
-}
-
-//获取商户名称的下拉
-const getTenantPull=(p)=>{
-  return ajax({
-    url:"/api/bpm/operator/get_all_operator",
-    type:"get",
-    data:p
-  })
-}
-
-//获取计税方式的下拉
-const getTaxWayPull=(p)=>{
-  return ajax({
-    url:"/api/bpm/merchantreceipt/get_tax_type",
-    type:"post",
-    data:p
-  })
-}
-
-//获取税率的下拉
-const getTaxRatePull=(p)=>{
-  return ajax({
-    url:"/api/bpm/merchantreceipt/get_percent_type",
-    type:"post",
-    data:p
-  })
-}
-//获取开票项目的下拉
-const getInvoiceItemPull=(p)=>{
-  return ajax({
-    url:"/api/bpm/merchantreceipt/get_item_list",
-    type:"post",
-    data:p
-  })
-}
-
-//获取含税标志的下拉
-const getTaxTypePull=(p)=>{
-  return ajax({
-    url:"/api/bpm/merchantreceipt/get_include_tax_list",
-    type:"post",
-    data:p
-  })
-}
-
-//新建保存
-const createForm=(p)=>{
-  return ajax({
-    url:"/api/bpm/merchantreceipt/add_receipt",
-    type:"post",
-    data:p
-  })
-}
-//查看详情
-const checkForm=(p)=>{
-  return ajax({
-    url:"/api/bpm/merchantreceipt/show_receipt",
-    type:"post",
-    data:p
-  })
-}
-//启用、停用
-const updateInvoiceStatus=(p)=>{
-  return ajax({
-    url:"/api/bpm/merchantreceipt//update_status",
-    type:"post",
-    data:p
-  })
-}
-export default {
-  getInvoiceTable,
-  getTenantPull,
-  getTaxWayPull,
-  getTaxRatePull,
-  getInvoiceItemPull,
-  getTaxTypePull,
-  createForm,
-  checkForm,
-  updateInvoiceStatus
-}
diff --git a/src/services/MerchantMgm/MerchantAdmin/index.js b/src/services/MerchantMgm/MerchantAdmin/index.js
deleted file mode 100644
index 0591654..0000000
--- a/src/services/MerchantMgm/MerchantAdmin/index.js
+++ /dev/null
@@ -1,65 +0,0 @@
-import ajax from "@/config/ajax"
-
-
-//获取表格数据
-const getMerchantAdminTable=(p)=>{
-  return ajax({
-    url:"/api/bpm/merchant/get_all_merchant",
-    type:"post",
-    data:p
-  })
-}
-
-//增加
-const addMerchantAdmin=(p)=>{
-  return ajax({
-    url:"/api/bpm/merchant/add_merchant",
-    type:"post",
-    data:p
-  })
-}
-
-//查看详情
-const checkMerchantAdmin=(p)=>{
-  return ajax({
-    url:"/api/bpm/merchant/show_merchant",
-    type:"post",
-    data:p
-  })
-}
-//编辑
-const updateMerchantAdmin=(p)=>{
-  return ajax({
-    url:"/api/bpm/merchant/edit_merchant",
-    type:"post",
-    data:p
-  })
-}
-
-//启用/停用
-const updateAdminStatus=(p)=>{
-  return ajax({
-    url:"/api/bpm/merchant/update_status",
-    type:"post",
-    data:p
-  })
-}
-
-//重置密码
-const resetPassWord=(p)=>{
-  return ajax({
-    url:"/api/bpm/merchant/update_pwd",
-    type:"post",
-    data:p
-  })
-}
-
-export default {
-  getMerchantAdminTable,
-  addMerchantAdmin,
-  checkMerchantAdmin,
-  updateAdminStatus,
-  updateMerchantAdmin,
-  resetPassWord
-}
-
diff --git a/src/services/MerchantMgm/MerchantInfo/index.js b/src/services/MerchantMgm/MerchantInfo/index.js
deleted file mode 100644
index b8e3082..0000000
--- a/src/services/MerchantMgm/MerchantInfo/index.js
+++ /dev/null
@@ -1,55 +0,0 @@
-import ajax from "@/config/ajax"
-
-//下拉框
-const getSelectOption = (p)=>{
-  return ajax({
-    url: "/api/com/common/get_sys_config",
-    type: 'get',
-    data: p
-  })
-}
-
-//获取表格数据
-const getMerchantInfoTable=(p)=>{
-  return ajax({
-    url:"/api/merchant/get_table",
-    type:"post",
-    data:p
-  })
-}
-
-//增加商户
-const addTenant=(p)=>{
-  return ajax({
-    url:"/api/bpm/merchantinfo/add_merchant",
-    type:"post",
-    data:p
-  })
-}
-
-//查看详情
-const checkTenant=(p)=>{
-  return ajax({
-    url:"/api/bpm/merchantinfo/show_merchant",
-    type:"post",
-    data:p
-  })
-}
-
-//启用/停用
-const updateStatus=(p)=>{
-  return ajax({
-    url:"/api/bpm/merchantinfo/update_status",
-    type:"post",
-    data:p
-  })
-}
-
-export default {
-  getSelectOption,
-  getMerchantInfoTable,
-  addTenant,
-  checkTenant,
-  updateStatus
-}
-
diff --git a/src/services/MerchantMgm/functionMgm/index.js b/src/services/MerchantMgm/functionMgm/index.js
deleted file mode 100644
index ff89d01..0000000
--- a/src/services/MerchantMgm/functionMgm/index.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import ajax from "@/config/ajax"
-
-
-//获取表格数据
-const getFunctionMgmTable=(p)=>{
-  return ajax({
-    url:"/api/bpm/merchantreceipt/get_all_func",
-    type:"post",
-    data:p
-  })
-}
-
-//增加
-
-
-//查看详情
-
-//编辑
-
-
-//启用/停用
-
-
-//重置密码
-
-
-export default {
-  getFunctionMgmTable,
-
-}
-
diff --git a/src/services/MerchantMgm/index.js b/src/services/MerchantMgm/index.js
index 36b2112..864d0b9 100644
--- a/src/services/MerchantMgm/index.js
+++ b/src/services/MerchantMgm/index.js
@@ -1,11 +1,34 @@
-import MerchantInfo from "./MerchantInfo";
-import invoiceConf from "./invoiceConf";
-import MerchantAdmin from "./MerchantAdmin";
-import functionMgm from "./functionMgm";
+import ajax from "@/config/ajax"
+
+//下拉框
+const getSelectOption = (p)=>{
+  return ajax({
+    url: "/api/com/common/get_sys_config",
+    type: 'get',
+    data: p
+  })
+}
+
+//获取表格数据
+const getTable=(p)=>{
+  return ajax({
+    url:"/api/merchant/get_table",
+    type:"post",
+    data:p
+  })
+}
+
+//增加商户
+const addTenant=(p)=>{
+  return ajax({
+    url:"/api/bpm/merchantinfo/add_merchan",
+    type:"post",
+    data:p
+  })
+}
 
 export default {
-  ...MerchantInfo,
-  ...invoiceConf,
-  ...MerchantAdmin,
-  ...functionMgm
+  getSelectOption,
+  getTable,
+  addTenant
 }