From f41444f00a4d1fb8e734dc88b17cbc4aa5369bde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A2=A8=E5=A4=A7=E5=8F=94?= <494979559@qq.com>
Date: Wed, 8 May 2024 14:19:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=8E=B0=E3=80=81=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Map/PlaceSearch/PlaceSearchMap.vue        |  2 +-
 src/views/system/withdraw/index.vue           | 55 ++++---------------
 2 files changed, 13 insertions(+), 44 deletions(-)

diff --git a/src/components/Map/PlaceSearch/PlaceSearchMap.vue b/src/components/Map/PlaceSearch/PlaceSearchMap.vue
index 34e3817..a922c92 100644
--- a/src/components/Map/PlaceSearch/PlaceSearchMap.vue
+++ b/src/components/Map/PlaceSearch/PlaceSearchMap.vue
@@ -78,7 +78,7 @@ export default {
         this.doPlaceSearch(this.keyword);
       } else {
         let city = this.area.city === '市辖区' ? this.area.province : this.area.city;
-        this.doPlaceSearch(city);
+        this.doPlaceSearch(city + '人民政府');
       }
     },
     initAMap() {
diff --git a/src/views/system/withdraw/index.vue b/src/views/system/withdraw/index.vue
index fb28f84..ca3349d 100644
--- a/src/views/system/withdraw/index.vue
+++ b/src/views/system/withdraw/index.vue
@@ -1,26 +1,26 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="用户" prop="userId">
+      <el-form-item label="用户名称" prop="userId">
         <el-input
           v-model="queryParams.userName"
-          placeholder="请输入用户"
+          placeholder="请输入用户名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="设备" prop="deviceId">
+      <el-form-item label="设备名称" prop="deviceId">
         <el-input
           v-model="queryParams.deviceName"
-          placeholder="请输入设备"
+          placeholder="请输入设备名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="房东(到账用户)" label-width="120" prop="landlordId">
+      <el-form-item label="商户名称" label-width="120" prop="landlordId">
         <el-input
-          v-model="queryParams.landlordName"
-          placeholder="请输入房东"
+          v-model="queryParams.mchName"
+          placeholder="请输入商户名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -32,38 +32,6 @@
     </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:bill: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:bill: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:bill:remove']"-->
-<!--        >删除</el-button>-->
-<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -79,8 +47,9 @@
 
     <el-table v-loading="loading" :data="billList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键" align="center" prop="billId" />
-      <el-table-column label="到账用户" align="center" prop="landlordName" />
+      <el-table-column label="ID" align="center" prop="billId" width="50"/>
+      <el-table-column label="提现单号" align="center" prop="billNo" />
+      <el-table-column label="到账用户" align="center" prop="mchName" />
       <el-table-column label="提现金额" align="center">
         <template slot-scope="d">
           {{d.row.money | money}}
@@ -99,7 +68,7 @@
       <el-table-column label="时间" align="center" prop="createTime" width="180"/>
       <el-table-column label="打款方式" align="center">
         <template slot-scope="d">
-          <dict-tag :value="d.row.payType" :options="dict.type.sm_transaction_bill_pay_type"/>
+          <dict-tag :value="d.row.channelId" :options="dict.type.sm_transaction_bill_pay_type"/>
         </template>
       </el-table-column>
       <el-table-column label="交易状态" align="center">
@@ -218,7 +187,7 @@ export default {
         pageSize: 10,
         userName: null,
         deviceName: null,
-        landlordName: null,
+        mchName: null,
         type: "2",  // 提现
       },
       // 表单参数