diff --git a/.env.development b/.env.development
index 934211c..51fee85 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@ ENV = 'development'
 # http://mer.crmeb.net/admin
 # base api
 # VUE_APP_BASE_API = 'http://192.168.31.106:8324'
-VUE_APP_BASE_API = 'https://mer1.crmeb.net'
+VUE_APP_BASE_API = 'http://127.0.0.1:8324'
 
 # socket 连接地址
 # VUE_APP_WS_URL = 'ws://0.0.0.0:8324'
diff --git a/src/api/supply.js b/src/api/supply.js
new file mode 100644
index 0000000..41559f2
--- /dev/null
+++ b/src/api/supply.js
@@ -0,0 +1,380 @@
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+import request from './request'
+
+/**
+ * @description 商户权限管理 -- 列表
+ */
+export function supplyMenuListApi(data) {
+  return request.get('supply/menu/lst', data)
+}
+/**
+ * @description 商户权限管理 -- 新增表单
+ */
+export function supplyMenuCreateApi() {
+  return request.get('supply/menu/create/form')
+}
+/**
+ * @description 商户权限管理 -- 编辑表单
+ */
+export function supplyMenuUpdateApi(id) {
+  return request.get(`supply/menu/update/form/${id}`)
+}
+/**
+ * @description 商户权限管理 -- 删除
+ */
+export function supplyMenuDeleteApi(id) {
+  return request.delete(`supply/menu/delete/${id}`)
+}
+/**
+ * @description 商户列表 -- 列表
+ */
+export function supplyListApi(data) {
+  return request.get('system/supply/lst', data)
+}
+/**
+ * @description 商户列表 -- 详情
+ */
+export function supplyDetail(id) {
+  return request.get(`system/supply/detail/${id}`)
+}
+/**
+ * @description 商户列表 -- 新增表单
+ */
+export function supplyCreateApi() {
+  return request.get('system/supply/create/form')
+}
+/**
+ * @description 商户列表 -- 新增
+ */
+export function supplyCreate(data) {
+  return request.post('system/supply/create', data)
+}
+/**
+ * @description 商户列表 -- 编辑表单
+ */
+export function supplyUpdateApi(id) {
+  return request.get(`system/supply/update/form/${id}`)
+}
+
+/**
+ * @description 商户列表 -- 编辑
+ */
+export function supplyUpdate(id,data) {
+  return request.post(`system/supply/update/${id}`,data)
+}
+/**
+ * @description 商户列表 -- 删除
+ */
+export function supplyDeleteApi(id) {
+  return request.delete(`system/supply/delete/${id}`)
+}
+/**
+ * @description 商户列表 -- 删除(表单)
+ */
+export function supplyDeleteForm(id) {
+  return request.get(`system/supply/delete/${id}/form`)
+}
+/**
+ * @description 商户列表 -- 修改开启状态
+ */
+export function supplyStatuseApi(id, status) {
+  return request.post(`system/supply/status/${id}`, { status })
+}
+/**
+ * @description 商户列表 -- 修改密码
+ */
+export function supplyPasswordApi(id) {
+  return request.get(`system/supply/password/form/${id}`)
+}
+/**
+ * @description 商户分类 -- 列表
+ */
+export function categoryListApi(data) {
+  return request.get('system/supply/category/lst', data)
+}
+/**
+ * @description 商户分类 -- 新增表单
+ */
+export function categoryCreateApi() {
+  return request.get('system/supply/category/form')
+}
+/**
+ * @description 商户分类 -- 编辑表单
+ */
+export function categoryUpdateApi(id) {
+  return request.get(`system/supply/category/form/${id}`)
+}
+/**
+ * @description 商户分类 -- 删除
+ */
+export function categoryDeleteApi(id) {
+  return request.delete(`system/supply/category/${id}`)
+}
+
+/**
+ * @description 商户对账 -- 订单列表
+ */
+export function merOrderListApi(id, data) {
+  return request.get(`supply/order/lst/${id}`, data)
+}
+/**
+ * @description 商户对账 -- 订单备注
+ */
+export function orderMarkApi(id) {
+  return request.get(`supply/order/mark/${id}/form`)
+}
+/**
+ * @description 商户对账 -- 退款订单列表
+ */
+export function refundOrderListApi(id, data) {
+  return request.get(`supply/order/refund/lst/${id}`, data)
+}
+/**
+ * @description 退款订单 -- 订单备注
+ */
+export function refundMarkApi(id) {
+  return request.get(`supply/order/refund/mark/${id}/form`)
+}
+/**
+ * @description 对账订单 -- 发起对账单
+ */
+export function reconciliationApi(id, data) {
+  return request.post(`supply/order/reconciliation/create/${id}`, data)
+}
+/**
+ * @description 对账订单 -- 发起对账单
+ */
+export function supplyLoginApi(mer_id) {
+  return request.post(`system/supply/login/${mer_id}`)
+}
+/**
+ * @description 申请管理 -- 列表
+ */
+export function intentionLstApi(data) {
+  return request.get('supply/intention/lst', data)
+}
+/**
+ * @description 申请管理 -- 备注
+ */
+export function auditApi(mer_id) {
+  return request.get(`supply/intention/mark/${mer_id}/form`)
+}
+/**
+ * @description 申请管理 -- 删除
+ */
+export function intentionDelte(mer_id) {
+  return request.delete(`supply/intention/delete/${mer_id}`)
+}
+/**
+ * @description 申请管理 -- 修改状态
+ */
+export function intentionStatusApi(mer_id) {
+  return request.get(`supply/intention/status/${mer_id}/form`)
+}
+/**
+ * @description 申请管理 -- 编辑复制次数
+ */
+export function changeCopyApi(mer_id) {
+  return request.get(`system/supply/changecopy/${mer_id}/form`)
+}
+/**
+ * @description 申请管理 -- 入驻协议详情
+ */
+export function intentionAgreeInfo() {
+  return request.get(`agreement/sys_intention_agree`)
+}
+/**
+ * @description 申请管理 -- 入驻协议保存
+ */
+export function intentionAgreeUpdate(data) {
+  return request.post(`agreement/sys_intention_agree`,data)
+}
+/**
+ * @description 店铺类型 -- 获取说明
+ */
+ export function getStoreTypeApi(key) {
+    return request.get(`agreement/${key}`)
+}
+/**
+ * @description 店铺类型 -- 编辑说明
+ */
+export function updateStoreTypeApi(type, data) {
+    return request.post(`agreement/${type}`, data)
+}
+/**
+ * @description 商户列表 -- 开启关闭
+ */
+export function supplyIsCloseApi(id, status) {
+  return request.post(`system/supply/close/${id}`, { status })
+}
+/**
+ * @description 商户列表 -- 开启商户数
+ */
+export function supplyCountApi() {
+  return request.get(`system/supply/count`)
+}
+
+/**
+ * @description 店铺类型 -- 创建店铺类型
+ */
+export function storeTypeCreateApi(data) {
+    return request.post(`supply/type/create`, data)
+}
+/**
+ * @description 店铺类型 -- 列表
+ */
+ export function storeTypeLstApi(data) {
+  return request.get(`supply/type/lst`, data)
+}
+/**
+ * @description 店铺类型 -- 店铺权限
+ */
+ export function storeJurisdictionApi() {
+  return request.get(`supply/type/mer_auth`)
+}
+/**
+ * @description 店铺类型 -- 创建店铺类型
+ */
+export function storeTypeUpdateApi(id, data) {
+    return request.post(`supply/type/update/${id}`, data)
+}
+/**
+ * @description 店铺类型列表 -- 删除
+ */
+export function storeTypeDeleteApi(id) {
+    return request.delete(`supply/type/delete/${id}`)
+}
+/**
+ * @description 店铺类型列表 -- 备注
+ */
+export function supplyTypeMarkForm(id) {
+    return request.get(`supply/type/mark/${id}`)
+}
+/**
+ * @description 店铺类型列表 -- 详情
+ */
+ export function supplyTypeDetailApi(id) {
+  return request.get(`/supply/type/detail/${id}`)
+}
+/**
+ * @description 店铺类型 -- 获取选择项
+ */
+export function getstoreTypeApi() {
+    return request.get(`supply/type/options`)
+}
+/**
+ * @description 商户分类 -- 获取选择项
+ */
+export function getMerCateApi() {
+    return request.get(`system/supply/category/options`)
+}
+/**
+ * @description 服务申请 -- 列表
+ */
+export function getApplymentLst(data) {
+    return request.get(`system/applyments/lst`, data)
+}
+/**
+ * @description 服务申请 -- 审核
+ */
+export function applymentStatusApi(id, data) {
+    return request.post(`system/applyments/status/${id}`, data)
+}
+/**
+ * @description 服务申请 -- 详情
+ */
+export function applymentDetailApi(id) {
+    return request.get(`system/applyments/detail/${id}`)
+}
+/**
+ * @description 商户 -- 分账列表
+ */
+ export function applymentLstApi(data) {
+    return request.get(`profitsharing/lst`, data)
+}
+/**
+ * @description 商户 -- 分账（立即分账）
+ */
+ export function splitAccountApi(id) {
+    return request.post(`profitsharing/again/${id}`)
+}
+/**
+ * @description 分账申请 -- 备注
+ */
+export function splitAccountMark(id) {
+    return request.get(`system/applyments/mark/${id}/form`)
+}
+/**
+ * @description 分账管理 -- 导出
+ */
+ export function ledgerManageExportApi(data) {
+  return request.get(`profitsharing/export`, data)
+}
+/**
+ * @description 缴存保证金 -- 列表
+ */
+ export function marginLstApi(data) {
+  return request.get(`margin/lst`, data)
+}
+/**
+ * @description 待缴保证金 -- 列表
+ */
+export function marginDepositLstApi(data) {
+  return request.get(`margin/make_up`, data)
+}
+/**
+ * @description 待缴保证金 -- 线下付款
+ */
+export function marginPaymentApi(id) {
+  return request.get(`margin/local/${id}/form`)
+}
+/**
+ * @description 退回保证金 -- 列表
+ */
+ export function marginRefundLstApi(data) {
+  return request.get(`margin/refund/lst`, data)
+}
+/**
+ * @description 退回保证金 -- 审核
+ */
+ export function marginRefundStatus(id) {
+  return request.get(`margin/refund/status/${id}/form`)
+}
+/**
+ * @description 退回保证金 -- 备注
+ */
+ export function marginRefundMark(id) {
+  return request.get(`margin/refund/mark/${id}/form`)
+}
+/**
+ * @description 退回保证金 -- 退回信息
+ */
+ export function marginRefundInfo(id) {
+  return request.get(`margin/refund/show/${id}`)
+}
+/**
+ * @description 退回保证金 -- 扣费记录
+ */
+ export function marginDeductionRecord(id, data) {
+  return request.get(`margin/list/${id}`, data)
+}
+/**
+ * @description 退回保证金 -- 保证金扣费
+ */
+ export function marginDeductionForm(id) {
+  return request.get(`margin/set/${id}/form`)
+}
+/**
+ * @description 商户详情 -- 操作记录
+ */
+export function supplyOperateLog(id, data) {
+  return request.get(`system/supply/get_operate_list/${id}`, data)
+}
diff --git a/src/router/index.js b/src/router/index.js
index 7d4d56b..65e59ba 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -39,6 +39,7 @@ import stationRouter from "./modules/station";
 import serviceRouter from "./modules/service";
 import communityRouter from "./modules/community";
 import deliveryRouter from "./modules/delivery";
