diff --git a/jsowell-ui/src/api/adapayMember/adapayMember.js b/jsowell-ui/src/api/adapayMember/adapayMember.js
index 3490b211a..a2a372764 100644
--- a/jsowell-ui/src/api/adapayMember/adapayMember.js
+++ b/jsowell-ui/src/api/adapayMember/adapayMember.js
@@ -1,75 +1,75 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 export function createAdapayMember(data) {
   return request({
-    url: '/adapay/member/createAdapayMember',
-    method: 'post',
-    data: data
-  })
+    url: "/adapay/member/createAdapayMember",
+    method: "post",
+    data: data,
+  });
 }
 
 export function selectAdapayMember(data) {
   return request({
-    url: '/adapay/member/selectAdapayMember',
-    method: 'post',
-    data: data
-  })
+    url: "/adapay/member/selectAdapayMember",
+    method: "post",
+    data: data,
+  });
 }
 
 // 营收报表
 export function getMerchantOrderReport(data) {
   return request({
-    url: '/order/report/getMerchantOrderReport',
-    method: 'post',
-    data: data
-  })
+    url: "/order/report/getMerchantOrderReportV2",
+    method: "post",
+    data: data,
+  });
 }
 // 汇付结算账号
 export function selectSettleAccount(data) {
   return request({
-    url: '/adapay/member/selectSettleAccount',
-    method: 'post',
-    data: data
-  })
+    url: "/adapay/member/selectSettleAccount",
+    method: "post",
+    data: data,
+  });
 }
 // 查看钱包
 export function queryAdapayAccountBalance(data) {
   return request({
-    url: '/adapay/member/queryAdapayAccountBalance',
-    method: 'post',
-    data: data
-  })
+    url: "/adapay/member/queryAdapayAccountBalance",
+    method: "post",
+    data: data,
+  });
 }
 // 新增企业
 export function createCorpMember(data) {
   return request({
-    url: '/adapay/member/createCorpMember',
-    method: 'post',
-    data: data
-  })
+    url: "/adapay/member/createCorpMember",
+    method: "post",
+    data: data,
+  });
 }
 // 结算 createSettleAccount
 export function createSettleAccount(data) {
   return request({
-    url: '/adapay/member/createSettleAccount',
-    method: 'post',
-    data: data
-  })
+    url: "/adapay/member/createSettleAccount",
+    method: "post",
+    data: data,
+  });
 }
 // 修改信息
 export function updateAdapayMember(data) {
-    return request({
-        url: '/adapay/member/updateAdapayMember',
-        method: 'post',
-        data: data
-    })
+  return request({
+    url: "/adapay/member/updateAdapayMember",
+    method: "post",
+    data: data,
+  });
 }
 
 // 提现金额接口
 export function withdraw(data) {
-    return request({
-        url: '/adapay/member/drawCash',
-        method: 'post',
-        data: data
-    })
+  return request({
+    url: "/adapay/member/drawCash",
+    method: "post",
+    data: data,
+  });
 }
diff --git a/jsowell-ui/src/router/index.js b/jsowell-ui/src/router/index.js
index 0492be725..25ccbde48 100644
--- a/jsowell-ui/src/router/index.js
+++ b/jsowell-ui/src/router/index.js
@@ -172,10 +172,10 @@ export const constantRoutes = [
     hidden: true,
     children: [
       {
-        path: "merchantVirtual",
-        component: () => import("@/views/financial/components/virtualFinance"),
-        name: "merchantVirtual",
-        meta: { title: "虚拟财务", activeMenu: "/financial/merchant" },
+        path: "index/:id",
+        component: () => import("@/views/financial/accountUserInfo"),
+        name: "accountUserInfo",
+        meta: { title: "开户信息", activeMenu: "/financial/merchant" },
       },
     ],
   },
@@ -185,13 +185,26 @@ export const constantRoutes = [
     hidden: true,
     children: [
       {
-        path: "cleanFinancial",
-        component: () => import("@/views/financial/components/cleanFinancial"),
-        name: "cleanFinancial",
-        meta: { title: "清分财务", activeMenu: "/financial/merchant" },
+        path: "financeDetail",
+        component: () => import("@/views/financial/financeDetail"),
+        name: "financeDetail",
+        meta: { title: "财务详情", activeMenu: "/financial/merchant" },
       },
     ],
-  }
+  },
+  // {
+  //   path: "/financial/merchant",
+  //   component: Layout,
+  //   hidden: true,
+  //   children: [
+  //     {
+  //       path: "withdrawalRecords",
+  //       component: () => import("@/views/financial/withdrawalRecords"),
+  //       name: "withdrawalRecords",
+  //       meta: { title: "提现记录", activeMenu: "/financial/merchant" },
+  //     },
+  //   ],
+  // },
 ];
 
 // 动态路由，基于用户权限动态去加载
