diff --git a/.env.development b/.env.development
index f882c4e..12a4bf3 100644
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,7 @@ ENV = 'development'
 
 # 电动车租赁系统/开发环境
 # VUE_APP_BASE_API = '/dev-api'
-VUE_APP_BASE_API = 'http://192.168.2.168:8090'
+VUE_APP_BASE_API = 'http://192.168.2.21:8090'
 # VUE_APP_BASE_API = 'https://zc.chuangtewl.com'
 # VUE_APP_BASE_API = 'https://zc.chuangtewl.com/prod-api'
 
diff --git a/src/api/system/user.js b/src/api/system/user.js
index b3cd10f..75e97c6 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -134,3 +134,11 @@ export function deptTreeSelect() {
     method: 'get'
   })
 }
+// 查询代理商下的商户
+export function getMerchantList(query) {
+  return request({
+    url: '/user/user/getMerchantList',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/views/system/merchant/merchantList.vue b/src/views/system/merchant/merchantList.vue
index 1a59e74..8719e9c 100644
--- a/src/views/system/merchant/merchantList.vue
+++ b/src/views/system/merchant/merchantList.vue
@@ -1,13 +1,695 @@
 <template>
-  <div class="">111</div>
+  <div class="app-container">
+    <el-col :span="24" :xs="24">
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form-item label="名称" prop="userName">
+          <el-input v-model="queryParams.realName" placeholder="请输入名称" clearable style="width: 240px"
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="手机号码" prop="phonenumber">
+          <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px"
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="代理商" prop="userType">
+          <el-select v-model="queryParams.agentId" placeholder="商户类型" clearable style="width: 240px">
+            <el-option v-for="dict in agentList" :key="dict.agentId" :label="dict.name" :value="dict.agentId" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-select v-model="queryParams.status" placeholder="商户状态" clearable style="width: 240px">
+            <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
+              :value="dict.value" />
+          </el-select>
+        </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="['system:user: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="['system:user: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="['system:user:remove']">删除</el-button>
+        </el-col>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      </el-row>
+
+      <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="50" align="center" />
+        <el-table-column label="商户名称" align="center" prop="userName" :show-overflow-tooltip="true" />
+        <el-table-column label="代理城市" align="center" prop="cityName" />
+        <el-table-column label="店铺名" align="center" prop="storeName" />
+        <el-table-column label="类型" align="center" prop="userType">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.rl_user_type" :value="scope.row.userType" />
+          </template>
+        </el-table-column>
+        <el-table-column label="手机号码" align="center" prop="phonenumber" />
+        <el-table-column label="分账比例(%)" align="center" prop="dividendProportion"
+          :formatter="formatDividendProportion" />
+        <el-table-column label="余额" align="center">
+          <template slot-scope="scope">
+            <span class="balance-cell">{{ scope.row.balance }}元</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" align="center">
+          <template slot-scope="scope">
+            <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
+              @change="handleStatusChange(scope.row)"></el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="合作时间" align="center" prop="createTime" width="160">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.cooperationTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
+          <template slot-scope="scope" v-if="scope.row.userId !== 1">
+            <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+              v-hasPermi="['system:user:edit']">修改</el-button>
+            <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['system:user:remove']">删除</el-button>
+            <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
+              v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
+              <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
+                  v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
+                <!--                  <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"-->
+                <!--                    v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>-->
+              </el-dropdown-menu>
+            </el-dropdown>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
+    </el-col>
+
+    <!-- 添加或修改商户配置对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="手机号">
+              <el-input v-model="form.userName" placeholder="请输入用户名" maxlength="30" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item v-if="form.userId == undefined" label="密码" prop="password">
+              <el-input v-model="form.password" placeholder="请输入密码" type="password" maxlength="20" show-password />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="代理商" prop="agentId">
+              <el-select v-model="form.agentId" filterable placeholder="请选择">
+                <el-option v-for="item in agentList" :key="item.agentId" :label="item.name + '  ' + item.contact"
+                  :value="item.agentId">
+                </el-option>
+              </el-select>
+            </el-form-item>
+
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="角色">
+              <el-select v-model="form.roleIds" placeholder="请选择角色">
+                <el-option v-for="item in filteredRoleOptions" :key="item.roleId" :label="item.roleName"
+                  :value="item.roleId" :disabled="item.status == 1"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="form.roleIds == 4">
+          <el-col :span="12">
+            <el-form-item label="分账比例(%)" label-width="100" prop="inputDividendProportion">
+              <el-input style="width: 64%" v-model="inputDividendProportion" placeholder="请输入分账比例" maxlength="11"
+                @input="handleInput" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="合作时间" prop="cooperationTime">
+              <el-date-picker v-model="form.cooperationTime" style="width: 200px" value-format="yyyy-MM-dd" type="date"
+                range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="状态" prop="status">
+              <el-radio-group v-model="form.status">
+                <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{
+                  dict.label
+                }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="form.roleIds == 4">
+            <el-form-item label="分账状态" prop="dividendStatus">
+              <el-switch v-model="form.dividendStatus"></el-switch>
+              <!-- <el-radio-group v-model="form.dividendStatus">
+                <el-radio v-for="dict in dict.type.rl_dividend_switch" :key="dict.value" :label="dict.value">{{
+                  dict.label
+                  }}</el-radio>
+              </el-radio-group> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row>
+          
+          <el-col :span="24"  v-for="(item,index) in withdList" :key="index" style="display: flexa;align-items: center;">
+            <img :src="item.picture" alt="" style="width: 30px;height: 30px;border-radius: 50%;">
+            <el-radio-group v-model="item.handlingChargeType">
+            <el-radio v-for="dict in dict.type.rl_handling_charge_type" :key="dict.value"
+              :label="dict.value">{{ dict.label }}</el-radio>
+          </el-radio-group>
+            
+          </el-col>
+        </el-row> -->
+        <div class="witd" v-for="(item, index) in withdList" :key="index" v-if="false">
+          <img :src="item.picture" alt="" style="width: 30px;height: 30px;border-radius: 50%;">
+          <div class="widname">{{ item.name }}</div>
+          <div class=""> 渠道状态： <el-switch v-model="item.isOpen" @change="updataWithd(item)"></el-switch></div>
+
+          </el-switch>
+          <el-radio-group v-model="item.handlingChargeType" @change="updataWithd(item)">
+            <el-radio v-for="dict in dict.type.rl_handling_charge_type" :key="dict.value" :label="dict.value">{{
+              dict.label
+            }}</el-radio>
+
+          </el-radio-group>
+          <div class="" style="width: 150px;">
+            <el-col :span="12" v-if="item.handlingChargeType == '1'">
+              <el-form-item label="比例(‰)">
+                <el-input v-model="item.withdrawHandlingCharge" placeholder="请输入手续费" style="width: 100px;"
+                  @change="updataWithd(item)" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" v-else>
+              <el-form-item label="每笔(元)">
+                <el-input v-model="item.withdrawHandlingCharge" placeholder="请输入手续费" style="width: 100px;"
+                  @change="updataWithd(item)" />
+              </el-form-item>
+            </el-col>
+          </div>
+          <div class="">
+            单笔最低
+            <el-input v-model.number="item.minAmount" placeholder="请输入单笔最低提现金额" :min="0" type="number"
+              @change="updataWithd(item)" style="width: 100px;">
+              <template #suffix>元</template>
+            </el-input>
+            单笔最高
+            <el-input v-model.number="item.maxAmount" placeholder="请输入单笔最高提现金额" :min="0" type="number"
+              @change="updataWithd(item)" style="width: 100px;">
+              <template #suffix>元</template>
+            </el-input>
+          </div>
+        </div>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+            </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>
+let timerId;
+import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect ,getMerchantList} from "@/api/system/user";
+import { updateExt } from "@/api/rl/ext";
+import { getToken } from "@/utils/auth";
+import { listCity } from "@/api/rl/common";
+import Treeselect from "@riophae/vue-treeselect";
+import { listAgent, getAgent, delAgent, addAgent, updateAgent } from "@/api/rl/agent";
+import { getuserWithdraw, putuserWithdraw } from "@/api/rl/withdraw"
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
 export default {
+  name: "User",
+  dicts: ['sys_normal_disable', 'sys_user_sex', 'et_dividend_item', 'rl_user_type', 'rl_dividend_switch', 'rl_handling_charge_type'],
+  computed: {
+    filteredRoleOptions() {
+      return this.roleOptions.filter(item => item.roleKey !== 'common'&&item.roleKey !== 'agent');
+    },
+  },
+  components: { Treeselect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      userList: null,
+      // 弹出层标题
+      title: "",
+      // 部门树选项
+      deptOptions: undefined,
+      // 是否显示弹出层
+      open: false,
+      // 部门名称
+      deptName: undefined,
+      // 默认密码
+      initPassword: undefined,
+      // 日期范围
+      dateRange: [],
+      // 城市选项
+      cityOptions: [],
+      // 角色选项
+      roleOptions: [],
+      // 表单参数
+      form: {
+        dividendStatus: false
+      },
+      inputDividendProportion: 30, // 用于输入的百分比
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
+      // 用户导入参数
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/system/user/importData"
+      },
+      withdList: [],
+      // 查询参数
+      queryParams: {
+        phonenumber: '',
+        realName: '',
+        agentIdP:1
+       
+      },
+      options: [{
+        value: '00',
+        label: '系统用户'
+      }, {
+        value: '02',
+        label: '代理商'
+      }, {
+        value: '03',
+        label: '商户'
+      }, {
+        value: '04',
+        label: '调度员'
+      }],
+      agentList: [],
+      // 表单校验
+      rules: {
+        agentId: [
+          { required: true, message: "请选择代理商", trigger: "blur" },
+        ],
+        dividendProportion: [
+          { required: true, message: "分账比例不能为空", trigger: "blur" },
+        ],
+        cityId: [
+          { required: true, message: "代理城市不能为空", trigger: "blur" },
+        ],
+        cooperationTime: [
+          { required: true, message: "请选择合作时间", trigger: "blur" }
+        ],
+        dividendStatus: [
+          { required: true, message: "请选择状态", trigger: "blur" }
+        ],
+        password: [
+          { required: true, message: "用户密码不能为空", trigger: "blur" },
+          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' },
+          { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }
+        ],
+        phonenumber: [
+          { required: true, message: "手机号不能为空", trigger: "blur" },
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: "请输入正确的手机号码",
+            trigger: "blur"
+          }
+        ]
+      }
+    };
+  },
+  watch: {
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+  created() {
+    this.getList();
+    setTimeout(() => {
+      console.log(this.dicts, 'dictsdicts');
+    }, 200);
 
-}
+    // this.getDeptTree();
+    this.getConfigKey("sys.user.initPassword").then(response => {
+      this.initPassword = response.msg;
+    });
+    this.getListCity();
+    this.getAgentList()
+  },
+  methods: {
+    updataWithd(item) {
+      clearTimeout(timerId);
+      // 设置一个新的定时器，在滑动停止后 500ms 执行 getmarks 方法
+      timerId = setTimeout(() => {
+        putuserWithdraw(item).then(response => {
+
+        });
+      }, 700);
+
+    },
+    handleInput() {
+      // 当输入时，将输入的百分比转换为原始值
+      console.log(111111111111)
+      const proportion = parseFloat(this.inputDividendProportion);
+      if (!isNaN(proportion)) {
+        console.log(22222222222)
+        this.form.dividendProportion = proportion / 100;
+      }
+    },
+    getAgentList() {
+      let data = {
+        pageNum: 1,
+        pageSize: 30,
+      }
+      listAgent(this.addDateRange(data)).then(response => {
+        console.log(response, 'responseresponseresponse');
+        this.agentList = response.rows
+        // console.log(this.options, ' this.options this.options');
+      });
+
+    },
+    formatDividendProportion(row) {
+      let dividendProportion = row.dividendProportion;
+      if (dividendProportion !== null && dividendProportion !== undefined) {
+        return (dividendProportion * 100).toFixed(2) + '%';
+      }
+      return '—'; // 或者返回其他默认值
+    },
+    /** 查询城市列表 */
+    getListCity() {
+      listCity().then(response => {
+        this.cityOptions = response.data;
+      });
+    },
+    /** 查询用户列表 */
+    getList() {
+      this.loading = true;
+      getMerchantList(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+        this.userList = response.data;
+       
+        this.loading = false;
+      }
+      );
+    },
+    /** 查询部门下拉树结构 */
+    getDeptTree() {
+      deptTreeSelect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.deptId = data.id;
+      this.handleQuery();
+    },
+    // 用户状态修改
+    handleStatusChange(row) {
+      console.log("=================" + row.status);
+      let status = row.status ? "1" : "0"
+      let text = row.status ? "停用" : "启用";
+      console.log("=======status==========" + status);
+      this.$modal.confirm('确认要"' + text + '""' + row.userName + '"商户吗？').then(function () {
+        return updateExt(row.userId, status);
+      }).then(() => {
+        this.$modal.msgSuccess(text + "成功");
+      }).catch(function () {
+        row.status = row.status === "0" ? "1" : "0";
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        userId: undefined,
+        deptId: undefined,
+        userName: undefined,
+        nickName: undefined,
+        password: undefined,
+        phonenumber: undefined,
+        dividendItemIds: [],
+        email: undefined,
+        sex: undefined,
+        dividendStatus: false,
+        status: "0",
+        remark: undefined,
+        payChannel: undefined,
+        areaIds: [],
+        postIds: [],
+        roleIds: [],
+
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.queryParams.deptId = undefined;
+      this.$refs.tree.setCurrentKey(null);
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.userId);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    // 更多操作触发
+    handleCommand(command, row) {
+      switch (command) {
+        case "handleResetPwd":
+          this.handleResetPwd(row);
+          break;
+        case "handleAuthRole":
+          this.handleAuthRole(row);
+          break;
+        default:
+          break;
+      }
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      getUser().then(response => {
+        this.roleOptions = response.roles;
+        this.open = true;
+        this.title = "添加系统用户";
+        this.form.password = this.initPassword;
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const userId = row.userId || this.ids;
+      getUser(userId).then(response => {
+        this.form = response.data;
+        this.postOptions = response.posts;
+        this.roleOptions = response.roles;
+        this.areaOptions = response.areas;
+        this.$set(this.form, "postIds", response.postIds);
+        this.$set(this.form, "roleIds", response.roleIds[0]);
+        this.$set(this.form, "areas", response.areas);
+        this.form.roleIds = response.roleIds[0]; // 取出第一个角色 ID
+        console.log("回显-=====roleIds[0]", response.roleIds[0])
+        this.inputDividendProportion = this.form.dividendProportion * 100;
+        console.log("this.form.dividendProportion========", this.form.dividendProportion)
+        console.log("inputDividendProportion========", this.inputDividendProportion)
+        this.open = true;
+        this.title = "修改系统用户";
+        this.form.password = "";
+        this.getUserwit(userId)
+      });
+    },
+    getUserwit(userId) {
+
+      getuserWithdraw(userId).then(response => {
+        console.log(response, 'aaaaaaaaaaa');
+        this.withdList = response.data
+      });
+    },
+    /** 重置密码按钮操作 */
+    handleResetPwd(row) {
+      this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        closeOnClickModal: false,
+        inputPattern: /^.{5,20}$/,
+        inputErrorMessage: "商户密码长度必须介于 5 和 20 之间",
+        inputValidator: (value) => {
+          if (/<|>|"|'|\||\\/.test(value)) {
+            return "不能包含非法字符：< > \" ' \\\ |"
+          }
+        },
+      }).then(({ value }) => {
+        resetUserPwd(row.userId, value).then(response => {
+          this.$modal.msgSuccess("修改成功，新密码是：" + value);
+        });
+      }).catch(() => { });
+    },
+    /** 分配角色操作 */
+    handleAuthRole: function (row) {
+      const userId = row.userId;
+      this.$router.push("/system/user-auth/role/" + userId);
+    },
+    /** 提交按钮 */
+    submitForm: function () {
+      this.$refs["form"].validate(valid => {
+        this.form.userType = '03';
+        this.form.roleIds = [this.form.roleIds];
+        console.log("提交roleIds==========" + this.form.roleIds)
+        this.form.dividendProportion = this.inputDividendProportion; // 转换为0.3
+        console.log('保存的分账比例:', this.form.dividendProportion);
+        // this.form.dividendStatus = this.form.dividendStatus === "1" ? 1 : 0;
+        if (valid) {
+          if (this.form.userId != undefined) {
+            updateUser(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addUser(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const userIds = row.userId || this.ids;
+      this.$modal.confirm('是否确认删除商户编号为"' + userIds + '"的数据项？').then(function () {
+        return delUser(userIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/user/export', {
+        ...this.queryParams
+      }, `user_${new Date().getTime()}.xlsx`)
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.title = "商户导入";
+      this.upload.open = true;
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+      this.download('system/user/importTemplate', {
+      }, `user_template_${new Date().getTime()}.xlsx`)
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+      this.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    }
+  }
+};
 </script>
+<style lang="scss">
+.witd {
+  margin-top: 10px;
+  display: flex;
+  flex-wrap: nowrap;
+  align-items: center;
+  justify-content: space-around;
 
-<style>
+  .widname {
+    width: 100px;
+  }
+}
 
-</style>
\ No newline at end of file
+.el-form-item__tip {
+  color: #ff0000;
+  font-size: 12px;
+  line-height: 18px;
+}
+
+.balance-cell {
+  font-weight: bold;
+  color: red;
+}
+</style>