+import supplyRouter from "./modules/supply";
 
 export const constantRoutes = [
   configRouter,
@@ -64,6 +65,7 @@ export const constantRoutes = [
   serviceRouter,
   communityRouter,
   deliveryRouter,
+  supplyRouter,
   {
     path: roterPre,
     component: Layout,
diff --git a/src/router/modules/supply.js b/src/router/modules/supply.js
new file mode 100644
index 0000000..55d44df
--- /dev/null
+++ b/src/router/modules/supply.js
@@ -0,0 +1,135 @@
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+import Layout from '@/layout'
+import { roterPre } from '@/settings'
+const supplyRouter =
+    {
+      path: `${roterPre}/supply`,
+      name: 'supply',
+      meta: {
+        icon: 'dashboard',
+        title: '商户管理'
+      },
+      alwaysShow: true,
+      component: Layout,
+      children: [
+        {
+          path: 'system',
+          name: 'SupplySystem',
+          meta: {
+            title: '商户权限管理',
+            noCache: true
+          },
+          component: () => import('@/views/supply/system/index')
+        },
+        {
+          path: 'list',
+          name: 'SupplyList',
+          meta: {
+            title: '商户列表',
+            noCache: true
+          },
+          component: () => import('@/views/supply/list/index')
+        },
+        {
+          path: 'list/reconciliation/:id/:type?',
+          name: 'SupplyRecord',
+          component: () => import('@/views/supply/list/record'),
+          meta: {
+            title: '商户对账',
+            noCache: true,
+            activeMenu: `${roterPre}/supply/list`
+          },
+          hidden: true
+        },
+        {
+          path: 'classify',
+          name: 'SupplyClassify',
+          meta: {
+            title: '商户分类',
+            noCache: true
+          },
+          component: () => import('@/views/supply/classify')
+        },
+        {
+          path: 'application',
+          name: 'SupplyApplication',
+          meta: {
+            title: '商户申请',
+            noCache: true
+          },
+          component: () => import('@/views/supply/application')
+        },
+        {
+          path: 'agree',
+          name: 'SupplyAgreement',
+          meta: {
+            title: '入驻协议',
+            noCache: true
+          },
+          component: () => import('@/views/supply/agreement')
+        },
+        {
+            path: 'type',
+            name: 'storeType',
+            meta: {
+              title: '店铺类型',
+              noCache: true
+            },
+            component: () => import('@/views/supply/type/index')
+          },
+          {
+            path: 'applyMents',
+            name: 'SupplyApplyMents',
+            meta: {
+              title: '服务申请',
+              noCache: true
+            },
+            component: () => import('@/views/supply/applyments/index')
+          },
+          {
+            path: 'applyList',
+            name: 'ApplyList',
+            meta: {
+              title: '分账商户列表'
+            },
+            component: () => import('@/views/supply/applyments/list')
+          },
+          {
+            path: 'type/description',
+            name: 'MerTypeDesc',
+            meta: {
+              title: '店铺类型说明',
+              noCache: true,
+            },
+            component: () => import('@/views/supply/type/description')
+          },
+          {
+            path: 'deposit_list',
+            name: 'DepositList',
+            meta: {
+              title: '店铺保证金管理',
+              noCache: true
+            },
+            component: () => import('@/views/supply/deposit/index')
+          },
+          {
+            path: 'recharge_record',
+            name: 'RechargeRecord',
+            meta: {
+              title: '商户充值记录',
+              noCache: true
+            },
+            component: () => import('@/views/supply/rechargeRecord/index')
+          },
+      ]
+    }
+
+export default supplyRouter
diff --git a/src/views/supply/agreement/index.vue b/src/views/supply/agreement/index.vue
new file mode 100644
index 0000000..136f98d
--- /dev/null
+++ b/src/views/supply/agreement/index.vue
@@ -0,0 +1,171 @@
+<template>
+  <div class="divBox">
+    <el-card class="box-card">
+      <el-form ref="formValidate" v-loading="fullscreenLoading" class="formValidate mt20"  :model="formValidate" label-width="100px" @submit.native.prevent>
+        <el-col :span="24">
+          <el-form-item>
+            <h3 class="title">商户入驻协议</h3>
+            <ueditor-from v-model="formValidate.agree" :content="formValidate.agree" style="width: 100%"/>
+          </el-form-item>
+        </el-col>
+        <el-form-item style="margin-top:30px;">
+          <el-button type="primary" class="submission" size="small" @click="previewProtol">预览</el-button>
+          <el-button type="primary" class="submission" size="small" @click="handleSubmit('formValidate')">提交</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <div class="Box">
+      <el-dialog
+        v-if="modals"
+        :visible.sync="modals"
+        title=""
+        height="30%"
+        custom-class="dialog-scustom"
+        class="addDia"
+      >
+        <div class="agreement">
+          <h3>商户入驻协议</h3>
+          <div class="content">
+            <div v-html="formValidate.agree"></div>
+          </div>
+        </div>
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script>
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+import ueditorFrom from '@/components/ueditorFrom'
+
+import {
+  intentionAgreeInfo,
+  intentionAgreeUpdate
+} from '@/api/supply'
+export default {
+  name: 'ProductExamine1',
+  components: { ueditorFrom },
+  data() {
+    return {
+      modals: false,
+      props: {
+        emitPath: false
+      },
+      formValidate: {
+        agree: '',
+      },
+      content: '',
+      fullscreenLoading: false,
+    }
+  },
+  mounted() {
+    this.getInfo();
+  },
+  methods: {
+    getInfo() {
+      this.fullscreenLoading = true
+      intentionAgreeInfo().then(res => {
+        const info = res.data
+        this.formValidate = {
+          agree: info.sys_intention_agree,
+        }
+        this.fullscreenLoading = false
+      }).catch(res => {
+        this.$message.error(res.message)
+        this.fullscreenLoading = false
+      })
+    },
+
+    // 提交
+    handleSubmit(name) {
+      if(this.formValidate.agree === '' || !this.formValidate.agree){
+        this.$message.warning("请输入协议信息！");
+        return
+      }else{
+        intentionAgreeUpdate(this.formValidate).then(async res => {
+          this.fullscreenLoading = false
+          this.$message.success(res.message)
+        }).catch(res => {
+          this.fullscreenLoading = false
+          this.$message.error(res.message)
+        })
+
+      }
+
+    },
+    previewProtol(){
+      this.modals = true;
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.dialog-scustom,.addDia{
+  min-width: 400px;
+  height: 900px;
+  .el-dialog{
+    width: 400px;
+  }
+  h3{
+    color: #333;
+    font-size: 16px;
+    text-align: center;
+    font-weight: bold;
+    margin: 0;
+  }
+}
+.title{
+  font-weight: bold;
+  font-size: 18px;
+  text-align: center;
+  width: 90%;
+}
+.agreement{
+  width: 350px;
+  margin: 0 auto;
+  box-shadow: 1px 5px 5px 2px rgba(0,0,0,.2);
+  padding: 26px;
+  border-radius: 15px;
+  .content{
+    height: 600px;
+    overflow-y:scroll;
+    /deep/ p{
+      font-size: 13px;
+      line-height: 22px;
+    }
+  }
+  /deep/ img{
+    max-width: 100%;
+  }
+  p{
+    text-align: justify;
+  }
+}
+/*css主要部分的样式*/
+/*定义滚动条宽高及背景，宽高分别对应横竖滚动条的尺寸*/
+
+::-webkit-scrollbar {
+  width: 10px; /*对垂直流动条有效*/
+  height: 10px; /*对水平流动条有效*/
+}
+
+/*定义滚动条的轨道颜色、内阴影及圆角*/
+::-webkit-scrollbar-track{
+  /*-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.3);*/
+  background-color: transparent;
+  border-radius: 3px;
+}
+
+</style>
+
+
+
diff --git a/src/views/supply/application/index.vue b/src/views/supply/application/index.vue
new file mode 100644
index 0000000..ecda849
--- /dev/null
+++ b/src/views/supply/application/index.vue
@@ -0,0 +1,310 @@
+<template>
+  <div class="divBox">
+    <div class="selCard">
+      <el-form :model="tableFrom" ref="searchForm" size="small" label-width="85px" :inline="true">
+        <el-form-item label="状态：" prop="status">
+          <el-select
+            v-model="tableFrom.status"
+            clearable
+            placeholder="请选择"
+            class="selWidth"
+            @change="getList(1)"
+          >
+            <el-option label="全部" value=""/>
+            <el-option label="待审核" value="0"/>
+            <el-option label="审核通过" value="1"/>
+            <el-option label="审核未通过" value="-1"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="选择时间：">
+          <el-date-picker
+            v-model="timeVal"
+            type="daterange"
+            placeholder="选择日期"
+            format="yyyy/MM/dd"
+            value-format="yyyy/MM/dd"
+            :picker-options="pickerOptions"
+            @change="onchangeTime"
+            style="width: 280px"
+          />
+        </el-form-item>
+        <el-form-item label="商户分类：" prop="category_id">
+          <el-select
+            v-model="tableFrom.category_id"
+            clearable
+            placeholder="请选择"
+            class="selWidth"
+            @change="getList(1)"
+          >
+            <el-option
+              v-for="item in merCateList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="店铺类型：" prop="type_id">
+          <el-select
+            v-model="tableFrom.type_id"
+            clearable
+            placeholder="请选择"
+            class="selWidth"
+            @change="getList(1)"
+          >
+            <el-option
+              v-for="item in storeType"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="关键字：" prop="keyword">
+          <el-input
+            v-model="tableFrom.keyword"
+            @keyup.enter.native="getList(1)"
+            placeholder="请输入商户名称关键字/联系电话"
+            class="selWidth"
+            clearable
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" size="small" @click="getList(1)">搜索</el-button>
+          <el-button size="small" @click="searchReset()">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <el-card class="mt14">
+      <el-table
+        v-loading="listLoading"
+        :data="tableData.data"
+        size="small"
+        highlight-current-row
+        class="switchTable"
+      >
+        <el-table-column prop="mer_intention_id" label="ID" min-width="60" />
+        <el-table-column prop="mer_name" label="商户名称" min-width="150" />
+        <el-table-column prop="category_name" label="商户分类" min-width="150" />
+        <el-table-column prop="type_name" label="店铺类型" min-width="150" />
+        <el-table-column prop="name" label="商户姓名" min-width="100" />
+        <el-table-column prop="phone" label="联系方式" min-width="100" />
+        <el-table-column prop="create_time" label="申请时间" min-width="150" />
+        <el-table-column prop="create_time" label="资质图片" min-width="150">
+          <template slot-scope="scope">
+            <div class="demo-image__preview">
+              <el-image
+                v-for="(item, index) in scope.row.images"
+                :key="index"
+                :src="item"
+                class="mr5"
+                :preview-src-list="[item]"
+              />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" min-width="150">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.status == 1" type="success">通过</el-tag>
+            <el-tag v-if="scope.row.status == 0" type="info">未处理</el-tag>
+            <el-tag v-if="scope.row.status == 2" type="warning">未通过</el-tag>
+            <div v-if="scope.row.status == 2">原因：{{ scope.row.fail_msg }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="mark" label="备注" min-width="150" />
+        <el-table-column label="操作" min-width="150" fixed="right">
+          <template slot-scope="scope">
+            <el-button
+              v-if="scope.row.status == 0"
+              type="text"
+              size="small"
+              @click="onchangeIsShow(scope.row.mer_intention_id)"
+              >审核</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="onEdit(scope.row.mer_intention_id)"
+              >备注</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="handleDelete(scope.row.mer_intention_id)"
+              >删除</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <el-pagination
+          background
+          :page-size="tableFrom.limit"
+          :current-page="tableFrom.page"
+          layout="total, prev, pager, next, jumper"
+          :total="tableData.total"
+          @size-change="handleSizeChange"
+          @current-change="pageChange"
+        />
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+import {
+  intentionLstApi,
+  auditApi,
+  intentionDelte,
+  intentionStatusApi,
+  getstoreTypeApi,
+  getMerCateApi
+} from "@/api/supply";
+import { fromList, statusList } from "@/libs/constants.js";
+import { roterPre } from "@/settings";
+import timeOptions from '@/utils/timeOptions';
+export default {
+  name: "MerchantApplication",
+  data() {
+    return {
+      props: {
+        emitPath: false
+      },
+      pickerOptions: timeOptions,
+      fromList: fromList,
+      statusList: statusList, //筛选状态列表
+      roterPre: roterPre,
+      isChecked: false,
+      listLoading: true,
+      merCateList: [],
+      storeType: [],
+      tableData: {
+        data: [],
+        total: 0,
+      },
+      tableFrom: {
+        page: 1,
+        limit: 20,
+        date: "",
+        status: this.$route.query.status ? this.$route.query.status : "",
+        keyword: "",
+        mer_intention_id: this.$route.query.id ? this.$route.query.id : "",
+        category_id: "",
+        type_id: ""
+      },
+      mer_id: this.$route.query.id ? this.$route.query.id : "",
+      autoUpdate: true,
+      timeVal: [],
+    };
+  },
+  watch: {
+    mer_id(newName, oldName) {
+     this.getList("");
+    }
+  },
+  mounted() {
+    this.getMerCategory();
+    this.getStoreType();
+    this.getList("");
+  },
+  methods: {
+    /**重置 */
+    searchReset(){
+      this.timeVal = []
+      this.tableFrom.date = ""
+      this.$refs.searchForm.resetFields()
+      this.getList(1)
+    },
+    statusChange(tab) {
+      this.tableFrom.status = tab;
+      this.tableFrom.page = 1;
+      this.getList("");
+    },
+    // 具体日期
+    onchangeTime(e) {
+      this.timeVal = e;
+      this.tableFrom.date = this.timeVal ? this.timeVal.join("-") : "";
+      this.tableFrom.page = 1;
+      this.getList("");
+    },
+    // 商户分类；
+    getMerCategory() {
+      getMerCateApi().then(res => {
+          this.merCateList = res.data
+      }).catch(res => {
+          this.$message.error(res.message)
+      })
+    },
+    /**获取店铺类型 */
+    getStoreType(){
+      getstoreTypeApi().then(res => {
+          this.storeType = res.data
+      }).catch(res => {
+          this.$message.error(res.message)
+      })
+    },
+    // 列表
+    getList(num) {
+      this.listLoading = true;
+      this.tableFrom.page = num ? num : this.tableFrom.page;
+      intentionLstApi(this.tableFrom)
+        .then((res) => {
+          this.tableData.data = res.data.list;
+          this.tableData.total = res.data.count;
+          this.listLoading = false;
+        })
+        .catch((res) => {
+          this.listLoading = false;
+          this.$message.error(res.message);
+        });
+    },
+    pageChange(page) {
+      this.tableFrom.page = page;
+      this.getList("");
+    },
+    handleSizeChange(val) {
+      this.tableFrom.limit = val;
+      this.getList(1);
+    },
+    // 修改状态
+    onchangeIsShow(id) {
+      this.$modalForm(intentionStatusApi(id)).then(() => this.getList(""));
+    },
+    // 添加
+
+    // 编辑
+    onEdit(id) {
+      this.$modalForm(auditApi(id)).then(() => this.getList(""));
+    },
+    // 删除
+    handleDelete(id) {
+      this.$deleteSure().then(() => {
+        intentionDelte(id)
+          .then(({ message }) => {
+            this.$message.success(message);
+            this.getList("");
+          })
+          .catch(({ message }) => {
+            this.$message.error(message);
+          });
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+/deep/ table .el-image {
+  display: inline-block !important;
+}
+@import '@/styles/form.scss';
+</style>
diff --git a/src/views/supply/applyments/index.vue b/src/views/supply/applyments/index.vue
new file mode 100644
index 0000000..032c9ef
--- /dev/null
+++ b/src/views/supply/applyments/index.vue
@@ -0,0 +1,488 @@
+<template>
+  <div class="divBox">
+    <div class="selCard">
+      <el-form :model="tableFrom" ref="searchForm" size="small" label-width="85px" :inline="true">
+        <el-form-item label="状态：" class="width100" prop="status">
+          <el-radio-group v-model="tableFrom.status" size="small" @change="statusChange(tableFrom.status)">
+            <el-radio-button v-for="(itemn, indexn) in statusList" :key="indexn" :label="itemn.val">{{ itemn.text }}</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="选择时间：">
+          <el-date-picker v-model="timeVal" type="daterange" placeholder="选择日期" format="yyyy/MM/dd" value-format="yyyy/MM/dd" :picker-options="pickerOptions" @change="onchangeTime" style="width:280px;" />
+        </el-form-item>
+        <el-form-item label="商户名称：" prop="mer_id">
+          <el-select v-model="tableFrom.mer_id" clearable filterable placeholder="请选择" class="selWidth" @change="getList(1)">
+            <el-option v-for="item in merSelect" :key="item.mer_id" :label="item.mer_name" :value="item.mer_id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" size="small" @click="getList(1)">搜索</el-button>
+          <el-button size="small" @click="searchReset()">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <el-card class="mt14">
+      <el-table v-loading="listLoading" :data="tableData.data" size="small" highlight-current-row>
+        <el-table-column prop="mer_applyments_id" label="ID" min-width="60" />
+        <el-table-column prop="applyment_id" label="微信支付申请单号" min-width="150" />
+        <el-table-column prop="out_request_no" label="业务申请编号" min-width="260" />
+        <el-table-column prop="merchant.mer_name" label="商户名" min-width="100" />
+        <el-table-column prop="sub_mchid" label="分账商户ID" min-width="90" />
+        <el-table-column prop="message" label="审核结果" min-width="100" />
+        <el-table-column prop="create_time" label="申请时间" min-width="150" />
+        <el-table-column label="状态" min-width="120">
+          <template slot-scope="scope">
+            <div v-if="scope.row.status == 0">待审核</div>
+            <div v-if="scope.row.status == -1">平台驳回</div>
+            <div v-if="scope.row.status == 10">平台提交审核中</div>
+            <div v-if="scope.row.status == 1">商户验证</div>
+            <div v-if="scope.row.status == 20">已完成</div>
+            <div v-if="scope.row.status == 30">已冻结</div>
+            <div v-if="scope.row.status == 40">微信驳回</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="mark" label="备注" min-width="150" />
+        <el-table-column label="操作" min-width="120" fixed="right">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="handleMark(scope.row.mer_applyments_id)">备注</el-button>
+            <el-button v-if="scope.row.status == 0" type="text" size="small" @click="handleDetail(scope.row.mer_id)">审核</el-button>
+            <el-button type="text" size="small" @click="handleDetail(scope.row.mer_id)">详情</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <el-pagination background :page-size="tableFrom.limit" :current-page="tableFrom.page" layout="total, prev, pager, next, jumper" :total="tableData.total" @size-change="handleSizeChange" @current-change="pageChange" />
+      </div>
+    </el-card>
+    <!-- 详情 -->
+    <el-drawer title="商户分账详情" :visible.sync="visible" size="800px" :before-close="handleClose" class="dia">
+      <div v-loading="loading">
+        <div class="box-container">
+         <div>
+          <div class="title" style="margin-top: 20px;">基本信息</div>
+            <div class="acea-row">
+              <div class="list sp"><label class="name">业务申请编号：</label>{{ formValidate.out_request_no }}</div>
+              <div class="list sp"><label class="name">主体类型：</label>{{formValidate.organization_type | organizationType }}</div>
+            </div>
+          </div>
+          <div v-if="formValidate.organization_type != 2401 && formValidate.organization_type != 2500" class="section">
+            <div class="title" style="margin-top: 20px;">{{(formValidate.organization_type == 2 || formValidate.organization_type == 4) ? '营业执照信息' : '登记证书信息'}}</div>
+            <div class="acea-row">
+              <div class="list sp100 image">
+                <label class="name">证件扫描件：</label>
+                <span class="img">
+                    <img style="max-width: 150px; height: 80px;" :src="formValidate.business_license_copy && formValidate.business_license_copy['dir']" @click="getPicture(formValidate.business_license_copy['dir'])" />
+                </span>
+            </div>
+                <div class="list sp100"><label class="name">证件注册号：</label>{{ formValidate.business_license_number }}</div>
+                <div class="list sp100"><label class="name">商户名称：</label>{{ formValidate.merchant_name }}</div>
+                <div class="list sp"><label class="name">经营者/法定代表人姓名：</label>{{ formValidate.legal_person }}</div>
+                <div class="list sp" v-if="formValidate.company_address"><label class="name">注册地址：</label>{{ formValidate.company_address }}</div>
+                <div class="list sp" v-if="formValidate.business_time"><label class="name">营业期限：</label>{{ formValidate.business_start +'-'+ formValidate.business_end }}</div>
+            </div>
+          </div>
+          <div v-if="formValidate.organization_cert_info" class="section">
+            <div class="title" style="margin-top: 20px;">组织机构代码证信息：</div>
+            <div class="acea-row">
+              <div class="list sp100 image">
+                <label class="name">组织机构代码证照片：</label>
+                <span class="img">
+                  <img style="max-width: 150px; height: 80px;" :src="formValidate.organization_copy && formValidate.organization_copy['dir']" @click="getPicture(formValidate.organization_copy['dir'])" />
+                </span>
+              </div>
+              <div class="list sp"><label class="name">组织机构代码：</label>{{ formValidate.organization_number }}</div>
+              <div class="list sp"><label class="name">组织机构代码有效期限：</label>{{ formValidate.start_time+'-'+formValidate.end_time }}</div>
+              <div class="list sp"><label class="name">经营者/法人证件类型：</label>{{ formValidate.id_doc_type | id_docType}}</div>
+            </div>
+          </div>
+          <div v-if="formValidate.id_doc_type == 1" class="section">
+            <div class="title" style="margin-top: 20px;">经营者/法人身份证信息：</div>
+            <div class="acea-row">
+              <div class="list sp100 image">
+                <label class="name">身份证人像面照片：</label>
+                <span class="img">
+                  <img style="max-width: 150px; height: 80px;" :src="formValidate.id_card_copy && formValidate.id_card_copy['dir']" @click="getPicture(formValidate.id_card_copy['dir'])" />
+                </span>
+              </div>
+              <div class="list sp100 image">
+                <label class="name">身份证国徽面照片：</label>
+                <span class="img">
+                  <img style="max-width: 150px; height: 80px;" :src="formValidate.id_card_national && formValidate.id_card_national['dir']" @click="getPicture(formValidate.id_card_national['dir'])" />
+                </span>
+              </div>
+              <div class="list sp"><label class="name">身份证姓名：</label>{{formValidate.id_card_name}}</div>
+              <div class="list sp"><label class="name">身份证号码：</label>{{formValidate.id_card_number}}</div>
+              <div class="list sp"><label class="name">身份证有效期限：</label>{{formValidate.id_card_valid_time}}</div>
+            </div>
+          </div>
+          <div v-else class="section">
+            <div class="title" style="margin-top: 20px;">经营者/法人其他类型证件信息：</div>
+            <div class="acea-row">
+              <div class="list sp"><label class="name">证件姓名：</label>{{formValidate.id_doc_name}}</div>
+              <div class="list sp"><label class="name">证件号码：</label>{{formValidate.id_doc_number }}</div>
+              <div class="list sp100 image">
+                <label class="name">证件照片：</label>
+                <span class="img">
+                  <img style="max-width: 150px; height: 80px;" :src="formValidate.id_doc_copy && formValidate.id_doc_copy['dir']" @click="getPicture(formValidate.id_doc_copy['dir'])" />
+                </span>
+              </div>
+              <div class="list sp"><label class="name">证件结束日期：</label>{{formValidate.doc_period_end}}</div>
+            </div>
+          </div>
+          <div class="section">
+            <div class="title" style="margin-top: 20px;">结算银行账户：</div>
+            <div class="acea-row">
+              <div class="list sp"><label class="name">账户类型：</label>{{formValidate.bank_account_type == 74 ? '对公账户' : '对私账户'}}</div>
+              <div class="list sp"><label class="name">开户银行：</label>{{formValidate.account_bank}}</div>
+              <div class="list sp"><label class="name">开户名称：</label>{{formValidate.account_name}}</div>
+              <div class="list sp"><label class="name">开户银行省市编码：</label>{{formValidate.bank_address_code}}</div>
+              <div v-if="formValidate.bank_branch_id" class="list sp"><label class="name">开户银行联行号：</label>{{formValidate.bank_branch_id}}</div>
+              <div v-if="formValidate.bank_name" class="list sp"><label class="name">开户银行全称 （含支行）：</label>{{formValidate.bank_name}}</div>
+              <div class="list sp"><label class="name">银行帐号：</label>{{formValidate.account_number}}</div>
+            </div>
+          </div>
+          <div class="section">
+            <div class="title" style="margin-top: 20px;">超级管理员信息：</div>
+            <div class="acea-row">
+              <div class="list sp"><label class="name">超级管理员类型：</label>{{formValidate.contact_type == 65 ? '经营者/法人' : '负责人'}}</div>
+              <div class="list sp"><label class="name">超级管理员姓名：</label>{{formValidate.contact_name}}</div>
+              <div class="list sp"><label class="name">超级管理员身份证件号码：</label>{{formValidate.contact_id_card_number}}</div>
+              <div class="list sp"><label class="name">超级管理员手机：</label>{{formValidate.mobile_phone}}</div>
+              <div v-if="formValidate.contact_email" class="list sp"><label class="name">超级管理员邮箱：</label>{{formValidate.contact_email}}</div>
+            </div>
+          </div>
+          <div class="section">
+            <div class="title" style="margin-top: 20px;">店铺信息：</div>
+            <div class="acea-row">
+              <div class="list sp"><label class="name">店铺名称：</label>{{formValidate.store_name}}</div>
+              <div v-if="formValidate.store_url" class="list sp"><label class="name">店铺链接：</label>{{formValidate.store_url}}</div>
+              <div v-if="formValidate.store_qr_code" class="list sp100 image">
+                <label class="name">店铺二维码：</label>
+                <span class="img">
+                  <img style="max-width: 150px; height: 80px;" :src="formValidate.store_qr_code && formValidate.store_qr_code['dir']" @click="getPicture(formValidate.store_qr_code['dir'])" />
+                </span>
+              </div>
+              <div v-if="formValidate.mini_program_sub_appid" class="list sp"><label class="name">小程序AppID：</label>{{formValidate.mini_program_sub_appid}}</div>
+              <div class="list sp"><label class="name">商户简称：</label>{{formValidate.merchant_shortname}}</div>
+              <div class="list sp100 image" v-if="formValidate.qualifications && formValidate.qualifications.length > 0">
+                <label class="name">特殊资质：</label>
+                <span class="img">
+                  <img v-for="(item, index) in formValidate.qualifications" :key="index" @click="getPicture(item.dir)" style="max-width: 150px; height: 80px;" :src="item['dir']" />
+                </span>
+              </div>
+              <div class="list sp100 image" v-if="formValidate.business_addition_pics && formValidate.business_addition_pics.length > 0">
+                <label class="name">补充材料：</label>
+                <span class="img">
+                  <img v-for="(item, index) in formValidate.business_addition_pics" :key="index" @click="getPicture(item.dir)" style="max-width: 150px; height: 80px;" :src="item['dir']" />
+                </span>
+              </div>
+              <div v-if="formValidate.business_addition_desc" class="list sp"><label class="name">补充说明：</label>{{formValidate.business_addition_desc}}</div>
+              <div v-if="formValidate.message" class="list sp"><label class="name">{{ (formValidate.status == -1 || formValidate.status == 40) ? '驳回原因' :  formValidate.status == 11 ? '需验证操作' : '审核结果' }}：</label>{{formValidate.message}}</div>
+            </div>
+          </div>
+        </div>
+        <el-form v-if="formValidate.status == 0" ref="ruleForm" :model="ruleForm" :rules="rules" label-width="80px" class="demo-ruleForm">
+          <el-form-item label="审核状态" prop="status">
+            <el-radio-group v-model="ruleForm.status">
+              <el-radio :label="10">通过</el-radio>
+              <el-radio :label="-1">拒绝</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item v-if="ruleForm.status===-1" label="原因" prop="refusal">
+            <el-input v-model="ruleForm.message" type="textarea" placeholder="请输入原因" />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="onSubmit">提交</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+    </el-drawer>
+    <!--查看图片-->
+    <el-dialog v-if="pictureVisible" :visible.sync="pictureVisible" width="700px">
+      <img :src="pictureUrl" class="pictures">
+    </el-dialog>
+  </div>
+</template>
+<script>
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+import {
+  getApplymentLst,
+  applymentDetailApi,
+  applymentStatusApi, splitAccountMark
+} from "@/api/supply";
+import { merSelectApi } from "@/api/product";
+import { fromList } from "@/libs/constants.js";
+import { roterPre } from "@/settings";
+import timeOptions from '@/utils/timeOptions';
+export default {
+  name: "MerchantApplyMents",
+  data() {
+    return {
+      props: {
+        emitPath: false
+      },
+      pickerOptions: timeOptions,
+      fromList: fromList,
+      merSelect: [],
+      statusList: [
+        { text: '全部', val: '' },
+        { text: '待审核', val: '0' },
+        { text: '平台驳回', val: '-1' },
+        { text: '审核中', val: '10' },
+        { text: '商户验证', val: '11' },
+        { text: '已完成', val: '20' },
+        { text: '已冻结', val: '30' },
+        { text: '微信驳回', val: '40' }
+      ], //筛选状态列表
+      roterPre: roterPre,
+      listLoading: true,
+      loading: true,
+      storeType: [],
+      tableData: {
+        data: [],
+        total: 0,
+      },
+      tableFrom: {
+        page: 1,
+        limit: 20,
+        date: "",
+        status: "",
+        mer_id: "",
+      },
+      timeVal: [],
+      visible: false,
+      formValidate: {},
+      ruleForm: {
+        message: '',
+        status: 10,
+      },
+      rules: {
+        status: [
+          { required: true, message: '请选择审核状态', trigger: 'change' }
+        ],
+        message: [
+          { required: true, message: '请填写拒绝原因', trigger: 'blur' }
+        ]
+      },
+      pictureVisible: false,
+      pictureUrl: ''
+    };
+  },
+  watch: {
+  },
+  mounted() {
+    this.getMerSelect()
+    this.getList("");
+  },
+  methods: {
+    /**重置 */
+    searchReset(){
+      this.timeVal = []
+      this.tableFrom.date = ""
+      this.$refs.searchForm.resetFields()
+      this.getList(1)
+    },
+    // 商户列表；
+    getMerSelect() {
+      merSelectApi().then(res => {
+        this.merSelect = res.data
+      }).catch(res => {
+        this.$message.error(res.message)
+      })
+    },
+    // 查看图片
+    getPicture(url) {
+      this.pictureVisible = true
+      this.pictureUrl = url
+    },
+    statusChange(tab) {
+      this.tableFrom.status = tab;
+      this.tableFrom.page = 1;
+      this.getList("");
+    },
+    // 具体日期
+    onchangeTime(e) {
+      this.timeVal = e;
+      this.tableFrom.date = this.timeVal ? this.timeVal.join("-") : "";
+      this.tableFrom.page = 1;
+      this.getList("");
+    },
+    handleClose() {
+      this.visible = false
+    },
+    // 列表
+    getList(num) {
+      this.listLoading = true;
+      this.tableFrom.page = num ? num : this.tableFrom.page;
+      getApplymentLst(this.tableFrom)
+        .then((res) => {
+          this.tableData.data = res.data.list;
+          this.tableData.total = res.data.count;
+          this.listLoading = false;
+        })
+        .catch((res) => {
+          this.listLoading = false;
+          this.$message.error(res.message);
+        });
+    },
+    pageChange(page) {
+      this.tableFrom.page = page;
+      this.getList("");
+    },
+    handleSizeChange(val) {
+      this.tableFrom.limit = val;
+      this.getList(1);
+    },
+    // 审核
+    onSubmit() {
+      applymentStatusApi(this.formValidate.mer_applyments_id, this.ruleForm).then((res) => {
+        this.$message.success(res.message)
+        this.visible = false
+        this.getList('')
+      }).catch((res) => {
+        this.$message.error(res.message)
+      });
+    },
+    // 备注
+    handleMark(id) {
+       this.$modalForm(splitAccountMark(id)).then(() => this.getList(''))
+    },
+    // 详情
+    handleDetail(id) {
+      this.loading = true
+      this.formValidate = {}
+      applymentDetailApi(id).then((res) => {
+        this.visible = true;
+        this.loading = false;
+        let info = res.data.info;
+        this.formValidate = {
+          mer_applyments_id: res.data.mer_applyments_id,
+          status: res.data.status,
+          message: res.data.message,
+          id_doc_type: info.id_doc_type,
+          out_request_no: info.out_request_no,
+          organization_type: info.organization_type,
+          business_license_copy: info.business_license_info ? info.business_license_info.business_license_copy : '',
+          business_license_number: info.business_license_info ? info.business_license_info.business_license_number : '',
+          merchant_name: info.business_license_info ? info.business_license_info.merchant_name : '',
+          legal_person: info.business_license_info ? info.business_license_info.legal_person : '',
+          company_address: info.business_license_info ? info.business_license_info.company_address : '',
+          organization_cert_info: info.organization_cert_info,
+          organization_copy: info.organization_cert_info ? info.organization_cert_info.organization_copy : '',
+          organization_number: info.organization_cert_info ? info.organization_cert_info.organization_number : '',
+          need_account_info: info.need_account_info,
+          contact_type: info.contact_info ? info.contact_info.contact_type : 65,
+          contact_name: info.contact_info ? info.contact_info.contact_name : '',
+          contact_id_card_number: info.contact_info ? info.contact_info.contact_id_card_number : '',
+          mobile_phone: info.contact_info ? info.contact_info.mobile_phone : '',
+          contact_email: info.contact_info ? info.contact_info.contact_email : '',
+          store_name: info.sales_scene_info ? info.sales_scene_info.store_name : '',
+          store_url: info.sales_scene_info ? info.sales_scene_info.store_url : '',
+          store_qr_code: info.sales_scene_info ? info.sales_scene_info.store_qr_code : '',
+          mini_program_sub_appid: info.sales_scene_info ? info.sales_scene_info.mini_program_sub_appid : '',
+          merchant_shortname: info.merchant_shortname,
+          qualifications: info.qualifications ? info.qualifications : [],
+          business_addition_pics: info.business_addition_pics ? info.business_addition_pics : [],
+          business_addition_desc: info.business_addition_desc,
+          business_time: info.business_license_info ? info.business_license_info.business_time : '',
+          business_start: info.business_license_info && info.business_license_info.business_time ? info.business_license_info.business_time[0] : '',
+          business_end: info.business_license_info && info.business_license_info.business_time ? info.business_license_info.business_time[1] : '',
+          start_time: info.organization_cert_info && info.organization_cert_info.organization_time ? info.organization_cert_info.organization_time[0] : '',
+          end_time: info.organization_cert_info && info.organization_cert_info.organization_time ? info.organization_cert_info.organization_time[1] : '',
+          bank_account_type: (info.account_info && info.account_info.bank_account_type) || 74,
+          account_bank: info.account_info ? info.account_info.account_bank : '',
+          account_name: info.account_info ? info.account_info.account_name : '',
+          bank_address_code: info.account_info ? info.account_info.bank_address_code : '',
+          bank_branch_id: info.account_info ? info.account_info.bank_branch_id : '',
+          bank_name: info.account_info ? info.account_info.bank_name : '',
+          account_number: info.account_info ? info.account_info.account_number : ''
+        };
+        if(info.id_doc_type == 1) {
+          this.formValidate.id_card_copy = (info.id_card_info && info.id_card_info.id_card_copy) || []
+          this.formValidate.id_card_national = (info.id_card_info && info.id_card_info.id_card_national) || ''
+          this.formValidate.id_card_name = (info.id_card_info && info.id_card_info.id_card_name) || ''
+          this.formValidate.id_card_number = (info.id_card_info && info.id_card_info.id_card_number) || ''
+          this.formValidate.id_card_valid_time = (info.id_card_info && info.id_card_info.id_card_valid_time) || ''
+        } else {
+          this.formValidate.id_doc_name = (info.id_doc_info && info.id_doc_info.id_doc_name) || ''
+          this.formValidate.id_doc_number = (info.id_doc_info && info.id_doc_info.id_doc_number) || ''
+          this.formValidate.id_doc_copy = (info.id_doc_info && info.id_doc_info.id_doc_copy) || ''
+          this.formValidate.doc_period_end = (info.id_doc_info && info.id_doc_info.doc_period_end) || ''
+        }
+      }).catch((res) => {
+
+      });
+
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.pictures {
+  width: 100%;
+  max-width: 100%;
+}
+/deep/ table .el-image {
+  display: inline-block !important;
+}
+.box-container {
+  overflow: hidden;
+  padding: 0 35px;
+}
+.box-container .list {
+  float: left;
+  font-size: 13px;
+  margin-top: 16px;
+  color: #606266;
+}
+.box-container .sp {
+  width: 50%;
+}
+.box-container .sp3 {
+  width: 33.3333%;
+}
+.box-container .sp100 {
+  width: 100%;
+}
+.box-container .list .blue {
+  color: var(--prev-color-primary);
+}
+.box-container .list.image {
+  margin: 20px 0;
+  position: relative;
+}
+.box-container .list.image .img {
+  position: absolute;
+  top: -20px;
+  img {
+    margin-right: 10px;
+  }
+}
+.labeltop {
+  max-height: 280px;
+  min-height: 120px;
+  overflow-y: auto;
+}
+.title {
+  padding-left: 10px;
+  border-left: 3px solid var(--prev-color-primary);
+  font-size: 14px;
+  line-height: 15px;
+  color: #303133;
+  font-weight: bold;
+}
+.section{
+  padding: 20px 0 8px;
+  border-bottom: 1px dashed #eeeeee;
+
+}
+</style>
diff --git a/src/views/supply/applyments/list.vue b/src/views/supply/applyments/list.vue
new file mode 100644
index 0000000..5b42067
--- /dev/null
+++ b/src/views/supply/applyments/list.vue
@@ -0,0 +1,339 @@
+<template>
+  <div class="divBox">
+    <div class="selCard">
+      <el-form :model="tableFrom" ref="searchForm" size="small" inline label-width="85px">
+        <el-form-item label="创建时间：">
+          <el-date-picker
+            v-model="timeVal"
+            value-format="yyyy/MM/dd"
+            format="yyyy/MM/dd"
+            type="daterange"
+            placement="bottom-end"
+            placeholder="自定义时间"
+            style="width: 280px;"
+            :picker-options="pickerOptions"
+            clearable
+            @change="onchangeTime"
+          />
+        </el-form-item>
+        <el-form-item label="分账时间：">
+          <el-date-picker
+            v-model="timeVal2"
+            value-format="yyyy/MM/dd"
+            format="yyyy/MM/dd"
+            size="small"
+            type="daterange"
+            placement="bottom-end"
+            placeholder="自定义时间"
+            style="width: 280px;"
+            :picker-options="pickerOptions"
+            clearable
+            @change="onchangeTime2"
+          />
+        </el-form-item>
+        <el-form-item label="状态：" prop="status">
+          <el-select
+            v-model="tableFrom.status"
+            placeholder="请选择"
+            class="selWidth"
+            clearable
+            @change="getList(1)"
+          >
+            <el-option v-for="item in applyStatus" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="账单类型：" prop="type">
+          <el-select
+            v-model="tableFrom.type"
+            placeholder="请选择"
+            class="selWidth"
+            clearable
+            @change="getList(1)"
+          >
+            <el-option label="订单支付" value="order" />
+            <el-option label="尾款支付" value="presell" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="商户名称：" prop="mer_id">
+          <el-select
+            v-model="tableFrom.mer_id"
+            clearable
+            filterable
+            placeholder="请选择"
+            class="selWidth"
+            @change="getList(1)"
+          >
+            <el-option
+              v-for="item in merSelect"
+              :key="item.mer_id"
+              :label="item.mer_name"
+              :value="item.mer_id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" size="small" @click="getList(1)">搜索</el-button>
+          <el-button size="small" @click="searchReset()">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <el-card class="mt14">
+      <div class="mb20">
+        <el-button size="small" type="primary" @click="exportRecord">导出列表</el-button>
+      </div>
+      <el-table v-loading="listLoading" :data="tableData.data" size="small">
+        <el-table-column prop="profitsharing_id" label="分账ID" min-width="60" />
+        <el-table-column prop="order.order_sn" label="订单编号" min-width="100" />
+        <el-table-column prop="merchant.mer_name" label="商户名称" min-width="100" />
+        <el-table-column label="订单金额" min-width="100">
+          <template slot-scope="scope">
+            <div>分账金额： {{ scope.row.profitsharing_price }}</div>
+            <div v-if="scope.row.profitsharing_refund > 0" style="color:#82e493;">退款金额： {{ scope.row.profitsharing_refund }}</div>
+            <div>分账给商户金额： {{ scope.row.profitsharing_mer_price }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label=" 账单类型" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.type == 'order' ? '订单支付' : '尾款支付' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" min-width="120">
+          <template slot-scope="scope">
+            <div v-if="scope.row.status == 0">未分账</div>
+            <div v-else-if="scope.row.status == 1">已分账<br>分账时间： {{ scope.row.profitsharing_time }}</div>
+            <div v-else-if="scope.row.status == -1">已退款</div>
+            <div v-else-if="scope.row.status == -2">分账失败<br> <span style="color: red; font-size: 12px;"> 失败原因： {{ scope.row.error_msg }}</span></div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="create_time" label="创建时间" min-width="120" />
+        <el-table-column label="操作" min-width="100" fixed="right">
+          <template slot-scope="scope">
+            <el-button
+            v-if="scope.row.status == -2"
+              type="text"
+              size="small"
+              class="mr10"
+              @click="splitAccount(scope.row.profitsharing_id)"
+            >立即分账</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <el-pagination
+          background
+          :page-size="tableFrom.limit"
+          :current-page="tableFrom.page"
+          layout="total, prev, pager, next, jumper"
+          :total="tableData.total"
+          @size-change="handleSizeChange"
+          @current-change="pageChange"
+        />
+      </div>
+    </el-card>
+    <!--导出订单列表-->
+    <file-list ref="exportList" />
+  </div>
+</template>
+
+<script>
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+import { applymentLstApi, splitAccountApi, ledgerManageExportApi } from '@/api/supply'
+import { merSelectApi } from "@/api/product";
+import fileList from '@/components/exportFile/fileList'
+import timeOptions from '@/utils/timeOptions';
+export default {
+  components: { fileList },
+  data() {
+    return {
+      pickerOptions: timeOptions,
+      tableData: {
+        data: [],
+        total: 0
+      },
+      merSelect: [],
+      listLoading: true,
+      tableFrom: {
+        type: '',
+        mer_id: '',
+        keyword: '',
+        status: '',
+        date: '',
+        profit_date: '',
+        page: 1,
+        limit: 20
+      },
+      timeVal: [],
+      timeVal2: [],
+      fromList: {
+        title: '选择时间',
+        custom: true,
+        fromTxt: [
+          { text: '全部', val: '' },
+          { text: '今天', val: 'today' },
+          { text: '昨天', val: 'yesterday' },
+          { text: '最近7天', val: 'lately7' },
+          { text: '最近30天', val: 'lately30' },
+          { text: '本月', val: 'month' },
+          { text: '本年', val: 'year' }
+        ]
+      },
+      selectionList: [],
+      ids: '',
+      LogLoading: false,
+      applyStatus: [
+        { value: 0, label: '待分账' },
+        { value: 1, label: '已分账' },
+        { value: -1, label: '已退款' },
+        { value: -2, label: '分账失败' }
+      ],
+      orderDatalist: null
+    }
+  },
+  mounted() {
+    this.getList('')
+    this.getMerSelect();
+  },
+  methods: {
+    /**重置 */
+    searchReset(){
+      this.timeVal = []
+      this.timeVal2 = []
+      this.tableFrom.date = ""
+      this.tableFrom.profit_date = ""
+      this.$refs.searchForm.resetFields()
+      this.getList(1)
+    },
+    // 商户列表；
+    getMerSelect() {
+      merSelectApi()
+        .then(res => {
+          this.merSelect = res.data;
+        })
+        .catch(res => {
+          this.$message.error(res.message);
+        });
+    },
+    // 立即分账
+    splitAccount(id){
+        this.$confirm('是否确认分账?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+            splitAccountApi(id).then(res => {
+                this.$message.success(res.message);
+                this.getList('')
+            }).catch(res => {
+                this.$message.error(res.message);
+                this.getList('')
+            });
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消'
+          });
+        });
+    },
+    // 具体日期
+    onchangeTime(e) {
+      this.timeVal = e
+      this.tableFrom.date = e ? this.timeVal.join('-') : ''
+      this.getList(1)
+    },
+    onchangeTime2(e) {
+      this.timeVal2 = e
+      this.tableFrom.profit_date = e ? this.timeVal2.join('-') : ''
+      this.getList(1)
+    },
+    // 导出
+    exportRecord() {
+      ledgerManageExportApi(this.tableFrom)
+        .then((res) => {
+          const h = this.$createElement;
+          this.$msgbox({
+            title: '提示',
+            message: h('p', null, [
+              h('span', null, '文件正在生成中，请稍后点击"'),
+              h('span', { style: 'color: teal' }, '导出记录'),
+              h('span', null, '"查看~ '),
+            ]),
+            confirmButtonText: '我知道了',
+          }).then(action => {
+
+          });
+        })
+        .catch((res) => {
+          this.$message.error(res.message)
+        })
+    },
+    // 导出列表
+    getExportFileList() {
+      this.$refs.exportList.exportFileList()
+    },
+    // 列表
+    getList(num) {
+      this.listLoading = true
+      this.tableFrom.page = num || this.tableFrom.page
+      applymentLstApi(this.tableFrom)
+        .then(res => {
+          this.tableData.data = res.data.list
+          this.tableData.total = res.data.count
+          this.listLoading = false
+        })
+        .catch(res => {
+          this.$message.error(res.message)
+          this.listLoading = false
+        })
+    },
+    pageChange(page) {
+      this.tableFrom.page = page
+      this.getList('')
+    },
+    handleSizeChange(val) {
+      this.tableFrom.limit = val
+      this.getList('')
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+table .el-image{
+  display: inline-block;
+}
+.el-dropdown-link {
+  cursor: pointer;
+  color: var(--prev-color-primary);
+  font-size: 12px;
+}
+.el-icon-arrow-down {
+  font-size: 12px;
+}
+.tabBox_tit {
+  width: 60%;
+  font-size: 12px !important;
+  margin: 0 2px 0 10px;
+  letter-spacing: 1px;
+  padding: 5px 0;
+  box-sizing: border-box;
+}
+.mt20 {
+  margin-top: 20px;
+}
+.demo-image__preview{
+  position: relative;
+}
+.maxw180{
+  display: inline-block;
+  max-width: 180px;
+}
+
+</style>
diff --git a/src/views/supply/classify/index.vue b/src/views/supply/classify/index.vue
new file mode 100644
index 0000000..431099f
--- /dev/null
+++ b/src/views/supply/classify/index.vue
@@ -0,0 +1,135 @@
+<template>
+  <div class="divBox">
+    <el-card>
+      <div class="mb20">
+        <el-button size="small" type="primary" @click="onAdd">添加商户分类</el-button>
+      </div>
+      <el-table
+        v-loading="listLoading"
+        :data="tableData.data"
+        size="small"
+        highlight-current-row
+      >
+        <el-table-column
+          prop="merchant_category_id"
+          label="ID"
+          min-width="60"
+        />
+        <el-table-column
+          prop="category_name"
+          label="分类名称"
+          min-width="150"
+        />
+        <el-table-column
+          prop="commission_rate"
+          label="手续费"
+          min-width="130"
+        />
+        <el-table-column
+          prop="create_time"
+          label="创建时间"
+          min-width="150"
+        />
+        <el-table-column label="操作" min-width="100" fixed="right">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="onEdit(scope.row.merchant_category_id)">编辑</el-button>
+            <el-button type="text" size="small" @click="handleDelete(scope.row.merchant_category_id, scope.$index)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <el-pagination
+          background
+          :page-size="tableFrom.limit"
+          :current-page="tableFrom.page"
+          layout="total, prev, pager, next, jumper"
+          :total="tableData.total"
+          @size-change="handleSizeChange"
+          @current-change="pageChange"
+        />
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+import {
+  categoryListApi,
+  categoryCreateApi,
+  categoryUpdateApi,
+  categoryDeleteApi
+} from '@/api/supply'
+export default {
+  name: 'MerchantClassify',
+  data() {
+    return {
+      tableFrom: {
+        page: 1,
+        limit: 20
+      },
+      tableData: {
+        data: [],
+        total: 0
+      },
+      listLoading: true
+    }
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    // 列表
+    getList() {
+      this.listLoading = true
+      categoryListApi(this.tableFrom).then(res => {
+        this.tableData.data = res.data.list
+        this.tableData.total = res.data.count
+        this.listLoading = false
+      }).catch(res => {
+        this.listLoading = false
+        this.$message.error(res.message)
+      })
+    },
+    pageChange(page) {
+      this.tableFrom.page = page
+      this.getList()
+    },
+    handleSizeChange(val) {
+      this.tableFrom.limit = val
+      this.getList()
+    },
+    // 添加
+    onAdd() {
+      this.$modalForm(categoryCreateApi()).then(() => this.getList())
+    },
+    // 编辑
+    onEdit(id) {
+      this.$modalForm(categoryUpdateApi(id)).then(() => this.getList())
+    },
+    // 删除
+    handleDelete(id, idx) {
+      this.$modalSure().then(() => {
+        categoryDeleteApi(id).then(({ message }) => {
+          this.$message.success(message)
+          this.tableData.data.splice(idx, 1)
+        }).catch(({ message }) => {
+          this.$message.error(message)
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/src/views/supply/deposit/index.vue b/src/views/supply/deposit/index.vue
new file mode 100644
index 0000000..386b951
--- /dev/null
+++ b/src/views/supply/deposit/index.vue
@@ -0,0 +1,720 @@
+<template>
+  <div class="divBox">
+    <div class="selCard">
+      <el-form :model="tableFrom" ref="searchForm" size="small" label-width="85px" :inline="true">
+        <el-form-item label="选择时间：">
+          <el-date-picker
+            v-model="timeVal"
+            type="daterange"
+            placeholder="选择日期"
+            format="yyyy/MM/dd"
+            value-format="yyyy/MM/dd"
+            @change="onchangeTime"
+            clearable
+            :picker-options="pickerOptions"
+            style="width: 280px;"
+          />
+        </el-form-item>
+        <el-form-item v-if="type == 0" label="审核状态：" prop="status">
+          <el-select
+            v-model="tableFrom.status"
+            clearable
+            placeholder="请选择"
+            class="selWidth"
+            @change="getList(1)"
+          >
+            <el-option label="全部" value="" />
+            <el-option label="待审核" value="0" />
+            <el-option label="已审核" value="1" />
+            <el-option label="审核失败" value="1" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="商户类别：" prop="is_trader">
+          <el-select
+            v-model="tableFrom.is_trader"
+            clearable
+            placeholder="请选择"
+            class="selWidth"
+            @change="getList(1)"
+          >
+            <el-option label="自营" value="1" />
+            <el-option label="非自营" value="0" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="商户分类：" prop="category_id">
+          <el-select
+            v-model="tableFrom.category_id"
+            clearable
+            placeholder="请选择"
+            class="selWidth"
+            @change="getList(1)"
+          >
+            <el-option
+              v-for="item in merCateList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="店铺类型：" prop="type_id">
+          <el-select
+            v-model="tableFrom.type_id"
+            clearable
+            placeholder="请选择"
+            class="selWidth"
+            @change="getList(1)"
+          >
+            <el-option
+              v-for="item in storeType"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="type == 0" label="退回状态：" prop="status">
+          <el-select
+            v-model="tableFrom.status"
+            clearable
+            placeholder="请选择"
+            class="selWidth"
+            @change="getList(1)"
+          >
+            <el-option label="待审核" value="0" />
+            <el-option label="未退回" value="-1" />
+            <el-option label="已退回" value="1" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="关键字：" prop="keyword">
+          <el-input
+            v-model="tableFrom.keyword"
+            @keyup.enter.native="getList(1)"
+            placeholder="请输入店铺关键字/店铺名/联系电话"
+            class="selWidth"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" size="small" @click="getList(1)">搜索</el-button>
+          <el-button size="small" @click="searchReset()">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <el-card class="mt14">
+      <div class="mb5">
+        <el-tabs
+          v-if="headeNum.length > 0"
+          v-model="type"
+          @tab-click="getList(1)"
+        >
+          <el-tab-pane
+            v-for="(item, index) in headeNum"
+            :key="index"
+            :name="item.type.toString()"
+            :label="item.title"
+          />
+        </el-tabs>
+      </div>
+      <el-table
+        v-loading="listLoading"
+        :data="tableData.data"
+        size="small"
+        highlight-current-row
+      >
+        <el-table-column
+          :prop="type != 0 ? 'mer_id' : 'financial_id'"
+          label="ID"
+          min-width="60"
+        />
+        <el-table-column
+          label="商户名称"
+          min-width="100"
+        >
+         <template slot-scope="scope">
+            <span>{{(scope.row.merchant&&scope.row.merchant.mer_name) || scope.row.mer_name}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column  v-if="type!=0" key="10" label="店铺类型" min-width="120">
+          <template slot-scope="scope">
+            <span v-if="type != 2" class="spBlock">{{
+              scope.row.merchantType &&
+              scope.row.merchantType.type_name
+                ? scope.row.merchantType.type_name
+                : ""
+            }}</span>
+            <span v-else class="spBlock">{{
+              scope.row.merchantType &&
+              scope.row.merchantType.type_name
+                ? scope.row.merchantType.type_name
+                : ""
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="商户姓名"
+          min-width="100"
+        >
+         <template slot-scope="scope">
+            <span>{{(scope.row.merchant&&scope.row.merchant.real_name) || scope.row.real_name}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-if="type != 2"
+          key="1"
+          :prop="type == 0 ? 'merchant.ot_margin' : 'ot_margin'"
+          label="保证金额度"
+          min-width="80"
+        />
+        <el-table-column
+          v-if="type == 0"
+          key="3"
+          label="申请状态"
+          min-width="100"
+        >
+          <template slot-scope="scope">
+            <span>{{
+              scope.row.status == 0
+                ? "待审核"
+                : scope.row.status == 1
+                ? "审核通过"
+                : "审核未通过"
+            }}</span>
+            <span
+              v-if="scope.row.status == -1"
+              style="display: block; font-size: 12px; color: red"
+              >原因： {{ scope.row.refusal }}</span
+            >
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-if="type == 0"
+          prop="merchant.margin"
+          key="7"
+          label="结余保证金"
+          min-width="100"
+        />
+         <el-table-column
+          v-if="type == 0"
+          prop="extract_money"
+          key="9"
+          label="退款金额"
+          min-width="100"
+        />
+        <el-table-column
+          v-if="type == 0"
+          prop="extract_money"
+          key="11"
+          label="退回方式"
+          min-width="100"
+        >
+         <template slot-scope="scope">
+            <span>{{ scope.row.financial_type == 3 ? "线下" : "线上" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-if="type == 0"
+          key="4"
+          prop="create_time"
+          label="申请时间"
+          min-width="150"
+        />
+        <el-table-column
+          v-if="type == 1"
+          key="14"
+          label="支付时间"
+          min-width="150"
+        >
+          <template slot-scope="scope">
+            <span>{{ scope.row.marginOrder && scope.row.marginOrder[0] && scope.row.marginOrder[0]['create_time'] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-if="type == 2"
+          key="15"
+          label="待缴金额"
+          min-width="100"
+        >
+          <template slot-scope="scope">
+            <span>{{ scope.row.is_margin == 1 ? scope.row.margin : (scope.row.ot_margin-scope.row.margin).toFixed(2) }}</span>
+          </template>
+         </el-table-column>
+        <el-table-column
+          v-if="type == 2"
+          key="18"
+          label="保证金额度"
+          min-width="100"
+        >
+          <template slot-scope="scope">
+            <span>{{ scope.row.ot_margin }}</span>
+          </template>
+        </el-table-column>
+         <el-table-column label="备注" min-width="120">
+          <template slot-scope="scope">
+            <span>{{ type == 0 ? scope.row.admin_mark : scope.row.mark }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="操作"
+          min-width="150"
+          fixed="right"
+        >
+          <template slot-scope="scope">
+            <el-button
+              v-if="type == 0"
+              type="text"
+              size="small"
+              @click="handleRemark(scope.row.financial_id)"
+              >备注</el-button
+            >
+            <el-button
+              v-if="scope.row.status == 0 && type == 0"
+              type="text"
+              size="small"
+              @click="handleAudit(scope.row.financial_id)"
+              >审核</el-button
+            >
+            <el-button
+              v-if="type == 1"
+              type="text"
+              size="small"
+              @click="handleDeduction(scope.row.mer_id)"
+              >保证金扣费</el-button
+            >
+            <el-button
+              v-if="
+                scope.row.status == 1 &&
+                scope.row.financial_status == 1 &&
+                type == 0
+              "
+              type="text"
+              size="small"
+              @click="handleInfo(scope.row.financial_id)"
+              >退回信息</el-button
+            >
+            <el-button
+              v-if="type != 2"
+              type="text"
+              size="small"
+              @click="handleRecord(scope.row.mer_id)"
+              >操作记录</el-button
+            >
+            <el-button
+              v-if="type == 2"
+              type="text"
+              size="small"
+              @click="offline(scope.row.mer_id)"
+              >线下付款</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <el-pagination
+          background
+          :page-size="tableFrom.limit"
+          :current-page="tableFrom.page"
+          layout="total, prev, pager, next, jumper"
+          :total="tableData.total"
+          @size-change="handleSizeChange"
+          @current-change="pageChange"
+        />
+      </div>
+    </el-card>
+    <!--退回保证金-->
+    <el-dialog
+      :title="isReturn ? '退回保证金' : '退回信息'"
+      :visible.sync="dialogVisible"
+      width="650px"
+      :before-close="handleClose"
+    >
+      <div class="container">
+        <div class="section">
+          <div class="title">商户信息</div>
+          <div class="label_list">
+            <div class="label_item">
+              <span class="label_title">商户名称：</span>
+              {{ marginData.merchant.mer_name }}
+            </div>
+            <div class="label_item">
+              <span class="label_title">商户ID：</span>
+               {{ marginData.merchant.mer_id }}
+            </div>
+            <div class="label_item">
+              <span class="label_title">店铺类型：</span>
+               {{
+                  marginData.merchant.merchantType &&
+                  marginData.merchant.merchantType.type_name
+                }}
+            </div>
+            <div class="label_item">
+              <span class="label_title">保证金额度：</span>
+              {{ marginData.merchant.ot_margin }}元
+            </div>
+            <div class="label_item">
+              <span class="label_title">扣费金额：</span>
+              {{
+                (marginData.financial_account.pay_price -
+                marginData.merchant.margin).toFixed(2)
+              }}元
+            </div>
+            <div class="label_item">
+              <span class="label_title">审核状态：</span>
+              {{ marginData.financial_status == 1 ? "已审核" : "待审核" }}
+            </div>
+            <div class="label_item">
+            <span class="label_title">退回方式：</span>
+            {{ marginData.financial_type == 3 ? "线下退回" : "线上退回" }}
+            </div>
+            <div class="label_item">
+              <span class="label_title" >应退回保证金金额：</span>
+              {{ marginData.extract_money }}元
+            </div>
+          </div>
+        </div>
+
+        <div class="section">
+          <div class="title">收款信息</div>
+          <div class="label_list">
+            <template v-if="marginData.financial_account && marginData.financial_account.account">
+              <div class="label_item" v-if="marginData.financial_account.account.name">
+                <span class="label_title">收款人姓名：</span>
+                 {{ marginData.financial_account.account.name }}
+              </div>
+              <div class="label_item" v-if="marginData.financial_account.account.code">
+                <span class="label_title">开户银行：</span>
+                 {{ marginData.financial_account.account.code }}
+              </div>
+              <div class="label_item" v-if="marginData.financial_account.account.pic">
+                <template v-if="marginData.financial_account.account.type == 1">
+                  <span class="label_title">银行账号：</span>
+                   {{ marginData.financial_account.account.pic }}
+                </template>
+
+                <img v-else-if="marginData.financial_account.account.type == 2" :src="marginData.financial_account.account.pic" style="width:120px;height:120px;" alt="">
+              </div>
+            </template>
+            <div class="label_item">
+              <span class="label_title"
+                >审核时间：{{ marginData.status_time }}</span
+              >
+            </div>
+          </div>
+        </div>
+      </div>
+    </el-dialog>
+    <!--扣费记录-->
+    <el-dialog
+      v-if="modalRecord"
+      :visible.sync="modalRecord"
+      title="操作记录"
+      width="800px"
+      close-on-click-modal
+      class="mapBox"
+      custom-class="dialog-scustom"
+    >
+      <el-table :data="recordData.data" :loading="recordLoading" size="small">
+        <el-table-column label="序号" min-width="50">
+          <template scope="scope">
+            <span>{{
+              scope.$index + (recordFrom.page - 1) * recordFrom.limit + 1
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="标题" min-width="90" prop="title" />
+        <el-table-column prop="number" label="金额" min-width="60">
+          <template scope="scope">
+            <span v-if="scope.row.pm == 1" style="color:#13ce66">+{{scope.row.number}}</span>
+            <span v-else style="color:rgb(237, 64, 20)">-{{scope.row.number}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="balance" label="保证金结余" min-width="90" />
+        <el-table-column label="备注" min-width="120" prop="mark" />
+        <el-table-column prop="create_time" label="操作时间" min-width="120" />
+      </el-table>
+      <div class="row-right page">
+        <el-pagination
+          :page-size="recordFrom.limit"
+          :current-page="recordFrom.page"
+          layout="prev, pager, next, jumper"
+          :total="recordData.total"
+          @size-change="handleSizeChanges"
+          @current-change="pageChanges"
+        />
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+import {
+  marginLstApi,
+  marginRefundLstApi,
+  marginRefundStatus,
+  marginRefundMark,
+  marginDepositLstApi,
+  marginPaymentApi,
+  getstoreTypeApi,
+  marginDeductionForm,
+  getMerCateApi,
+  marginRefundInfo,
+  marginDeductionRecord,
+} from "@/api/supply";
+import timeOptions from '@/utils/timeOptions';
+import { fromList } from "@/libs/constants.js";
+import { roterPre } from "@/settings";
+export default {
+  name: "MerchantList",
+  data() {
+    return {
+      pickerOptions: timeOptions,
+      fromList: fromList,
+      roterPre: roterPre,
+      isChecked: false,
+      listLoading: true,
+      recordLoading: true,
+      merCateList: [],
+      storeType: [],
+      dialogVisible: false,
+      modalRecord: false,
+      formValidate: {},
+      isReturn: false,
+      type: "1",
+      headeNum: [
+        {
+          count: "",
+          type: "2",
+          title: "待缴保证金",
+        },
+        {
+          count: "",
+          type: "1",
+          title: "缴存保证金",
+        },
+        {
+          count: "",
+          type: "0",
+          title: "退回保证金",
+        },
+      ],
+      tableData: {
+        data: [],
+        total: 0,
+      },
+      recordData: {
+        data: [],
+        total: 0,
+      },
+      tableFrom: {
+        page: 1,
+        limit: 20,
+        date: "",
+        status: "",
+        keyword: "",
+        is_trader: "",
+        category_id: "",
+        type_id: "",
+      },
+      recordFrom: {
+        page: 1,
+        limit: 20,
+      },
+      autoUpdate: true,
+      timeVal: [],
+      recordId: "",
+      marginData: {
+        merchant: {},
+        financial_account: {},
+      },
+    };
+  },
+  mounted() {
+    this.getMerCategory();
+    this.getStoreType();
+    this.getList("");
+  },
+  methods: {
+    /**重置 */
+    searchReset(){
+      this.timeVal = []
+      this.tableFrom.date = ""
+      this.$refs.searchForm.resetFields()
+      this.getList(1)
+    },
+    // 具体日期
+    onchangeTime(e) {
+      this.timeVal = e;
+      this.tableFrom.date = this.timeVal ? this.timeVal.join("-") : "";
+      this.tableFrom.page = 1;
+      this.getList("");
+    },
+    // 商户分类；
+    getMerCategory() {
+      getMerCateApi()
+        .then((res) => {
+          this.merCateList = res.data;
+        })
+        .catch((res) => {
+          this.$message.error(res.message);
+        });
+    },
+    getStoreType() {
+      getstoreTypeApi()
+        .then((res) => {
+          this.storeType = res.data;
+        })
+        .catch((res) => {
+          this.$message.error(res.message);
+        });
+    },
+    // 列表
+    getList(num) {
+      this.listLoading = true;
+      this.tableFrom.page = num ? num : this.tableFrom.page;
+      this.type == 1
+        ? marginLstApi(this.tableFrom) //缴存
+          .then((res) => {
+            this.tableData.data = res.data.list;
+            this.tableData.total = res.data.count;
+            this.listLoading = false;
+          })
+          .catch((res) => {
+            this.listLoading = false;
+            this.$message.error(res.message);
+          })
+      : this.type == 2 ? marginDepositLstApi(this.tableFrom) //待缴
+        .then((res) => {
+          this.tableData.data = res.data.list;
+          this.tableData.total = res.data.count;
+          this.listLoading = false;
+        })
+        .catch((res) => {
+          this.listLoading = false;
+          this.$message.error(res.message);
+        })
+      : marginRefundLstApi(this.tableFrom) //退回
+        .then((res) => {
+          this.tableData.data = res.data.list;
+          this.tableData.total = res.data.count;
+          this.listLoading = false;
+        })
+        .catch((res) => {
+          this.listLoading = false;
+          this.$message.error(res.message);
+        });
+    },
+    pageChange(page) {
+      this.tableFrom.page = page;
+      this.getList("");
+    },
+    handleSizeChange(val) {
+      this.tableFrom.limit = val;
+      this.getList(1);
+    },
+    pageChanges(page) {
+      this.recordFrom.page = page;
+      this.getRecordList(this.recordId);
+    },
+    handleSizeChanges(val) {
+      this.recordFrom.limit = val;
+      this.getRecordList(this.recordId);
+    },
+    // 列表
+    getRecordList(id) {
+      this.recordLoading = true;
+      this.recordId = id;
+      marginDeductionRecord(id, this.recordFrom)
+        .then((res) => {
+          this.recordData.data = res.data.list;
+          this.recordData.total = res.data.count;
+          this.recordLoading = false;
+        })
+        .catch((res) => {
+          this.recordLoading = false;
+          this.$message.error(res.message);
+        });
+    },
+    // 审核
+    handleAudit(id) {
+      this.$modalForm(marginRefundStatus(id)).then(() => this.getList(""));
+    },
+    // 备注
+    handleRemark(id) {
+      this.$modalForm(marginRefundMark(id)).then(() => this.getList(""));
+    },
+    // 保证金扣费
+    handleDeduction(id) {
+      this.$modalForm(marginDeductionForm(id)).then(() => this.getList(""));
+    },
+    // 退回信息
+    handleInfo(id) {
+      this.dialogVisible = true;
+      marginRefundInfo(id)
+        .then((res) => {
+          this.marginData = res.data;
+          this.marginData.merchant = res.data.merchant;
+        })
+        .catch((res) => {
+          this.$message.error(res.message);
+        });
+    },
+    // 线下付款
+    offline(id) {
+      this.$modalForm(marginPaymentApi(id)).then(() => this.getList(""));
+    },
+    // 退回记录
+    handleRecord(id) {
+      this.modalRecord = true;
+      this.recordFrom.page = 1;
+      this.getRecordList(id);
+    },
+    handleClose() {
+      this.dialogVisible = false;
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.section {
+  padding: 15px 0 30px;
+  border-bottom: 1px dashed #eeeeee;
+  &:last-child{
+    padding-top: 30px;
+    border-bottom: none;
+  }
+  .title{
+    padding-left: 10px;
+    border-left: 3px solid var(--prev-color-primary);
+    font-size: 14px;
+    line-height: 15px;
+    color: #303133;
+    font-weight: bold;
+  }
+}
+.label_list {
+  display: flex;
+  flex-wrap: wrap;
+}
+.label_item {
+  margin-top: 16px;
+  font-size: 13px;
+  display: flex;
+  flex: 0 0 calc(100% / 2);
+  color: #606266;
+  .label_title{
+    color: #909399;
+  }
+}
+/deep/.el-card__header{
+  border-bottom: none;
+  padding-bottom: 0;
+}
+</style>
diff --git a/src/views/supply/list/handle/merDetails.vue b/src/views/supply/list/handle/merDetails.vue
new file mode 100644
index 0000000..756deb6
--- /dev/null
+++ b/src/views/supply/list/handle/merDetails.vue
@@ -0,0 +1,336 @@
+<template>
+  <div>
+    <el-drawer
+      :with-header="false"
+      :size="1000"
+      :visible.sync="drawer"
+      :direction="direction"
+      :before-close="handleClose"
+    >
+      <div v-loading="loading">
+        <div v-if="!isAdd" class="head">
+          <div class="full">
+            <img class="order_icon" :src="orderImg" alt="" />
+            <div class="text">
+              <div class="title">
+                <span class="bold">{{ merData.mer_name }}</span>
+                <el-tag v-if="merData.is_trader" type="danger" class="tags_name" effect="dark" size="mini">自营</el-tag>
+                <el-tag v-if="merData.merchantType" type="warning" class="tags_name" effect="dark" size="mini">{{merData.merchantType.type_name}}</el-tag>
+              </div>
+              <div>
+                <span class="mr20">{{ merData.mer_address }}</span>
+              </div>
+            </div>
+            <div>
+              <el-button
+                v-if="isEdit"
+                size="small"
+                @click="cancelEdit"
+                >取消</el-button
+              >
+              <el-button
+                v-if="!isEdit"
+                type="primary"
+                size="small"
+                @click="merEdit"
+                >编辑</el-button
+              >
+              <el-button
+                v-if="isEdit"
+                type="success"
+                size="small"
+                @click="saveInfo"
+                >完成</el-button
+              >
+              <el-dropdown @command="handleCommand" class="ml10">
+                <el-button icon="el-icon-more" size="small"></el-button>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item command="password">修改管理员密码</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </div>
+          </div>
+          <ul class="list">
+            <li class="item">
+              <div class="title">联系人</div>
+              <div>{{merData.real_name}}</div>
+            </li>
+            <li class="item">
+              <div class="title">联系电话</div>
+              <div>{{ merData.mer_phone }}</div>
+            </li>
+            <li class="item">
+              <div class="title">状态</div>
+              <div>{{ merData.status==1 ? '开启' : '关闭' }}</div>
+            </li>
+            <li class="item">
+              <div class="title">入驻时间</div>
+              <div>{{ merData.create_time }}</div>
+            </li>
+          </ul>
+        </div>
+        <div v-else class="head">
+          <div class="text">
+            <div class="title">
+              <span class="bold">添加商户</span>
+            </div>
+          </div>
+        </div>
+        <!--详情-->
+        <merEditForm
+          ref="editForm"
+          :merId="merId"
+          :merCateList="merCateList"
+          :storeType="storeType"
+          :isAdd="isAdd"
+          :merData="merData"
+          @modifyCopy="modifyCopy"
+          @success="editSuccess"
+          v-if="isEdit || isAdd">
+        </merEditForm>
+        <mer-info ref="merInfo" :merData="merData" v-else-if="!isEdit && !isAdd"></mer-info>
+      </div>
+      <div v-if="isAdd" class="footer">
+        <el-button size="small" @click="handleClose">取消</el-button>
+        <el-button type="primary" size="small" @click="submitInfo">提交</el-button>
+      </div>
+    </el-drawer>
+
+  </div>
+</template>
+<script>
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+import {
+  supplyDetail,
+} from '@/api/supply';
+import merInfo from './merInfo';
+import merEditForm from './merEditForm';
+export default {
+  props: {
+    drawer: {
+      type: Boolean,
+      default: false,
+    },
+    merCateList: {
+      type: Array,
+      default: [],
+    },
+    storeType: {
+      type: Array,
+      default: [],
+    }
+  },
+  components: { merInfo, merEditForm },
+  data() {
+    return {
+      loading: true,
+      merId: '',
+      isEdit: false,
+      isAdd: false,
+      direction: 'rtl',
+      activeName: 'detail',
+      merData: {},
+      orderImg: require('@/assets/images/store_icon.png'),
+
+    };
+  },
+  filters: {
+  },
+  methods: {
+    handleClose() {
+      if(this.isEdit || this.isAdd) {
+        this.$refs.editForm.resetData();
+        this.$refs.editForm.activeName = 'detail';
+      }else{
+        this.$refs.merInfo.activeName = 'detail';
+      }
+      this.$emit('closeDrawer');
+    },
+    getInfo(id) {
+      this.merId = id
+      this.isAdd = false;
+      supplyDetail(id)
+        .then((res) => {
+          this.loading = false;
+          this.drawer = true;
+          this.merData = res.data;
+          if(!this.isEdit)this.$refs.merInfo.onOperateLog(this.merId);
+        })
+        .catch((res) => {
+          this.$message.error(res.message);
+        });
+    },
+    initData(){
+      this.merData = {
+        is_trader:0
+      }
+      this.isEdit = false;
+      this.isAdd = true;
+      this.loading = false;
+    },
+    merEdit(){
+      this.isEdit = true;
+      this.$nextTick(()=>{
+        this.getInfo(this.merId);
+      })
+    },
+    cancelEdit() {
+      this.isEdit = false
+    },
+    // 编辑成功回调
+    editSuccess(){
+      if(this.isAdd){
+        this.handleClose();
+      }else{
+        this.isEdit = false;
+      }
+      this.$emit('getList')
+    },
+    // 修改采集商品次数
+    modifyCopy(){
+      this.$emit('handleTimes',this.merId);
+    },
+     //下拉
+    handleCommand() {
+      this.$emit('onPassword',this.merId);
+    },
+    saveInfo(){
+      this.$refs.editForm.onSubmit(this.merId);
+      setTimeout(()=>{
+        this.getInfo(this.merId);
+      },500)
+    },
+    submitInfo(){
+      this.$refs.editForm.handleCreate();
+    }
+  },
+};
+</script>
+<style lang="scss" scoped>
+.head {
+  padding: 20px 35px;
+  .full {
+    display: flex;
+    align-items: center;
+    .order_icon {
+      width: 60px;
+      height: 60px;
+    }
+    .text {
+      align-self: center;
+      flex: 1;
+      min-width: 0;
+      padding-left: 12px;
+      font-size: 13px;
+      color: #606266;
+      .title {
+        margin-bottom: 10px;
+        font-weight: 500;
+        font-size: 16px;
+        line-height: 16px;
+        color: #282828;
+      }
+    }
+  }
+  .bold{
+    font-weight: bold;
+  }
+  .list {
+    display: flex;
+    margin-top: 20px;
+    overflow: hidden;
+    list-style: none;
+    padding: 0;
+    .item {
+      flex: none;
+      width: 200px;
+      font-size: 14px;
+      line-height: 14px;
+      color: rgba(0, 0, 0, 0.85);
+      .title {
+        margin-bottom: 12px;
+        font-size: 13px;
+        line-height: 13px;
+        color: #666666;
+      }
+    }
+  }
+}
+.el-tabs--border-card {
+  box-shadow: none;
+  border-bottom: none;
+}
+.section {
+  padding: 20px 0 8px;
+  border-bottom: 1px dashed #eeeeee;
+  .title {
+    padding-left: 10px;
+    border-left: 3px solid var(--prev-color-primary);
+    font-size: 15px;
+    line-height: 15px;
+    color: #303133;
+  }
+  .list {
+    display: flex;
+    flex-wrap: wrap;
+    list-style: none;
+    padding: 0;
+  }
+  .item {
+    flex: 0 0 calc(100% / 2);
+    display: flex;
+    margin-top: 16px;
+    font-size: 13px;
+    color: #606266;
+
+    &:nth-child(2n + 1) {
+      padding-right: 20px;
+      padding-left: 20px;
+    }
+    &:nth-child(2n) {
+     padding-right: 20px;
+    }
+  }
+  .value {
+    flex: 1;
+    image {
+      display: inline-block;
+      width: 40px;
+      height: 40px;
+      margin: 0 12px 12px 0;
+      vertical-align: middle;
+    }
+  }
+}
+.tab {
+  display: flex;
+  align-items: center;
+  .el-image {
+    width: 36px;
+    height: 36px;
+    margin-right: 10px;
+  }
+}
+/deep/.el-drawer__body {
+  overflow: auto;
+}
+.gary {
+  color: #aaa;
+}
+.footer{
+  width: 100%;
+  text-align: center;
+  position: absolute;
+  bottom: 17px;
+  padding-top: 17px;
+  border-top: 1px dashed #eeeeee;
+}
+</style>
diff --git a/src/views/supply/list/handle/merEditForm.vue b/src/views/supply/list/handle/merEditForm.vue
new file mode 100644
index 0000000..f9ad12b
--- /dev/null
+++ b/src/views/supply/list/handle/merEditForm.vue
@@ -0,0 +1,510 @@
+<template>
+  <el-form
+    ref="merDataField"
+    size="small"
+    :rules="ruleValidate"
+    :model="merData"
+    label-width="120px"
+    @submit.native.prevent
+    >
+    <el-tabs v-loading="loading" type="border-card" v-model="activeName">
+      <el-tab-pane label="基本信息" name="detail">
+        <div class="section">
+          <div class="title">基础信息</div>
+          <el-row :gutter="24" class="mt20">
+            <el-col :span="12">
+              <el-form-item label="商户名称：" prop="mer_name">
+                <el-input
+                  size="small"
+                  v-model="merData.mer_name"
+                  placeholder="请填写商户名称"
+                  class="selWidth"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="商户地址：" prop="mer_address">
+                <el-input
+                  size="small"
+                  v-model="merData.mer_address"
+                  placeholder="请填写详细地址"
+                  class="selWidth"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="商户分类：" prop="category_id">
+               <el-select
+                  size="small"
+                  v-model="merData.category_id"
+                  placeholder="请选择"
+                  class="selWidth"
+                >
+                  <el-option
+                    v-for="item in merCateList"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="商户类型：" prop="is_trader">
+                <el-radio-group
+                  v-model="merData.is_trader"
+                >
+                  <el-radio :label="1" class="radio">自营</el-radio>
+                  <el-radio :label="0">非自营</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="店铺类型：" prop="type_id">
+                <el-select
+                  size="small"
+                  v-model="merData.type_id"
+                  placeholder="请选择"
+                  class="selWidth"
+                >
+                  <el-option
+                    v-for="item in storeType"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="推荐商户：" prop="is_best">
+                <el-switch
+                  v-model="merData.is_best"
+                  :active-value="1"
+                  :inactive-value="0"
+                  :width="50"
+                  active-text="是"
+                  inactive-text="否"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="排序：" prop="sort">
+                <el-input-number
+                  size="small"
+                  v-model="merData.sort"
+                  controls-position="right"
+                  placeholder="请输入排序"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="商户状态：" prop="status">
+                <el-switch
+                  v-model="merData.status"
+                  :active-value="1"
+                  :inactive-value="0"
+                  :width="55"
+                  active-text="开启"
+                  inactive-text="关闭"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="备注：" prop="mark">
+                <el-input
+                  type="textarea"
+                  size="small"
+                  v-model="merData.mark"
+                  placeholder="请填写备注"
+                  class="selWidth"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="经营信息" name="operate">
+        <div class="section">
+          <div class="title">费用信息</div>
+          <el-row :gutter="24" class="mt20">
+            <el-col v-if="!isAdd" :span="24">
+              <el-form-item label="店铺保证金：" prop="ot_margin">
+                <span>{{merData.is_margin == 0 ? '无' : merData.ot_margin+'元'}}</span>
+              </el-form-item>
+            </el-col>
+            <el-col v-if="!isAdd && merData.is_margin != 0" :span="24">
+              <el-form-item label="保证金支付状态：">
+                <span>{{merData.is_margin == 1 ? '待缴' : merData.is_margin == 0 ? '无' : '已缴' }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col v-if="!isAdd && merData.is_margin != 0" :span="24">
+              <el-form-item label="保证金余额：">
+                <span>{{merData.margin}}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="手续费设置：" prop="commission_rate">
+                <el-switch
+                  v-model="merData.commission_switch"
+                  :active-value="1"
+                  :inactive-value="0"
+                  :width="55"
+                  active-text="开启"
+                  inactive-text="关闭"
+                />
+                <span v-if="merData.commission_switch">
+                  <el-input-number
+                    :min="0"
+                    v-model="merData.commission_rate"
+                    size="small"
+                    controls-position="right"
+                    placeholder="请输入手续费"
+                  />%
+                </span>
+                <div class="info info-red">(注：此处如未设置手续费，系统会自动读取商户分类下对应手续费；此处已设置，则优先以此处设置为准)</div>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+        <div class="section">
+          <div class="title">审核信息</div>
+           <el-row :gutter="24" class="mt20">
+            <el-col :span="8">
+              <el-form-item label="商品审核：" prop="is_audit">
+                <el-switch
+                  v-model="merData.is_audit"
+                  :active-value="1"
+                  :inactive-value="0"
+                  :width="50"
+                  active-text="是"
+                  inactive-text="否"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="直播间审核：" prop="is_bro_room">
+                <el-switch
+                  v-model="merData.is_bro_room"
+                  :active-value="1"
+                  :inactive-value="0"
+                  :width="50"
+                  active-text="是"
+                  inactive-text="否"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="直播商品：" prop="is_bro_goods">
+                <el-switch
+                  v-model="merData.is_bro_goods"
+                  :active-value="1"
+                  :inactive-value="0"
+                  :width="50"
+                  active-text="是"
+                  inactive-text="否"
+                />
+              </el-form-item>
+            </el-col>
+           </el-row>
+        </div>
+        <div class="section">
+          <div class="title">其他信息</div>
+          <div class="mt20">
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="商户关键字：" prop="mer_keyword">
+                  <el-input
+                    size="small"
+                    v-model="merData.mer_keyword"
+                    placeholder="请填写商户关键字"
+                    class="selWidth"
+                  />
+                </el-form-item>
+              </el-col>
+           </el-row>
+           <el-row v-if="!isAdd" :gutter="24">
+            <el-col :span="12" style="position: relative;">
+              <el-form-item label="商品采集数：">
+                <el-input v-model="merData.copy_product_num" size="small" disabled ></el-input>
+                <el-button type="text" @click="modifyCopy" style="margin-left: 10px;position:absolute;right: -30px;">修改</el-button>
+              </el-form-item>
+            </el-col>
+           </el-row>
+          </div>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="账号信息" name="account">
+        <div class="section">
+          <div class="title">登录账号</div>
+           <el-row :gutter="24" class="mt20">
+            <el-col :span="12">
+              <el-form-item label="商户账号：" prop="mer_account">
+                <el-input
+                  type="text"
+                  size="small"
+                  v-model="merData.mer_account"
+                  :disabled="!isAdd"
+                  class="selWidth"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="登陆密码：" prop="mer_password">
+                <el-input
+                  type="password"
+                  size="small"
+                  v-model="merData.mer_password"
+                  :disabled="!isAdd"
+                  class="selWidth"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="!isAdd" :span="12">
+              <el-form-item label="联系人：" prop="real_name">
+                <el-input
+                  type="text"
+                  size="small"
+                  placeholder="请填写联系人"
+                  v-model="merData.real_name"
+                  class="selWidth"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="联系电话：" prop="mer_phone">
+                <el-input
+                  size="small"
+                  placeholder="请填写联系电话"
+                  v-model="merData.mer_phone"
+                  class="selWidth"
+                />
+              </el-form-item>
+            </el-col>
+           </el-row>
+        </div>
+        <div class="section">
+          <div class="title">财务帐号</div>
+           <el-row :gutter="24" class="mt20">
+            <el-col :span="12">
+              <el-form-item label="分账商户号：" prop="sub_mchid">
+                <el-input
+                  placeholder="请填写分账商户号"
+                  size="small"
+                  v-model="merData.sub_mchid"
+                  class="selWidth"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <div class="info-red" style="margin-left: 120px;">当开启自动分账时，每个子商户在微信后台的分账商户号，即特约子商户号</div>
+            </el-col>
+           </el-row>
+        </div>
+      </el-tab-pane>
+  </el-tabs>
+</el-form>
+
+</template>
+<script>
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+import { supplyUpdate, supplyCreate } from "@/api/supply";
+export default {
+  props: {
+    merData: {
+      type: Object,
+      default: {},
+    },
+    isAdd: {
+      type: Boolean,
+      default: false,
+    },
+    merCateList: {
+      type: Array,
+      default: [],
+    },
+    storeType: {
+      type: Array,
+      default: [],
+    }
+  },
+  data() {
+    const validatePhone = (rule, value, callback) => {
+      if (!value) {
+        return callback(new Error('请填写联系方式'))
+      } else if (!/^1[3456789]\d{9}$/.test(value)) {
+        callback(new Error('格式不正确!'))
+      } else {
+        callback()
+      }
+    }
+    return {
+      loading: false,
+      merId: '',
+      direction: 'rtl',
+      activeName: 'detail',
+      ruleValidate: {
+        mer_name: [
+          { required: true, message: '请输入商户名称', trigger: 'blur' }
+        ],
+        mer_account: [
+          { required: true, message: '请输入商户账号', trigger: 'blur' }
+        ],
+        category_id: [
+          { required: true, message: '请选择商户分类', trigger: 'change' }
+        ],
+        type_id: [
+          { required: true, message: '请选择店铺类型', trigger: 'change' }
+        ],
+        mer_phone: [{ required: true, validator: validatePhone, trigger: 'blur' }],
+      },
+    };
+  },
+  filters: {
+  },
+  mounted() {
+
+  },
+  methods: {
+
+    /**修改采集次数 */
+    modifyCopy() {
+      this.$emit('modifyCopy')
+    },
+    /**重置表单数据 */
+    resetData(){
+      this.$refs.merDataField.resetFields();
+    },
+    /*提交信息*/
+    onSubmit(id){
+      this.$refs['merDataField'].validate(valid => {
+        if (valid) {
+          this.loading = true;
+          supplyUpdate(id,this.merData)
+          .then(async res => {
+            this.$message.success(res.message);
+            this.loading = false;
+            this.$emit('success');
+          })
+          .catch(res => {
+            this.loading = false;
+            this.$message.error(res.message);
+          });
+        }
+      });
+    },
+    /**创建商户 */
+    handleCreate(){
+      this.$refs['merDataField'].validate((valid) => {
+        if (valid) {
+          supplyCreate(this.merData)
+            .then(async (res) => {
+              this.$message.success(res.message);
+              this.$emit('success');
+            })
+            .catch((res) => {
+              this.$message.error(res.message);
+            });
+        } else {
+          if(!this.merData.mer_name)return this.$message.error('请填写基本信息-商户名称');
+          if(!this.merData.category_id)return this.$message.error('请选择基本信息-商户分类');
+          if(!this.merData.type_id)return this.$message.error('请选择基本信息-店铺类型');
+          if(!this.merData.mer_account)return this.$message.error('请填写账号信息-商户账号');
+          if(!this.merData.mer_phone)return this.$message.error('请填写账号信息-联系电话');
+        }
+      });
+    }
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-tabs--border-card {
+  box-shadow: none;
+  border-bottom: none;
+}
+.section {
+  padding: 20px 0 8px;
+  border-bottom: 1px dashed #eeeeee;
+  .title {
+    padding-left: 10px;
+    border-left: 3px solid var(--prev-color-primary);
+    font-size: 15px;
+    line-height: 15px;
+    color: #303133;
+  }
+  .list {
+    display: flex;
+    flex-wrap: wrap;
+    list-style: none;
+    padding: 0;
+  }
+  .item {
+    flex: 0 0 calc(100% / 2);
+    display: flex;
+    margin-top: 16px;
+    font-size: 13px;
+    color: #606266;
+
+    &:nth-child(2n + 1) {
+      padding-right: 20px;
+      padding-left: 20px;
+    }
+    &:nth-child(2n) {
+     padding-right: 20px;
+    }
+  }
+  .value {
+    flex: 1;
+    image {
+      display: inline-block;
+      width: 40px;
+      height: 40px;
+      margin: 0 12px 12px 0;
+      vertical-align: middle;
+    }
+  }
+}
+.info-red{
+  color: red;
+  font-size: 12px;
+}
+/deep/.el-input-number.is-controls-right .el-input__inner{
+ padding: 0 40px 0 10px;
+}
+/deep/.el-form-item__label{
+  font-weight: normal;
+  color: #282828;
+}
+.tab {
+  display: flex;
+  align-items: center;
+  .el-image {
+    width: 36px;
+    height: 36px;
+    margin-right: 10px;
+  }
+}
+/deep/.el-drawer__body {
+  overflow: auto;
+}
+.gary {
+  color: #aaa;
+}
+
+</style>
diff --git a/src/views/supply/list/handle/merInfo.vue b/src/views/supply/list/handle/merInfo.vue
new file mode 100644
index 0000000..2c8b1c1
--- /dev/null
+++ b/src/views/supply/list/handle/merInfo.vue
@@ -0,0 +1,420 @@
+<template>
+  <div>
+    <el-tabs type="border-card" v-model="activeName">
+      <el-tab-pane label="基本信息" name="detail">
+        <div class="section">
+          <div class="title">基础信息</div>
+          <ul class="list">
+            <li class="item">
+              <div>商户名称：</div>
+              <div class="value">
+                {{merData.mer_name}}
+              </div>
+            </li>
+            <li class="item">
+              <div>商户类型：</div>
+              <div class="value">{{merData.is_trader == 1 ? "自营" : "非自营"}}</div>
+            </li>
+            <li class="item">
+              <div>商户分类：</div>
+              <div v-if="merData.merchantCategory" class="value">
+                {{merData.merchantCategory.category_name}}
+                <span class="info info-red">(该分类下的商户手续费是{{merData.merchantCategory.commission_rate*100}}%)</span>
+              </div>
+            </li>
+            <li class="item">
+              <div>推荐商户：</div>
+              <div class="value">{{merData.is_best == 1 ? "是" : "否"}}</div>
+            </li>
+            <li v-if="merData.merchantType" class="item">
+              <div>店铺类型：</div>
+              <div class="value">{{merData.merchantType.type_name}}</div>
+            </li>
+            <li class="item">
+              <div>商户状态：</div>
+              <div class="value">{{merData.status == 1 ? "开启" : "关闭"}}</div>
+            </li>
+            <li class="item">
+              <div>排序：</div>
+              <div class="value">{{merData.sort}}</div>
+            </li>
+            <li class="item">
+              <div>更新时间：</div>
+              <div class="value">{{merData.update_time}}</div>
+            </li>
+            <li class="item">
+              <div>备注：</div>
+              <div class="value">{{merData.mark}}</div>
+            </li>
+          </ul>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="经营信息" name="business">
+        <div class="section">
+          <div class="title">费用信息</div>
+          <ul class="list">
+            <li class="item item100">
+              <div>手续费单独设置：</div>
+              <div class="value">
+                {{merData.commission_switch ? "开启" : "关闭"}}
+              </div>
+            </li>
+            <li v-if="merData.commission_switch" class="item item100">
+              <div>手续费：</div>
+              <div class="value">
+                {{ merData.commission_rate}}%
+                <span class="info info-red">(注：此处如未设置手续费，系统会自动读取商户分类下对应手续费；此处已设置，则优先以此处设置为准)</span>
+              </div>
+            </li>
+            <li class="item">
+              <div>店铺保证金：</div>
+              <div class="value">
+                {{merData.is_margin == 0 ? '无' : merData.ot_margin}}
+              </div>
+            </li>
+            <li v-if="merData.is_margin != 0" class="item">
+              <div>保证金支付状态：</div>
+              <div class="value">{{merData.is_margin == 1 ? '待缴' : merData.is_margin == 0 ? '无' : '已缴' }}
+                <span v-if="(merData.is_margin==10 && merData.margin-merData.ot_margin<0)" class="info-red">(需补缴)</span>
+              </div>
+            </li>
+            <li v-if="merData.is_margin != 0" class="item">
+              <div>保证金余额：</div>
+              <div class="value">{{merData.margin}}</div>
+            </li>
+          </ul>
+        </div>
+        <div class="section">
+          <div class="title">审核信息</div>
+          <ul class="list">
+            <li class="item">
+              <div>商品审核：</div>
+              <div class="value">{{merData.is_audit == 1 ? '需审核' : '免审核'}}</div>
+            </li>
+            <li class="item">
+              <div>直播间审核：</div>
+              <div class="value">{{merData.is_bro_room == 1 ? '需审核' : '免审核'}}</div>
+            </li>
+            <li class="item">
+              <div>直播商品：</div>
+              <div class="value">{{merData.is_bro_goods == 1 ? '需审核' : '免审核'}}</div>
+            </li>
+          </ul>
+        </div>
+        <div class="section">
+          <div class="title">其他信息</div>
+          <ul class="list">
+            <li class="item item100">
+              <div>搜索商户关键字：</div>
+              <div class="value">{{merData.mer_keyword}}</div>
+            </li>
+            <li class="item item100">
+              <div>剩余商品采集数：</div>
+              <div class="value">{{merData.copy_product_num}}次</div>
+            </li>
+            <li class="item item100">
+              <div>商户资质：</div>
+              <div class="value">
+                <el-image
+                  v-for="(item, index) in merData.mer_certificate"
+                  :key="index"
+                  :src="item"
+                  @click="lookImg(item)"
+                  style="width: 36px;height: 36px;margin-right: 5px;"
+                  />
+              </div>
+            </li>
+          </ul>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="账号信息" name="account">
+        <div class="section">
+          <div class="title">登录账号</div>
+          <ul class="list">
+            <li class="item">
+              <div>商户账号：</div>
+              <div class="value">
+                {{merData.mer_account}}
+              </div>
+            </li>
+            <li class="item">
+              <div>登录密码：</div>
+              <div class="value">{{merData.mer_password}}</div>
+
+            </li>
+            <li class="item">
+              <div>联系人：</div>
+              <div class="value">{{merData.real_name}}</div>
+            </li>
+            <li class="item">
+              <div>联系电话：</div>
+              <div class="value">{{merData.mer_phone}}</div>
+            </li>
+            <!-- <li class="item">
+              <div>绑定手机号：</div>
+              <div class="value">{{merData.real_name}}</div>
+            </li>
+            <li class="item">
+              <div>绑定微信用户昵称/ID：</div>
+              <div class="value">{{merData.real_name}}</div>
+            </li>  -->
+          </ul>
+        </div>
+        <div v-if="merData.sub_mchid" class="section">
+          <div class="title">财务帐号</div>
+          <ul class="list">
+            <li class="item">
+              <div>微信分账商户号：</div>
+              <div class="value">{{merData.sub_mchid}}</div>
+            </li>
+          </ul>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="操作记录" name="operate">
+        <div class="section">
+          <el-form size="small" label-width="80px">
+            <div class="acea-row">
+              <el-form-item label="操作端：">
+                <el-select
+                  v-model="tableFromLog.type"
+                  placeholder="请选择"
+                  style="width: 140px; margin-right: 20px"
+                  clearable
+                  filterable
+                  @change="onOperateLog(merId)"
+                >
+                  <el-option label="平台端" value="1" />
+                  <el-option label="商户端" value="2" />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="操作时间：">
+                <el-date-picker
+                  style="width: 380px; margin-right: 20px"
+                  v-model="timeVal"
+                  type="datetimerange"
+                  placeholder="选择日期"
+                  value-format="yyyy/MM/dd HH:mm:ss"
+                  clearable
+                  @change="onchangeTime"
+                >
+                </el-date-picker>
+              </el-form-item>
+              <!-- <div>
+                <el-button type="primary" size="small" @click="onOrderLog(orderId)">查询</el-button>
+              </div> -->
+            </div>
+          </el-form>
+          <el-table :data="tableDataLog.data" size="small">
+            <el-table-column prop="order_id" label="序号" min-width="80">
+              <template scope="scope">
+            <span>{{ scope.$index+(tableFromLog.page - 1) * tableFromLog.limit + 1 }}</span>
+          </template>
+          </el-table-column>
+            <el-table-column label="操作记录" min-width="200">
+              <template slot-scope="scope">
+                <span>{{ scope.row.category_name }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作端" min-width="150">
+              <template slot-scope="scope">
+                <div class="tab">
+                  <div>{{ scope.row.type }}</div>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作角色" min-width="150">
+              <template slot-scope="scope">
+                <div class="tab">
+                  <div>{{ scope.row.operator_role_nickname }}</div>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作人" min-width="150">
+              <template slot-scope="scope">
+                <div class="tab">
+                  <div>{{ scope.row.operator_nickname }}</div>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作时间" min-width="150">
+              <template slot-scope="scope">
+                <div class="tab">
+                  <div class="line1">{{ scope.row.create_time }}</div>
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
+          <div class="block">
+            <el-pagination background :page-size="tableFromLog.limit" :current-page="tableFromLog.page" layout="total, prev, pager, next, jumper" :total="tableDataLog.total" @size-change="handleSizeChangeLog" @current-change="pageChangeLog" />
+          </div>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+     <div class="images" v-show="false" v-viewer="{ movable: false }">
+      <img v-for="(src,index) in merData.mer_certificate" :src="src" :key="index" />
+    </div>
+  </div>
+</template>
+<script>
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+import { supplyOperateLog } from "@/api/supply";
+export default {
+  props: {
+    merData: {
+      type: Object,
+      default: {},
+    },
+  },
+  data() {
+    return {
+      loading: true,
+      merId: '',
+      direction: 'rtl',
+      activeName: 'detail',
+      timeVal: [],
+      tableDataLog: {
+        data: [],
+        total: 0
+      },
+      tableFromLog: {
+        user_type: '',
+        date: [],
+        page: 1,
+        limit: 10
+      },
+    };
+  },
+  filters: {
+  },
+  methods: {
+    lookImg(item) {
+      this.imageUrl = item;
+      const viewer = this.$el.querySelector('.images').$viewer;
+      viewer.show();
+      this.$nextTick(() => {
+        let i = this.merData.mer_certificate.findIndex((e) => e === item);
+        viewer.update().view(i);
+      });
+    },
+    // 具体日期
+    onchangeTime(e) {
+      this.timeVal = e
+      this.tableFromLog.date = e ? this.timeVal.join('-') : ''
+      this.onOperateLog(this.merId)
+    },
+    onOperateLog(id){
+      this.merId = id;
+      supplyOperateLog(id, this.tableFromLog).then((res) => {
+        this.tableDataLog.data = res.data.list
+        this.tableDataLog.total = res.data.count
+      });
+    },
+    pageChangeLog(page) {
+      this.tableFromLog.page = page
+      this.onOperateLog(this.merId)
+    },
+    handleSizeChangeLog(val) {
+      this.tableFromLog.limit = val
+      this.onOperateLog(this.merId)
+    },
+    operationType(type) {
+      if (type == 0) {
+        return '系统';
+      } else if (type == 1) {
+        return '用户';
+      } else if (type == 2) {
+        return '平台';
+      } else if (type == 3) {
+        return '商户';
+      } else if (type == 4) {
+        return '商家客服';
+      } else {
+        return '未知';
+      }
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-tabs--border-card {
+  box-shadow: none;
+  border-bottom: none;
+}
+.section {
+  padding: 20px 0 8px;
+  border-bottom: 1px dashed #eeeeee;
+  .title {
+    padding-left: 10px;
+    border-left: 3px solid var(--prev-color-primary);
+    font-size: 15px;
+    line-height: 15px;
+    color: #303133;
+  }
+  .list {
+    display: flex;
+    flex-wrap: wrap;
+    list-style: none;
+    padding: 0;
+    margin-top: 5px;
+  }
+  .item {
+    flex: 0 0 calc(100% / 2);
+    display: flex;
+    margin-top: 16px;
+    font-size: 13px;
+    color: #606266;
+    padding-right: 20px;
+    padding-left: 20px;
+    &.item100{
+     flex: 0 0 calc(100% / 1);
+     padding-right: 20px;
+     padding-left: 20px;
+    }
+    &:nth-child(2n + 1) {
+      padding-right: 20px;
+      padding-left: 20px;
+    }
+    // &:nth-child(2n) {
+    //  padding-right: 20px;
+    // }
+  }
+  .value {
+    flex: 1;
+    image {
+      display: inline-block;
+      width: 40px;
+      height: 40px;
+      margin: 0 12px 12px 0;
+      vertical-align: middle;
+    }
+  }
+}
+.info-red{
+  color: red;
+  font-size: 12px;
+}
+.tab {
+  display: flex;
+  align-items: center;
+  .el-image {
+    width: 36px;
+    height: 36px;
+    margin-right: 10px;
+  }
+}
+/deep/.el-drawer__body {
+  overflow: auto;
+}
+.gary {
+  color: #aaa;
+}
+
+</style>
diff --git a/src/views/supply/list/index.vue b/src/views/supply/list/index.vue
new file mode 100644
index 0000000..33f38ce
--- /dev/null
+++ b/src/views/supply/list/index.vue
@@ -0,0 +1,419 @@
+<template>
+  <div class="divBox">
+    <div class="selCard">
+      <el-form :model="tableFrom" ref="searchForm" size="small" label-width="85px" :inline="true">
+        <el-form-item label="选择时间：">
+          <el-date-picker
+            v-model="timeVal"
+            type="daterange"
+            placeholder="选择日期"
+            format="yyyy/MM/dd"
+            value-format="yyyy/MM/dd"
+            range-separator="-"
+            style="width:280px;"
+            :picker-options="pickerOptions"
+            @change="onchangeTime"
+          />
+        </el-form-item>
+        <el-form-item label="商户类别：" prop="is_trader">
+          <el-select
+            v-model="tableFrom.is_trader"
+            clearable
+            placeholder="请选择"
+            class="selWidth"
+            @change="getList(1)"
+          >
+            <el-option label="自营" value="1" />
+            <el-option label="非自营" value="0" />
+          </el-select>
+        </el-form-item>
+          <el-form-item label="商户分类：" prop="category_id">
+            <el-select
+            v-model="tableFrom.category_id"
+            clearable
+            placeholder="请选择"
+            class="selWidth"
+            @change="getList(1)"
+          >
+            <el-option
+              v-for="item in merCateList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="店铺类型：" prop="type_id">
+          <el-select
+            v-model="tableFrom.type_id"
+            clearable
+            placeholder="请选择"
+            class="selWidth"
+            @change="getList(1)"
+          >
+            <el-option
+              v-for="item in storeType"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="是否推荐：" prop="is_best">
+          <el-select
+            v-model="tableFrom.is_best"
+            clearable
+            placeholder="请选择"
+            class="selWidth"
+            @change="getList(1)"
+          >
+            <el-option key="1" label="是" value="1"/>
+            <el-option key="0" label="否" value="0"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="关键字：" prop="keyword">
+          <el-input
+            v-model="tableFrom.keyword"
+            @keyup.enter.native="getList(1)"
+            placeholder="请输入店铺关键字/店铺名/联系电话"
+            class="selWidth"
+            clearable
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" size="small" @click="getList(1)">搜索</el-button>
+          <el-button size="small" @click="searchReset()">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <el-card class="mt14">
+      <div class="mb20">
+        <el-tabs v-if="headeNum.length > 0" v-model="tableFrom.status" @tab-click="getList(1),getHeadNum()">
+          <el-tab-pane
+            v-for="(item,index) in headeNum"
+            :key="index"
+            :name="item.type.toString()"
+            :label="item.title +'('+item.count +')' "
+          />
+        </el-tabs>
+        <el-button size="small" type="primary" class="mt5" @click="onAdd">添加商户</el-button>
+      </div>
+      <el-table
+        v-loading="listLoading"
+        :data="tableData.data"
+        size="small"
+        highlight-current-row
+      >
+        <el-table-column prop="mer_id" label="ID" min-width="60" />
+        <el-table-column prop="mer_name" label="商户名称" min-width="150" />
+        <el-table-column prop="real_name" label="商户姓名" min-width="150" />
+        <el-table-column prop="status" label="推荐" min-width="100">
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.is_best"
+              :active-value="1"
+              :inactive-value="0"
+              active-text="是"
+              inactive-text="否"
+              :width="40"
+              @click.native="onchangeIsShow(scope.row)"
+            />
+          </template>
+        </el-table-column>
+         <el-table-column prop="status" label="开启/关闭" min-width="100">
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.status"
+              :active-value="1"
+              :inactive-value="0"
+              active-text="开启"
+              inactive-text="关闭"
+              :width="55"
+              @click.native="onchangeIsClose(scope.row)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column prop="create_time" label="创建时间" min-width="150" />
+        <el-table-column prop="margin" label="保证金" min-width="150">
+          <template slot-scope="scope">
+            <span>{{scope.row.is_margin == 1 ? '未支付' : scope.row.is_margin == 0 ? '无' : '已支付'}}</span>
+
+          </template>
+        </el-table-column>
+        <el-table-column prop="sort" label="排序" min-width="100" />
+        <el-table-column prop="mark" label="备注" min-width="200" />
+
+        <el-table-column label="操作" min-width="150" fixed="right">
+          <template slot-scope="scope">
+            <el-button
+              v-if="tableFrom.status === '1'"
+              type="text"
+              size="small"
+              @click="onLogo(scope.row.mer_id)"
+            >登录</el-button>
+            <el-button type="text" size="small" @click="onEdit(scope.row.mer_id)">编辑</el-button>
+            <el-button type="text" size="small" @click="onDetails(scope.row.mer_id)">详情</el-button>
+            <el-button
+              v-if="tableFrom.status === '0'"
+              type="text"
+              size="small"
+              @click="handleDelete(scope.row.mer_id, scope.$index)"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <el-pagination
+          background
+          :page-size="tableFrom.limit"
+          :current-page="tableFrom.page"
+          layout="total, prev, pager, next, jumper"
+          :total="tableData.total"
+          @size-change="handleSizeChange"
+          @current-change="pageChange"
+        />
+      </div>
+    </el-card>
+    <!--商户详情-->
+    <mer-detail
+      ref="merDetail"
+      :merId="merId"
+      :merCateList="merCateList"
+      :storeType="storeType"
+      @closeDrawer="closeDrawer"
+      @changeDrawer="changeDrawer"
+      @onPassword="onPassword"
+      @handleTimes="handleTimes"
+      @getList="getList"
+      :drawer="drawer"
+    ></mer-detail>
+  </div>
+</template>
+<script>
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+import {
+  supplyListApi,
+  supplyDeleteForm,
+  supplyStatuseApi,
+  supplyPasswordApi,
+  supplyLoginApi,
+  changeCopyApi,
+  supplyCountApi,
+  supplyIsCloseApi,
+  getstoreTypeApi,
+  getMerCateApi, marginDeductionForm
+} from "@/api/supply";
+import merDetail from './handle/merDetails.vue';
+import { fromList } from "@/libs/constants.js";
+import { roterPre } from "@/settings";
+import SettingMer from "@/libs/settingMer";
+import Cookies from "js-cookie";
+import timeOptions from '@/utils/timeOptions';
+export default {
+  name: "SupplyList",
+  components: { merDetail },
+  data() {
+    return {
+      fromList: fromList,
+      pickerOptions: timeOptions,
+      roterPre: roterPre,
+      isChecked: false,
+      listLoading: true,
+      merCateList: [],
+      storeType: [],
+      headeNum: [
+        {
+          count: '',
+          type: "1",
+          title: "正常开启的商户"
+        },
+        {
+          count: '',
+          type: "0",
+          title: "已关闭商户"
+        }
+      ],
+      tableData: {
+        data: [],
+        total: 0
+      },
+      tableFrom: {
+        page: 1,
+        limit: 20,
+        date: "",
+        status: "1",
+        keyword: "",
+        is_trader: "",
+        is_best: "",
+        category_id: '',
+        type_id: ""
+      },
+      autoUpdate: true,
+      merId: "",
+      drawer: false,
+      timeVal: []
+    };
+  },
+  mounted() {
+    this.getHeadNum();
+    this.getMerCategory();
+    this.getStoreType();
+    this.getList("");
+  },
+  methods: {
+    /**重置 */
+    searchReset(){
+      this.timeVal = []
+      this.tableFrom.date = ""
+      this.$refs.searchForm.resetFields()
+      this.getList(1)
+    },
+    onLogo(id) {
+      supplyLoginApi(id)
+        .then(res => {
+          Cookies.set("merchantToken", res.data.token);
+          window.open(SettingMer.httpUrl + res.data.url);
+        })
+        .catch(res => {
+          this.$message.error(res.message);
+        });
+    },
+    // 具体日期
+    onchangeTime(e) {
+      this.timeVal = e;
+      this.tableFrom.date = this.timeVal ? this.timeVal.join("-") : "";
+      this.tableFrom.page = 1;
+      this.getList("");
+    },
+    // 获取开启商户数
+    getHeadNum() {
+      supplyCountApi()
+        .then(res => {
+          this.headeNum[0]["count"] = res.data.valid;
+          this.headeNum[1]["count"] = res.data.invalid;
+        })
+        .catch(res => {});
+    },
+    // 商户分类；
+    getMerCategory() {
+        getMerCateApi().then(res => {
+            this.merCateList = res.data
+        }).catch(res => {
+            this.$message.error(res.message)
+        })
+    },
+    getStoreType(){
+        getstoreTypeApi().then(res => {
+            this.storeType = res.data
+        }).catch(res => {
+            this.$message.error(res.message)
+        })
+    },
+    // 列表
+    getList(num) {
+      this.listLoading = true;
+      this.tableFrom.page = num ? num : this.tableFrom.page;
+      supplyListApi(this.tableFrom)
+        .then(res => {
+          this.tableData.data = res.data.list;
+          this.tableData.total = res.data.count;
+          this.listLoading = false;
+        })
+        .catch(res => {
+          this.listLoading = false;
+          this.$message.error(res.message);
+        });
+    },
+    pageChange(page) {
+      this.tableFrom.page = page;
+      this.getList("");
+    },
+    handleSizeChange(val) {
+      this.tableFrom.limit = val;
+      this.getList(1);
+    },
+    // 修改状态
+    onchangeIsShow(row) {
+      const title = row.is_best === 1 ? "是否开启推荐商户" : "是否关闭推荐商户";
+      this.$modalSure(title).then(() => {
+        supplyStatuseApi(row.mer_id, row.is_best)
+          .then(({ message }) => {
+            this.$message.success(message);
+            this.getList("");
+          })
+          .catch(({ message }) => {
+            this.getList("");
+            this.$message.error(message);
+          });
+      });
+    },
+    // 开启关闭
+    onchangeIsClose(row) {
+      supplyIsCloseApi(row.mer_id, row.status)
+        .then(({ message }) => {
+          this.$message.success(message);
+          this.getList("");
+          this.getHeadNum();
+        })
+        .catch(({ message }) => {
+          this.$message.error(message);
+        });
+    },
+    // 添加
+    onAdd() {
+      // this.$modalForm(merchantCreateApi()).then(() => this.getList(""));
+      this.drawer = true;
+      this.$refs.merDetail.initData();
+    },
+    // 编辑
+    onEdit(id) {
+      this.merId = id;
+      this.$refs.merDetail.isEdit = true;
+      this.$refs.merDetail.getInfo(id);
+      this.drawer = true;
+
+    },
+    // 详情
+    onDetails(id) {
+      this.merId = id;
+      this.$refs.merDetail.isEdit = false;
+      this.$refs.merDetail.getInfo(id);
+      this.drawer = true;
+    },
+    changeDrawer(v) {
+      this.drawer = v;
+    },
+    closeDrawer() {
+      this.drawer = false;
+    },
+    // 删除
+    handleDelete(id) {
+      this.$modalForm(supplyDeleteForm(id)).then(() => this.getList(""));
+    },
+    // 扣除保证金
+    onDeduct(id) {
+      this.$modalForm(marginDeductionForm(id)).then(() => this.getList(""));
+    },
+    // 设置复制次数
+    handleTimes(id) {
+      this.$modalForm(changeCopyApi(id)).then(() => this.getList(""));
+    },
+
+    // 修改密码表单
+    onPassword(id) {
+      this.$modalForm(supplyPasswordApi(id));
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/src/views/supply/list/record.vue b/src/views/supply/list/record.vue
new file mode 100644
index 0000000..8a9eb90
--- /dev/null
+++ b/src/views/supply/list/record.vue
@@ -0,0 +1,632 @@
+<template>
+<div class="divBox">
+    <el-card class="box-card mb20">
+        <div slot="header" class="clearfix">
+            <router-link v-if="$route.params.type === '1'" :to="{path:roterPre+'/merchant/list'}">
+                <el-button size="mini" class="mr20 mb20" icon="el-icon-back">返回</el-button>
+            </router-link>
+            <router-link v-else :to="{path:roterPre+'/accounts/reconciliation'}">
+                <el-button size="mini" class="mr20 mb20" icon="el-icon-back">返回</el-button>
+            </router-link>
+            <div v-if="$route.params.type === '1'" class="filter-container">
+                <el-form :inline="true">
+                    <el-form-item label="使用状态：" class="mr20">
+                        <el-select v-model="tableFrom.status" placeholder="请选择评价状态" @change="init">
+                            <el-option label="全部" value="" />
+                            <el-option label="未对账" value="0" />
+                            <el-option label="已对账" value="1" />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="时间选择：" class="mr10">
+                        <el-date-picker v-model="timeVal" type="daterange" align="right" unlink-panels format="yyyy/MM/dd" value-format="yyyy/MM/dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" @change="onchangeTime" />
+                    </el-form-item>
+                </el-form>
+            </div>
+            <el-button v-if="$route.params.type === '1'" size="small" type="primary" @click="onAdd(0)">商户对账</el-button>
+        </div>
+        <el-table v-loading="listLoading" :data="tableData.data" style="width: 100%" size="mini" class="table" highlight-current-row>
+            <el-table-column type="expand">
+                <template slot-scope="props">
+                    <el-form label-position="left" inline class="demo-table-expand demo-table-expands">
+                        <el-form-item label="收货人：">
+                            <span>{{ props.row.real_name | filterEmpty }}</span>
+                        </el-form-item>
+                        <el-form-item label="电话：">
+                            <span>{{ props.row.user_phone | filterEmpty }}</span>
+                        </el-form-item>
+                        <el-form-item label="地址：">
+                            <span>{{ props.row.user_address | filterEmpty }}</span>
+                        </el-form-item>
+                        <el-form-item label="商品总数：">
+                            <span>{{ props.row.total_num | filterEmpty }}</span>
+                        </el-form-item>
+                        <el-form-item label="支付状态：">
+                            <span>{{ props.row.pay_type | payTypeFilter }}</span>
+                        </el-form-item>
+                        <el-form-item label="支付时间：">
+                            <span>{{ props.row.pay_time | filterEmpty }}</span>
+                        </el-form-item>
+                        <el-form-item label="对账备注：">
+                            <span>{{ props.row.admin_mark }}</span>
+                        </el-form-item>
+                    </el-form>
+                </template>
+            </el-table-column>
+            <el-table-column v-if="$route.params.type === '1'" width="50">
+                <template slot="header" slot-scope="scope">
+                    <el-popover placement="top-start" width="100" trigger="hover" class="tabPop">
+                        <div>
+                            <span class="spBlock onHand" :class="{'check': chkName === 'dan'}" @click="onHandle('dan',scope.$index)">选中本页</span>
+                            <span class="spBlock onHand" :class="{'check': chkName === 'duo'}" @click="onHandle('duo')">选中全部</span>
+                        </div>
+                        <el-checkbox slot="reference" :value="(chkName === 'dan' && checkedPage.indexOf(tableFrom.page) > -1) || chkName === 'duo'" @change="changeType" />
+                    </el-popover>
+                </template>
+                <template slot-scope="scope">
+                    <el-checkbox :value="checkedIds.indexOf(scope.row.order_id) > -1 || (chkName === 'duo' && noChecked.indexOf(scope.row.order_id) === -1)" @change="(v)=>changeOne(v,scope.row)" />
+                </template>
+            </el-table-column>
+            <el-table-column prop="order_id" label="ID" width="60" />
+            <el-table-column label="是否对账" min-width="100">
+                <template slot-scope="scope">
+                    <span>{{ scope.row.reconciliation_id | reconciliationFilter }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column prop="order_sn" label="订单编号" min-width="190" />
+            <el-table-column label="商品信息" min-width="330">
+                <template slot-scope="scope">
+                    <div v-for="(val, i ) in scope.row.orderProduct" :key="i" class="tabBox acea-row row-middle">
+                        <div class="demo-image__preview">
+                            <el-image :src="val.cart_info.product.image" :preview-src-list="[val.cart_info.product.image]" />
+                        </div>
+                        <span class="tabBox_tit">{{ val.cart_info.product.store_name + ' | ' }}{{ val.cart_info.productAttr.sku }}</span>
+                        <span class="tabBox_pice">{{ '￥'+ val.cart_info.productAttr.price + ' x '+ val.product_num }}</span>
+                    </div>
+                </template>
+            </el-table-column>
+            <el-table-column label="商品总价" min-width="150">
+                <template slot-scope="scope">
+                    <span>{{ getTotal(scope.row.orderProduct) }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column prop="pay_price" label="实际支付" min-width="100" />
+            <el-table-column label="佣金金额" min-width="100">
+              <template slot-scope="scope">
+                <span>{{Number(scope.row.extension_one)+Number(scope.row.extension_two)}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="total_postage" label="邮费" min-width="100" />
+          <el-table-column prop="order_rate" label="手续费" min-width="100" />
+            <el-table-column prop="create_time" label="下单时间" min-width="150" />
+            <el-table-column v-if="$route.params.type === '1'" label="操作" min-width="80" fixed="right">
+                <template slot-scope="scope">
+                    <el-button type="text" size="small" @click="addMark(scope.row.order_id)">添加备注</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="block mb20">
+            <el-pagination background :page-size="tableFrom.limit" :current-page="tableFrom.page" layout="total, prev, pager, next, jumper" :total="tableData.total" @size-change="handleSizeChange" @current-change="pageChange" />
+        </div>
+    </el-card>
+    <el-card class="box-card">
+        <el-table v-loading="listLoading" :data="tableDataRefund.data" style="width: 100%" size="mini" class="table" highlight-current-row>
+            <el-table-column type="expand">
+                <template slot-scope="props">
+                    <el-form label-position="left" inline class="demo-table-expand">
+                        <el-form-item label="订单号：">
+                            <span>{{ props.row.order.order_sn }}</span>
+                        </el-form-item>
+                        <el-form-item label="退款商品总价：">
+                            <span>{{ getTotalRefund(props.row.refundProduct) }}</span>
+                        </el-form-item>
+                        <el-form-item label="退款商品总数：">
+                            <span>{{ props.row.refund_num }}</span>
+                        </el-form-item>
+                        <el-form-item label="申请退款时间：">
+                            <span>{{ props.row.create_time | filterEmpty }}</span>
+                        </el-form-item>
+                        <el-form-item label="对账备注：">
+                            <span>{{ props.row.admin_mark }}</span>
+                        </el-form-item>
+                    </el-form>
+                </template>
+            </el-table-column>
+            <el-table-column v-if="$route.params.type === '1'" width="50">
+                <template slot="header" slot-scope="scope">
+                    <el-popover placement="top-start" width="100" trigger="hover" class="tabPop">
+                        <div>
+                            <span class="spBlock onHand" :class="{'check': chkNameRefund === 'dan'}" @click="onHandleRefund('dan',scope.$index)">选中本页</span>
+                            <span class="spBlock onHand" :class="{'check': chkNameRefund === 'duo'}" @click="onHandleRefund('duo')">选中全部</span>
+                        </div>
+                        <el-checkbox slot="reference" :value="(chkNameRefund === 'dan' && checkedPage.indexOf(tableFrom.page) > -1) || chkNameRefund === 'duo'" @change="changeTypeRefund" />
+                    </el-popover>
+                </template>
+                <!--:disabled="isDisabled"-->
+                <template slot-scope="scope">
+                    <el-checkbox :value="refundCheckedIds.indexOf(scope.row.refund_order_id) > -1 || (chkNameRefund === 'duo' && refundNoChecked.indexOf(scope.row.refund_order_id) === -1)" @change="(v)=>changeOneRefund(v,scope.row)" />
+                </template>
+            </el-table-column>
+            <el-table-column prop="refund_order_id" label="ID" width="60" />
+            <el-table-column label="退款单号" min-width="170">
+                <template slot-scope="scope">
+                    <span style="display: block;" v-text="scope.row.refund_order_sn" />
+                    <span v-show="scope.row.is_del > 0" style="color: #ED4014;display: block;">用户已删除</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="是否对账" min-width="100">
+                <template slot-scope="scope">
+                    <span>{{ scope.row.reconciliation_id | reconciliationFilter }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column prop="user.nickname" label="用户信息" min-width="130" />
+            <el-table-column prop="refund_price" label="退款金额" min-width="130" />
+            <el-table-column prop="nickname" label="商品信息" min-width="330">
+                <template slot-scope="scope">
+                    <div v-for="(val, i ) in scope.row.refundProduct" :key="i" class="tabBox acea-row row-middle">
+                        <div class="demo-image__preview">
+                            <el-image :src="val.product.cart_info.product.image" :preview-src-list="[val.product.cart_info.product.image]" />
+                        </div>
+                        <span class="tabBox_tit">{{ val.product.cart_info.product.store_name + ' | ' }}{{ val.product.cart_info.productAttr.sku }}</span>
+                        <span class="tabBox_pice">{{ '￥'+ val.product.cart_info.productAttr.price + ' x '+ val.product.product_num }}</span>
+                    </div>
+                </template>
+            </el-table-column>
+            <el-table-column prop="serviceScore" label="订单状态" min-width="250">
+                <template slot-scope="scope">
+                    <span style="display: block">{{ scope.row.status | orderRefundFilter }}</span>
+                    <span style="display: block">退款原因：{{ scope.row.refund_message }}</span>
+                    <!--<p>备注说明：{{scope.row.mark}}</p>-->
+                    <span style="display: block">状态变更时间：{{ scope.row.status_time }}</span>
+                    <!--<p>备注凭证：{{}}</p>-->
+                </template>
+            </el-table-column>
+            <el-table-column v-if="$route.params.type === '1'" key="10" label="操作" min-width="80" fixed="right">
+
+                <template slot-scope="scope">
+                    <el-button type="text" size="small" @click="onOrderMark(scope.row.refund_order_id)">订单备注</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="block">
+            <el-pagination background :page-size="tableFrom.limit" :current-page="tableFrom.page" layout="total, prev, pager, next, jumper" :total="tableDataRefund.total" @size-change="handleSizeChangeRefund" @current-change="pageChangeRefund" />
+        </div>
+    </el-card>
+</div>
+</template>
+
+<script>
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+import {
+    merOrderListApi,
+    refundOrderListApi,
+    orderMarkApi,
+    refundMarkApi,
+    reconciliationApi
+} from '@/api/supply'
+import {
+    reconciliationOrderApi,
+    reconciliationRefundApi
+} from '@/api/accounts'
+import {
+    roterPre
+} from '@/settings'
+export default {
+    name: 'Record',
+    data() {
+        return {
+            roterPre: roterPre,
+            chkName: '',
+            chkNameRefund: '',
+            isIndeterminate: true,
+            resource: [],
+            visible: false,
+            timeVal: [],
+            pickerOptions: {
+                shortcuts: [{
+                    text: '最近一周',
+                    onClick(picker) {
+                        const end = new Date()
+                        const start = new Date()
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+                        picker.$emit('pick', [start, end])
+                    }
+                }, {
+                    text: '最近一个月',
+                    onClick(picker) {
+                        const end = new Date()
+                        const start = new Date()
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+                        picker.$emit('pick', [start, end])
+                    }
+                }, {
+                    text: '最近三个月',
+                    onClick(picker) {
+                        const end = new Date()
+                        const start = new Date()
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+                        picker.$emit('pick', [start, end])
+                    }
+                }]
+            },
+            listLoading: true,
+            tableData: {
+                data: [],
+                total: 0
+            },
+            tableDataRefund: {
+                data: [],
+                total: 0
+            },
+            tableFrom: {
+                page: 1,
+                limit: 10,
+                date: '',
+                status: ''
+            },
+            ids: [],
+            idsRefund: [],
+            checkedPage: [],
+            checkedIds: [], // 订单当前页选中的数据
+            noChecked: [], // 订单全选状态下当前页不选中的数据
+            refundCheckedIds: [], // 退款单当前页选中的数据
+            refundNoChecked: [] // 退款单全选状态下当前页不选中的数据
+        }
+    },
+    mounted() {
+        this.init()
+    },
+    created() {
+        this.tempRoute = Object.assign({}, this.$route)
+    },
+    methods: {
+        isDisabled(row) {
+            if (row.status !== 3) {
+                return false
+            }
+            return true
+        },
+        init() {
+            this.tableFrom.page = 1
+            this.getList()
+            this.getRefundList()
+            if (this.$route.params.type === 0) {
+                this.setTagsViewTitle()
+            }
+        },
+        // 订单
+        onHandle(name) {
+            this.chkName = this.chkName === name ? '' : name
+            this.changeType(!(this.chkName === ''))
+        },
+        changeOne(v, order) {
+            if (v) {
+                if (this.chkName === 'duo') {
+                    const index = this.noChecked.indexOf(order.order_id)
+                    if (index > -1) this.noChecked.splice(index, 1)
+                } else {
+                    const index = this.checkedIds.indexOf(order.order_id)
+                    if (index === -1) this.checkedIds.push(order.order_id)
+                }
+            } else {
+                if (this.chkName === 'duo') {
+                    const index = this.noChecked.indexOf(order.order_id)
+                    if (index === -1) this.noChecked.push(order.order_id)
+                } else {
+                    const index = this.checkedIds.indexOf(order.order_id)
+                    if (index > -1) this.checkedIds.splice(index, 1)
+                }
+            }
+        },
+        changeType(v) {
+            if (v) {
+                if (!this.chkName) {
+                    this.chkName = 'dan'
+                }
+            } else {
+                this.chkName = ''
+            }
+            const index = this.checkedPage.indexOf(this.tableFrom.page)
+            if (this.chkName === 'dan') {
+                this.checkedPage.push(this.tableFrom.page)
+            } else if (index > -1) {
+                this.checkedPage.splice(index, 1)
+            }
+            this.syncCheckedId()
+        },
+        syncCheckedId() {
+            const ids = this.tableData.data.map(v => v.order_id)
+            if (this.chkName === 'duo') {
+                this.checkedIds = []
+            } else if (this.chkName === 'dan') {
+                ids.forEach(id => {
+                    const index = this.checkedIds.indexOf(id)
+                    if (index === -1) {
+                        this.checkedIds.push(id)
+                    }
+                })
+            } else {
+                ids.forEach(id => {
+                    const index = this.checkedIds.indexOf(id)
+                    if (index > -1) {
+                        this.checkedIds.splice(index, 1)
+                    }
+                })
+            }
+        },
+        // 退款订单
+        onHandleRefund(name) {
+            this.chkNameRefund = this.chkNameRefund === name ? '' : name
+            this.changeTypeRefund(!(this.chkNameRefund === ''))
+        },
+        changeOneRefund(v, order) {
+            if (v) {
+                if (this.chkNameRefund === 'duo') {
+                    const index = this.refundNoChecked.indexOf(order.refund_order_id)
+                    if (index > -1) this.refundNoChecked.splice(index, 1)
+                } else {
+                    const index = this.refundCheckedIds.indexOf(order.refund_order_id)
+                    if (index === -1) this.refundCheckedIds.push(order.refund_order_id)
+                }
+            } else {
+                if (this.chkNameRefund === 'duo') {
+                    const index = this.refundNoChecked.indexOf(order.refund_order_id)
+                    if (index === -1) this.refundNoChecked.push(order.refund_order_id)
+                } else {
+                    const index = this.refundCheckedIds.indexOf(order.refund_order_id)
+                    if (index > -1) this.refundCheckedIds.splice(index, 1)
+                }
+            }
+        },
+        changeTypeRefund(v) {
+            if (v) {
+                if (!this.chkNameRefund) {
+                    this.chkNameRefund = 'dan'
+                }
+            } else {
+                this.chkNameRefund = ''
+            }
+            const index = this.checkedPage.indexOf(this.tableFrom.page)
+            if (this.chkNameRefund === 'dan') {
+                this.checkedPage.push(this.tableFrom.page)
+            } else if (index > -1) {
+                this.checkedPage.splice(index, 1)
+            }
+            this.syncCheckedIdRefund()
+        },
+        syncCheckedIdRefund() {
+            const ids = this.tableDataRefund.data.map(v => v.refund_order_id)
+            if (this.chkNameRefund === 'duo') {
+                this.refundCheckedIds = []
+            } else if (this.chkNameRefund === 'dan') {
+                ids.forEach(id => {
+                    const index = this.refundCheckedIds.indexOf(id)
+                    if (index === -1) {
+                        this.refundCheckedIds.push(id)
+                    }
+                })
+            } else {
+                ids.forEach(id => {
+                    const index = this.refundCheckedIds.indexOf(id)
+                    if (index > -1) {
+                        this.refundCheckedIds.splice(index, 1)
+                    }
+                })
+            }
+        },
+        onAdd() {
+            // if (this.ids.length === 0 || this.idsRefund.length === 0) return this.$message.warning('请先选择对账单')
+            const datas = {
+                order_ids: this.checkedIds,
+                order_out_ids: this.noChecked,
+                order_type: this.chkName === 'duo' ? 1 : 0,
+                refund_order_ids: this.refundCheckedIds,
+                refund_out_ids: this.refundNoChecked,
+                refund_type: this.chkNameRefund === 'duo' ? 1 : 0,
+                date: this.tableFrom.date
+            }
+            this.$modalSure('发起商户对账吗').then(() => {
+                reconciliationApi(this.$route.params.id, datas, ).then(({
+                    message
+                }) => {
+                    this.$message.success(message)
+                    this.tableFrom.page = 1
+                    this.getList()
+                    this.getRefundList()
+                    this.chkName = ''
+                    this.chkNameRefund = ''
+                    this.refundCheckedIds = []
+                    this.checkedIds = []
+                    this.noChecked = []
+                    this.refundNoChecked = []
+                }).catch(({
+                    message
+                }) => {
+                    this.$message.error(message)
+                })
+            })
+        },
+        // 具体日期
+        onchangeTime(e) {
+            this.timeVal = e
+            this.tableFrom.date = this.timeVal ? this.timeVal.join('-') : ''
+            this.tableFrom.page = 1
+            this.getList()
+            this.getRefundList()
+        },
+        // 退款备注
+        onOrderMark(id) {
+            this.$modalForm(refundMarkApi(id)).then(() => this.getRefundList())
+        },
+        // 订单备注
+        addMark(id) {
+            this.$modalForm(orderMarkApi(id)).then(() => this.getList())
+        },
+        getTotalRefund(row) {
+            let sum = 0
+            for (let i = 0; i < row.length; i++) {
+                sum += row[i].product.cart_info.productAttr.price * row[i].refund_num
+            }
+            return sum
+        },
+        getTotal(row) {
+            let sum = 0
+            for (let i = 0; i < row.length; i++) {
+                sum += row[i].cart_info.productAttr.price * row[i].product_num
+            }
+            return sum
+        },
+        // 列表
+        getList() {
+            this.listLoading = true
+            this.$route.params.type === '1' ? merOrderListApi(this.$route.params.id, this.tableFrom).then(res => {
+                this.tableData.data = res.data.list
+                this.tableData.total = res.data.count
+                this.tableData.data.map((item) => {
+                    this.$set(item, {
+                        checked: false
+                    })
+                })
+                this.listLoading = false
+            }).catch(res => {
+                this.listLoading = false
+                this.$message.error(res.message)
+            }) : reconciliationOrderApi(this.$route.params.id, this.tableFrom).then(res => {
+                this.tableData.data = res.data.list
+                this.tableData.total = res.data.count
+                this.tableData.data.map((item) => {
+                    this.$set(item, {
+                        checked: false
+                    })
+                })
+                this.listLoading = false
+            }).catch(res => {
+                this.listLoading = false
+                this.$message.error(res.message)
+            })
+        },
+        pageChange(page) {
+            this.tableFrom.page = page
+            this.getList()
+        },
+        handleSizeChange(val) {
+            this.tableFrom.limit = val
+            this.chkName = ''
+            this.getList()
+        },
+        // 退款列表
+        getRefundList() {
+            this.listLoading = true
+            this.$route.params.type === '1' ? refundOrderListApi(this.$route.params.id, this.tableFrom).then(res => {
+                this.tableDataRefund.data = res.data.list
+                this.tableDataRefund.total = res.data.count
+                this.listLoading = false
+            }).catch(res => {
+                this.listLoading = false
+                this.$message.error(res.message)
+            }) : reconciliationRefundApi(this.$route.params.id, this.tableFrom).then(res => {
+                this.tableDataRefund.data = res.data.list
+                this.tableDataRefund.total = res.data.count
+                this.listLoading = false
+            }).catch(res => {
+                this.listLoading = false
+                this.$message.error(res.message)
+            })
+        },
+        pageChangeRefund(page) {
+            this.tableFrom.page = page
+            this.getRefundList()
+        },
+        handleSizeChangeRefund(val) {
+            this.tableFrom.limit = val
+            this.getRefundList()
+        },
+        setTagsViewTitle() {
+            const title = '查看订单'
+            const route = Object.assign({}, this.tempRoute, {
+                title: `${title}-${this.$route.params.id}`
+            })
+            this.$store.dispatch('tagsView/updateVisitedView', route)
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.spBlock {
+    cursor: pointer;
+}
+
+.check {
+    color: #00a2d4;
+}
+
+.tabPop {
+    /deep/ .el-popover {
+        width: 100px !important;
+    }
+}
+
+.fang {
+    display: inline-block;
+    position: relative;
+    border: 1px solid #DCDFE6;
+    border-radius: 2px;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    width: 14px;
+    height: 14px;
+    background-color: #fff;
+    z-index: 1;
+    -webkit-transition: border-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46), background-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46);
+    transition: border-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46), background-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46);
+}
+
+.el-table /deep/.DisabledSelection .cell .el-checkbox__inner {
+    margin-left: -30px;
+    position: relative;
+}
+
+.el-table /deep/.DisabledSelection .cell:before {
+    content: "全选";
+    position: absolute;
+    right: 11px;
+}
+
+.demo-table-expands {
+    /deep/ label {
+        width: 84px !important;
+        color: #99a9bf;
+    }
+}
+
+.selWidth {
+    width: 300px;
+}
+
+.el-dropdown-link {
+    cursor: pointer;
+    color: var(--prev-color-primary);
+    font-size: 12px;
+}
+
+.el-icon-arrow-down {
+    font-size: 12px;
+}
+
+.tabBox_tit {
+    width: 60%;
+    font-size: 12px !important;
+    margin: 0 2px 0 10px;
+    letter-spacing: 1px;
+    padding: 5px 0;
+    box-sizing: border-box;
+}
+</style>
diff --git a/src/views/supply/rechargeRecord/index.vue b/src/views/supply/rechargeRecord/index.vue
new file mode 100644
index 0000000..54e7dbd
--- /dev/null
+++ b/src/views/supply/rechargeRecord/index.vue
@@ -0,0 +1,203 @@
+<template>
+  <div class="divBox">
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <div class="container">
+          <el-form size="small" label-width="100px">
+            <el-form-item label="时间选择：" class="width100">
+              <el-radio-group
+                v-model="tableFrom.date"
+                type="button"
+                class="mr20"
+                size="small"
+                @change="selectChange(tableFrom.date)"
+              >
+                <el-radio-button
+                  v-for="(item,i) in fromList.fromTxt"
+                  :key="i"
+                  :label="item.val"
+                >{{ item.text }}</el-radio-button>
+              </el-radio-group>
+              <el-date-picker
+                v-model="timeVal"
+                value-format="yyyy/MM/dd"
+                format="yyyy/MM/dd"
+                size="small"
+                type="daterange"
+                placement="bottom-end"
+                placeholder="自定义时间"
+                style="width: 250px;"
+                @change="onchangeTime"
+              />
+            </el-form-item>
+             <el-form-item label="商户名称：" style="display: inline-block;">
+              <el-select
+                v-model="tableFrom.mer_id"
+                clearable
+                filterable
+                placeholder="请选择"
+                class="selWidth"
+                @change="getList(1),getStatisticalData()"
+              >
+                <el-option
+                  v-for="item in merSelect"
+                  :key="item.mer_id"
+                  :label="item.mer_name"
+                  :value="item.mer_id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-form>
+        </div>
+        <cards-data :card-lists="cardLists" />
+      </div>
+      <el-table
+        v-loading="listLoading"
+        :data="tableData.data"
+        style="width: 100%"
+        size="mini"
+        class="table"
+        highlight-current-row
+      >
+        <el-table-column label="序号" min-width="60">
+          <template scope="scope">
+            <span>{{ scope.$index+(tableFrom.page - 1) * tableFrom.limit + 1 }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="商户名称" min-width="150">
+          <template slot-scope="scope">
+            <span>{{ scope.row.merchant ? scope.row.merchant.mer_name :'' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="充值金额（元）" min-width="100" >
+          <template slot-scope="scope">
+            <span>{{ scope.row.financial_pm === 1 ? scope.row.number : -scope.row.number }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="create_time" label="支付时间" min-width="130" />
+      </el-table>
+      <div class="block">
+        <el-pagination
+          background
+          :page-size="tableFrom.limit"
+          :current-page="tableFrom.page"
+          layout="total, prev, pager, next, jumper"
+          :total="tableData.total"
+          @size-change="handleSizeChange"
+          @current-change="pageChange"
+        />
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+import { capitalFlowLstApi, getStatisticsApi } from '@/api/accounts'
+import { merSelectApi } from "@/api/product";
+import { fromList } from '@/libs/constants.js'
+import { roterPre } from '@/settings'
+import cardsData from "@/components/cards/index";
+export default {
+  name: 'AccountsCapitalFlow',
+  components: { cardsData },
+  data() {
+    return {
+      timeVal: [],
+      merSelect: [],
+      tableData: {
+        data: [],
+        total: 0
+      },
+      roterPre: roterPre,
+      listLoading: true,
+      tableFrom: {
+        date: '',
+        keyword: '',
+        mer_id: '',
+        page: 1,
+        limit: 20
+      },
+      fromList: fromList,
+      options: [],
+      cardLists: [],
+    }
+  },
+  mounted() {
+    this.getList()
+    this.getStatisticalData()
+    this.getMerSelect()
+  },
+  methods: {
+    // 时间选择
+    selectChange(tab) {
+      this.tableFrom.date = tab
+      this.timeVal = []
+      this.tableFrom.page = 1;
+      this.getList()
+      this.getStatisticalData()
+    },
+    // 具体日期
+    onchangeTime(e) {
+      this.timeVal = e
+      this.tableFrom.date = e ? this.timeVal.join('-') : ''
+      this.tableFrom.page = 1;
+      this.getList()
+      this.getStatisticalData()
+    },
+    //获取统计数据
+    getStatisticalData(){
+        getStatisticsApi({date:this.tableFrom.date}).then((res) => {
+          this.cardLists = res.data;
+        })
+        .catch((res) => {
+          this.$message.error(res.message);
+        });
+    },
+    // 商户列表；
+    getMerSelect() {
+      merSelectApi()
+        .then((res) => {
+          this.merSelect = res.data;
+        })
+        .catch((res) => {
+          this.$message.error(res.message);
+        });
+    },
+    // 列表
+    getList(num) {
+      this.listLoading = true
+      this.tableFrom.page = num ? num : this.tableFrom.page;
+      capitalFlowLstApi(this.tableFrom)
+        .then((res) => {
+          this.tableData.data = res.data.list
+          this.tableData.total = res.data.count
+          this.listLoading = false
+        })
+        .catch((res) => {
+          this.$message.error(res.message)
+          this.listLoading = false
+        })
+    },
+    pageChange(page) {
+      this.tableFrom.page = page
+      this.getList()
+    },
+    handleSizeChange(val) {
+      this.tableFrom.limit = val
+      this.getList()
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/supply/system/index.vue b/src/views/supply/system/index.vue
new file mode 100644
index 0000000..7dd59d5
--- /dev/null
+++ b/src/views/supply/system/index.vue
@@ -0,0 +1,146 @@
+<template>
+  <div class="divBox">
+    <el-card>
+      <div class="mb20">
+        <el-button size="small" type="primary" @click="onAdd(0)">添加菜单</el-button>
+      </div>
+      <el-table
+        v-loading="listLoading"
+        :data="tableData.data"
+        size="small"
+        row-key="menu_id"
+        :default-expand-all="false"
+        :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+      >
+        <el-table-column
+          label="菜单名称"
+          min-width="200"
+        >
+          <template slot-scope="scope">
+            <span>{{scope.row.menu_name + '  [ ' + scope.row.menu_id + '  ]'}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="route"
+          label="菜单地址"
+          min-width="150"
+        />
+        <el-table-column label="菜单图标" min-width="100">
+          <template slot-scope="scope">
+            <div class="listPic">
+              <i :class="'el-icon-' + scope.row.icon" style="font-size: 20px;" />
+            </div>
+          </template>
+        </el-table-column>
+        <!--<el-table-column-->
+        <!--prop="status"-->
+        <!--label="是否显示"-->
+        <!--min-width="100"-->
+        <!--&gt;-->
+        <!--<template slot-scope="scope">-->
+        <!--<el-switch-->
+        <!--v-model="scope.row.status"-->
+        <!--:active-value="1"-->
+        <!--:inactive-value="0"-->
+        <!--@change="onchangeIsShow(scope.row)"-->
+        <!--/>-->
+        <!--</template>-->
+        <!--</el-table-column>-->
+        <el-table-column
+          prop="create_time"
+          label="创建时间"
+          min-width="150"
+        />
+        <el-table-column label="操作" min-width="150" fixed="right">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" :disabled="isChecked" @click="onAdd(scope.row.menu_id)">添加子菜单</el-button>
+            <el-button type="text" size="small" @click="onEdit(scope.row.menu_id)">编辑</el-button>
+            <el-button type="text" size="small" @click="handleDelete(scope.row.menu_id, scope.$index)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+  </div>
+</template>
+
+<script>
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+import {
+  supplyMenuListApi, supplyMenuCreateApi, supplyMenuUpdateApi, supplyMenuDeleteApi
+} from '@/api/supply'
+export default {
+  name: 'supplySystem',
+  data() {
+    return {
+      isChecked: false,
+      listLoading: true,
+      tableData: {
+        data: [],
+        total: 0
+      },
+      tableFrom: {
+        page: 1,
+        limit: 20
+      }
+    }
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    // 列表
+    getList() {
+      this.listLoading = true
+      supplyMenuListApi(this.tableFrom).then(res => {
+        this.tableData.data = res.data.list
+        this.tableData.total = res.data.count
+        this.listLoading = false
+      }).catch(res => {
+        this.listLoading = false
+        this.$message.error(res.message)
+      })
+    },
+    pageChange(page) {
+      this.tableData.page = page
+      this.getList()
+    },
+    handleSizeChange(val) {
+      this.tableData.limit = val
+      this.getList()
+    },
+    // 添加
+    onAdd(id) {
+      const config = {}
+      if (Number(id) > 0) config.formData = { pid: id }
+      this.$modalForm(supplyMenuCreateApi(), config).then(() => this.getList())
+    },
+    // 编辑
+    onEdit(id) {
+      this.$modalForm(supplyMenuUpdateApi(id)).then(() => this.getList())
+    },
+    // 删除
+    handleDelete(id) {
+      this.$modalSure().then(() => {
+        supplyMenuDeleteApi(id).then(({ message }) => {
+          this.$message.success(message)
+          this.getList()
+        }).catch(({ message }) => {
+          this.$message.error(message)
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+@import '@/styles/form.scss';
+</style>
diff --git a/src/views/supply/type/description.vue b/src/views/supply/type/description.vue
new file mode 100644
index 0000000..82945a1
--- /dev/null
+++ b/src/views/supply/type/description.vue
@@ -0,0 +1,171 @@
+<template>
+  <div class="divBox">
+    <el-card class="box-card">
+      <el-form ref="formValidate" v-loading="fullscreenLoading" class="formValidate mt20"  :model="formValidate" label-width="100px" @submit.native.prevent>
+        <el-col :span="24">
+          <el-form-item>
+            <h3 class="title">店铺类型说明</h3>
+            <ueditor-from v-model="formValidate.agree" :content="formValidate.agree" style="width: 100%"/>
+          </el-form-item>
+        </el-col>
+        <el-form-item style="margin-top:30px;">
+          <el-button type="primary" class="submission" size="small" @click="previewProtol">预览</el-button>
+          <el-button type="primary" class="submission" size="small" @click="handleSubmit('formValidate')">提交</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <div class="Box">
+      <el-dialog
+        v-if="modals"
+        :visible.sync="modals"
+        title=""
+        height="30%"
+        custom-class="dialog-scustom"
+        class="addDia"
+      >
+        <div class="agreement">
+          <h3>店铺类型说明</h3>
+          <div class="content">
+            <div v-html="formValidate.agree"></div>
+          </div>
+        </div>
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script>
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+import ueditorFrom from '@/components/ueditorFrom'
+
+import {
+  getStoreTypeApi,
+  updateStoreTypeApi
+} from '@/api/supply'
+export default {
+  name: 'storeTypeDesc',
+  components: { ueditorFrom },
+  data() {
+    return {
+      modals: false,
+      props: {
+        emitPath: false
+      },
+      formValidate: {
+        agree: '',
+      },
+      content: '',
+      fullscreenLoading: false,
+    }
+  },
+  mounted() {
+    this.getInfo();
+  },
+  methods: {
+    getInfo() {
+      this.fullscreenLoading = true
+      getStoreTypeApi('sys_merchant_type').then(res => {
+        const info = res.data
+        this.formValidate = {
+          agree: info.sys_merchant_type,
+        }
+        this.fullscreenLoading = false
+      }).catch(res => {
+        this.$message.error(res.message)
+        this.fullscreenLoading = false
+      })
+    },
+
+    // 提交
+    handleSubmit(name) {
+      if(this.formValidate.agree === '' || !this.formValidate.agree){
+        this.$message.warning("请输入协议信息！");
+        return
+      }else{
+        updateStoreTypeApi('sys_merchant_type',this.formValidate).then(async res => {
+          this.fullscreenLoading = false
+          this.$message.success(res.message)
+        }).catch(res => {
+          this.fullscreenLoading = false
+          this.$message.error(res.message)
+        })
+
+      }
+
+    },
+    previewProtol(){
+      this.modals = true;
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.dialog-scustom,.addDia{
+  min-width: 400px;
+  height: 900px;
+  .el-dialog{
+    width: 400px;
+  }
+  h3{
+    color: #333;
+    font-size: 16px;
+    text-align: center;
+    font-weight: bold;
+    margin: 0;
+  }
+}
+.title{
+  font-weight: bold;
+  font-size: 18px;
+  text-align: center;
+  width: 90%;
+}
+.agreement{
+  width: 350px;
+  margin: 0 auto;
+  box-shadow: 1px 5px 5px 2px rgba(0,0,0,.2);
+  padding: 26px;
+  border-radius: 15px;
+  .content{
+    height: 600px;
+    overflow-y:scroll;
+    /deep/ p{
+      font-size: 13px;
+      line-height: 22px;
+    }
+  }
+  /deep/ img{
+    max-width: 100%;
+  }
+  p{
+    text-align: justify;
+  }
+}
+/*css主要部分的样式*/
+/*定义滚动条宽高及背景，宽高分别对应横竖滚动条的尺寸*/
+
+::-webkit-scrollbar {
+  width: 10px; /*对垂直流动条有效*/
+  height: 10px; /*对水平流动条有效*/
+}
+
+/*定义滚动条的轨道颜色、内阴影及圆角*/
+::-webkit-scrollbar-track{
+  /*-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.3);*/
+  background-color: transparent;
+  border-radius: 3px;
+}
+
+</style>
+
+
+
diff --git a/src/views/supply/type/index.vue b/src/views/supply/type/index.vue
new file mode 100644
index 0000000..327aed5
--- /dev/null
+++ b/src/views/supply/type/index.vue
@@ -0,0 +1,252 @@
+<template>
+  <div class="divBox">
+    <el-card>
+      <div class="mb20">
+        <el-button size="small" type="primary" @click="onAdd"
+          >添加店铺类型
+        </el-button>
+      </div>
+      <el-table
+        v-loading="listLoading"
+        :data="tableData.data"
+        size="small"
+        highlight-current-row
+        class="switchTable"
+      >
+        <el-table-column prop="mer_type_id" label="ID" min-width="60" />
+        <el-table-column
+          prop="type_name"
+          label="店铺类型名称"
+          min-width="120"
+        />
+        <el-table-column
+          label="店铺数量（个）"
+          prop="merchant_count"
+          min-width="120"
+        />
+        <el-table-column prop="type_name" label="店铺保证金" min-width="120">
+          <template slot-scope="scope">
+            <span class="spBlock">{{
+              scope.row.is_margin ? scope.row.margin + "元" : "无"
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="type_info"
+          label="店铺类型要求"
+          min-width="150"
+        />
+        <el-table-column
+          prop="create_time"
+          label="创建时间"
+          min-width="150"
+        />
+        <el-table-column
+          prop="update_time"
+          label="最新修改时间"
+          min-width="150"
+        />
+        <el-table-column
+          label="操作"
+          min-width="180"
+          fixed="right"
+        >
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="handleDetail(scope.row,false)"
+              >详情
+            </el-button>
+            <el-button type="text" size="small" @click="handleDetail(scope.row,true)"
+              >编辑
+            </el-button>
+            <el-button
+              type="text"
+              size="small"
+              @click="handleDelete(scope.row.mer_type_id, scope.$index)"
+              >删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <el-pagination
+          background
+          :page-size="tableFrom.limit"
+          :current-page="tableFrom.page"
+          layout="total, prev, pager, next, jumper"
+          :total="tableData.total"
+          @size-change="handleSizeChange"
+          @current-change="pageChange"
+        />
+      </div>
+    </el-card>
+    <!-- 详情抽屉弹窗 -->
+    <type-detail
+      ref="typeDetail"
+      :typeId="typeId"
+      :isCreate="isCreate"
+      :permissions="permissions"
+      @getList="getList"
+      @closeDrawer="closeDrawer"
+      @changeDrawer="changeDrawer"
+      :drawer="drawer"
+    ></type-detail>
+  </div>
+</template>
+<script>
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+import {
+  storeTypeLstApi,
+  storeTypeDeleteApi,
+  storeJurisdictionApi,
+  supplyTypeMarkForm,
+} from "@/api/supply";
+import typeDetail from './typeDetails.vue';
+import { fromList } from "@/libs/constants.js";
+import { roterPre } from "@/settings";
+
+export default {
+  name: "MerchantList",
+  components: { typeDetail },
+  data() {
+    return {
+      fromList: fromList,
+      roterPre: roterPre,
+      listLoading: true,
+      append: true,
+      permissions: [], //店铺类型
+      tableData: {
+        data: [],
+        total: 0,
+      },
+      tableFrom: {
+        page: 1,
+        limit: 20,
+      },
+      formValidate: {
+        type_name: "",
+        type_info: "",
+        is_margin: 1,
+        margin: 0,
+        auth: [],
+        description: "",
+      },
+      isEdit: false,
+      isCreate: false,
+      typeId: "",
+      drawer: false
+    };
+  },
+
+  mounted() {
+    this.getList("");
+  },
+  methods: {
+    // 列表
+    getList(num) {
+      this.listLoading = true;
+      this.tableFrom.page = num ? num : this.tableFrom.page;
+      storeTypeLstApi(this.tableFrom)
+        .then((res) => {
+          this.tableData.data = res.data.list;
+          this.tableData.total = res.data.count;
+          this.listLoading = false;
+          this.jurisdiction();
+        })
+        .catch((res) => {
+          this.listLoading = false;
+          this.$message.error(res.message);
+        });
+    },
+    pageChange(page) {
+      this.tableFrom.page = page;
+      this.getList("");
+    },
+    handleSizeChange(val) {
+      this.tableFrom.limit = val;
+      this.getList(1);
+    },
+    // 添加
+    onAdd() {
+      this.drawer = true;
+      this.$refs.typeDetail.isEdit = true;
+      this.isCreate = true;
+      this.$refs.typeDetail.addType();
+      this.$refs.tree && this.$refs.tree.setCheckedKeys([]);
+
+    },
+    //获取权限
+    jurisdiction() {
+      storeJurisdictionApi().then((res) => {
+        function loadData(lst) {
+          lst.forEach((v) => {
+            v.value = v.id;
+            v.label = v.title;
+            delete v.id;
+            delete v.title;
+            if (v.children) {
+              if (!v.children.length) {
+                delete v.children;
+              } else {
+                loadData(v.children);
+              }
+            }
+          });
+          return lst;
+        }
+        this.permissions = loadData(res.data);
+      });
+    },
+    // 详情
+    handleDetail(row,edit) {
+      this.typeId = row.mer_type_id;
+      this.drawer = true;
+      this.isEdit = edit;
+      this.isCreate = false;
+      this.$refs.typeDetail.getInfo(this.typeId,edit)
+    },
+    changeDrawer(v) {
+      this.drawer = v;
+    },
+    closeDrawer() {
+      this.drawer = false;
+    },
+    // 删除
+    handleDelete(id) {
+      this.$modalSure("确定删除该店铺类型吗").then(() => {
+        storeTypeDeleteApi(id)
+          .then(({ message }) => {
+            this.$message.success(message);
+            this.getList("");
+          })
+          .catch(({ message }) => {
+            this.$message.error(message);
+          });
+      });
+    },
+    // 备注
+    handleMark(id) {
+      this.$modalForm(supplyTypeMarkForm(id)).then(() => this.getList());
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.input_inline {
+  /deep/ .el-input {
+    width: 200px;
+    margin-right: 5px;
+  }
+}
+</style>
diff --git a/src/views/supply/type/record.vue b/src/views/supply/type/record.vue
new file mode 100644
index 0000000..159b8c4
--- /dev/null
+++ b/src/views/supply/type/record.vue
@@ -0,0 +1,632 @@
+<template>
+<div class="divBox">
+    <el-card class="box-card mb20">
+        <div slot="header" class="clearfix">
+            <router-link v-if="$route.params.type === '1'" :to="{path:roterPre+'/merchant/list'}">
+                <el-button size="mini" class="mr20 mb20" icon="el-icon-back">返回</el-button>
+            </router-link>
+            <router-link v-else :to="{path:roterPre+'/accounts/reconciliation'}">
+                <el-button size="mini" class="mr20 mb20" icon="el-icon-back">返回</el-button>
+            </router-link>
+            <div v-if="$route.params.type === '1'" class="filter-container">
+                <el-form :inline="true">
+                    <el-form-item label="使用状态：" class="mr20">
+                        <el-select v-model="tableFrom.status" placeholder="请选择评价状态" @change="init">
+                            <el-option label="全部" value="" />
+                            <el-option label="未对账" value="0" />
+                            <el-option label="已对账" value="1" />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="时间选择：" class="mr10">
+                        <el-date-picker v-model="timeVal" type="daterange" align="right" unlink-panels format="yyyy/MM/dd" value-format="yyyy/MM/dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" @change="onchangeTime" />
+                    </el-form-item>
+                </el-form>
+            </div>
+            <el-button v-if="$route.params.type === '1'" size="small" type="primary" @click="onAdd(0)">商户对账</el-button>
+        </div>
+        <el-table v-loading="listLoading" :data="tableData.data" size="small" class="table" highlight-current-row>
+            <el-table-column type="expand">
+                <template slot-scope="props">
+                    <el-form label-position="left" inline class="demo-table-expand demo-table-expands">
+                        <el-form-item label="收货人：">
+                            <span>{{ props.row.real_name | filterEmpty }}</span>
+                        </el-form-item>
+                        <el-form-item label="电话：">
+                            <span>{{ props.row.user_phone | filterEmpty }}</span>
+                        </el-form-item>
+                        <el-form-item label="地址：">
+                            <span>{{ props.row.user_address | filterEmpty }}</span>
+                        </el-form-item>
+                        <el-form-item label="商品总数：">
+                            <span>{{ props.row.total_num | filterEmpty }}</span>
+                        </el-form-item>
+                        <el-form-item label="支付状态：">
+                            <span>{{ props.row.pay_type | payTypeFilter }}</span>
+                        </el-form-item>
+                        <el-form-item label="支付时间：">
+                            <span>{{ props.row.pay_time | filterEmpty }}</span>
+                        </el-form-item>
+                        <el-form-item label="对账备注：">
+                            <span>{{ props.row.admin_mark }}</span>
+                        </el-form-item>
+                    </el-form>
+                </template>
+            </el-table-column>
+            <el-table-column v-if="$route.params.type === '1'" width="50">
+                <template slot="header" slot-scope="scope">
+                    <el-popover placement="top-start" width="100" trigger="hover" class="tabPop">
+                        <div>
+                            <span class="spBlock onHand" :class="{'check': chkName === 'dan'}" @click="onHandle('dan',scope.$index)">选中本页</span>
+                            <span class="spBlock onHand" :class="{'check': chkName === 'duo'}" @click="onHandle('duo')">选中全部</span>
+                        </div>
+                        <el-checkbox slot="reference" :value="(chkName === 'dan' && checkedPage.indexOf(tableFrom.page) > -1) || chkName === 'duo'" @change="changeType" />
+                    </el-popover>
+                </template>
+                <template slot-scope="scope">
+                    <el-checkbox :value="checkedIds.indexOf(scope.row.order_id) > -1 || (chkName === 'duo' && noChecked.indexOf(scope.row.order_id) === -1)" @change="(v)=>changeOne(v,scope.row)" />
+                </template>
+            </el-table-column>
+            <el-table-column prop="order_id" label="ID" width="60" />
+            <el-table-column label="是否对账" min-width="100">
+                <template slot-scope="scope">
+                    <span>{{ scope.row.reconciliation_id | reconciliationFilter }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column prop="order_sn" label="订单编号" min-width="190" />
+            <el-table-column label="商品信息" min-width="330">
+                <template slot-scope="scope">
+                    <div v-for="(val, i ) in scope.row.orderProduct" :key="i" class="tabBox acea-row row-middle">
+                        <div class="demo-image__preview">
+                            <el-image :src="val.cart_info.product.image" :preview-src-list="[val.cart_info.product.image]" />
+                        </div>
+                        <span class="tabBox_tit">{{ val.cart_info.product.store_name + ' | ' }}{{ val.cart_info.productAttr.sku }}</span>
+                        <span class="tabBox_pice">{{ '￥'+ val.cart_info.productAttr.price + ' x '+ val.product_num }}</span>
+                    </div>
+                </template>
+            </el-table-column>
+            <el-table-column label="商品总价" min-width="150">
+                <template slot-scope="scope">
+                    <span>{{ getTotal(scope.row.orderProduct) }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column prop="pay_price" label="实际支付" min-width="100" />
+            <el-table-column label="佣金金额" min-width="100">
+              <template slot-scope="scope">
+                <span>{{Number(scope.row.extension_one)+Number(scope.row.extension_two)}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="total_postage" label="邮费" min-width="100" />
+          <el-table-column prop="order_rate" label="手续费" min-width="100" />
+            <el-table-column prop="create_time" label="下单时间" min-width="150" />
+            <el-table-column v-if="$route.params.type === '1'" label="操作" min-width="80" fixed="right">
+                <template slot-scope="scope">
+                    <el-button type="text" size="small" @click="addMark(scope.row.order_id)">添加备注</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="block mb20">
+            <el-pagination background :page-size="tableFrom.limit" :current-page="tableFrom.page" layout="total, prev, pager, next, jumper" :total="tableData.total" @size-change="handleSizeChange" @current-change="pageChange" />
+        </div>
+    </el-card>
+    <el-card class="box-card">
+        <el-table v-loading="listLoading" :data="tableDataRefund.data" size="small" class="table" highlight-current-row>
+            <el-table-column type="expand">
+                <template slot-scope="props">
+                    <el-form label-position="left" inline class="demo-table-expand">
+                        <el-form-item label="订单号：">
+                            <span>{{ props.row.order.order_sn }}</span>
+                        </el-form-item>
+                        <el-form-item label="退款商品总价：">
+                            <span>{{ getTotalRefund(props.row.refundProduct) }}</span>
+                        </el-form-item>
+                        <el-form-item label="退款商品总数：">
+                            <span>{{ props.row.refund_num }}</span>
+                        </el-form-item>
+                        <el-form-item label="申请退款时间：">
+                            <span>{{ props.row.create_time | filterEmpty }}</span>
+                        </el-form-item>
+                        <el-form-item label="对账备注：">
+                            <span>{{ props.row.admin_mark }}</span>
+                        </el-form-item>
+                    </el-form>
+                </template>
+            </el-table-column>
+            <el-table-column v-if="$route.params.type === '1'" width="50">
+                <template slot="header" slot-scope="scope">
+                    <el-popover placement="top-start" width="100" trigger="hover" class="tabPop">
+                        <div>
+                            <span class="spBlock onHand" :class="{'check': chkNameRefund === 'dan'}" @click="onHandleRefund('dan',scope.$index)">选中本页</span>
+                            <span class="spBlock onHand" :class="{'check': chkNameRefund === 'duo'}" @click="onHandleRefund('duo')">选中全部</span>
+                        </div>
+                        <el-checkbox slot="reference" :value="(chkNameRefund === 'dan' && checkedPage.indexOf(tableFrom.page) > -1) || chkNameRefund === 'duo'" @change="changeTypeRefund" />
+                    </el-popover>
+                </template>
+                <!--:disabled="isDisabled"-->
+                <template slot-scope="scope">
+                    <el-checkbox :value="refundCheckedIds.indexOf(scope.row.refund_order_id) > -1 || (chkNameRefund === 'duo' && refundNoChecked.indexOf(scope.row.refund_order_id) === -1)" @change="(v)=>changeOneRefund(v,scope.row)" />
+                </template>
+            </el-table-column>
+            <el-table-column prop="refund_order_id" label="ID" width="60" />
+            <el-table-column label="退款单号" min-width="170">
+                <template slot-scope="scope">
+                    <span style="display: block;" v-text="scope.row.refund_order_sn" />
+                    <span v-show="scope.row.is_del > 0" style="color: #ED4014;display: block;">用户已删除</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="是否对账" min-width="100">
+                <template slot-scope="scope">
+                    <span>{{ scope.row.reconciliation_id | reconciliationFilter }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column prop="user.nickname" label="用户信息" min-width="130" />
+            <el-table-column prop="refund_price" label="退款金额" min-width="130" />
+            <el-table-column prop="nickname" label="商品信息" min-width="330">
+                <template slot-scope="scope">
+                    <div v-for="(val, i ) in scope.row.refundProduct" :key="i" class="tabBox acea-row row-middle">
+                        <div class="demo-image__preview">
+                            <el-image :src="val.product.cart_info.product.image" :preview-src-list="[val.product.cart_info.product.image]" />
+                        </div>
+                        <span class="tabBox_tit">{{ val.product.cart_info.product.store_name + ' | ' }}{{ val.product.cart_info.productAttr.sku }}</span>
+                        <span class="tabBox_pice">{{ '￥'+ val.product.cart_info.productAttr.price + ' x '+ val.product.product_num }}</span>
+                    </div>
+                </template>
+            </el-table-column>
+            <el-table-column prop="serviceScore" label="订单状态" min-width="250">
+                <template slot-scope="scope">
+                    <span style="display: block">{{ scope.row.status | orderRefundFilter }}</span>
+                    <span style="display: block">退款原因：{{ scope.row.refund_message }}</span>
+                    <!--<p>备注说明：{{scope.row.mark}}</p>-->
+                    <span style="display: block">状态变更时间：{{ scope.row.status_time }}</span>
+                    <!--<p>备注凭证：{{}}</p>-->
+                </template>
+            </el-table-column>
+            <el-table-column v-if="$route.params.type === '1'" key="10" label="操作" min-width="80" fixed="right">
+
+                <template slot-scope="scope">
+                    <el-button type="text" size="small" @click="onOrderMark(scope.row.refund_order_id)">订单备注</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="block">
+            <el-pagination background :page-size="tableFrom.limit" :current-page="tableFrom.page" layout="total, prev, pager, next, jumper" :total="tableDataRefund.total" @size-change="handleSizeChangeRefund" @current-change="pageChangeRefund" />
+        </div>
+    </el-card>
+</div>
+</template>
+
+<script>
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+import {
+    merOrderListApi,
+    refundOrderListApi,
+    orderMarkApi,
+    refundMarkApi,
+    reconciliationApi
+} from '@/api/supply'
+import {
+    reconciliationOrderApi,
+    reconciliationRefundApi
+} from '@/api/accounts'
+import {
+    roterPre
+} from '@/settings'
+export default {
+    name: 'Record',
+    data() {
+        return {
+            roterPre: roterPre,
+            chkName: '',
+            chkNameRefund: '',
+            isIndeterminate: true,
+            resource: [],
+            visible: false,
+            timeVal: [],
+            pickerOptions: {
+                shortcuts: [{
+                    text: '最近一周',
+                    onClick(picker) {
+                        const end = new Date()
+                        const start = new Date()
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+                        picker.$emit('pick', [start, end])
+                    }
+                }, {
+                    text: '最近一个月',
+                    onClick(picker) {
+                        const end = new Date()
+                        const start = new Date()
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+                        picker.$emit('pick', [start, end])
+                    }
+                }, {
+                    text: '最近三个月',
+                    onClick(picker) {
+                        const end = new Date()
+                        const start = new Date()
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+                        picker.$emit('pick', [start, end])
+                    }
+                }]
+            },
+            listLoading: true,
+            tableData: {
+                data: [],
+                total: 0
+            },
+            tableDataRefund: {
+                data: [],
+                total: 0
+            },
+            tableFrom: {
+                page: 1,
+                limit: 10,
+                date: '',
+                status: ''
+            },
+            ids: [],
+            idsRefund: [],
+            checkedPage: [],
+            checkedIds: [], // 订单当前页选中的数据
+            noChecked: [], // 订单全选状态下当前页不选中的数据
+            refundCheckedIds: [], // 退款单当前页选中的数据
+            refundNoChecked: [] // 退款单全选状态下当前页不选中的数据
+        }
+    },
+    mounted() {
+        this.init()
+    },
+    created() {
+        this.tempRoute = Object.assign({}, this.$route)
+    },
+    methods: {
+        isDisabled(row) {
+            if (row.status !== 3) {
+                return false
+            }
+            return true
+        },
+        init() {
+            this.tableFrom.page = 1
+            this.getList()
+            this.getRefundList()
+            if (this.$route.params.type === 0) {
+                this.setTagsViewTitle()
+            }
+        },
+        // 订单
+        onHandle(name) {
+            this.chkName = this.chkName === name ? '' : name
+            this.changeType(!(this.chkName === ''))
+        },
+        changeOne(v, order) {
+            if (v) {
+                if (this.chkName === 'duo') {
+                    const index = this.noChecked.indexOf(order.order_id)
+                    if (index > -1) this.noChecked.splice(index, 1)
+                } else {
+                    const index = this.checkedIds.indexOf(order.order_id)
+                    if (index === -1) this.checkedIds.push(order.order_id)
+                }
+            } else {
+                if (this.chkName === 'duo') {
+                    const index = this.noChecked.indexOf(order.order_id)
+                    if (index === -1) this.noChecked.push(order.order_id)
+                } else {
+                    const index = this.checkedIds.indexOf(order.order_id)
+                    if (index > -1) this.checkedIds.splice(index, 1)
+                }
+            }
+        },
+        changeType(v) {
+            if (v) {
+                if (!this.chkName) {
+                    this.chkName = 'dan'
+                }
+            } else {
+                this.chkName = ''
+            }
+            const index = this.checkedPage.indexOf(this.tableFrom.page)
+            if (this.chkName === 'dan') {
+                this.checkedPage.push(this.tableFrom.page)
+            } else if (index > -1) {
+                this.checkedPage.splice(index, 1)
+            }
+            this.syncCheckedId()
+        },
+        syncCheckedId() {
+            const ids = this.tableData.data.map(v => v.order_id)
+            if (this.chkName === 'duo') {
+                this.checkedIds = []
+            } else if (this.chkName === 'dan') {
+                ids.forEach(id => {
+                    const index = this.checkedIds.indexOf(id)
+                    if (index === -1) {
+                        this.checkedIds.push(id)
+                    }
+                })
+            } else {
+                ids.forEach(id => {
+                    const index = this.checkedIds.indexOf(id)
+                    if (index > -1) {
+                        this.checkedIds.splice(index, 1)
+                    }
+                })
+            }
+        },
+        // 退款订单
+        onHandleRefund(name) {
+            this.chkNameRefund = this.chkNameRefund === name ? '' : name
+            this.changeTypeRefund(!(this.chkNameRefund === ''))
+        },
+        changeOneRefund(v, order) {
+            if (v) {
+                if (this.chkNameRefund === 'duo') {
+                    const index = this.refundNoChecked.indexOf(order.refund_order_id)
+                    if (index > -1) this.refundNoChecked.splice(index, 1)
+                } else {
+                    const index = this.refundCheckedIds.indexOf(order.refund_order_id)
+                    if (index === -1) this.refundCheckedIds.push(order.refund_order_id)
+                }
+            } else {
+                if (this.chkNameRefund === 'duo') {
+                    const index = this.refundNoChecked.indexOf(order.refund_order_id)
+                    if (index === -1) this.refundNoChecked.push(order.refund_order_id)
+                } else {
+                    const index = this.refundCheckedIds.indexOf(order.refund_order_id)
+                    if (index > -1) this.refundCheckedIds.splice(index, 1)
+                }
+            }
+        },
+        changeTypeRefund(v) {
+            if (v) {
+                if (!this.chkNameRefund) {
+                    this.chkNameRefund = 'dan'
+                }
+            } else {
+                this.chkNameRefund = ''
+            }
+            const index = this.checkedPage.indexOf(this.tableFrom.page)
+            if (this.chkNameRefund === 'dan') {
+                this.checkedPage.push(this.tableFrom.page)
+            } else if (index > -1) {
+                this.checkedPage.splice(index, 1)
+            }
+            this.syncCheckedIdRefund()
+        },
+        syncCheckedIdRefund() {
+            const ids = this.tableDataRefund.data.map(v => v.refund_order_id)
+            if (this.chkNameRefund === 'duo') {
+                this.refundCheckedIds = []
+            } else if (this.chkNameRefund === 'dan') {
+                ids.forEach(id => {
+                    const index = this.refundCheckedIds.indexOf(id)
+                    if (index === -1) {
+                        this.refundCheckedIds.push(id)
+                    }
+                })
+            } else {
+                ids.forEach(id => {
+                    const index = this.refundCheckedIds.indexOf(id)
+                    if (index > -1) {
+                        this.refundCheckedIds.splice(index, 1)
+                    }
+                })
+            }
+        },
+        onAdd() {
+            // if (this.ids.length === 0 || this.idsRefund.length === 0) return this.$message.warning('请先选择对账单')
+            const datas = {
+                order_ids: this.checkedIds,
+                order_out_ids: this.noChecked,
+                order_type: this.chkName === 'duo' ? 1 : 0,
+                refund_order_ids: this.refundCheckedIds,
+                refund_out_ids: this.refundNoChecked,
+                refund_type: this.chkNameRefund === 'duo' ? 1 : 0,
+                date: this.tableFrom.date
+            }
+            this.$modalSure('发起商户对账吗').then(() => {
+                reconciliationApi(this.$route.params.id, datas, ).then(({
+                    message
+                }) => {
+                    this.$message.success(message)
+                    this.tableFrom.page = 1
+                    this.getList()
+                    this.getRefundList()
+                    this.chkName = ''
+                    this.chkNameRefund = ''
+                    this.refundCheckedIds = []
+                    this.checkedIds = []
+                    this.noChecked = []
+                    this.refundNoChecked = []
+                }).catch(({
+                    message
+                }) => {
+                    this.$message.error(message)
+                })
+            })
+        },
+        // 具体日期
+        onchangeTime(e) {
+            this.timeVal = e
+            this.tableFrom.date = this.timeVal ? this.timeVal.join('-') : ''
+            this.tableFrom.page = 1
+            this.getList()
+            this.getRefundList()
+        },
+        // 退款备注
+        onOrderMark(id) {
+            this.$modalForm(refundMarkApi(id)).then(() => this.getRefundList())
+        },
+        // 订单备注
+        addMark(id) {
+            this.$modalForm(orderMarkApi(id)).then(() => this.getList())
+        },
+        getTotalRefund(row) {
+            let sum = 0
+            for (let i = 0; i < row.length; i++) {
+                sum += row[i].product.cart_info.productAttr.price * row[i].refund_num
+            }
+            return sum
+        },
+        getTotal(row) {
+            let sum = 0
+            for (let i = 0; i < row.length; i++) {
+                sum += row[i].cart_info.productAttr.price * row[i].product_num
+            }
+            return sum
+        },
+        // 列表
+        getList() {
+            this.listLoading = true
+            this.$route.params.type === '1' ? merOrderListApi(this.$route.params.id, this.tableFrom).then(res => {
+                this.tableData.data = res.data.list
+                this.tableData.total = res.data.count
+                this.tableData.data.map((item) => {
+                    this.$set(item, {
+                        checked: false
+                    })
+                })
+                this.listLoading = false
+            }).catch(res => {
+                this.listLoading = false
+                this.$message.error(res.message)
+            }) : reconciliationOrderApi(this.$route.params.id, this.tableFrom).then(res => {
+                this.tableData.data = res.data.list
+                this.tableData.total = res.data.count
+                this.tableData.data.map((item) => {
+                    this.$set(item, {
+                        checked: false
+                    })
+                })
+                this.listLoading = false
+            }).catch(res => {
+                this.listLoading = false
+                this.$message.error(res.message)
+            })
+        },
+        pageChange(page) {
+            this.tableFrom.page = page
+            this.getList()
+        },
+        handleSizeChange(val) {
+            this.tableFrom.limit = val
+            this.chkName = ''
+            this.getList()
+        },
+        // 退款列表
+        getRefundList() {
+            this.listLoading = true
+            this.$route.params.type === '1' ? refundOrderListApi(this.$route.params.id, this.tableFrom).then(res => {
+                this.tableDataRefund.data = res.data.list
+                this.tableDataRefund.total = res.data.count
+                this.listLoading = false
+            }).catch(res => {
+                this.listLoading = false
+                this.$message.error(res.message)
+            }) : reconciliationRefundApi(this.$route.params.id, this.tableFrom).then(res => {
+                this.tableDataRefund.data = res.data.list
+                this.tableDataRefund.total = res.data.count
+                this.listLoading = false
+            }).catch(res => {
+                this.listLoading = false
+                this.$message.error(res.message)
+            })
+        },
+        pageChangeRefund(page) {
+            this.tableFrom.page = page
+            this.getRefundList()
+        },
+        handleSizeChangeRefund(val) {
+            this.tableFrom.limit = val
+            this.getRefundList()
+        },
+        setTagsViewTitle() {
+            const title = '查看订单'
+            const route = Object.assign({}, this.tempRoute, {
+                title: `${title}-${this.$route.params.id}`
+            })
+            this.$store.dispatch('tagsView/updateVisitedView', route)
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.spBlock {
+    cursor: pointer;
+}
+
+.check {
+    color: #00a2d4;
+}
+
+.tabPop {
+    /deep/ .el-popover {
+        width: 100px !important;
+    }
+}
+
+.fang {
+    display: inline-block;
+    position: relative;
+    border: 1px solid #DCDFE6;
+    border-radius: 2px;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    width: 14px;
+    height: 14px;
+    background-color: #fff;
+    z-index: 1;
+    -webkit-transition: border-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46), background-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46);
+    transition: border-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46), background-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46);
+}
+
+.el-table /deep/.DisabledSelection .cell .el-checkbox__inner {
+    margin-left: -30px;
+    position: relative;
+}
+
+.el-table /deep/.DisabledSelection .cell:before {
+    content: "全选";
+    position: absolute;
+    right: 11px;
+}
+
+.demo-table-expands {
+    /deep/ label {
+        width: 84px !important;
+        color: #99a9bf;
+    }
+}
+
+.selWidth {
+    width: 300px;
+}
+
+.el-dropdown-link {
+    cursor: pointer;
+    color: var(--prev-color-primary);
+    font-size: 12px;
+}
+
+.el-icon-arrow-down {
+    font-size: 12px;
+}
+
+.tabBox_tit {
+    width: 60%;
+    font-size: 12px !important;
+    margin: 0 2px 0 10px;
+    letter-spacing: 1px;
+    padding: 5px 0;
+    box-sizing: border-box;
+}
+</style>
diff --git a/src/views/supply/type/typeDetails.vue b/src/views/supply/type/typeDetails.vue
new file mode 100644
index 0000000..fb0ac00
--- /dev/null
+++ b/src/views/supply/type/typeDetails.vue
@@ -0,0 +1,324 @@
+<template>
+  <div>
+    <el-drawer
+      :with-header="false"
+      :size="1000"
+      :visible.sync="drawer"
+      :direction="direction"
+      :before-close="handleClose"
+    >
+      <div v-loading="loading">
+        <div v-if="create" class="head" style="padding: 20px 10px 15px;">
+          <div class="full">
+            <div class="text">
+              <div class="title">
+                <span class="bold">添加店铺类型</span>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div v-else class="head">
+          <div class="full">
+            <img class="order_icon" :src="orderImg" alt="" />
+            <div class="text">
+              <div class="title">
+                <span class="bold">{{ typeData.type_name }}</span>
+              </div>
+              <div>
+                <span class="mr20">保证金：{{ typeData.is_margin ? typeData.margin+'元' : '无' }}</span>
+              </div>
+            </div>
+             <div>
+              <el-button
+                v-if="isEdit"
+                size="small"
+                @click="cancel"
+                >取消</el-button
+              >
+              <el-button
+                v-if="!isEdit && !create"
+                type="primary"
+                size="small"
+                @click="typeEdit"
+                >编辑</el-button
+              >
+              <el-button
+                v-if="isEdit && !create"
+                type="success"
+                size="small"
+                @click="saveInfo"
+                >完成</el-button
+              >
+            </div>
+          </div>
+        </div>
+         <!--编辑-->
+        <typeEditForm ref="editForm" :typeId="typeId" :isCreate="create" :activeName="activeName" :permissions="permissions" :formValidate="formValidate" @success="saveSuccess" @handleClose="handleClose" v-if="isEdit || create"></typeEditForm>
+         <!--详情-->
+        <type-info ref="typeInfo" :typeData="typeData" :activeName="activeName" v-else></type-info>
+      </div>
+      <div v-if="create" class="footer">
+        <el-button type="primary" size="small" @click="submitInfo">提交</el-button>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+<script>
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+import {
+  supplyTypeDetailApi,
+} from '@/api/supply';
+import typeInfo from './typeInfo';
+import typeEditForm from './typeEditForm';
+export default {
+  props: {
+    drawer: {
+      type: Boolean,
+      default: false,
+    },
+    isCreate: {
+      type: Boolean,
+      default: false,
+    },
+    permissions: {
+      type: Array,
+      default: [false],
+    }
+  },
+  components: {typeInfo, typeEditForm},
+  data() {
+    return {
+      loading: true,
+      typeId: '',
+      direction: 'rtl',
+      activeName: "basic",
+      isEdit: false,
+      typeData: {},
+      create: this.isCreate,
+      orderImg: require('@/assets/images/type_icon.png'),
+      formValidate: {
+        type_name: "",
+        type_info: "",
+        is_margin: 1,
+        margin: 0,
+        auth: [],
+        description: "",
+        update_time: "",
+        create_time: "",
+      },
+    };
+  },
+  filters: {
+  },
+  methods: {
+    handleClose() {
+      this.$emit('closeDrawer');
+    },
+    saveSuccess(){
+      this.activeName = 'basic';
+      this.$emit('closeDrawer');
+      setTimeout(() =>{
+        this.$emit('getList')
+      },100)
+    },
+    getInfo(id,edit) {
+      this.typeId = id
+      this.isEdit = edit;
+      this.create = false;
+      this.loading = true;
+      supplyTypeDetailApi(id)
+        .then((res) => {
+          this.loading = false;
+          if(this.isEdit)this.$refs.editForm.resetForm();
+          this.typeData = res.data;
+          let info = res.data;
+          this.formValidate = {
+            type_name: info.type_name,
+            type_info: info.type_info,
+            mark: info.mark,
+            is_margin: info.is_margin || 0,
+            margin: info.margin || 0,
+            auth: info.auth_ids,
+            description: info.description,
+            update_time: info.update_time,
+            create_time: info.create_time,
+            merchant_count: info.merchant_count || 0
+          };
+          this.$nextTick(()=>{
+            this.$refs.editForm.name = 'basic';
+            this.$refs.editForm.setChecked();
+          })
+
+        })
+        .catch((res) => {
+          this.loading = false;
+          this.$message.error(res.message);
+        });
+    },
+    //编辑
+    typeEdit(){
+      this.isEdit = true;
+      this.$refs.editForm.editInit()
+    },
+    /**添加类型初始化 */
+    addType(){
+      this.loading = false;
+      this.create = true;
+      // this.formValidate = {
+      //   type_name: "",
+      //   type_info: "",
+      //   is_margin: 0,
+      //   margin: 0,
+      //   auth: [],
+      //   description: "",
+      //   update_time: "",
+      //   create_time: "",
+      // };
+      this.$nextTick(()=>{
+        this.$refs.editForm.name = 'basic';
+        this.$refs.editForm.resetForm();
+        this.$refs.editForm.editInit()
+      })
+    },
+    // 取消
+    cancel(){
+      if(this.create){
+        this.drawer = false;
+      }else{
+        this.isEdit = false;
+      }
+    },
+    // 保存
+    saveInfo(){
+      this.$refs.editForm.onSubmit(this.typeId);
+    },
+    submitInfo(){
+      this.$refs.editForm.handleCreateType('formValidate');
+    }
+  },
+};
+</script>
+<style lang="scss" scoped>
+.head {
+  padding: 30px 20px;
+  .full {
+    display: flex;
+    align-items: center;
+    .order_icon {
+      width: 60px;
+      height: 60px;
+    }
+    .text {
+      align-self: center;
+      flex: 1;
+      min-width: 0;
+      padding-left: 12px;
+      font-size: 13px;
+      color: #606266;
+      .title {
+        margin-bottom: 10px;
+        font-weight: 500;
+        font-size: 16px;
+        line-height: 16px;
+        color: #282828;
+      }
+    }
+  }
+  .bold{
+    font-weight: bold;
+  }
+  .list {
+    display: flex;
+    margin-top: 20px;
+    overflow: hidden;
+    list-style: none;
+    padding: 0;
+    .item {
+      flex: none;
+      width: 200px;
+      font-size: 14px;
+      line-height: 14px;
+      color: rgba(0, 0, 0, 0.85);
+      .title {
+        margin-bottom: 12px;
+        font-size: 13px;
+        line-height: 13px;
+        color: #666666;
+      }
+    }
+  }
+}
+.el-tabs--border-card {
+  box-shadow: none;
+  border-bottom: none;
+}
+.section {
+  padding: 20px 0 8px;
+  .title {
+    padding-left: 10px;
+    border-left: 3px solid var(--prev-color-primary);
+    font-size: 15px;
+    line-height: 15px;
+    color: #303133;
+  }
+  .list {
+    display: flex;
+    flex-wrap: wrap;
+    list-style: none;
+    padding: 0;
+  }
+  .item {
+    flex: 0 0 calc(100% / 2);
+    display: flex;
+    margin-top: 16px;
+    font-size: 13px;
+    color: #606266;
+
+    &:nth-child(2n + 1) {
+      padding-right: 20px;
+      padding-left: 20px;
+    }
+    &:nth-child(2n) {
+     padding-right: 20px;
+    }
+  }
+  .value {
+    flex: 1;
+    image {
+      display: inline-block;
+      width: 40px;
+      height: 40px;
+      margin: 0 12px 12px 0;
+      vertical-align: middle;
+    }
+  }
+}
+.tab {
+  display: flex;
+  align-items: center;
+  .el-image {
+    width: 36px;
+    height: 36px;
+    margin-right: 10px;
+  }
+}
+/deep/.el-drawer__body {
+  overflow: auto;
+}
+.footer{
+  width: 100%;
+  text-align: center;
+  position: absolute;
+  bottom: 17px;
+  padding-top: 17px;
+  border-top: 1px dashed #eeeeee;
+}
+</style>
diff --git a/src/views/supply/type/typeEditForm.vue b/src/views/supply/type/typeEditForm.vue
new file mode 100644
index 0000000..98ef4ed
--- /dev/null
+++ b/src/views/supply/type/typeEditForm.vue
@@ -0,0 +1,307 @@
+<template>
+  <el-form
+    ref="formValidate"
+    size="small"
+    :rules="ruleValidate"
+    :model="formValidate"
+    label-width="120px"
+    @submit.native.prevent
+    >
+    <el-tabs v-loading="loading" type="border-card" v-model="name">
+      <el-tab-pane label="基本信息" name="basic">
+        <div class="section">
+          <div class="title">店铺类型详情</div>
+          <el-row class="mt20">
+            <el-col :span="12">
+              <el-form-item label="店铺类型名称：" prop="type_name">
+                <el-input
+                  v-model="formValidate.type_name"
+                  placeholder="请填写店铺类型名称"
+                  class="selWidth"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="店铺保证金：">
+                <el-radio-group v-model="formValidate.is_margin">
+                  <el-radio :label="0" class="radio">无</el-radio>
+                  <el-radio :label="1">有</el-radio>
+                </el-radio-group>
+                <span v-if="formValidate.is_margin == 1">
+                  <el-input
+                    v-model="formValidate.margin"
+                    placeholder="请填写保证金"
+                    style="width:120px;margin-left: 8px;"
+                  /> 元
+                </span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="店铺类型要求：">
+                <el-input
+                v-model="formValidate.type_info"
+                type="textarea"
+                :rows="3"
+                placeholder="请填写店铺类型要求"
+                class="selWidth"
+              />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="其他说明：">
+                <el-input
+                v-model="formValidate.description"
+                type="textarea"
+                :rows="3"
+                placeholder="请填写其他说明"
+                class="selWidth"
+              />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="备注：">
+                <el-input
+                v-model="formValidate.mark"
+                type="textarea"
+                :rows="3"
+                placeholder="请填写备注"
+                class="selWidth"
+              />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col v-if="!create" :span="24">
+              <el-form-item label="已有店铺数量：">
+               <span>{{formValidate.merchant_count}}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col v-if="!create" :span="24">
+              <el-form-item label="创建时间：">
+               <span>{{formValidate.create_time}}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col v-if="!create" :span="24">
+              <el-form-item label="最新修改时间：">
+               <span>{{formValidate.update_time}}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="权限信息" name="permission">
+      <div class="section">
+        <div class="title">权限管理</div>
+         <el-form-item prop="auth">
+          <el-tree
+              ref="tree"
+              :data="permissions"
+              show-checkbox
+              node-key="value"
+              :default-checked-keys="formValidate.auth || []"
+              @hook:mounted="$refs.tree.setCheckedKeys(formValidate.auth || [])"
+              @check="
+                [
+                  (formValidate.auth = $refs.tree.getCheckedKeys()),
+                  $refs.formValidate.validateField('auth'),
+                ]
+              "
+            ></el-tree>
+          </el-form-item>
+      </div>
+    </el-tab-pane>
+  </el-tabs>
+</el-form>
+
+</template>
+<script>
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+import { storeTypeUpdateApi, storeTypeCreateApi  } from "@/api/supply";
+export default {
+  props: {
+    formValidate: {
+      type: Object,
+      default: {},
+    },
+    permissions: {
+      type: Array,
+      default: [false],
+    },
+    activeName: {
+      type: String,
+      default: "basic",
+    },
+    isCreate: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      merId: '',
+      direction: 'rtl',
+      name: 'basic',
+      create: this.isCreate,
+      ruleValidate: {
+        type_name: [
+          { required: true, message: '请输入店铺类型', trigger: 'blur' }
+        ],
+        auth: [
+          { required: true, message: "请选择店铺权限", trigger: "change" },
+        ],
+      },
+    };
+  },
+
+  filters: {
+  },
+  mounted() {
+  },
+  methods: {
+    /*提交信息*/
+    onSubmit(id){
+      this.$refs['formValidate'].validate(valid => {
+        if (valid) {
+          this.loading = true;
+          storeTypeUpdateApi(id, this.formValidate)
+            .then(async (res) => {
+              this.$message.success(res.message);
+              this.loading = false;
+              this.$emit('success');
+            })
+            .catch((res) => {
+              this.$message.error(res.message);
+              this.loading = false;
+            });
+        }
+      });
+    },
+    /**重置表单验证 */
+    resetForm(){
+      this.$refs.formValidate.resetFields();
+    },
+    /**添加类型初始化 */
+    addType(){
+      this.loading = false;
+    },
+    /**编辑初始化 */
+    editInit() {
+      this.name = 'basic'
+      this.setChecked();
+    },
+    /**根据返回数据选中权限 */
+    setChecked(){
+      this.$refs.tree && this.$refs.tree.setCheckedKeys(this.formValidate.auth);
+    },
+    handleCreateType(name){
+      this.$refs[name].validate((valid) => {
+        if (valid) {
+          storeTypeCreateApi(this.formValidate)
+            .then(async (res) => {
+              this.$message.success(res.message);
+              this.$emit('success');
+            })
+            .catch((res) => {
+              this.$message.error(res.message);
+            });
+        } else {
+
+          return false;
+        }
+      });
+    }
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-tabs--border-card {
+  box-shadow: none;
+  border-bottom: none;
+}
+.section {
+  padding: 20px 0 8px;
+  border-bottom: 1px dashed #eeeeee;
+  .title {
+    padding-left: 10px;
+    border-left: 3px solid var(--prev-color-primary);
+    font-size: 15px;
+    line-height: 15px;
+    color: #303133;
+  }
+  .list {
+    display: flex;
+    flex-wrap: wrap;
+    list-style: none;
+    padding: 0;
+  }
+  .item {
+    flex: 0 0 calc(100% / 2);
+    display: flex;
+    margin-top: 16px;
+    font-size: 13px;
+    color: #606266;
+
+    &:nth-child(2n + 1) {
+      padding-right: 20px;
+      padding-left: 20px;
+    }
+    &:nth-child(2n) {
+     padding-right: 20px;
+    }
+  }
+  .value {
+    flex: 1;
+    image {
+      display: inline-block;
+      width: 40px;
+      height: 40px;
+      margin: 0 12px 12px 0;
+      vertical-align: middle;
+    }
+  }
+}
+.info-red{
+  color: red;
+  font-size: 12px;
+}
+/deep/.el-input-number.is-controls-right .el-input__inner{
+ padding: 0 40px 0 10px;
+}
+/deep/.el-form-item__label{
+  font-weight: normal;
+  color: #282828;
+}
+.tab {
+  display: flex;
+  align-items: center;
+  .el-image {
+    width: 36px;
+    height: 36px;
+    margin-right: 10px;
+  }
+}
+/deep/.el-drawer__body {
+  overflow: auto;
+}
+.gary {
+  color: #aaa;
+}
+
+</style>
diff --git a/src/views/supply/type/typeInfo.vue b/src/views/supply/type/typeInfo.vue
new file mode 100644
index 0000000..e6b4adf
--- /dev/null
+++ b/src/views/supply/type/typeInfo.vue
@@ -0,0 +1,151 @@
+<template>
+  <el-tabs type="border-card" v-model="name">
+    <el-tab-pane label="基本信息" name="basic">
+      <div class="section">
+        <div class="title">店铺类型详情</div>
+        <ul class="list">
+          <li class="item">
+            <div>店铺类型名称：</div>
+            <div class="value">
+              {{typeData.type_name}}
+            </div>
+          </li>
+          <li class="item">
+            <div>店铺保证金：</div>
+            <div class="value">{{typeData.is_margin ? typeData.margin+'元' : '无'}}</div>
+          </li>
+          <li class="item">
+            <div>店铺类型要求：</div>
+            <div class="value">{{typeData.type_info}}</div>
+          </li>
+          <li class="item">
+            <div>已有店铺数量：</div>
+            <div class="value">{{typeData.merchant_count}}</div>
+          </li> 
+          <li class="item">
+            <div>其他说明：</div>
+            <div class="value">{{typeData.description || "无"}}</div>
+          </li>
+          <li class="item">
+            <div>创建时间：</div>
+            <div class="value">{{typeData.create_time}}</div>
+          </li>
+          <li class="item">
+            <div>最新修改时间：</div>
+            <div class="value">{{typeData.update_time}}</div>
+          </li>
+        </ul>
+      </div>
+    </el-tab-pane>
+    <el-tab-pane label="权限信息" name="permission">
+      <div class="section">
+        <div class="title">权限管理</div>
+        <ul class="list">
+          <li class="item">
+            <div>权限范围：</div>
+            <div class="value">
+              <el-tree
+                ref="treeDetail"
+                :data="typeData.options"
+                :props="{ label: 'title' }"
+              ></el-tree>
+            </div>
+          </li>
+        </ul>
+      </div>
+    </el-tab-pane>
+        
+  </el-tabs> 
+</template>
+<script>
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+export default {
+  props: {
+    typeData: {
+      type: Object,
+      default: {},
+    },
+    activeName: {
+      type: String,
+      default: "basic",
+    }
+  },
+  data() {
+    return {
+      loading: true,
+      typeId: '',
+      direction: 'rtl',
+      name: this.activeName
+    };
+  },
+  filters: {
+  },
+  methods: {
+
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-tabs--border-card {
+  box-shadow: none;
+  border-bottom: none;
+}
+.section {
+  padding: 20px 0 8px;
+  border-bottom: 1px dashed #eeeeee;
+  .title {
+    padding-left: 10px;
+    border-left: 3px solid var(--prev-color-primary);
+    font-size: 15px;
+    line-height: 15px;
+    color: #303133;
+  }
+  .list {
+    display: flex;
+    flex-wrap: wrap;
+    list-style: none;
+    padding: 0;
+    margin-top: 5px;
+  }
+  .item {
+    flex: 0 0 calc(100% / 2);
+    display: flex;
+    margin-top: 16px;
+    font-size: 13px;
+    color: #606266;
+    &.item100{
+     flex: 0 0 calc(100% / 1);
+     padding-right: 20px;
+     padding-left: 20px;
+    }
+    &:nth-child(2n + 1) {
+      padding-right: 20px;
+      padding-left: 20px;
+    }
+    &:nth-child(2n) {
+     padding-right: 20px;
+    }
+  }
+  .value {
+    flex: 1;
+    image {
+      display: inline-block;
+      width: 40px;
+      height: 40px;
+      margin: 0 12px 12px 0;
+      vertical-align: middle;
+    }
+  }
+}
+/deep/.el-drawer__body {
+  overflow: auto;
+}
+</style>