diff --git a/jsowell-ui/src/views/financial/accountUserInfo.vue b/jsowell-ui/src/views/financial/accountUserInfo.vue
new file mode 100644
index 000000000..2cf5642da
--- /dev/null
+++ b/jsowell-ui/src/views/financial/accountUserInfo.vue
@@ -0,0 +1,14 @@
+<template>
+  <div>
+    <adapay-member></adapay-member>
+  </div>
+</template>
+
+<script>
+import adapayMember from "../pile/merchant/components/adapayMember.vue";
+export default {
+  components: { adapayMember },
+};
+</script>
+
+<style></style>
diff --git a/jsowell-ui/src/views/financial/financeDetail.vue b/jsowell-ui/src/views/financial/financeDetail.vue
new file mode 100644
index 000000000..df794979b
--- /dev/null
+++ b/jsowell-ui/src/views/financial/financeDetail.vue
@@ -0,0 +1,608 @@
+<template>
+  <div class="app-container">
+    <div class="header">
+      <div class="header-txt">运营汇总</div>
+      <el-button type="primary" @click="goAccount">开户信息</el-button>
+    </div>
+    <div class="header">
+      <template v-if="operationStatus == null">
+        <div class="foot1">
+          <div style="margin: 12px 0">没有查询到结算账户</div>
+        </div>
+      </template>
+      <template v-else>
+        <template v-if="showAccountList">
+          <div
+            class="foot1"
+            v-for="(item, index) in settleAccountList"
+            :key="index"
+          >
+            <div>
+              <span>运营商：</span>
+              {{ merchant }}
+            </div>
+            <div class="margin-10">
+              商家性质：{{ merchantNature === "1" ? "对公" : "对私" }}
+            </div>
+            <div class="margin-10">
+              开户行名称：{{ cityBankCode(item.bankCode) }}
+            </div>
+            <div>收款卡号：{{ item.cardId }}</div>
+            <div class="margin-10">预留手机：{{ item.telNo }}</div>
+          </div>
+        </template>
+        <div class="foot1" v-else>
+          <div>
+            <span>运营商：</span>
+            {{ merchant }}
+          </div>
+          <div class="margin-10">
+            商家性质：{{ merchantNature === "1" ? "对公" : "对私" }}
+          </div>
+          <div>开户状态：{{ adapayCorpMember.auditDesc }}</div>
+          <div class="margin-10">
+            开户行名称：{{ cityBankCode(adapayCorpMember.bankCode) }}
+          </div>
+          <div>收款卡号：{{ adapayCorpMember.cardNo }}</div>
+          <div class="margin-10">预留手机：{{ adapayCorpMember.legalMp }}</div>
+        </div>
+      </template>
+      <div class="foot2">
+        <el-descriptions :column="1">
+          <el-descriptions-item label="总度数(度)">
+            <span class="color">
+              {{ merchantOrderReport.useElectricity }}
+            </span>
+          </el-descriptions-item>
+          <el-descriptions-item label="充电时长(分钟)">
+            <span class="color">{{ merchantOrderReport.chargeTime }}</span>
+          </el-descriptions-item>
+          <el-descriptions-item label="电费金额(元)">
+            <span class="color">{{
+              merchantOrderReport.electricityAmount
+            }}</span>
+          </el-descriptions-item>
+          <el-descriptions-item label="交易金额(元)">
+            <span class="color">{{ merchantOrderReport.tradeAmount }}</span>
+          </el-descriptions-item>
+          <el-descriptions-item label="虚拟金额(元)">
+            <span class="color">{{ merchantOrderReport.virtualAmount }}</span>
+          </el-descriptions-item>
+        </el-descriptions>
+      </div>
+      <div class="foot3">
+        <el-descriptions :column="1">
+          <el-descriptions-item label="充电次数(次)">
+            <span class="color">{{ merchantOrderReport.chargeNum }}</span>
+          </el-descriptions-item>
+          <el-descriptions-item label="收入金额(元)">
+            <span class="color">{{ merchantOrderReport.totalAmount }}</span>
+          </el-descriptions-item>
+          <el-descriptions-item label="服务费金额(元)">
+            <span class="color">{{ merchantOrderReport.serviceAmount }}</span>
+          </el-descriptions-item>
+          <el-descriptions-item label="交易手续费(元)">
+            <span class="color">{{ merchantOrderReport.tradeFee }}</span>
+          </el-descriptions-item>
+          <el-descriptions-item label="白名单支付(次)">
+            <span class="color">{{
+              merchantOrderReport.whitelistPaymentsNum === null
+                ? "一"
+                : merchantOrderReport.whitelistPaymentsNum
+            }}</span>
+          </el-descriptions-item>
+        </el-descriptions>
+      </div>
+      <template v-if="operationStatus == null">
+        <div class="foot4">未查询到运营商结算账户，提现功能现已关闭</div>
+      </template>
+      <template v-else>
+        <div class="foot4">
+          <div class="margin-right">
+            <div>可提现(元)</div>
+            <div class="margin-10">{{ adapayMember.avlBalance }}</div>
+            <el-button
+              type="primary"
+              v-if="adapayMember.avlBalance > withdrawalFee"
+              @click="dialogVisible = true"
+              >提现申请</el-button
+            >
+            <p class="center" v-else>
+              注:
+              <span class="text"
+                >该余额大于{{ withdrawalFee }}元时，才可发起取现</span
+              >
+            </p>
+          </div>
+          <div class="margin-right">
+            <div class="">冻结金额(元)</div>
+            <div class="margin-10">{{ adapayMember.frzBalance }}</div>
+            <div class="">
+              注:
+              <span class="text"
+                >当配置了自动结算功能，在每日发起结算时会将可用余额转为冻结金额。该部分金额不允许取现。</span
+              >
+            </div>
+          </div>
+          <div class="margin-right">
+            <div class="">昨日日终余额(元)</div>
+            <div class="margin-10">{{ adapayMember.lastAvlBalance }}</div>
+          </div>
+          <!-- <div class="margin-right">
+            <div>提现申请中</div>
+            <div class="margin-10">
+              {{ adapayMember.withdrawalApplication }}(元)
+            </div>
+            <el-button type="primary" @click="recordDialog = true"
+            >提现记录</el-button
+          >
+          </div>
+          <div class="margin-right">
+            <div>已提现</div>
+            <div class="margin-10">{{ adapayMember.withdrawn }}(元)</div>
+            <div style="font-size: 13px">已成功提现到绑定银行卡的金额汇总</div>
+          </div> -->
+        </div>
+      </template>
+    </div>
+    <hr />
+    <div class="center">
+      <div class="header-txt">运营分析</div>
+      <el-form
+        :model="queryParams"
+        ref="queryForm"
+        size="small"
+        inline
+        label-width="68px"
+      >
+        <el-form-item label="日期" prop="tradeDate">
+          <el-date-picker
+            v-model="createTimeRange"
+            style="width: 240px"
+            value-format="yyyy-MM-dd"
+            :default-time="['00:00:00', '23:59:59']"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            :clearable="false"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            size="mini"
+            @click="handleQuery"
+            >搜索</el-button
+          >
+        </el-form-item>
+      </el-form>
+    </div>
+    <hr />
+    <el-table :data="reportList">
+      <el-table-column label="日期" align="center" prop="tradeDate" />
+      <!-- <el-table-column label="站点名称" align="center" prop="stationName">
+        <template slot-scope="scope">
+          <router-link
+            :to="
+              '/station/detail/index/' +
+              scope.row.stationId +
+              '/' +
+              scope.row.stationName
+            "
+            class="link-type"
+          >
+            <span>{{ scope.row.stationName }}</span>
+          </router-link>
+        </template>
+      </el-table-column> -->
+
+      <el-table-column label="账单状态" align="center" prop="billStatus">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.bill_status"
+            :value="scope.row.billStatus"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="应收金额（元）"
+        align="center"
+        prop="receivableAmount"
+      />
+      <el-table-column
+        label="可提现金额（元）"
+        align="center"
+        prop="withdrawAbleAmount"
+      />
+      <el-table-column
+        label="交易手续费（元）"
+        align="center"
+        prop="feeAmount"
+      />
+      <!-- <el-table-column label="清分时间" align="center" prop="clearingTime" /> -->
+      <!-- <el-table-column
+        label="应清分金额"
+        align="center"
+        prop="shouldClearingAmount"
+      />
+      <el-table-column
+        label="实际清分金额"
+        align="center"
+        prop="actualClearingAmount"
+      />
+      <el-table-column
+        label="清分账单编号"
+        align="center"
+        prop="clearingBillCode"
+      /> -->
+      <el-table-column label="提现订单号" align="center" prop=" withdrawCode" />
+      <el-table-column
+        label="提现申请时间"
+        align="center"
+        prop="withdrawalTime"
+      />
+      <el-table-column label="操作" align="center">
+        <template slot-scope="scope">
+          <span class="link-type" @click="goTradeDate(scope)">订单流水</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      v-show="reportTotal > 0"
+      :total="reportTotal"
+      :page.sync="reportQueryParams.pageNum"
+      :limit.sync="reportQueryParams.pageSize"
+      @pagination="getList"
+    />
+    <!-- 提现申请弹窗 -->
+    <el-dialog title="提现申请" :visible.sync="dialogVisible" width="33%">
+      温馨提示
+      <div style="font-size: 12px; color: gray">
+        <p>1.提现将在3个工作日内审核到账,节假日审核顺延</p>
+        <p>2.部分流量方的充电订单存在账期,需要一定周期后才开始执行清分</p>
+        <p>3.提现为银行自动付款,根据银行要求会收取手续费,请知悉</p>
+      </div>
+      <p>
+        可提现（元）：
+        <span class="number">{{ adapayMember.avlBalance }}</span>
+      </p>
+      <p>
+        手续费（元）：
+        <span class="number">{{ withdrawalFee.toFixed(2) }}</span>
+      </p>
+      <p>
+        实际到账（元）：
+        <span class="number">
+          <!-- <span>11</span> -->
+          {{ adapayMember.avlBalance - withdrawalFee }}
+        </span>
+      </p>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submit">提交</el-button>
+      </span>
+    </el-dialog>
+    <!-- 提现记录 -->
+    <el-dialog title="提现记录" :visible.sync="recordDialog">
+      <el-table :data="tableData" style="width: 100%">
+        <el-table-column label="日期" />
+        <el-table-column label="账单状态" />
+        <el-table-column label="应收金额(元)" />
+        <el-table-column label="充值手续费(元)" />
+        <el-table-column label="可提现金额(元)" />
+        <el-table-column label="提现订单号(元)" />
+        <el-table-column label="提现申请时间(元)" />
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <router-link
+              :to="{
+                path: '/financial/merchant/merchantVirtual',
+                query: {
+                  merchantId: scope.row.id,
+                  merchantName: scope.row.merchantName,
+                },
+              }"
+              class="link-type"
+            >
+              <span>订单流水</span>
+            </router-link>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+    <el-dialog
+      title="订单流水"
+      :visible.sync="dialogTableVisible"
+      :before-close="orderClose"
+    >
+      <el-table :data="orderList">
+        <el-table-column property="orderCode" label="订单编号" />
+        <el-table-column property="settleAmount" label="结算金额(元)" />
+        <el-table-column property="clearingStatus" label="清分状态">
+          <template slot-scope="scope">
+            <span>{{
+              scope.row.clearingStatus === "0" ? "未清分" : "已清分"
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column property="clearingBillCode" label="清分账单编号" />
+        <el-table-column property="withdrawStatus" label="提现状态" />
+        <el-table-column property="withdrawCode" label="提现编号" />
+      </el-table>
+      <pagination
+        v-show="orderTotal > 0"
+        :total="orderTotal"
+        :page.sync="getOrderParams.pageNum"
+        :limit.sync="getOrderParams.pageSize"
+        @pagination="getOrderList"
+      />
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  getMerchantOrderReport,
+  withdraw,
+  selectAdapayMember,
+  queryAdapayAccountBalance,
+} from "@/api/adapayMember/adapayMember";
+import { getOrderReportDetail } from "@/api/order/order";
+import { getDay } from "@/utils/common";
+import text from "@/assets/json/bank_code.json";
+
+export default {
+  dicts: ["bill_status"],
+  data() {
+    return {
+      operationStatus: null,
+      adapayMember: {},
+      // 开启
+      recordDialog: false,
+      tableData: [],
+      merchant: this.$route.query.merchantName,
+      orderTotal: 0,
+      getOrderParams: {
+        pageNum: 1,
+        pageSize: 10,
+        merchantId: null,
+        tradeDate: null,
+      },
+      orderList: [],
+      dialogTableVisible: false,
+      dialogVisible: false,
+      withdrawalFee: 5,
+      reportTotal: 0,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      merchantId: this.$route.query.merchantId,
+      createTimeRange: [],
+      reportList: [],
+      reportQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        merchantId: this.$route.query.merchantId,
+        startTime: "",
+        endTime: "",
+      },
+      merchantOrderReport: {},
+      adapayCorpMember: {},
+      settleAccountList: [],
+      merchantNature: "",
+      showAdapayCorp: "",
+      showAccountList: false,
+    };
+  },
+  methods: {
+    // 银行编码
+    cityBankCode(code) {
+      // if (code === undefined) return;
+      const cityList = text.cityList;
+      let arr = cityList.find((item) => item.bankCode === code);
+      // console.log("银行编码对应的银行名称 arr", arr);
+      return arr.bankName;
+    },
+    selectAdapayMember() {
+      console.log("this.merchantId", this.merchantId);
+      let param = {
+        merchantId: this.merchantId,
+      };
+      selectAdapayMember(param).then((response) => {
+        console.log("查询结算账户", response);
+        this.operationStatus = response.data;
+        // console.log("this.operationStatus", this.operationStatus.bankAcctType);
+        // 商家性质：
+        if (response.data != null) {
+          // 对公返回的结果 商家性质：
+          this.merchantNature = this.operationStatus.bankAcctType;
+          console.log("对公信息", this.adapayCorpMember);
+          if (response.data.settleAccountList !== null) {
+            // 个人账户
+            this.adapayCorpMember = response.data.adapayMember;
+            this.settleAccountList = response.data.settleAccountList;
+            this.showAccountList = true;
+          }
+          this.showAdapayCorp = response.data.adapayCorpMember;
+          if (response.data.adapayCorpMember != null)
+            return (this.adapayCorpMember = response.data.adapayCorpMember);
+        }
+      });
+    },
+    getAdapayBalance() {
+      let param = {
+        merchantId: this.merchantId,
+      };
+      queryAdapayAccountBalance(param).then((response) => {
+        console.log("查询 可提现金额 queryAdapayAccountBalance", response);
+        this.adapayMember = response.data;
+      });
+    },
+    getOrderList() {
+      console.log("this.getOrderParams", this.getOrderParams);
+      getOrderReportDetail(this.getOrderParams).then((res) => {
+        console.log("获取订单列表res", res);
+        this.orderList = res.rows;
+        this.orderTotal = res.total;
+        // console.log("this.orderTotal", this.orderTotal);
+      });
+    },
+    // 弹层关闭之前执行的事情
+    orderClose() {
+      this.dialogTableVisible = false;
+      this.getOrderParams.pageNum = 1;
+      this.orderList = [];
+      this.orderTotal = 0;
+    },
+    // 订单流水按钮
+    goTradeDate(scope) {
+      // console.log("点击日期出现弹层", scope);
+      if (scope.row.tradeDate === null)
+        return this.$message.info("此条数据暂不显示订单流水");
+      // console.log("点击日期出现弹层", scope.row.tradeDate);
+      this.dialogTableVisible = true;
+      this.getOrderParams.merchantId = scope.row.merchantId;
+      this.getOrderParams.tradeDate = scope.row.tradeDate;
+      this.getOrderList();
+    },
+    getList() {
+      console.log("queryParams", this.queryParams);
+      getMerchantOrderReport(this.reportQueryParams).then((response) => {
+        // console.log("查询报表", reportList, merchantOrderReport);
+        console.log("getMerchantOrderReport", response);
+        if (response.data) {
+          this.merchantOrderReport = response.data.merchantOrderReport;
+          if (response.data.pageResponse === null)
+            return (this.reportList = []);
+          this.reportList = response.data.pageResponse.list;
+          this.reportTotal = response.data.pageResponse.total;
+        } else {
+          this.reportList = [];
+          this.merchantOrderReport = null;
+        }
+      });
+    },
+    handleClose() {
+      this.$confirm("确认提交？")
+        .then((_) => {
+          let params = {
+            merchantId: this.merchantId,
+            cashAmt: this.adapayMember.avlBalance,
+          };
+          console.log("点击提交按钮之前执行 params", params);
+          withdraw(params).then((response) => {
+            console.log("res 提现金额", response);
+            if (response.code !== 200)
+              return this.$modal.msgError(response.msg);
+            this.$modal.msgSuccess("操作成功");
+            // 重新查询当前 显示的可提现金额
+            this.getAdapayBalance();
+          });
+          this.dialogVisible = false;
+        })
+        .catch((_) => {});
+    },
+    // 点击提交按钮
+    submit() {
+      this.handleClose();
+    },
+    withdrawalClick() {
+      // this.$router.push({
+      //   name: "withdrawalRecords",
+      // });
+    },
+    goAccount() {
+      this.$router.push({
+        name: "accountUserInfo",
+        params: {
+          id: this.merchantId,
+        },
+      });
+    },
+    // 点击搜索按钮
+    handleQuery() {
+      let arr = this.createTimeRange[0];
+      let str = this.createTimeRange[1];
+      console.log("点击搜索时展示的日期数据", arr, str);
+      this.reportQueryParams.startTime = arr;
+      this.reportQueryParams.endTime = str;
+      this.reportQueryParams.pageNum = 1;
+      this.reportTotal = 0;
+      this.getList();
+      // this.getOrderList();
+    },
+    defaultDate() {
+      //字符串拼接，开始时间，结束时间
+      let beg = getDay(-30); //当月第一天
+      let end = getDay(0); //当天
+      this.createTimeRange = [beg, end];
+      // console.log("this.createTimeRange", this.createTimeRange);
+      // return this.createTimeRange;
+      this.reportQueryParams.startTime = beg;
+      this.reportQueryParams.endTime = end;
+      this.getList();
+    },
+  },
+  created() {
+    this.defaultDate();
+    this.getAdapayBalance();
+    this.selectAdapayMember();
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.center {
+  display: flex;
+  align-content: center;
+  margin-top: 30px;
+}
+.margin-10 {
+  margin: 10px 0;
+}
+.font-13 {
+  font-size: 13px;
+}
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.header-txt {
+  font-size: 24px;
+}
+.text {
+  font-size: 12px;
+  color: red;
+}
+.foot1 {
+  margin-top: 10px;
+  // width: 320px;
+  // margin-right: 10px;
+  // font-size: 13px;
+}
+.foot2 {
+  margin-left: 10px;
+  margin-right: 10px;
+  width: 200px;
+}
+.foot3 {
+  width: 200px;
+  margin-right: 10px;
+}
+.foot4 {
+  flex: 1;
+  display: contents;
+}
+.margin-right {
+  width: 180px;
+  margin-right: 10px;
+  text-align: center;
+}
+.color {
+  color: #000;
+  font-weight: bolder;
+}
+</style>
diff --git a/jsowell-ui/src/views/financial/merchant.vue b/jsowell-ui/src/views/financial/merchant.vue
index 7e4b751d1..5184f9193 100644
--- a/jsowell-ui/src/views/financial/merchant.vue
+++ b/jsowell-ui/src/views/financial/merchant.vue
@@ -1,183 +1,213 @@
 <template>
-    <div class="app-container">
-        <el-table
-            :data="merchantList"
-            stripe
-            border
-            style="width: 100%">
-            <el-table-column
-                prop="merchantName"
-                label="运营商"
-                align="center"
-            />
-            <el-table-column
-                prop="organizationCode"
-                label="组织机构代码"
-                align="center"
-            />
-            <el-table-column
-                prop="status"
-                label="状态"
-                align="center"
-                width="130"
-            >
-                <template slot-scope="scope">
-                    <dict-tag
-                        :options="dict.type.merchant_status"
-                        :value="scope.row.status"
-                    />
-                </template>
-            </el-table-column>
-            <el-table-column
-                prop="managerName"
-                label="联系人"
-                align="center"
-                width="130"
-            />
-            <el-table-column
-                prop="managerPhone"
-                label="联系方式"
-                align="center"
-                width="300"
-            />
-            <el-table-column
-                prop="createTime"
-                label="入驻时间"
-                align="center"
-            />
-            <el-table-column
-                prop="address"
-                label="操作"
-                align="center">
-                <template slot-scope="scope"> 
-                    <!--  :to="'/merchant/detail/index/' + scope.row.id" -->
-                    <router-link
-                        :to="{path:'/financial/merchant/merchantVirtual', query: {merchantId: scope.row.id,merchantName:scope.row.merchantName}} "
-                        class="link-type"
-                    >
-                        <span>虚拟财务</span>
-                    </router-link>
-                    <router-link
-                        :to="{path:'/financial/merchant/cleanFinancial', query: {merchantId: scope.row.id,merchantName:scope.row.merchantName}} "
-                        class="link-type"
-                    >
-                        <span style="margin-left:10px;color: darkblue;">清分财务</span>
-                    </router-link>
-                </template>
-            </el-table-column>
-        </el-table>
+  <div class="app-container">
+    <!-- <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      label-width="110px"
+      @submit.native.prevent
+    >
+      <el-form-item label="运营商名称" prop="merchantName">
+        <el-input
+          v-model="queryParams.merchantName"
+          placeholder="请输入运营商名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form> -->
+    <el-table :data="merchantList" style="width: 100%" v-loading="loading">
+      <el-table-column prop="merchantName" label="运营商" align="center">
+        <template slot-scope="scope">
+          <router-link
+            :to="{
+              path: '/financial/merchant/financeDetail',
+              query: {
+                merchantId: scope.row.id,
+                merchantName: scope.row.merchantName,
+              },
+            }"
+            class="link-type"
+          >
+            <span>{{ scope.row.merchantName }}</span>
+          </router-link>
+        </template>
+      </el-table-column>
 
-         <pagination
-                v-show="total > 0"
-                :total="total"
-                :page.sync="queryParams.pageNum"
-                :limit.sync="queryParams.pageSize"
-                @pagination="getMerchantList"
-            />
-    </div>
+      <el-table-column
+        prop="organizationCode"
+        label="组织机构代码"
+        align="center"
+      />
+      <el-table-column prop="status" label="状态" align="center" width="130">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.merchant_status"
+            :value="scope.row.status"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="managerName"
+        label="联系人"
+        align="center"
+        width="130"
+      />
+      <el-table-column
+        prop="managerPhone"
+        label="联系方式"
+        align="center"
+        width="300"
+      />
+      <el-table-column prop="createTime" label="入驻时间" align="center" />
+      <!--  :to="'/merchant/detail/index/' + scope.row.id" -->
+      <!-- <el-table-column prop="address" label="操作" align="center">
+        <template slot-scope="scope">
+          <router-link
+            :to="{
+              path: '/financial/merchant/merchantVirtual',
+              query: {
+                merchantId: scope.row.id,
+                merchantName: scope.row.merchantName,
+              },
+            }"
+            class="link-type"
+          >
+            <span>虚拟财务</span>
+          </router-link>
+          <router-link
+            :to="{
+              path: '/financial/merchant/financeDetail',
+              query: {
+                merchantId: scope.row.id,
+              },
+            }"
+            class="link-type"
+          >
+            <span style="margin-left: 10px; color: darkblue">清分财务</span>
+          </router-link>
+        </template>
+      </el-table-column> -->
+    </el-table>
 
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getMerchantList"
+    />
+  </div>
 </template>
 
 <script>
-
-import {getFinancialMerchantList} from "@/api/pile/merchant";
+import { getFinancialMerchantList } from "@/api/pile/merchant";
 
 export default {
-    dicts: ["merchant_status"],
-    data() {
-        return {
-            // 运营商列表
-            merchantList: [],
-
-            showOrHideText: "显示更多查询条件",
-            buttonBoolean: false,
-            //图标，可根据自己的需求匹配
-            icon: "el-icon-caret-bottom",
-            total: 0,
-            queryParams: {
-                pageNum: 1,
-                pageSize: 10
-            }
-        };
+  dicts: ["merchant_status"],
+  data() {
+    return {
+      // 运营商列表
+      merchantList: [],
+      loading: true,
+      showOrHideText: "显示更多查询条件",
+      buttonBoolean: false,
+      //图标，可根据自己的需求匹配
+      icon: "el-icon-caret-bottom",
+      total: 0,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+    };
+  },
+  created() {
+    this.getMerchantList();
+  },
+  methods: {
+    showOrHide() {
+      if (this.buttonBoolean) {
+        this.icon = "el-icon-caret-bottom";
+        this.showOrHideText = "显示更多查询条件";
+        this.buttonBoolean = !this.buttonBoolean;
+      } else {
+        this.icon = "el-icon-caret-top";
+        this.showOrHideText = "收起";
+        this.buttonBoolean = !this.buttonBoolean;
+      }
     },
-    created() {
-        this.getMerchantList();
+    // 获取运营商列表
+    getMerchantList() {
+      this.loading = true;
+      getFinancialMerchantList(this.queryParams).then((response) => {
+        this.merchantList = response.rows;
+        // console.log("response", response);
+        this.total = response.total;
+        this.loading = false;
+      });
     },
-    methods: {
-        showOrHide() {
-            if (this.buttonBoolean) {
-                this.icon = "el-icon-caret-bottom";
-                this.showOrHideText = "显示更多查询条件";
-                this.buttonBoolean = !this.buttonBoolean;
-            } else {
-                this.icon = "el-icon-caret-top";
-                this.showOrHideText = "收起";
-                this.buttonBoolean = !this.buttonBoolean;
-            }
-        },
-        // 获取运营商列表
-        getMerchantList() {
-            getFinancialMerchantList(this.queryParams).then((response) => {
-                this.merchantList = response.rows;
-                this.total = response.total;
-            })
-        },
-        // 取消按钮
-        cancel() {
-            this.open = false;
-            this.reset();
-        },
-        /** 搜索按钮操作 */
-        handleQuery() {
-            this.queryParams.pageNum = 1;
-            // 获取订单列表
-            // this.getList();
-            // 获取订单总金额
-            // this.getOrderTotalData();
-        },
-        /** 重置按钮操作 */
-        resetQuery() {
-            this.resetForm("queryForm");
-            // this.handleQuery();
-        },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      console.log("搜索的值", this.queryParams);
+      this.queryParams.pageNum = 1;
+      this.getMerchantList();
     },
+    /** 重置按钮操作 */
+    resetQuery() {
+      // this.resetForm("queryForm");
+      this.handleQuery();
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>
 ::v-deep
-.el-descriptions--medium:not(.is-bordered)
-.el-descriptions-item__cell {
-    padding-bottom: 4px;
+  .el-descriptions--medium:not(.is-bordered)
+  .el-descriptions-item__cell {
+  padding-bottom: 4px;
 }
 
 ::v-deep .el-descriptions__header {
-    margin-bottom: 10px;
+  margin-bottom: 10px;
 }
 
 .cardview-box {
-    width: 100%;
-    margin-bottom: 12px;
-    font-size: 16px;
-    color: #4a4a4a;
-    border: 1px solid #f0f0f0;
+  width: 100%;
+  margin-bottom: 12px;
+  font-size: 16px;
+  color: #4a4a4a;
+  border: 1px solid #f0f0f0;
 }
 
 .cardview-static {
-    height: 100%;
-    width: 100%;
-    display: flex;
-    justify-content: space-between;
-    align-content: center;
-    padding: 0 10px;
-    height: 46px;
-    line-height: 46px;
-    background-color: #f0f0f0;
+  height: 100%;
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-content: center;
+  padding: 0 10px;
+  height: 46px;
+  line-height: 46px;
+  background-color: #f0f0f0;
 }
 
 .flex {
-    display: flex;
-    justify-content: space-between;
-    align-content: center;
-    margin-bottom: 10px;
+  display: flex;
+  justify-content: space-between;
+  align-content: center;
+  margin-bottom: 10px;
 }
 </style>
diff --git a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue
index 9d7baee66..2940189e0 100644
--- a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue
+++ b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue
@@ -742,8 +742,6 @@ import { getToken } from "@/utils/auth";
 import text from "@/assets/json/bank_code.json";
 export default {
     components: {},
-
-    props: ["merchantId"],
     data() {
         return {
             dataDisabled: false,
@@ -816,7 +814,7 @@ export default {
             dialog: false,
             adapayCorpMember: {
                 bankAcctType: "1",
-                merchantId: this.merchantId,
+                merchantId: this.$route.params.id,
             },
             // 汇付会员
             adapayMember: "",
@@ -1338,7 +1336,7 @@ export default {
             this.adapayCorpMember.socialCreditCodeExpires =
                 this.updateSocialCreditCode;
             console.log(this.adapayCorpMember, "this.adapayCorpMember");
-            this.adapayCorpMember.merchantId = this.merchantId;
+            // this.adapayCorpMember.merchantId = this.merchantId;
             console.log("修改成功", form);
             this.$refs[form].validate((valid) => {
                 if (valid) {
@@ -1426,7 +1424,7 @@ export default {
             );
             this.adapayCorpMember.socialCreditCodeExpires = this.dataValue;
             this.adapayCorpMember.legalCertIdExpires = this.addLegalCertIdDate;
-            this.adapayCorpMember.merchantId = this.merchantId;
+            // this.adapayCorpMember.merchantId = this.$route.params.id;
             this.$refs[adapayCorpMember].validate((valid) => {
                 console.log(this.adapayCorpMember, "this.adapayCorpMember");
                 if (valid) {
@@ -1476,9 +1474,9 @@ export default {
         },
         // 查询汇付会员
         selectAdapayMember() {
-            console.log("this.merchantId", this.merchantId);
+            console.log("this.merchantId", this.adapayCorpMember.merchantId);
             let param = {
-                merchantId: this.merchantId,
+                merchantId: this.adapayCorpMember.merchantId,
             };
             selectAdapayMember(param).then((response) => {
                 console.log("查询 selectAdapayMember", response);
diff --git a/jsowell-ui/src/views/pile/merchant/detail.vue b/jsowell-ui/src/views/pile/merchant/detail.vue
index a86c0a678..ff4f86ae8 100644
--- a/jsowell-ui/src/views/pile/merchant/detail.vue
+++ b/jsowell-ui/src/views/pile/merchant/detail.vue
@@ -1,43 +1,35 @@
 <template>
-
-    <div class="app-container">
-  <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
-    <el-tab-pane label="支付设置" name="first">
-      <adapay-member :merchantId="merchantId"></adapay-member>
-    </el-tab-pane>
-    <!-- <el-tab-pane label="配置管理" name="second">配置管理</el-tab-pane> -->
-<!--    <el-tab-pane label="角色管理" name="third">角色管理</el-tab-pane>-->
-    <el-tab-pane label="钱包汇总" name="wallet">
-      <wallet-summary :merchantId="merchantId"></wallet-summary>
-    </el-tab-pane>
-    <el-tab-pane label="营收报表" name="revenue">
-      <revenue :merchantId="merchantId"></revenue>
-    </el-tab-pane>
-  </el-tabs>
-    </div>
-
+  <div class="app-container">
+    <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
+      <el-tab-pane label="钱包汇总" name="wallet">
+        <adapay-member :merchantId="merchantId"></adapay-member>
+        <wallet-summary :merchantId="merchantId"></wallet-summary>
+      </el-tab-pane>
+      <el-tab-pane label="营收报表" name="revenue">
+        <revenue :merchantId="merchantId"></revenue>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
 </template>
 
 <script>
-import adapayMember from './components/adapayMember.vue';
-import Revenue from './components/revenue.vue';
-import WalletSummary from './components/walletSummary.vue';
+import adapayMember from "./components/adapayMember.vue";
+import Revenue from "./components/revenue.vue";
+import WalletSummary from "./components/walletSummary.vue";
 export default {
   components: { adapayMember, Revenue, WalletSummary },
- data() {
-      return {
-        activeName: 'first',
-        merchantId:this.$route.params.id
-      };
+  data() {
+    return {
+      activeName: "wallet",
+      merchantId: this.$route.params.id,
+    };
+  },
+  methods: {
+    handleClick(tab, event) {
+      console.log(tab, event);
     },
-    methods: {
-      handleClick(tab, event) {
-        console.log(tab, event);
-      }
-    }
-}
+  },
+};
 </script>
 
-<style>
-
-</style>
+<style></style>
diff --git a/jsowell-ui/src/views/pile/merchant/index.vue b/jsowell-ui/src/views/pile/merchant/index.vue
index 335b54a08..64be0dad2 100644
--- a/jsowell-ui/src/views/pile/merchant/index.vue
+++ b/jsowell-ui/src/views/pile/merchant/index.vue
@@ -1,690 +1,656 @@
 <template>
-    <div class="app-container">
-        <el-form
-            :model="queryParams"
-            ref="queryForm"
-            size="small"
-            :inline="true"
-            v-show="showSearch"
-            label-width="110px"
-            @submit.native.prevent
+  <div class="app-container main">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="110px"
+      @submit.native.prevent
+    >
+      <el-form-item label="运营商名称" prop="merchantName">
+        <el-input
+          v-model="queryParams.merchantName"
+          placeholder="请输入运营商名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
         >
-            <el-form-item label="运营商名称" prop="merchantName">
-                <el-input
-                    v-model="queryParams.merchantName"
-                    placeholder="请输入运营商名称"
-                    clearable
-                    @keyup.enter.native="handleQuery"
-                />
-            </el-form-item>
-            <el-form-item>
-                <el-button
-                    type="primary"
-                    icon="el-icon-search"
-                    size="mini"
-                    @click="handleQuery"
-                    >搜索</el-button
-                >
-                <el-button
-                    icon="el-icon-refresh"
-                    size="mini"
-                    @click="resetQuery"
-                    >重置</el-button
-                >
-            </el-form-item>
-        </el-form>
-
-        <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
-                <el-button
-                    type="primary"
-                    plain
-                    icon="el-icon-plus"
-                    size="mini"
-                    @click="handleAdd"
-                    v-hasPermi="['pile:merchant:add']"
-                    >新增</el-button
-                >
-            </el-col>
-            <el-col :span="1.5">
-                <el-button
-                    type="success"
-                    plain
-                    icon="el-icon-edit"
-                    size="mini"
-                    :disabled="single"
-                    @click="handleUpdate"
-                    v-hasPermi="['pile:merchant:edit']"
-                    >修改</el-button
-                >
-            </el-col>
-            <el-col :span="1.5">
-                <el-button
-                    type="danger"
-                    plain
-                    icon="el-icon-delete"
-                    size="mini"
-                    :disabled="multiple"
-                    @click="handleDelete"
-                    v-hasPermi="['pile:merchant:remove']"
-                    >删除</el-button
-                >
-            </el-col>
-            <el-col :span="1.5">
-                <el-button
-                    type="warning"
-                    plain
-                    icon="el-icon-download"
-                    size="mini"
-                    @click="handleExport"
-                    v-hasPermi="['pile:merchant:export']"
-                    >导出</el-button
-                >
-            </el-col>
-            <right-toolbar
-                :showSearch.sync="showSearch"
-                @queryTable="getList"
-            ></right-toolbar>
-        </el-row>
-
-        <el-table
-            v-loading="loading"
-            :data="merchantList"
-            @selection-change="handleSelectionChange"
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
         >
-            <el-table-column type="selection" width="55" align="center" />
-            <!--<el-table-column label="" align="center" prop="id" />-->
-            <el-table-column
-                label="运营商名称"
-                align="center"
-                prop="merchantName"
-            >
-                <template slot-scope="scope">
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['pile:merchant:add']"
+          >新增</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['pile:merchant:edit']"
+          >修改</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['pile:merchant:remove']"
+          >删除</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['pile:merchant:export']"
+          >导出</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="merchantList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <!--<el-table-column label="" align="center" prop="id" />-->
+      <el-table-column label="运营商名称" align="center" prop="merchantName">
+        <!-- <template slot-scope="scope">
                     <router-link
                         :to="'/merchant/detail/index/' + scope.row.id"
                         class="link-type"
                     >
                         <span>{{ scope.row.merchantName }}</span>
                     </router-link>
-                </template>
-            </el-table-column>
-            <el-table-column label="地址" align="center" prop="address" />
-            <el-table-column label="状态" align="center" prop="status" />
-            <el-table-column
-                label="组织机构代码"
-                align="center"
-                prop="organizationCode"
-            />
-            <el-table-column
-                label="负责人姓名"
-                align="center"
-                prop="managerName"
-            />
-            <el-table-column
-                label="负责人电话号码"
-                align="center"
-                prop="managerPhone"
-            />
-            <el-table-column
-                label="客服电话号码"
-                align="center"
-                prop="servicePhone"
-            />
-            <el-table-column label="公司logo" align="center" prop="logoUrl">
-                <template slot-scope="scope">
-                    <el-image
-                        style="width: 100px; height: 100px"
-                        :src="scope.row.logoUrl"
-                        :preview-src-list="[scope.row.logoUrl]"
-                        fit="fill"
-                    ></el-image>
-                </template>
-            </el-table-column>
-            <el-table-column
-                label="操作"
-                align="center"
-                v-if="checkPermi(['pile:merchant:edit'])"
-                class-name="small-padding fixed-width"
+                </template> -->
+      </el-table-column>
+      <el-table-column label="地址" align="center" prop="address" />
+      <el-table-column label="状态" align="center" prop="status" />
+      <el-table-column
+        label="组织机构代码"
+        align="center"
+        prop="organizationCode"
+      />
+      <el-table-column label="负责人姓名" align="center" prop="managerName" />
+      <el-table-column
+        label="负责人电话号码"
+        align="center"
+        prop="managerPhone"
+      />
+      <el-table-column
+        label="客服电话号码"
+        align="center"
+        prop="servicePhone"
+      />
+      <el-table-column label="公司logo" align="center" prop="logoUrl">
+        <template slot-scope="scope">
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="scope.row.logoUrl"
+            :preview-src-list="[scope.row.logoUrl]"
+            fit="fill"
+          ></el-image>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        align="center"
+        v-if="checkPermi(['pile:merchant:edit'])"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['pile:merchant:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['pile:merchant:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改充电桩运营商信息对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="50%"
+      append-to-body
+      :before-close="closeBefore"
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="200px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="运营商名称" prop="merchantName">
+              <el-input
+                v-model="form.merchantName"
+                maxlength="40"
+                placeholder="请输入运营商名称"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="组织机构代码" prop="organizationCode">
+              <el-input
+                v-model="form.organizationCode"
+                placeholder="请输入组织机构代码"
+                maxlength="30"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="负责人姓名" prop="managerName">
+              <el-input
+                v-model="form.managerName"
+                placeholder="请输入负责人姓名"
+                maxlength="10"
+                minlength="1"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="负责人电话号码" prop="managerPhone">
+              <el-input
+                v-model="form.managerPhone"
+                placeholder="请输入负责人电话号码"
+                maxlength="15"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="地址" prop="address">
+                <el-input
+                  v-model="form.address"
+                  maxlength="30"
+                  placeholder="请输入地址"
+                />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="客服电话号码" prop="servicePhone">
+                <el-input
+                  v-model="form.servicePhone"
+                  maxlength="15"
+                  placeholder="请输入客服电话号码"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="运营商等级">
+              <el-select
+                v-model="form.merchantLevel"
+                placeholder="请选择运营商等级"
+                @change="grade"
+              >
+                <el-option
+                  v-for="item in options"
+                  :key="item.label"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label="上级运营商"
+              prop="parentId"
+              v-if="form.merchantLevel === '2'"
             >
-                <template slot-scope="scope">
-                    <el-button
-                        size="mini"
-                        type="text"
-                        icon="el-icon-edit"
-                        @click="handleUpdate(scope.row)"
-                        v-hasPermi="['pile:merchant:edit']"
-                        >修改</el-button
-                    >
-                    <el-button
-                        size="mini"
-                        type="text"
-                        icon="el-icon-delete"
-                        @click="handleDelete(scope.row)"
-                        v-hasPermi="['pile:merchant:remove']"
-                        >删除</el-button
-                    >
-                </template>
-            </el-table-column>
-        </el-table>
-
-        <pagination
-            v-show="total > 0"
-            :total="total"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getList"
-        />
-
-        <!-- 添加或修改充电桩运营商信息对话框 -->
-        <el-dialog
-            :title="title"
-            :visible.sync="open"
-            width="50%"
-            append-to-body
-            :before-close="closeBefore"
-        >
-            <el-form
-                ref="form"
-                :model="form"
-                :rules="rules"
-                label-width="200px"
+              <el-select v-model="form.parentId" placeholder="请选择上级运营商">
+                <el-option
+                  v-for="item in firstLevelMerchant"
+                  :key="item.merchantName"
+                  :label="item.merchantName"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label="小程序APPID"
+              prop="appId"
+              v-if="form.merchantLevel === '1'"
             >
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="运营商名称" prop="merchantName">
-                            <el-input
-                                v-model="form.merchantName"
-                                maxlength="40"
-                                placeholder="请输入运营商名称"
-                            />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item
-                            label="组织机构代码"
-                            prop="organizationCode"
-                        >
-                            <el-input
-                                v-model="form.organizationCode"
-                                placeholder="请输入组织机构代码"
-                                maxlength="30"
-                            />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="负责人姓名" prop="managerName">
-                            <el-input
-                                v-model="form.managerName"
-                                placeholder="请输入负责人姓名"
-                                maxlength="10"
-                                minlength="1"
-                            />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item
-                            label="负责人电话号码"
-                            prop="managerPhone"
-                        >
-                            <el-input
-                                v-model="form.managerPhone"
-                                placeholder="请输入负责人电话号码"
-                                maxlength="15"
-                            />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="地址" prop="address">
-                                <el-input
-                                    v-model="form.address"
-                                    maxlength="30"
-                                    placeholder="请输入地址"
-                                />
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item
-                                label="客服电话号码"
-                                prop="servicePhone"
-                            >
-                                <el-input
-                                    v-model="form.servicePhone"
-                                    maxlength="15"
-                                    placeholder="请输入客服电话号码"
-                                />
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </el-row>
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="运营商等级">
-                            <el-select
-                                v-model="form.merchantLevel"
-                                placeholder="请选择运营商等级"
-                                @change="grade"
-                            >
-                                <el-option
-                                    v-for="item in options"
-                                    :key="item.label"
-                                    :label="item.label"
-                                    :value="item.value"
-                                />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item
-                            label="上级运营商"
-                            prop="parentId"
-                            v-if="form.merchantLevel === '2'"
-                        >
-                            <el-select
-                                v-model="form.parentId"
-                                placeholder="请选择上级运营商"
-                            >
-                                <el-option
-                                    v-for="item in firstLevelMerchant"
-                                    :key="item.merchantName"
-                                    :label="item.merchantName"
-                                    :value="item.id"
-                                />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item
-                            label="小程序APPID"
-                            prop="appId"
-                            v-if="form.merchantLevel === '1'"
-                        >
-                            <el-input
-                                v-model="form.appId"
-                                maxlength="30"
-                                placeholder="请输入小程序APPID"
-                            />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-form-item label="公司logo" prop="logoUrl">
-                    <el-upload
-                        class="upload-demo"
-                        :action="actionUrl"
-                        :headers="headers"
-                        :on-success="handleSuccess"
-                        :on-preview="handlePreview"
-                        :on-remove="handleRemove"
-                        :file-list="fileList"
-                        list-type="picture"
-                        :limit="1"
-                        :on-exceed="handleExceed"
-                    >
-                        <el-button size="small" type="primary"
-                            >点击上传</el-button
-                        >
-                        <div slot="tip" class="el-upload__tip">
-                            当前仅支持上传jpg/png格式
-                        </div>
-                    </el-upload>
-                    <!-- <el-input v-model="form.logoUrl" placeholder="" /> -->
-                </el-form-item>
-
-                <el-row>
-                    <el-divider
-                        >填入运营商管理员账号和密码，则自动创建一个该运营商的管理员账号</el-divider
-                    >
-                    <el-col :span="12">
-                        <el-form-item label="运营商管理员账号" prop="userName">
-                            <el-input
-                                v-model="form.userName"
-                                placeholder="请输入运营商管理员账号"
-                            />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="运营商管理员密码" prop="password">
-                            <el-input
-                                v-model="form.password"
-                                placeholder="请输入运营商管理员密码"
-                            />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="submitForm">确 定</el-button>
-                <el-button @click="cancel">取 消</el-button>
+              <el-input
+                v-model="form.appId"
+                maxlength="30"
+                placeholder="请输入小程序APPID"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="公司logo" prop="logoUrl">
+          <el-upload
+            class="upload-demo"
+            :action="actionUrl"
+            :headers="headers"
+            :on-success="handleSuccess"
+            :on-preview="handlePreview"
+            :on-remove="handleRemove"
+            :file-list="fileList"
+            list-type="picture"
+            :limit="1"
+            :on-exceed="handleExceed"
+          >
+            <el-button size="small" type="primary">点击上传</el-button>
+            <div slot="tip" class="el-upload__tip">
+              当前仅支持上传jpg/png格式
             </div>
-        </el-dialog>
-    </div>
+          </el-upload>
+          <!-- <el-input v-model="form.logoUrl" placeholder="" /> -->
+        </el-form-item>
+
+        <el-row>
+          <el-divider
+            >填入运营商管理员账号和密码，则自动创建一个该运营商的管理员账号</el-divider
+          >
+          <el-col :span="12">
+            <el-form-item label="运营商管理员账号" prop="userName">
+              <el-input
+                v-model="form.userName"
+                placeholder="请输入运营商管理员账号"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="运营商管理员密码" prop="password">
+              <el-input
+                v-model="form.password"
+                placeholder="请输入运营商管理员密码"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
 import {
-    listMerchant,
-    getMerchant,
-    delMerchant,
-    addMerchant,
-    updateMerchant,
-    queryFirstLevelMerchant,
+  listMerchant,
+  getMerchant,
+  delMerchant,
+  addMerchant,
+  updateMerchant,
+  queryFirstLevelMerchant,
 } from "@/api/pile/merchant";
 import { checkPermi } from "@/utils/permission";
 import { getToken } from "@/utils/auth";
 export default {
-    name: "Merchant",
-    data() {
-        return {
-            actionUrl: process.env.VUE_APP_BASE_API + "/common/uploadOSS",
-            dialogImageUrl: "",
-            headers: {
-                Authorization: "Bearer " + getToken(),
-            },
-            imageUrl: null,
-            fileList: [],
-            // 遮罩层
-            loading: true,
-            // 选中数组
-            ids: [],
-            // 非单个禁用
-            single: true,
-            // 非多个禁用
-            multiple: true,
-            // 显示搜索条件
-            showSearch: true,
-            // 总条数
-            total: 0,
-            // 充电桩运营商信息表格数据
-            merchantList: [],
-            // 一级运营商列表
-            firstLevelMerchant: [],
-            // 弹出层标题
-            title: "",
-            // 是否显示弹出层
-            open: false,
-            // 查询参数
-            queryParams: {
-                pageNum: 1,
-                pageSize: 10,
-                merchantName: null,
-                address: null,
-                status: null,
-                organizationCode: null,
-                managerName: null,
-                managerPhone: null,
-                servicePhone: null,
-                logoUrl: null,
-            },
-            options: [
-                {
-                    value: "1",
-                    label: "一级运营商",
-                },
-                {
-                    value: "2",
-                    label: "二级运营商",
-                },
-            ],
-            // 表单参数
-            form: {},
-            // 表单校验
-            rules: {
-                merchantName: [
-                    {
-                        required: true,
-                        message: "请输入运营商名称",
-                        trigger: "blur",
-                    },
-                    {
-                        min: 1,
-                        max: 35,
-                        message: "长度在 1 到 35 个字符",
-                        trigger: "blur",
-                    },
-                ],
-                organizationCode: [
-                    {
-                        required: true,
-                        message: "请输入组织机构代码",
-                        trigger: "blur",
-                    },
-                ],
-                address: [
-                    { required: true, message: "请输入地址", trigger: "blur" },
-                ],
-                managerName: [
-                    {
-                        required: true,
-                        message: "请输入负责人姓名",
-                        trigger: "blur",
-                    },
-                ],
-                managerPhone: [
-                    {
-                        required: true,
-                        message: "请输入负责人电话号码",
-                        trigger: "blur",
-                    },
-                ],
-                servicePhone: [
-                    {
-                        required: true,
-                        message: "请输入客服电话号码",
-                        trigger: "blur",
-                    },
-                ],
-                logoUrl: [
-                    {
-                        required: true,
-                        message: "请上传公司logo",
-                        trigger: "blur",
-                    },
-                ],
-                appId: [
-                    {
-                        required: true,
-                        message: "请输入小程序APPID",
-                        trigger: "blur",
-                    },
-                ],
-                //   验证规则：
-                parentId: [
-                    {
-                        required: true,
-                        message: "请选择上级运营商",
-                        trigger: "change",
-                    },
-                ],
-            },
-        };
+  name: "Merchant",
+  data() {
+    return {
+      actionUrl: process.env.VUE_APP_BASE_API + "/common/uploadOSS",
+      dialogImageUrl: "",
+      headers: {
+        Authorization: "Bearer " + getToken(),
+      },
+      imageUrl: null,
+      fileList: [],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 充电桩运营商信息表格数据
+      merchantList: [],
+      // 一级运营商列表
+      firstLevelMerchant: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        merchantName: null,
+        address: null,
+        status: null,
+        organizationCode: null,
+        managerName: null,
+        managerPhone: null,
+        servicePhone: null,
+        logoUrl: null,
+      },
+      options: [
+        {
+          value: "1",
+          label: "一级运营商",
+        },
+        {
+          value: "2",
+          label: "二级运营商",
+        },
+      ],
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        merchantName: [
+          {
+            required: true,
+            message: "请输入运营商名称",
+            trigger: "blur",
+          },
+          {
+            min: 1,
+            max: 35,
+            message: "长度在 1 到 35 个字符",
+            trigger: "blur",
+          },
+        ],
+        organizationCode: [
+          {
+            required: true,
+            message: "请输入组织机构代码",
+            trigger: "blur",
+          },
+        ],
+        address: [{ required: true, message: "请输入地址", trigger: "blur" }],
+        managerName: [
+          {
+            required: true,
+            message: "请输入负责人姓名",
+            trigger: "blur",
+          },
+        ],
+        managerPhone: [
+          {
+            required: true,
+            message: "请输入负责人电话号码",
+            trigger: "blur",
+          },
+        ],
+        servicePhone: [
+          {
+            required: true,
+            message: "请输入客服电话号码",
+            trigger: "blur",
+          },
+        ],
+        logoUrl: [
+          {
+            required: true,
+            message: "请上传公司logo",
+            trigger: "blur",
+          },
+        ],
+        appId: [
+          {
+            required: true,
+            message: "请输入小程序APPID",
+            trigger: "blur",
+          },
+        ],
+        //   验证规则：
+        parentId: [
+          {
+            required: true,
+            message: "请选择上级运营商",
+            trigger: "change",
+          },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+    this.getFirstMerchantList();
+  },
+  methods: {
+    checkPermi,
+    closeBefore() {
+      this.open = false;
+      this.fileList = [];
     },
-    created() {
-        this.getList();
-        this.getFirstMerchantList();
+    handleExceed(files, fileList) {
+      this.$message.warning(
+        `当前限制选择 1 张图片，本次选择了 ${files.length} 张，共选择了 ${
+          files.length + fileList.length
+        } 张`
+      );
     },
-    methods: {
-        checkPermi,
-        closeBefore() {
-            this.open = false;
-            this.fileList = [];
-        },
-        handleExceed(files, fileList) {
-            this.$message.warning(
-                `当前限制选择 1 张图片，本次选择了 ${
-                    files.length
-                } 张，共选择了 ${files.length + fileList.length} 张`
-            );
-        },
-        handleSuccess(res, file) {
-            this.imageUrl = URL.createObjectURL(file.raw);
-            console.log("图片上传成功 url：", this.imageUrl);
-            console.log("图片上传成功 res：", res);
-            this.fileList.push({ url: res.url });
-            this.form.logoUrl = res.url;
-        },
-        handleRemove(file, fileList) {
-            console.log("移除图片", file, fileList);
-            // 从pics数组中，找到图片对应的索引值
-            const i = this.fileList.findIndex((x) => x.uid === file.uid);
-            // 调用splice方法，移除图片信息
-            this.fileList.splice(i, 1);
-        },
-        handlePreview(file) {
-            // console.log(file);
-            this.dialogImageUrl = file.url;
-            console.log(this.dialogImageUrl);
-            this.dialogVisible = true;
-        },
-        /** 查询充电桩运营商信息列表 */
-        getList() {
-            this.loading = true;
-            listMerchant(this.queryParams).then((response) => {
-                this.merchantList = response.rows;
-                // console.log(response.rows[0].logoUrl,222222222);
-                // this.srcList=response.rows[0].logoUrl;
-                // console.log(this.srcList,222222222);
-                console.log("this.merchantList", this.merchantList);
-                this.total = response.total;
-                this.loading = false;
-            });
-        },
-        // 查询一级运营商列表
-        getFirstMerchantList() {
-            queryFirstLevelMerchant().then((response) => {
-                this.firstLevelMerchant = response.rows;
-            });
-        },
-        // 取消按钮
-        cancel() {
-            this.open = false;
-            this.fileList = [];
-            this.reset();
-        },
-        // 表单重置
-        reset() {
-            this.form = {
-                id: null,
-                merchantName: null,
-                address: null,
-                status: "0",
-                organizationCode: null,
-                managerName: null,
-                managerPhone: null,
-                servicePhone: null,
-                logoUrl: null,
-                createBy: null,
-                createTime: null,
-                updateBy: null,
-                updateTime: null,
-                delFlag: null,
-                parentId: null,
-                appId: null,
-            };
-            this.resetForm("form");
-        },
-        /** 搜索按钮操作 */
-        handleQuery() {
-            this.queryParams.pageNum = 1;
-            this.getList();
-        },
-        /** 重置按钮操作 */
-        resetQuery() {
-            this.resetForm("queryForm");
-            this.handleQuery();
-        },
-        // 多选框选中数据
-        handleSelectionChange(selection) {
-            this.ids = selection.map((item) => item.id);
-            this.single = selection.length !== 1;
-            this.multiple = !selection.length;
-        },
-        /** 新增按钮操作 */
-        handleAdd() {
-            this.reset();
-            this.open = true;
-            this.title = "添加运营商信息";
-        },
-        /** 修改按钮操作 */
-        handleUpdate(row) {
-            this.fileList = [];
-            this.fileList.push({ url: row.logoUrl });
-            this.reset();
-            const id = row.id || this.ids;
-            getMerchant(id).then((response) => {
-                this.form = response.data;
-                this.open = true;
-                this.title = "修改运营商信息";
-            });
-        },
-        // 选择运营商等级后清空
-        grade() {
-            if (this.form.merchantLevel === "1") {
-                this.form.parentId = null;
-            } else if (this.form.merchantLevel === "2") {
-                this.form.appId = null;
-            }
-        },
-        /** 提交按钮 */
-        submitForm() {
-            console.log("this.form", this.form, this.form.logoUrl);
-            this.$refs["form"].validate((valid) => {
-                if (valid) {
-                    if (this.form.id != null) {
-                        updateMerchant(this.form).then((response) => {
-                            this.$modal.msgSuccess("修改成功");
-                            this.open = false;
-                            this.getList();
-                        });
-                    } else {
-                        addMerchant(this.form).then((response) => {
-                            this.$modal.msgSuccess("新增成功");
-                            this.open = false;
-                            this.getList();
-                        });
-                    }
-                }
-            });
-        },
-        /** 删除按钮操作 */
-        handleDelete(row) {
-            const ids = row.id || this.ids;
-            this.$modal
-                .confirm(
-                    '是否确认删除充电桩运营商信息编号为"' + ids + '"的数据项？'
-                )
-                .then(function () {
-                    return delMerchant(ids);
-                })
-                .then(() => {
-                    this.getList();
-                    this.$modal.msgSuccess("删除成功");
-                })
-                .catch(() => {});
-        },
-        /** 导出按钮操作 */
-        handleExport() {
-            this.download(
-                "pile/merchant/export",
-                {
-                    ...this.queryParams,
-                },
-                `merchant_${new Date().getTime()}.xlsx`
-            );
-        },
+    handleSuccess(res, file) {
+      this.imageUrl = URL.createObjectURL(file.raw);
+      console.log("图片上传成功 url：", this.imageUrl);
+      console.log("图片上传成功 res：", res);
+      this.fileList.push({ url: res.url });
+      this.form.logoUrl = res.url;
     },
+    handleRemove(file, fileList) {
+      console.log("移除图片", file, fileList);
+      // 从pics数组中，找到图片对应的索引值
+      const i = this.fileList.findIndex((x) => x.uid === file.uid);
+      // 调用splice方法，移除图片信息
+      this.fileList.splice(i, 1);
+    },
+    handlePreview(file) {
+      // console.log(file);
+      this.dialogImageUrl = file.url;
+      console.log(this.dialogImageUrl);
+      this.dialogVisible = true;
+    },
+    /** 查询充电桩运营商信息列表 */
+    getList() {
+      this.loading = true;
+      listMerchant(this.queryParams).then((response) => {
+        this.merchantList = response.rows;
+        // console.log(response.rows[0].logoUrl,222222222);
+        // this.srcList=response.rows[0].logoUrl;
+        // console.log(this.srcList,222222222);
+        console.log("this.merchantList", this.merchantList);
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 查询一级运营商列表
+    getFirstMerchantList() {
+      queryFirstLevelMerchant().then((response) => {
+        this.firstLevelMerchant = response.rows;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.fileList = [];
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        merchantName: null,
+        address: null,
+        status: "0",
+        organizationCode: null,
+        managerName: null,
+        managerPhone: null,
+        servicePhone: null,
+        logoUrl: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        delFlag: null,
+        parentId: null,
+        appId: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加运营商信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.fileList = [];
+      this.fileList.push({ url: row.logoUrl });
+      this.reset();
+      const id = row.id || this.ids;
+      getMerchant(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改运营商信息";
+      });
+    },
+    // 选择运营商等级后清空
+    grade() {
+      if (this.form.merchantLevel === "1") {
+        this.form.parentId = null;
+      } else if (this.form.merchantLevel === "2") {
+        this.form.appId = null;
+      }
+    },
+    /** 提交按钮 */
+    submitForm() {
+      console.log("this.form", this.form, this.form.logoUrl);
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateMerchant(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addMerchant(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm('是否确认删除充电桩运营商信息编号为"' + ids + '"的数据项？')
+        .then(function () {
+          return delMerchant(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "pile/merchant/export",
+        {
+          ...this.queryParams,
+        },
+        `merchant_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-upload-list--picture .el-upload-list__item {
-    width: 40%;
+  width: 40%;
 }
-::v-deep .el-select > .el-input {
-    width: 280px;
+::v-deep .main .el-select > .el-input {
+  width: 280px;
 }
 </style>