From e608ee2b51146f205e2667ff03aa494169039286 Mon Sep 17 00:00:00 2001
From: hucan <951870319@qq.com>
Date: Thu, 27 Feb 2025 15:03:20 +0800
Subject: [PATCH] 1

---
 src/api/admin/member-withdrawal-log.js        |  65 +++
 src/views/admin/dict/data.vue                 | 128 ++---
 src/views/admin/line-coinnetwork/index.vue    | 453 ++++++++--------
 .../admin/line-pre-order/AddPosition.vue      | 429 +++++++++++++++
 src/views/admin/member-renwa-log/index.vue    | 508 ++++++++----------
 .../admin/member-renwal-config/index.vue      |   6 +-
 .../admin/member-withdrawal-log/approve.vue   | 144 +++++
 .../admin/member-withdrawal-log/index.vue     | 342 ++++++++++++
 8 files changed, 1496 insertions(+), 579 deletions(-)
 create mode 100644 src/api/admin/member-withdrawal-log.js
 create mode 100644 src/views/admin/line-pre-order/AddPosition.vue
 create mode 100644 src/views/admin/member-withdrawal-log/approve.vue
 create mode 100644 src/views/admin/member-withdrawal-log/index.vue

diff --git a/src/api/admin/member-withdrawal-log.js b/src/api/admin/member-withdrawal-log.js
new file mode 100644
index 0000000..aeb6c5c
--- /dev/null
+++ b/src/api/admin/member-withdrawal-log.js
@@ -0,0 +1,65 @@
+import request from '@/utils/request'
+
+// 查询MemberWithdrawalLog列表
+export function listMemberWithdrawalLog(query) {
+    return request({
+        url: '/api/v1/member-withdrawal-log',
+        method: 'get',
+        params: query
+    })
+}
+
+// 查询MemberWithdrawalLog详细
+export function getMemberWithdrawalLog (id) {
+    return request({
+        url: '/api/v1/member-withdrawal-log/' + id,
+        method: 'get'
+    })
+}
+
+
+// 新增MemberWithdrawalLog
+export function addMemberWithdrawalLog(data) {
+    return request({
+        url: '/api/v1/member-withdrawal-log',
+        method: 'post',
+        data: data
+    })
+}
+
+// 修改MemberWithdrawalLog
+export function updateMemberWithdrawalLog(data) {
+    return request({
+        url: '/api/v1/member-withdrawal-log/'+data.id,
+        method: 'put',
+        data: data
+    })
+}
+
+// 删除MemberWithdrawalLog
+export function delMemberWithdrawalLog(data) {
+    return request({
+        url: '/api/v1/member-withdrawal-log',
+        method: 'delete',
+        data: data
+    })
+}
+
+//确认提现申请
+
+export function approve(data){
+    return request({
+        url: '/api/v1/member-withdrawal-log/approve',
+        method: 'put',
+        data: data
+    })
+}
+
+//到账提现申请
+export function confirm(data){
+    return request({
+        url: '/api/v1/member-withdrawal-log/confirm',
+        method: 'put',
+        data: data
+    })
+}
\ No newline at end of file
diff --git a/src/views/admin/dict/data.vue b/src/views/admin/dict/data.vue
index d30d315..3d284ef 100644
--- a/src/views/admin/dict/data.vue
+++ b/src/views/admin/dict/data.vue
@@ -5,31 +5,16 @@
         <el-form ref="queryForm" :model="queryParams" :inline="true">
           <el-form-item label="字典名称" prop="dictType">
             <el-select v-model="queryParams.dictType" size="small">
-              <el-option
-                v-for="item in typeOptions"
-                :key="item.dictId"
-                :label="item.dictName"
-                :value="item.dictType"
-              />
+              <el-option v-for="item in typeOptions" :key="item.dictId" :label="item.dictName" :value="item.dictType" />
             </el-select>
           </el-form-item>
           <el-form-item label="字典标签" prop="dictLabel">
-            <el-input
-              v-model="queryParams.dictLabel"
-              placeholder="请输入字典标签"
-              clearable
-              size="small"
-              @keyup.enter.native="handleQuery"
-            />
+            <el-input v-model="queryParams.dictLabel" placeholder="请输入字典标签" clearable size="small"
+              @keyup.enter.native="handleQuery" />
           </el-form-item>
           <el-form-item label="状态" prop="status">
             <el-select v-model="queryParams.status" placeholder="数据状态" clearable size="small">
-              <el-option
-                v-for="dict in statusOptions"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
+              <el-option v-for="dict in statusOptions" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
           <el-form-item>
@@ -40,33 +25,16 @@
 
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button
-              v-permisaction="['admin:sysDictData:add']"
-              type="primary"
-              icon="el-icon-plus"
-              size="mini"
-              @click="handleAdd"
-            >新增</el-button>
+            <el-button v-permisaction="['admin:sysDictData:add']" type="primary" icon="el-icon-plus" size="mini"
+              @click="handleAdd">新增</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button
-              v-permisaction="['admin:sysDictData:edit']"
-              type="success"
-              icon="el-icon-edit"
-              size="mini"
-              :disabled="single"
-              @click="handleUpdate"
-            >修改</el-button>
+            <el-button v-permisaction="['admin:sysDictData:edit']" type="success" icon="el-icon-edit" size="mini"
+              :disabled="single" @click="handleUpdate">修改</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button
-              v-permisaction="['admin:sysDictData:remove']"
-              type="danger"
-              icon="el-icon-delete"
-              size="mini"
-              :disabled="multiple"
-              @click="handleDelete"
-            >删除</el-button>
+            <el-button v-permisaction="['admin:sysDictData:remove']" type="danger" icon="el-icon-delete" size="mini"
+              :disabled="multiple" @click="handleDelete">删除</el-button>
           </el-col>
         </el-row>
 
@@ -85,31 +53,16 @@
           </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
-              <el-button
-                v-permisaction="['admin:sysDictData:edit']"
-                size="mini"
-                type="text"
-                icon="el-icon-edit"
-                @click="handleUpdate(scope.row)"
-              >修改</el-button>
-              <el-button
-                v-permisaction="['admin:sysDictData:remove']"
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="handleDelete(scope.row)"
-              >删除</el-button>
+              <el-button v-permisaction="['admin:sysDictData:edit']" size="mini" type="text" icon="el-icon-edit"
+                @click="handleUpdate(scope.row)">修改</el-button>
+              <el-button v-permisaction="['admin:sysDictData:remove']" size="mini" type="text" icon="el-icon-delete"
+                @click="handleDelete(scope.row)">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
 
-        <pagination
-          v-show="total>0"
-          :total="total"
-          :page.sync="queryParams.pageIndex"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageIndex"
+          :limit.sync="queryParams.pageSize" @pagination="getList" />
 
         <!-- 添加或修改参数配置对话框 -->
         <el-dialog :title="title" :visible.sync="open" width="500px" :close-on-click-modal="false">
@@ -128,16 +81,23 @@
             </el-form-item>
             <el-form-item label="状态" prop="status">
               <el-radio-group v-model="form.status">
-                <el-radio
-                  v-for="dict in statusOptions"
-                  :key="dict.value"
-                  :label="dict.value"
-                >{{ dict.label }}</el-radio>
+                <el-radio v-for="dict in statusOptions" :key="dict.value" :label="dict.value">{{ dict.label
+                  }}</el-radio>
               </el-radio-group>
             </el-form-item>
             <el-form-item label="备注" prop="remark">
               <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
             </el-form-item>
+            <div style="text-align: right;"><el-button @click="addLuanguage">新增多语言</el-button></div>
+            <el-form-item v-for="(item, index) in form.languageData" :key="'luanguage_' + index"
+              :label="'多语言' + (index + 1)" prop="languageData">
+              <div class="luanguage-item">
+                <el-input v-model="item.k" placeholder="多语言key(zh-CN,en)" style="width: 45%;" />
+                <el-input v-model="item.v" placeholder="请输入多语言文本" style="width: 45%;" />
+                <el-button type="warning" size="mini" circle icon="el-icon-delete" @click="luanguageDel(index)"
+                  round></el-button>
+              </div>
+            </el-form-item>
           </el-form>
           <div slot="footer" class="dialog-footer">
             <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -295,9 +255,10 @@ export default {
       })
     },
     /** 提交按钮 */
-    submitForm: function() {
+    submitForm: function () {
       this.$refs['form'].validate(valid => {
         if (valid) {
+          console.log('form',this.form)
           this.form.status = parseInt(this.form.status)
           if (this.form.dictCode !== undefined) {
             updateData(this.form).then(response => {
@@ -330,7 +291,7 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(function() {
+      }).then(function () {
         return delData({ 'ids': dictCodes })
       }).then((response) => {
         if (response.code === 200) {
@@ -340,7 +301,7 @@ export default {
         } else {
           this.msgError(response.msg)
         }
-      }).catch(function() {})
+      }).catch(function () { })
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -349,12 +310,33 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(function() {
+      }).then(function () {
         return exportData(queryParams)
       }).then(response => {
         this.download(response.msg)
-      }).catch(function() {})
+      }).catch(function () { })
+    },
+    addLuanguage() {
+      this.form.languageData.push({ k: "", v: "" })
+    },
+    luanguageDel(index) {
+      if (this.form.languageData) {
+        this.form.languageData.splice(index, 1)
+      }
     }
   }
 }
 </script>
+
+<style scoped>
+.luanguage-item {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
+
+.luanguage-item>*:first-child {
+  margin-left: 0;
+  /* 去掉第一个元素的左边距 */
+}
+</style>
diff --git a/src/views/admin/line-coinnetwork/index.vue b/src/views/admin/line-coinnetwork/index.vue
index 47b825d..316a208 100644
--- a/src/views/admin/line-coinnetwork/index.vue
+++ b/src/views/admin/line-coinnetwork/index.vue
@@ -1,10 +1,9 @@
-
 <template>
     <BasicLayout>
         <template #wrapper>
             <el-card class="box-card">
                 <el-form ref="queryForm" :model="queryParams" :inline="true" label-width="68px">
-                    
+
                     <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>
@@ -13,98 +12,68 @@
 
                 <el-row :gutter="10" class="mb8">
                     <el-col :span="1.5">
-                        <el-button
-                                v-permisaction="['admin:lineCoinnetwork:add']"
-                                type="primary"
-                                icon="el-icon-plus"
-                                size="mini"
-                                @click="handleAdd"
-                        >新增
+                        <el-button v-permisaction="['admin:lineCoinnetwork:add']" type="primary" icon="el-icon-plus"
+                            size="mini" @click="handleAdd">新增
                         </el-button>
                     </el-col>
                     <el-col :span="1.5">
-                        <el-button
-                                v-permisaction="['admin:lineCoinnetwork:edit']"
-                                type="success"
-                                icon="el-icon-edit"
-                                size="mini"
-                                :disabled="single"
-                                @click="handleUpdate"
-                        >修改
+                        <el-button v-permisaction="['admin:lineCoinnetwork:edit']" type="success" icon="el-icon-edit"
+                            size="mini" :disabled="single" @click="handleUpdate">修改
                         </el-button>
                     </el-col>
                     <el-col :span="1.5">
-                        <el-button
-                                v-permisaction="['admin:lineCoinnetwork:remove']"
-                                type="danger"
-                                icon="el-icon-delete"
-                                size="mini"
-                                :disabled="multiple"
-                                @click="handleDelete"
-                        >删除
+                        <el-button v-permisaction="['admin:lineCoinnetwork:remove']" type="danger" icon="el-icon-delete"
+                            size="mini" :disabled="multiple" @click="handleDelete">删除
                         </el-button>
                     </el-col>
                 </el-row>
 
                 <el-table v-loading="loading" :data="lineCoinnetworkList" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" align="center"/>
+                    <el-table-column type="selection" width="55" align="center" />
+                    <el-table-column label="网络名称" prop="networkName" align="center" />
+                    <el-table-column label="最小提现金额" prop="minWithdrawal" align="center" />
+                    <el-table-column label="手续费" prop="fee" align="center" />
+                    <el-table-column label="状态" prop="status" align="center">
+                        <template slot-scope="scope">
+                            {{ scope.row.status == 1 ? '启用' : '禁用' }}
+                        </template>
+                    </el-table-column>
                     <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                         <template slot-scope="scope">
-                         <el-popconfirm
-                           class="delete-popconfirm"
-                           title="确认要修改吗?"
-                           confirm-button-text="修改"
-                           @confirm="handleUpdate(scope.row)"
-                         >
-                           <el-button
-                             slot="reference"
-                             v-permisaction="['admin:lineCoinnetwork:edit']"
-                             size="mini"
-                             type="text"
-                             icon="el-icon-edit"
-                           >修改
-                           </el-button>
-                         </el-popconfirm>
-                         <el-popconfirm
-                            class="delete-popconfirm"
-                            title="确认要删除吗?"
-                            confirm-button-text="删除"
-                            @confirm="handleDelete(scope.row)"
-                         >
-                            <el-button
-                              slot="reference"
-                              v-permisaction="['admin:lineCoinnetwork:remove']"
-                              size="mini"
-                              type="text"
-                              icon="el-icon-delete"
-                            >删除
-                            </el-button>
-                         </el-popconfirm>
+                            <el-popconfirm class="delete-popconfirm" title="确认要修改吗?" confirm-button-text="修改"
+                                @confirm="handleUpdate(scope.row)">
+                                <el-button slot="reference" v-permisaction="['admin:lineCoinnetwork:edit']" size="mini"
+                                    type="text" icon="el-icon-edit">修改
+                                </el-button>
+                            </el-popconfirm>
+                            <el-popconfirm class="delete-popconfirm" title="确认要删除吗?" confirm-button-text="删除"
+                                @confirm="handleDelete(scope.row)">
+                                <el-button slot="reference" v-permisaction="['admin:lineCoinnetwork:remove']"
+                                    size="mini" type="text" icon="el-icon-delete">删除
+                                </el-button>
+                            </el-popconfirm>
                         </template>
                     </el-table-column>
                 </el-table>
 
-                <pagination
-                        v-show="total>0"
-                        :total="total"
-                        :page.sync="queryParams.pageIndex"
-                        :limit.sync="queryParams.pageSize"
-                        @pagination="getList"
-                />
+                <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageIndex"
+                    :limit.sync="queryParams.pageSize" @pagination="getList" />
 
                 <!-- 添加或修改对话框 -->
                 <el-dialog :title="title" :visible.sync="open" width="500px">
-                    <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-                        
-                                    <el-form-item label="网络名称" prop="networkName">
-                                        <el-input v-model="form.networkName" placeholder="网络名称"
-                                                      />
-                                    </el-form-item>
-                                    <el-form-item label="网络token名称" prop="tokenName">
+                    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+
+                        <el-form-item label="网络名称" prop="networkName">
+                            <el-input v-model="form.networkName" placeholder="网络名称" />
+                        </el-form-item>
+                        <el-form-item label="最小提现金额" prop="minWithdrawal">
+                            <el-input v-model="form.minWithdrawal" placeholder="最小提现金额"></el-input>
+                        </el-form-item>
+                        <!-- <el-form-item label="网络token名称" prop="tokenName">
                                         <el-input v-model="form.tokenName" placeholder="网络token名称"
                                                       />
-                                    </el-form-item>
-                                    <el-form-item label="充值区块确认数" prop="arrivalNum">
+                                    </el-form-item> -->
+                        <!-- <el-form-item label="充值区块确认数" prop="arrivalNum">
                                         <el-input v-model="form.arrivalNum" placeholder="充值区块确认数"
                                                       />
                                     </el-form-item>
@@ -115,11 +84,15 @@
                                     <el-form-item label="提现确认平均时间，单位分钟" prop="unlockTime">
                                         <el-input v-model="form.unlockTime" placeholder="提现确认平均时间，单位分钟"
                                                       />
-                                    </el-form-item>
-                                    <el-form-item label="网络手续费，该字段是动态的，后面会有服务定时更新该字段" prop="fee">
-                                        <el-input v-model="form.fee" placeholder="网络手续费，该字段是动态的，后面会有服务定时更新该字段"
-                                                      />
-                                    </el-form-item>
+                                    </el-form-item> -->
+                        <el-form-item label="手续费(百分比)" prop="fee">
+                            <el-input v-model="form.fee" placeholder="手续费(百分比)" />
+                        </el-form-item>
+                        <el-form-item label="状态" prop="status">
+                            <el-switch v-model="form.status" active-text="启用" :active-value="1" :inactive-value="2"
+                                inactive-text="禁用">
+                            </el-switch>
+                        </el-form-item>
                     </el-form>
                     <div slot="footer" class="dialog-footer">
                         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -132,174 +105,182 @@
 </template>
 
 <script>
-    import {addLineCoinnetwork, delLineCoinnetwork, getLineCoinnetwork, listLineCoinnetwork, updateLineCoinnetwork} from '@/api/admin/line-coinnetwork'
-    
-    export default {
-        name: 'LineCoinnetwork',
-        components: {
-        },
-        data() {
-            return {
-                // 遮罩层
-                loading: true,
-                // 选中数组
-                ids: [],
-                // 非单个禁用
-                single: true,
-                // 非多个禁用
-                multiple: true,
-                // 总条数
-                total: 0,
-                // 弹出层标题
-                title: '',
-                // 是否显示弹出层
-                open: false,
-                isEdit: false,
-                // 类型数据字典
-                typeOptions: [],
-                lineCoinnetworkList: [],
-                
-                // 关系表类型
-                
-                // 查询参数
-                queryParams: {
-                    pageIndex: 1,
-                    pageSize: 10,
-                    
-                },
-                // 表单参数
-                form: {
-                },
-                // 表单校验
-                rules: {}
+import { addLineCoinnetwork, delLineCoinnetwork, getLineCoinnetwork, listLineCoinnetwork, updateLineCoinnetwork } from '@/api/admin/line-coinnetwork'
+
+export default {
+    name: 'LineCoinnetwork',
+    components: {
+    },
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 总条数
+            total: 0,
+            // 弹出层标题
+            title: '',
+            // 是否显示弹出层
+            open: false,
+            isEdit: false,
+            // 类型数据字典
+            typeOptions: [],
+            lineCoinnetworkList: [],
+            statusOptions: [{
+                label: "启用",
+                value: 1
+            }, {
+                label: "禁用",
+                value: 2
+            }],
+            // 关系表类型
+
+            // 查询参数
+            queryParams: {
+                pageIndex: 1,
+                pageSize: 10,
+                idOrder:"desc",
+            },
+            // 表单参数
+            form: {
+            },
+            // 表单校验
+            rules: {
+                networkName: [{ required: true, message: '网络名称不能为空', trigger: 'blur' }],
+                minWithdrawal: [{ required: true, message: '最小提现金额不能为空', trigger: 'blur' }],
+                fee: [{ required: true, message: '手续费不能为空', trigger: 'blur' }],
+            }
         }
+    },
+    created() {
+        this.getList()
+    },
+    methods: {
+        /** 查询参数列表 */
+        getList() {
+            this.loading = true
+            listLineCoinnetwork(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+                this.lineCoinnetworkList = response.data.list
+                this.total = response.data.count
+                this.loading = false
+            }
+            )
         },
-        created() {
-            this.getList()
-            },
-        methods: {
-            /** 查询参数列表 */
-            getList() {
-                this.loading = true
-                listLineCoinnetwork(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-                        this.lineCoinnetworkList = response.data.list
-                        this.total = response.data.count
-                        this.loading = false
-                    }
-                )
-            },
-            // 取消按钮
-            cancel() {
-                this.open = false
-                this.reset()
-            },
-            // 表单重置
-            reset() {
-                this.form = {
-                
+        // 取消按钮
+        cancel() {
+            this.open = false
+            this.reset()
+        },
+        // 表单重置
+        reset() {
+            this.form = {
+
                 id: undefined,
                 networkName: undefined,
-                tokenName: undefined,
-                arrivalNum: undefined,
-                unlockNum: undefined,
-                unlockTime: undefined,
+                status: 1,
+                minWithdrawal: undefined,
                 fee: undefined,
             }
-                this.resetForm('form')
-            },
-            getImgList: function() {
-              this.form[this.fileIndex] = this.$refs['fileChoose'].resultList[0].fullUrl
-            },
-            fileClose: function() {
-              this.fileOpen = false
-            },
-            // 关系
-            // 文件
-            /** 搜索按钮操作 */
-            handleQuery() {
-                this.queryParams.pageIndex = 1
-                this.getList()
-            },
-            /** 重置按钮操作 */
-            resetQuery() {
-                this.dateRange = []
-                this.resetForm('queryForm')
-                this.handleQuery()
-            },
-            /** 新增按钮操作 */
-            handleAdd() {
-                this.reset()
-                this.open = true
-                this.title = '添加【币种网络】'
-                this.isEdit = false
-            },
-            // 多选框选中数据
-            handleSelectionChange(selection) {
-                this.ids = selection.map(item => item.id)
-                this.single = selection.length !== 1
-                this.multiple = !selection.length
-            },
-            /** 修改按钮操作 */
-            handleUpdate(row) {
-                this.reset()
-                const id =
+            this.resetForm('form')
+        },
+        getImgList: function () {
+            this.form[this.fileIndex] = this.$refs['fileChoose'].resultList[0].fullUrl
+        },
+        fileClose: function () {
+            this.fileOpen = false
+        },
+        // 关系
+        // 文件
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageIndex = 1
+            this.getList()
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.dateRange = []
+            this.resetForm('queryForm')
+            this.handleQuery()
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.reset()
+            this.open = true
+            this.title = '添加【币种网络】'
+            this.isEdit = false
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map(item => item.id)
+            this.single = selection.length !== 1
+            this.multiple = !selection.length
+        },
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            this.reset()
+            const id =
                 row.id || this.ids
-                getLineCoinnetwork(id).then(response => {
-                    this.form = response.data
-                    this.open = true
-                    this.title = '修改【币种网络】'
-                    this.isEdit = true
-                })
-            },
-            /** 提交按钮 */
-            submitForm: function () {
-                this.$refs['form'].validate(valid => {
-                    if (valid) {
-                        if (this.form.id !== undefined) {
-                            updateLineCoinnetwork(this.form).then(response => {
-                                if (response.code === 200) {
-                                    this.msgSuccess(response.msg)
-                                    this.open = false
-                                    this.getList()
-                                } else {
-                                    this.msgError(response.msg)
-                                }
-                            })
-                        } else {
-                            addLineCoinnetwork(this.form).then(response => {
-                                if (response.code === 200) {
-                                    this.msgSuccess(response.msg)
-                                    this.open = false
-                                    this.getList()
-                                } else {
-                                    this.msgError(response.msg)
-                                }
-                            })
-                        }
+            getLineCoinnetwork(id).then(response => {
+                this.form = response.data
+                this.open = true
+                this.title = '修改【币种网络】'
+                this.isEdit = true
+            })
+        },
+        /** 提交按钮 */
+        submitForm: function () {
+            this.$refs['form'].validate(valid => {
+                if (valid) {
+                    if (this.form.id !== undefined) {
+                        updateLineCoinnetwork(this.form).then(response => {
+                            if (response.code === 200) {
+                                this.msgSuccess(response.msg)
+                                this.open = false
+                                this.getList()
+                            } else {
+                                this.msgError(response.msg)
+                            }
+                        })
+                    } else {
+                        addLineCoinnetwork(this.form).then(response => {
+                            if (response.code === 200) {
+                                this.msgSuccess(response.msg)
+                                this.open = false
+                                this.getList()
+                            } else {
+                                this.msgError(response.msg)
+                            }
+                        })
                     }
-                })
-            },
-            /** 删除按钮操作 */
-            handleDelete(row) {
-                var Ids = (row.id && [row.id]) || this.ids
+                }
+            })
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            var Ids = (row.id && [row.id]) || this.ids
 
-                this.$confirm('是否确认删除编号为"' + Ids + '"的数据项?', '警告', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(function () {
-                      return delLineCoinnetwork( { 'ids': Ids })
-                }).then((response) => {
-                   if (response.code === 200) {
-                     this.msgSuccess(response.msg)
-                     this.open = false
-                     this.getList()
-                   } else {
-                     this.msgError(response.msg)
-                   }
-                }).catch(function () {
-                })
-            }
+            this.$confirm('是否确认删除编号为"' + Ids + '"的数据项?', '警告', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(function () {
+                return delLineCoinnetwork({ 'ids': Ids })
+            }).then((response) => {
+                if (response.code === 200) {
+                    this.msgSuccess(response.msg)
+                    this.open = false
+                    this.getList()
+                } else {
+                    this.msgError(response.msg)
+                }
+            }).catch(function () {
+            })
         }
     }
+}
 </script>
diff --git a/src/views/admin/line-pre-order/AddPosition.vue b/src/views/admin/line-pre-order/AddPosition.vue
new file mode 100644
index 0000000..e0e709d
--- /dev/null
+++ b/src/views/admin/line-pre-order/AddPosition.vue
@@ -0,0 +1,429 @@
+<template>
+    <el-dialog :title="title" :visible.sync="open" width="1200px" :close-on-click-modal="false">
+        <el-form ref="form" :model="form" :rules="rules" label-width="180px" style="height: 600px;overflow: hidden auto;">
+              <el-form-item label="交易所" prop="exchange_type">
+                <el-select
+                  v-model="form.exchange_type"
+                  style="width: 100%;"
+                  placeholder="请选择交易所"
+                  clearable
+                  filterable
+                  size="small"
+                  @change="onchangeForm"
+                >
+                  <el-option
+                    v-for="dict in exchangeTypes"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="订单类型" prop="symbol_type">
+                <el-radio-group v-model="form.symbol_type">
+                  <el-radio :label="1">现货</el-radio>
+                  <el-radio :label="2">合约</el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <!-- <el-form-item label="对冲类型" prop="cover_type">
+              <el-radio-group v-model="form.cover_type">
+                <el-radio :label="0">无对冲</el-radio>
+                <el-radio :label="1" :disabled="form.symbol_type==2">现货对合约</el-radio>
+                <el-radio :label="2" :disabled="form.symbol_type==1">合约对合约</el-radio>
+                <el-radio :label="3" :disabled="form.symbol_type==1">合约对现货</el-radio>
+              </el-radio-group>
+            </el-form-item> -->
+              <el-form-item label="api用户" prop="api_id">
+                <el-row>
+                  <el-col :span="21">
+                    <el-select
+                      v-model="form.api_id"
+                      multiple
+                      style="width: 100%;"
+                      placeholder="请选择api用户"
+                      clearable
+                      filterable
+                      size="small"
+                    >
+                      <el-option
+                        v-for="dict in lineUsers"
+                        :key="dict.id"
+                        :label="dict.apiName"
+                        :value="dict.id"
+                      />
+                    </el-select>
+                  </el-col>
+                  <el-col :span="3">
+                    <el-button size="mini" type="primary" style="margin-left: 10px;" @click="onSelectAll">全选</el-button>
+                  </el-col>
+                </el-row>
+              </el-form-item>
+              <!-- <el-form-item label="交易对组id" prop="groupId">
+              <el-input
+                v-model="form.groupId"
+                placeholder="交易对组id"
+              />
+            </el-form-item> -->
+              <el-form-item v-if="title==='批量添加'" label="交易对组" prop="symbol_group_id">
+                <el-select
+                  v-if="title==='批量添加'"
+                  v-model="form.symbol_group_id"
+                  style="width: 100%;"
+                  placeholder="请选择交易对组"
+                  clearable
+                  size="small"
+                  filterable
+                >
+                  <el-option
+                    v-for="dict in comSymbols"
+                    :key="dict.id"
+                    :label="dict.groupName"
+                    :value="dict.id"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item v-else label="交易对" prop="symbol">
+                <el-select
+                  v-model="form.symbol"
+                  style="width: 100%;"
+                  placeholder="请选择交易对"
+                  clearable
+                  filterable
+                  :remote-method="getSymbol"
+                  :loading="searchLoding"
+                  remote
+                  size="small"
+                  @change="onchangeSymbol"
+                >
+                  <el-option
+                    v-for="dict in comSymbols"
+                    :key="dict.id || dict.symbol"
+                    :label="dict.symbol"
+                    :value="dict.symbol"
+                  />
+                  <div class="page">
+                    <pagination
+                      v-show="symbol.total>0"
+                      :background="false"
+                      :total="symbol.total"
+                      layout="prev, pager, next"
+                      :page.sync="symbol.pageIndex"
+                      :limit.sync="symbol.pageSize"
+                      @pagination="getSymbol"
+                    />
+                  </div>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="购买方向" prop="site">
+                <el-radio-group v-model="form.site">
+                  <el-radio label="BUY">买（多）</el-radio>
+                  <el-radio label="SELL" :disabled="form.order_type==1">卖（空）</el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item label="购买金额（U）" prop="buy_price">
+                <el-input
+                  v-model="form.buy_price"
+                  placeholder="购买金额（U）"
+                />
+              </el-form-item>
+              <el-form-item label="价格模式" prop="price_pattern">
+                <el-radio-group v-model="form.price_pattern">
+                  <el-radio label="percentage">百分比</el-radio>
+                  <el-radio label="mixture" :disabled="title==='批量添加'">主单实价委托百分比</el-radio>
+                  <el-radio label="aicoin" :disabled="title==='批量添加'">aiCoin买入点</el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item v-if="form.price_pattern === 'percentage'" label="下单百分比" prop="price">
+                <el-input
+                  v-model="form.price"
+                  placeholder="下单百分比"
+                />
+              </el-form-item>
+              <el-row v-else type="flex">
+                <el-col :span="14">
+                  <el-form-item label="下单价(实际价格)" prop="price">
+                    <el-input
+                      v-model="form.price"
+                      placeholder="下单价(实际价格)"
+                    >
+                      <template #prepend>
+                        <el-select v-if="form.price_pattern === 'aicoin'" v-model="aicoinPrice" placeholder="请选择" style="width: 150px;" @change="onchangeAicoin">
+                          <el-option v-for="o in JSON.stringify(aicoins) !== '{}' ? options : []" :key="o.label" :label="o.label" :value="aicoins[o.value] || ''">
+                            <span style="float: left">{{ o.label }}</span>
+                            <span style="float: right">{{ aicoins[o.value] || 0 }}</span>
+                          </el-option>
+                        </el-select>
+                      </template>
+                      <template #append>
+                        <span v-if="form.price_pattern !== 'percentage'">{{ comPrice }}</span>
+                      </template>
+                    </el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="5">
+                  <el-form-item label="计算百分比">
+                    <el-inputNumber v-model="percenter" controls-position="right" :min="0" style="width: 100px;" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="5">
+                  <el-button type="primary" style="margin-left: 50px;" @click="onCalc">计算</el-button>
+                </el-col>
+              </el-row>
+              <el-form-item label="止盈百分比" prop="profit">
+                <el-input
+                  v-model="form.profit"
+                  placeholder="止盈百分比"
+                />
+              </el-form-item>
+              <!-- <el-form-item label="亏损百分比" prop="stop_price">
+              <el-input
+                v-model="form.stop_price"
+                placeholder="亏损百分比"
+              />
+            </el-form-item> -->
+              <!-- <template v-if="form.cover_type!=0">
+              <el-form-item label="对冲单购买类型" prop="hedge_buy_type">
+                <el-radio-group v-model="form.hedge_buy_type">
+                  <el-radio :label="1">百分比</el-radio>
+                  <el-radio :label="2">实际金额</el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item label="对冲总购买金额" prop="HedgeBuyTotal">
+                <el-input
+                  v-model.number="form.HedgeBuyTotal"
+                  type="number"
+                  placeholder="对冲总购买金额"
+                />
+              </el-form-item>
+              <el-form-item label="对冲止盈百分比" prop="HedgeTakeProfit">
+                <el-input
+                  v-model.number="form.HedgeTakeProfit"
+                  type="number"
+                  placeholder="对冲止盈百分比"
+                />
+              </el-form-item>
+              <el-form-item label="对冲止损百分比" prop="HedgeStopLoss">
+                <el-input
+                  v-model.number="form.HedgeStopLoss"
+                  type="number"
+                  placeholder="对冲止损百分比
+"
+                />
+              </el-form-item>
+            </template> -->
+              <!-- <el-form-item label="对冲百分比" prop="cover_rate">
+              <el-input
+                v-model="form.cover_rate"
+                placeholder="对冲百分比"
+              />
+            </el-form-item>
+            <el-form-item label="加仓后盈利比例" prop="profit_rate">
+              <el-input
+                v-model="form.profit_rate"
+                placeholder="加仓后盈利比例"
+              />
+            </el-form-item>
+            <el-form-item label="对冲平仓最大次数" prop="hedge_close_count">
+              <el-input
+                v-model.number="form.hedge_close_count"
+                type="number"
+                placeholder="对冲平仓最大次数"
+              />
+            </el-form-item>
+            <el-form-item label="随机对冲百分比" prop="hedge_trigger_percent">
+              <el-row :gutter="20">
+                <el-col :span="11"><el-input v-model.number="form.hedge_trigger_percent" type="number" placeholder="最小值"><template #append>最小值</template></el-input></el-col>
+                <el-col :span="11"><el-input v-model.number="form.hedge_trigger_percent_max" type="number" placeholder="最大值"><template #append>最大值</template></el-input></el-col>
+              </el-row>
+            </el-form-item> -->
+              <el-form-item label="主单类型" prop="main_order_type">
+                <el-radio-group v-model="form.main_order_type">
+                  <el-radio label="LIMIT">限价</el-radio>
+                  <el-radio label="MARKET">市价</el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <!-- <el-form-item label="对冲单下单类型" prop="hedge_order_type">
+              <el-radio-group v-model="form.hedge_order_type">
+                <el-radio label="LIMIT">限价</el-radio>
+                <el-radio label="MARKET">市价</el-radio>
+              </el-radio-group>
+            </el-form-item> -->
+              <!-- <el-form-item label="加仓主单类型" prop="add_position_main_type">
+              <el-radio-group v-model="form.add_position_main_type">
+                <el-radio label="LIMIT">限价</el-radio>
+                <el-radio label="MARKET">市价</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="加仓对冲单类型" prop="add_position_hedge_type">
+              <el-radio-group v-model="form.add_position_hedge_type">
+                <el-radio label="LIMIT">限价</el-radio>
+                <el-radio label="MARKET">市价</el-radio>
+              </el-radio-group>
+            </el-form-item> -->
+              <el-form-item label="对标价类型" prop="price_type">
+                <el-radio-group v-model="form.price_type">
+                  <el-radio label="new">最新价</el-radio>
+                  <el-radio label="mixture" :disabled="title==='批量添加'">标记价</el-radio>
+                  <el-radio label="aicoin" :disabled="title==='批量添加'">aicoin</el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item label="订单过期时间" prop="profit_rate">
+                <el-input
+                  v-model.number="form.expire_hour"
+                  class="hour"
+                  type="number"
+                  placeholder="订单过期时间"
+                >
+                  <template slot="append">小时</template>
+                </el-input>
+              </el-form-item>
+              <el-form-item v-if="title==='批量添加'" label="批量下单次数" prop="order_num">
+                <el-input
+                  v-model.number="form.order_num"
+                  min="1"
+                  type="number"
+                  placeholder="批量下单次数"
+                />
+              </el-form-item>
+              <el-form-item v-if="title==='批量添加'" label="执行类型" prop="script">
+                <el-radio-group v-model="form.script">
+                  <el-radio label="1"><span>脚本执行</span></el-radio>
+                  <el-radio label="0">直接执行</el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item label="主单亏损百分比" prop="reduce_price">
+                <el-input v-model.number="form.reduce_price" type="number" placeholder="主单亏损百分比" />
+              </el-form-item>
+              <el-form-item label="主单减仓数量百分比" prop="reduce_num">
+                <el-input v-model.number="form.reduce_num" type="number" placeholder="主单减仓数量百分比" />
+              </el-form-item>
+              <el-form-item label="主单减仓后止盈价百分比" prop="reduce_take_profit">
+                <el-input v-model.number="form.reduce_take_profit" type="number" placeholder="主单减仓后止盈价百分比">
+                  <template v-if="title!=='批量添加'" #append>{{ re_take_profit_ratio }}</template>
+                </el-input>
+              </el-form-item>
+              <el-form-item label="主单减仓后止损价百分比" prop="reduce_stop_price">
+                <el-input v-model.number="form.reduce_stop_price" type="number" placeholder="主单减仓后止损价百分比" />
+              </el-form-item>
+              <el-row>
+                <el-col :span="4"><el-form-item label="主单加仓配置" /></el-col>
+                <el-col :span="2"><el-button type="primary" size="mini" @click="onAddExt(0)">新增</el-button></el-col>
+                <el-col v-if="title!=='批量添加'" :span="2"><el-button type="primary" size="mini" :disabled="form.ext && form.ext.length===0" @click="onCalculate">计算</el-button></el-col>
+              </el-row>
+              <div v-for="(item,index) in form.ext" :key="index" class="exts">
+                <el-row :gutter="20">
+                  <el-col :span="5">
+                    <div style="margin-bottom: 8px;">加仓类型</div>
+                    <el-radio-group v-model="item.addPositionOrderType" size="mini">
+                      <el-radio label="LIMIT">限价</el-radio>
+                      <el-radio label="MARKET">市价</el-radio>
+                    </el-radio-group>
+                  </el-col>
+                  <el-col :span="5">
+                    <div style="margin-bottom: 8px;">加仓方式</div>
+                    <el-radio-group v-model="item.addPositionType" size="mini">
+                      <el-radio :label="1">百分比</el-radio>
+                      <el-radio :label="2">实际金额</el-radio>
+                    </el-radio-group>
+                  </el-col>
+                  <el-col :span="5">加仓下跌百分比<el-input v-model.number="item.addPositionPriceRatio" size="mini" type="number" placeholder="加仓下跌百分比" /></el-col>
+                  <el-col :span="5">加仓数值<el-input v-model.number="item.addPositionVal" size="mini" type="number" placeholder="加仓数值" /></el-col>
+                  <el-col :span="4">加仓后止盈价百分比<el-input v-model.number="item.takeProfitRatio" size="mini" type="number" placeholder="止盈百分比">
+                    <template v-if="title!=='批量添加'" #append>{{ ext[index] ? ext[index].reTakeProfitRatio : 0 }}</template>
+                  </el-input></el-col>
+                </el-row>
+                <el-row :gutter="20" style="margin-top: 10px;">
+                  <el-col :span="5">减仓下跌百分比<el-input v-model.number="item.reducePriceRatio" size="mini" type="number" placeholder="减仓下跌百分比" /></el-col>
+                  <el-col :span="5">减仓数量百分比<el-input v-model.number="item.reduceNumRatio" size="mini" type="number" placeholder="减仓数量百分比" /></el-col>
+                  <el-col :span="5">减仓后止盈价百分比<el-input v-model.number="item.reduceTakeProfitRatio" size="mini" type="number" placeholder="减仓后止盈百分比">
+                    <template v-if="title!=='批量添加'" #append>{{ ext[index] ? ext[index].reduceReTakeProfitRatio : 0 }}</template>
+                  </el-input></el-col>
+                  <el-col :span="5">减仓后止损价百分比<el-input v-model.number="item.reduceStopLossRatio" size="mini" type="number" placeholder="减仓后止损百分比" /></el-col>
+                  <el-col :span="4"><div style="margin-bottom: 14px;" /><el-button size="mini" type="danger" @click="onAddExt(1,index)">删除</el-button></el-col>
+                </el-row>
+              </div>
+              <el-form-item label="是否保存模板" prop="save_template">
+                <el-radio-group v-model="form.save_template">
+                  <el-radio label="0">否</el-radio>
+                  <el-radio label="1">保存并下单</el-radio>
+                  <el-radio label="2">仅保存模板</el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item label="模板名称" prop="template_name">
+                <el-input
+                  v-model="form.template_name"
+                  placeholder="模板名称"
+                />
+              </el-form-item>
+
+            </el-form>
+        <div slot="footer" class="dialog-footer" style="text-align: right;">
+            <el-button type="primary" @click="submitForm">确 定</el-button>
+            <el-button @click="cancel">取 消</el-button>
+        </div>
+    </el-dialog>
+</template>
+
+<script>
+import { resetForm } from '@/utils/costum';
+
+export default {
+    name: "AddPosition",
+    props: {
+        open: {
+            type: Boolean,
+            default: false
+        }
+    },
+    data() {
+        return {
+            form:{},
+      options: [
+        { label: '买入点1', value: 'buyPoint1' },
+        { label: '买入点2', value: 'buyPoint2' },
+        { label: '买入点3', value: 'buyPoint3' },
+        { label: '卖出点1', value: 'sellPoint1' },
+        { label: '卖出点2', value: 'sellPoint2' },
+        { label: '卖出点3', value: 'sellPoint3' }
+      ],
+      buyer: [
+        { v: 'BUY', l: '买（多）' },
+        { v: 'SELL', l: '卖（空）' }
+      ],
+        }
+    },
+    methods: {
+        resetForm(){
+            this.form={
+                id:null,
+                exchangeType:"",
+                orderType:1,
+                symbol:"",
+                apiId:null,
+                site:'',
+                buyPrice:null,
+                pricePattern:'',
+                price:null,
+                profit:null,
+                addPositionOrderType:'LIMIT',
+                priceType:null,
+                reTakeProfitRatio:null,
+                reducePriceRatio:null,
+                reduceNumRatio:null,
+                reduceTakeProfitRatio:null,
+                reduceStopLossRatio:null,
+            }
+        },
+        //提交
+        submitForm() {
+
+        },
+        //取消
+        cancel() {
+            this.$emit("update:open", false)
+        }
+    }
+}
+</script>
+
+<style scoped></style>
\ No newline at end of file
diff --git a/src/views/admin/member-renwa-log/index.vue b/src/views/admin/member-renwa-log/index.vue
index a7f736f..68525b3 100644
--- a/src/views/admin/member-renwa-log/index.vue
+++ b/src/views/admin/member-renwa-log/index.vue
@@ -1,10 +1,9 @@
-
 <template>
     <BasicLayout>
         <template #wrapper>
             <el-card class="box-card">
                 <el-form ref="queryForm" :model="queryParams" :inline="true" label-width="68px">
-                    
+
                     <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>
@@ -12,7 +11,7 @@
                 </el-form>
 
                 <el-row :gutter="10" class="mb8">
-                    <el-col :span="1.5">
+                    <!-- <el-col :span="1.5">
                         <el-button
                                 v-permisaction="['admin:memberRenwaLog:add']"
                                 type="primary"
@@ -21,8 +20,8 @@
                                 @click="handleAdd"
                         >新增
                         </el-button>
-                    </el-col>
-                    <el-col :span="1.5">
+                    </el-col> -->
+                    <!-- <el-col :span="1.5">
                         <el-button
                                 v-permisaction="['admin:memberRenwaLog:edit']"
                                 type="success"
@@ -32,125 +31,96 @@
                                 @click="handleUpdate"
                         >修改
                         </el-button>
-                    </el-col>
+                    </el-col> -->
                     <el-col :span="1.5">
-                        <el-button
-                                v-permisaction="['admin:memberRenwaLog:remove']"
-                                type="danger"
-                                icon="el-icon-delete"
-                                size="mini"
-                                :disabled="multiple"
-                                @click="handleDelete"
-                        >删除
+                        <el-button v-permisaction="['admin:memberRenwaLog:remove']" type="danger" icon="el-icon-delete"
+                            size="mini" :disabled="multiple" @click="handleDelete">删除
                         </el-button>
                     </el-col>
                 </el-row>
 
                 <el-table v-loading="loading" :data="memberRenwaLogList" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" align="center"/><el-table-column label="续期套餐名称" align="center" prop="renwalName"
-                                                 :show-overflow-tooltip="true"/><el-table-column label="续期时长(天数)" align="center" prop="renwalDuration"
-                                                 :show-overflow-tooltip="true"/><el-table-column label="订单状态(member_renwal_log_status)" align="center" prop="status"
-                                                 :formatter="statusFormat" width="100">
-                                    <template slot-scope="scope">
-                                        {{ statusFormat(scope.row) }}
-                                    </template>
-                                </el-table-column><el-table-column label="应付金额" align="center" prop="payableAmount"
-                                                 :show-overflow-tooltip="true"/><el-table-column label="实付金额" align="center" prop="actualPaymentAmount"
-                                                 :show-overflow-tooltip="true"/><el-table-column label="付款地址" align="center" prop="fromAddress"
-                                                 :show-overflow-tooltip="true"/><el-table-column label="代币" align="center" prop="coin"
-                                                 :show-overflow-tooltip="true"/><el-table-column label="支付时间" align="center" prop="paymentTime"
-                                                 :show-overflow-tooltip="true">
-                                    <template slot-scope="scope">
-                                    <span>{{ parseTime(scope.row.paymentTime) }}</span>
-                                    </template>
-                                </el-table-column>
+                    <el-table-column type="selection" width="55" align="center" />
+
+                    <el-table-column label="昵称" align="center" prop="nickName" :show-overflow-tooltip="true" />
+                    <el-table-column label="续期套餐名称" align="center" prop="renwalName"
+                        :show-overflow-tooltip="true" /><el-table-column label="续期时长(天数)" align="center"
+                        prop="renwalDuration" :show-overflow-tooltip="true" /><el-table-column label="订单状态"
+                        align="center" prop="status" :formatter="statusFormat" width="100">
+                        <template slot-scope="scope">
+                            {{ statusFormat(scope.row.status) }}
+                        </template>
+                    </el-table-column><el-table-column label="应付金额" align="center" prop="payableAmount"
+                        :show-overflow-tooltip="true" />
+                    <el-table-column label="实付金额" align="center" prop="actualPaymentAmount"
+                        :show-overflow-tooltip="true" />
+                    <el-table-column label="付款地址" align="center" prop="fromAddress" :show-overflow-tooltip="true" />
+                    <el-table-column label="代币" align="center" prop="coin" :show-overflow-tooltip="true" />
+
+                    <el-table-column label="创建时间" align="center" prop="createdAt" :show-overflow-tooltip="true">
+                        <template slot-scope="scope">
+                            <span>{{ parseTime(scope.row.createdAt) }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="支付时间" align="center" prop="paymentTime" :show-overflow-tooltip="true">
+                        <template slot-scope="scope">
+                            <span>{{ parseTime(scope.row.paymentTime) }}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                         <template slot-scope="scope">
-                         <el-popconfirm
-                           class="delete-popconfirm"
-                           title="确认要修改吗?"
-                           confirm-button-text="修改"
-                           @confirm="handleUpdate(scope.row)"
-                         >
-                           <el-button
-                             slot="reference"
-                             v-permisaction="['admin:memberRenwaLog:edit']"
-                             size="mini"
-                             type="text"
-                             icon="el-icon-edit"
-                           >修改
-                           </el-button>
-                         </el-popconfirm>
-                         <el-popconfirm
-                            class="delete-popconfirm"
-                            title="确认要删除吗?"
-                            confirm-button-text="删除"
-                            @confirm="handleDelete(scope.row)"
-                         >
-                            <el-button
-                              slot="reference"
-                              v-permisaction="['admin:memberRenwaLog:remove']"
-                              size="mini"
-                              type="text"
-                              icon="el-icon-delete"
-                            >删除
-                            </el-button>
-                         </el-popconfirm>
+                            <!-- <el-popconfirm class="delete-popconfirm" title="确认要修改吗?" confirm-button-text="修改"
+                                @confirm="handleUpdate(scope.row)">
+                                <el-button slot="reference" v-permisaction="['admin:memberRenwaLog:edit']" size="mini"
+                                    type="text" icon="el-icon-edit">修改
+                                </el-button>
+                            </el-popconfirm> -->
+                            <el-popconfirm v-if="scope.row.status == 'expired'" class="delete-popconfirm" title="确认要删除吗?"
+                                confirm-button-text="删除" @confirm="handleDelete(scope.row)">
+                                <el-button slot="reference" v-permisaction="['admin:memberRenwaLog:remove']" size="mini"
+                                    type="text" icon="el-icon-delete">删除
+                                </el-button>
+                            </el-popconfirm>
                         </template>
                     </el-table-column>
                 </el-table>
 
-                <pagination
-                        v-show="total>0"
-                        :total="total"
-                        :page.sync="queryParams.pageIndex"
-                        :limit.sync="queryParams.pageSize"
-                        @pagination="getList"
-                />
+                <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageIndex"
+                    :limit.sync="queryParams.pageSize" @pagination="getList" />
 
                 <!-- 添加或修改对话框 -->
                 <el-dialog :title="title" :visible.sync="open" width="500px">
                     <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-                        
-                                    <el-form-item label="套餐id" prop="renwalId">
-                                        <el-input v-model="form.renwalId" placeholder="套餐id"
-                                                      />
-                                    </el-form-item>
-                                    <el-form-item label="续期套餐名称" prop="renwalName">
-                                        <el-input v-model="form.renwalName" placeholder="续期套餐名称"
-                                                      />
-                                    </el-form-item>
-                                    <el-form-item label="续期时长(天数)" prop="renwalDuration">
-                                        <el-input v-model="form.renwalDuration" placeholder="续期时长(天数)"
-                                                      />
-                                    </el-form-item>
-                                    <el-form-item label="订单状态(member_renwal_log_status)" prop="status">
-                                        <el-input v-model="form.status" placeholder="订单状态(member_renwal_log_status)"
-                                                      />
-                                    </el-form-item>
-                                    <el-form-item label="应付金额" prop="payableAmount">
-                                        <el-input v-model="form.payableAmount" placeholder="应付金额"
-                                                      />
-                                    </el-form-item>
-                                    <el-form-item label="实付金额" prop="actualPaymentAmount">
-                                        <el-input v-model="form.actualPaymentAmount" placeholder="实付金额"
-                                                      />
-                                    </el-form-item>
-                                    <el-form-item label="付款地址" prop="fromAddress">
-                                        <el-input v-model="form.fromAddress" placeholder="付款地址"
-                                                      />
-                                    </el-form-item>
-                                    <el-form-item label="代币" prop="coin">
-                                        <el-input v-model="form.coin" placeholder="代币"
-                                                      />
-                                    </el-form-item>
-                                    <el-form-item label="支付时间" prop="paymentTime">
-                                        <el-date-picker
-                                                    v-model="form.paymentTime"
-                                                    type="datetime"
-                                                    placeholder="选择日期">
-                                            </el-date-picker>
-                                    </el-form-item>
+
+                        <el-form-item label="套餐id" prop="renwalId">
+                            <el-input v-model="form.renwalId" placeholder="套餐id" />
+                        </el-form-item>
+                        <el-form-item label="续期套餐名称" prop="renwalName">
+                            <el-input v-model="form.renwalName" placeholder="续期套餐名称" />
+                        </el-form-item>
+                        <el-form-item label="续期时长(天数)" prop="renwalDuration">
+                            <el-input v-model="form.renwalDuration" placeholder="续期时长(天数)" />
+                        </el-form-item>
+                        <el-form-item label="订单状态" prop="status">
+                            {{ statusFormat(form.status) }}
+                            <el-input v-model="form.status" placeholder="订单状态(member_renwal_log_status)" />
+                        </el-form-item>
+                        <el-form-item label="应付金额" prop="payableAmount">
+                            <el-input v-model="form.payableAmount" placeholder="应付金额" />
+                        </el-form-item>
+                        <el-form-item label="实付金额" prop="actualPaymentAmount">
+                            <el-input v-model="form.actualPaymentAmount" placeholder="实付金额" />
+                        </el-form-item>
+                        <el-form-item label="付款地址" prop="fromAddress">
+                            <el-input v-model="form.fromAddress" placeholder="付款地址" />
+                        </el-form-item>
+                        <el-form-item label="代币" prop="coin">
+                            <el-input v-model="form.coin" placeholder="代币" />
+                        </el-form-item>
+                        <el-form-item label="支付时间" prop="paymentTime">
+                            <el-date-picker v-model="form.paymentTime" type="datetime" placeholder="选择日期">
+                            </el-date-picker>
+                        </el-form-item>
                     </el-form>
                     <div slot="footer" class="dialog-footer">
                         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -163,74 +133,74 @@
 </template>
 
 <script>
-    import {addMemberRenwaLog, delMemberRenwaLog, getMemberRenwaLog, listMemberRenwaLog, updateMemberRenwaLog} from '@/api/admin/member-renwa-log'
-    
-    export default {
-        name: 'MemberRenwaLog',
-        components: {
-        },
-        data() {
-            return {
-                // 遮罩层
-                loading: true,
-                // 选中数组
-                ids: [],
-                // 非单个禁用
-                single: true,
-                // 非多个禁用
-                multiple: true,
-                // 总条数
-                total: 0,
-                // 弹出层标题
-                title: '',
-                // 是否显示弹出层
-                open: false,
-                isEdit: false,
-                // 类型数据字典
-                typeOptions: [],
-                memberRenwaLogList: [],
-                statusOptions: [],
-                // 关系表类型
-                
-                // 查询参数
-                queryParams: {
-                    pageIndex: 1,
-                    pageSize: 10,
-                    
-                },
-                // 表单参数
-                form: {
-                },
-                // 表单校验
-                rules: {}
+import { addMemberRenwaLog, delMemberRenwaLog, getMemberRenwaLog, listMemberRenwaLog, updateMemberRenwaLog } from '@/api/admin/member-renwa-log'
+
+export default {
+    name: 'MemberRenwaLog',
+    components: {
+    },
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 总条数
+            total: 0,
+            // 弹出层标题
+            title: '',
+            // 是否显示弹出层
+            open: false,
+            isEdit: false,
+            // 类型数据字典
+            typeOptions: [],
+            memberRenwaLogList: [],
+            statusOptions: [],
+            // 关系表类型
+
+            // 查询参数
+            queryParams: {
+                pageIndex: 1,
+                pageSize: 10,
+                idOrder: "desc"
+            },
+            // 表单参数
+            form: {
+            },
+            // 表单校验
+            rules: {}
         }
+    },
+    created() {
+        this.getList()
+        this.getDicts('member_renwal_log_status').then(response => {
+            this.statusOptions = response.data
+        })
+    },
+    methods: {
+        /** 查询参数列表 */
+        getList() {
+            this.loading = true
+            listMemberRenwaLog(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+                this.memberRenwaLogList = response.data.list
+                this.total = response.data.count
+                this.loading = false
+            }
+            )
         },
-        created() {
-            this.getList()
-            this.getDicts('member_renwal_log_status').then(response => {
-                this.statusOptions = response.data
-            })
-            },
-        methods: {
-            /** 查询参数列表 */
-            getList() {
-                this.loading = true
-                listMemberRenwaLog(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-                        this.memberRenwaLogList = response.data.list
-                        this.total = response.data.count
-                        this.loading = false
-                    }
-                )
-            },
-            // 取消按钮
-            cancel() {
-                this.open = false
-                this.reset()
-            },
-            // 表单重置
-            reset() {
-                this.form = {
-                
+        // 取消按钮
+        cancel() {
+            this.open = false
+            this.reset()
+        },
+        // 表单重置
+        reset() {
+            this.form = {
+
                 id: undefined,
                 renwalId: undefined,
                 renwalName: undefined,
@@ -242,104 +212,104 @@
                 coin: undefined,
                 paymentTime: undefined,
             }
-                this.resetForm('form')
-            },
-            getImgList: function() {
-              this.form[this.fileIndex] = this.$refs['fileChoose'].resultList[0].fullUrl
-            },
-            fileClose: function() {
-              this.fileOpen = false
-            },
-            statusFormat(row) {
-                return this.selectDictLabel(this.statusOptions, row.status)
-            },
-            // 关系
-            // 文件
-            /** 搜索按钮操作 */
-            handleQuery() {
-                this.queryParams.pageIndex = 1
-                this.getList()
-            },
-            /** 重置按钮操作 */
-            resetQuery() {
-                this.dateRange = []
-                this.resetForm('queryForm')
-                this.handleQuery()
-            },
-            /** 新增按钮操作 */
-            handleAdd() {
-                this.reset()
-                this.open = true
-                this.title = '添加会员续期记录'
-                this.isEdit = false
-            },
-            // 多选框选中数据
-            handleSelectionChange(selection) {
-                this.ids = selection.map(item => item.id)
-                this.single = selection.length !== 1
-                this.multiple = !selection.length
-            },
-            /** 修改按钮操作 */
-            handleUpdate(row) {
-                this.reset()
-                const id =
+            this.resetForm('form')
+        },
+        getImgList: function () {
+            this.form[this.fileIndex] = this.$refs['fileChoose'].resultList[0].fullUrl
+        },
+        fileClose: function () {
+            this.fileOpen = false
+        },
+        statusFormat(status) {
+            return this.selectDictLabel(this.statusOptions, status)
+        },
+        // 关系
+        // 文件
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageIndex = 1
+            this.getList()
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.dateRange = []
+            this.resetForm('queryForm')
+            this.handleQuery()
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.reset()
+            this.open = true
+            this.title = '添加会员续期记录'
+            this.isEdit = false
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map(item => item.id)
+            this.single = selection.length !== 1
+            this.multiple = !selection.length
+        },
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            this.reset()
+            const id =
                 row.id || this.ids
-                getMemberRenwaLog(id).then(response => {
-                    this.form = response.data
-                    this.open = true
-                    this.title = '修改会员续期记录'
-                    this.isEdit = true
-                })
-            },
-            /** 提交按钮 */
-            submitForm: function () {
-                this.$refs['form'].validate(valid => {
-                    if (valid) {
-                        if (this.form.id !== undefined) {
-                            updateMemberRenwaLog(this.form).then(response => {
-                                if (response.code === 200) {
-                                    this.msgSuccess(response.msg)
-                                    this.open = false
-                                    this.getList()
-                                } else {
-                                    this.msgError(response.msg)
-                                }
-                            })
-                        } else {
-                            addMemberRenwaLog(this.form).then(response => {
-                                if (response.code === 200) {
-                                    this.msgSuccess(response.msg)
-                                    this.open = false
-                                    this.getList()
-                                } else {
-                                    this.msgError(response.msg)
-                                }
-                            })
-                        }
+            getMemberRenwaLog(id).then(response => {
+                this.form = response.data
+                this.open = true
+                this.title = '修改会员续期记录'
+                this.isEdit = true
+            })
+        },
+        /** 提交按钮 */
+        submitForm: function () {
+            this.$refs['form'].validate(valid => {
+                if (valid) {
+                    if (this.form.id !== undefined) {
+                        updateMemberRenwaLog(this.form).then(response => {
+                            if (response.code === 200) {
+                                this.msgSuccess(response.msg)
+                                this.open = false
+                                this.getList()
+                            } else {
+                                this.msgError(response.msg)
+                            }
+                        })
+                    } else {
+                        addMemberRenwaLog(this.form).then(response => {
+                            if (response.code === 200) {
+                                this.msgSuccess(response.msg)
+                                this.open = false
+                                this.getList()
+                            } else {
+                                this.msgError(response.msg)
+                            }
+                        })
                     }
-                })
-            },
-            /** 删除按钮操作 */
-            handleDelete(row) {
-                var Ids = (row.id && [row.id]) || this.ids
+                }
+            })
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            var Ids = (row.id && [row.id]) || this.ids
 
-                this.$confirm('是否确认删除编号为"' + Ids + '"的数据项?', '警告', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(function () {
-                      return delMemberRenwaLog( { 'ids': Ids })
-                }).then((response) => {
-                   if (response.code === 200) {
-                     this.msgSuccess(response.msg)
-                     this.open = false
-                     this.getList()
-                   } else {
-                     this.msgError(response.msg)
-                   }
-                }).catch(function () {
-                })
-            }
+            this.$confirm('是否确认删除编号为"' + Ids + '"的数据项?', '警告', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(function () {
+                return delMemberRenwaLog({ 'ids': Ids })
+            }).then((response) => {
+                if (response.code === 200) {
+                    this.msgSuccess(response.msg)
+                    this.open = false
+                    this.getList()
+                } else {
+                    this.msgError(response.msg)
+                }
+            }).catch(function () {
+            })
         }
     }
+}
 </script>
diff --git a/src/views/admin/member-renwal-config/index.vue b/src/views/admin/member-renwal-config/index.vue
index 7810ad6..5a8313c 100644
--- a/src/views/admin/member-renwal-config/index.vue
+++ b/src/views/admin/member-renwal-config/index.vue
@@ -87,11 +87,14 @@
 
                 <!-- 添加或修改对话框 -->
                 <el-dialog :title="title" :visible.sync="open" width="500px">
-                    <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+                    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
 
                         <el-form-item label="套餐名称" prop="packageName">
                             <el-input v-model="form.packageName" placeholder="套餐名称" />
                         </el-form-item>
+                        <el-form-item label="套餐名称(英文)" prop="packageNameEn">
+                            <el-input v-model="form.packageNameEn" placeholder="套餐名称(英文)" />
+                        </el-form-item>
                         <el-form-item label="续期时间(天)" prop="durationDay">
                             <el-input v-model="form.durationDay" type="number" :min="1" placeholder="续期时间(天)" />
                         </el-form-item>
@@ -187,6 +190,7 @@ export default {
             // 表单校验
             rules: {
                 packageName: [{ required: true, message: '套餐名称不能为空', trigger: 'blur' }],
+                packageNameEn:[{required:true,message:'套餐英文名称不能为空',trigger:'blur'}],
                 status: [{ required: true, message: '套餐状态不能为空', trigger: 'blur' }],
                 durationDay: [{ required: true, message: '套餐时长不能为空', trigger: 'blur' }],
                 originalPrice: [{ required: true, message: '原价不能为空', trigger: 'blur' }],
diff --git a/src/views/admin/member-withdrawal-log/approve.vue b/src/views/admin/member-withdrawal-log/approve.vue
new file mode 100644
index 0000000..5adf777
--- /dev/null
+++ b/src/views/admin/member-withdrawal-log/approve.vue
@@ -0,0 +1,144 @@
+<template>
+    <el-dialog :title="title" :visible.sync="dialogVisible" width="500px" :close-on-click-modal="false" @closed="closeDialog">
+        <el-form ref="form" :model="form" :rules="rules" label-width="90px">
+            <el-form-item label="网络名称" prop="networkName">
+                {{ form.networkName }}
+            </el-form-item>
+            <el-form-item label="用户" prop="userName">
+                {{ form.userName }}
+            </el-form-item>
+            <el-form-item label="提现金额(U)" prop="amount">
+                {{ form.amount }}
+            </el-form-item>
+            <el-form-item label="提现状态" prop="statusName">
+               {{form.statusName}}
+            </el-form-item>
+            <!-- <el-form-item label="确认时间" prop="confirmTime">
+                <el-date-picker v-model="form.confirmTime" type="datetime" placeholder="选择日期">
+                </el-date-picker>
+            </el-form-item> -->
+            <el-form-item label="手续费" prop="fee">
+                {{ form.fee }}
+            </el-form-item>
+            <el-form-item v-if="form.status === 'pending' || form.status === 'approved'" label="审核状态"
+                prop="approveStatus">
+                <el-radio-group v-model="form.approveStatus">
+                    <template v-if="form.status === 'pending'">
+                        <el-radio v-for="(item, index) in options" :key="'option_' + index" :label="item.value">{{
+                            item.label }}</el-radio>
+                    </template>
+                    <template v-else-if="form.status === 'approved'">
+                        <el-radio v-for="(item, index) in confirmOptions" :key="'confirm_option_' + index"
+                            :label="item.value">{{
+                                item.label }}</el-radio>
+                    </template>
+                </el-radio-group>
+            </el-form-item>
+            <el-form-item label="备注" prop="remark">
+                <el-input v-model="form.remark" type="textarea" maxlength="200" show-word-limit placeholder="备注" />
+            </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+            <el-button type="primary" :loading="loading" @click="submitForm">确 定</el-button>
+            <el-button @click="cancel">取 消</el-button>
+        </div>
+    </el-dialog>
+</template>
+
+<script>
+import { approve, confirm } from '@/api/admin/member-withdrawal-log'
+
+export default {
+    name: 'approve',
+    props: {
+        open: {
+            type: Boolean,
+            default: false
+        },
+        title: {
+            type: String,
+            default: "提现审核"
+        },
+        data: {
+            type: Object,
+            default: () => { }
+        }
+    },
+    watch: {
+        open(val) {
+            this.dialogVisible = val
+        },
+        data(val) {
+            this.form = { approveStatus: 1, ...val }
+        }
+    },
+    data() {
+        return {
+            dialogVisible: this.open,
+            form: {
+
+            },
+            loading: false,
+            // approveStatus:1,
+            rules: {
+                approveStatus: [{ required: true, message: '请选择审核状态', trigger: 'trigger' }]
+            },
+            options: [{
+                label: '通过',
+                value: 1
+            }, {
+                label: '拒绝',
+                value: 2
+            }],
+            confirmOptions: [
+                {
+                    label: "已转账",
+                    value: 1
+                },
+                {
+                    label: "转账失败",
+                    value: 2
+                }
+            ]
+        }
+    },
+    methods: {
+        submitForm() {
+            this.loading = true
+            //审核
+            if (this.form.status === 'pending') {
+                approve({ id: this.form.id, approval: this.form.approveStatus, remark: this.form.remark }).then(res => {
+                    if (res.code === 200) {
+                        this.msgSuccess(res.msg)
+                        this.cancel()
+                    }
+                })
+                    .finally(f => {
+                        this.loading = false
+                    })
+            } else if (this.form.status === 'approved') { //确认提现
+                confirm({ id: this.form.id, confirmVal: this.form.approveStatus, remark: this.form.remark }).then(res => {
+                    console.log("res", res)
+                    if (res.code === 200) {
+                        this.msgSuccess(res.msg)
+                        this.cancel()
+                    }
+                })
+                    .finally(f => {
+                        this.loading = false
+                    })
+            } else {
+                this.loading = false
+            }
+        },
+        closeDialog(){  
+            this.form = {}
+            this.loading = false
+            this.$emit('update:open', false)
+        },
+        cancel() {
+            this.dialogVisible = false
+        }
+    }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/admin/member-withdrawal-log/index.vue b/src/views/admin/member-withdrawal-log/index.vue
new file mode 100644
index 0000000..393bd13
--- /dev/null
+++ b/src/views/admin/member-withdrawal-log/index.vue
@@ -0,0 +1,342 @@
+<template>
+    <BasicLayout>
+        <template #wrapper>
+            <el-card class="box-card">
+                <el-form ref="queryForm" :model="queryParams" :inline="true" label-width="68px">
+                    <el-form-item label="网络名称" prop="networkName"><el-input v-model="queryParams.networkName"
+                            placeholder="请输入网络名称" clearable size="small" @keyup.enter.native="handleQuery" />
+                    </el-form-item>
+                    <el-form-item label="提现状态" prop="status"><el-select v-model="queryParams.status" placeholder="提现状态"
+                            clearable size="small">
+                            <el-option v-for="dict in statusOptions" :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 
+                                v-permisaction="['admin:memberWithdrawalLog:add']"
+                                type="primary"
+                                icon="el-icon-plus"
+                                size="mini"
+                                @click="handleAdd"
+                        >新增
+                        </el-button>
+                    </el-col>
+                    <el-col :span="1.5">
+                        <el-button
+                                v-permisaction="['admin:memberWithdrawalLog:edit']"
+                                type="success"
+                                icon="el-icon-edit"
+                                size="mini"
+                                :disabled="single"
+                                @click="handleUpdate"
+                        >修改
+                        </el-button>
+                    </el-col> -->
+                    <el-col :span="1.5">
+                        <el-button v-permisaction="['admin:memberWithdrawalLog:remove']" type="danger"
+                            icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete">删除
+                        </el-button>
+                    </el-col>
+                </el-row>
+
+                <el-table v-loading="loading" :data="memberWithdrawalLogList" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" align="center" />
+                    <el-table-column label="网络名称" align="center" prop="networkName" :show-overflow-tooltip="true" />
+                    <el-table-column label="用户名" align="center" prop="userName" :show-overflow-tooltip="true" />
+                    <el-table-column label="提现金额(U)" align="center" prop="amount" :show-overflow-tooltip="true" />
+
+                    <el-table-column label="手续费" align="center" prop="fee"
+                        :show-overflow-tooltip="true" /><el-table-column label="备注" align="center" prop="remark"
+                        :show-overflow-tooltip="true" />
+
+                    <el-table-column label="提现状态" align="center" prop="status" :formatter="statusFormat" width="100">
+                        <template slot-scope="scope">
+                            {{ statusFormat(scope.row.status) }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="提交时间" align="center" prop="createdTime" width="160px">
+                        <template slot-scope="scope">
+                            <span>{{ parseTime(scope.row.createdAt) }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="确认时间" align="center" prop="confirmTime" width="160px">
+                        <template slot-scope="scope">
+                            <span>{{ parseTime(scope.row.confirmTime) }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                        <template slot-scope="scope">
+                            <!-- <el-popconfirm class="delete-popconfirm" title="确认要修改吗?" confirm-button-text="修改"
+                                @confirm="handleUpdate(scope.row)">
+                                <el-button slot="reference" v-permisaction="['admin:memberWithdrawalLog:edit']"
+                                    size="mini" type="text" icon="el-icon-edit">修改
+                                </el-button>
+                            </el-popconfirm> -->
+                            <el-button v-permisaction="['admin:memberWithdrawalLog:approve']"
+                                v-if="scope.row.status == 'pending'" @click="handleApprove(scope.row, '提现审核')"
+                                size="mini" type="text">审核
+                            </el-button>
+                            <el-button v-permisaction="['admin:memberWithdrawalLog:confirm']"
+                                v-if="scope.row.status == 'approved'" @click="handleApprove(scope.row, '确认到账')"
+                                size="mini" type="text">确认到账
+                            </el-button>
+                            <el-popconfirm class="delete-popconfirm" title="确认要删除吗?" confirm-button-text="删除"
+                                @confirm="handleDelete(scope.row)">
+                                <el-button slot="reference" v-permisaction="['admin:memberWithdrawalLog:remove']"
+                                    size="mini" type="text" icon="el-icon-delete">删除
+                                </el-button>
+                            </el-popconfirm>
+                        </template>
+                    </el-table-column>
+                </el-table>
+
+                <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageIndex"
+                    :limit.sync="queryParams.pageSize" @pagination="getList" />
+
+                <!-- 添加或修改对话框 -->
+                <el-dialog :title="title" :visible.sync="open"  width="500px">
+                    <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+
+                        <el-form-item label="网络id" prop="networkId">
+                            <el-input v-model="form.networkId" placeholder="网络id" />
+                        </el-form-item>
+                        <el-form-item label="网络名称" prop="networkName">
+                            <el-input v-model="form.networkName" placeholder="网络名称" />
+                        </el-form-item>
+                        <el-form-item label="用户id" prop="userId">
+                            <el-input v-model="form.userId" placeholder="用户id" />
+                        </el-form-item>
+                        <el-form-item label="提现金额(U)" prop="amount">
+                            <el-input v-model="form.amount" placeholder="提现金额(U)" />
+                        </el-form-item>
+                        <el-form-item label="提现状态(member_withdrawal_status)" prop="status">
+                            <el-input v-model="form.status" placeholder="提现状态(member_withdrawal_status)" />
+                        </el-form-item>
+                        <el-form-item label="确认时间" prop="confirmTime">
+                            <el-date-picker v-model="form.confirmTime" type="datetime" placeholder="选择日期">
+                            </el-date-picker>
+                        </el-form-item>
+                        <el-form-item label="手续费比例" prop="fee">
+                            <el-input v-model="form.fee" placeholder="手续费比例" />
+                        </el-form-item>
+                        <el-form-item label="备注" prop="remark">
+                            <el-input v-model="form.remark" placeholder="备注" />
+                        </el-form-item>
+                    </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>
+            </el-card>
+            <approve :open.sync="showApprove" :title="showApproveTitle" :data="approveData"  @update:open="handleClose"></approve>
+        </template>
+    </BasicLayout>
+</template>
+
+<script>
+import { addMemberWithdrawalLog, delMemberWithdrawalLog, getMemberWithdrawalLog, listMemberWithdrawalLog, updateMemberWithdrawalLog } from '@/api/admin/member-withdrawal-log'
+import approve from './approve.vue'
+export default {
+    name: 'MemberWithdrawalLog',
+    components: {
+        approve
+    },
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 总条数
+            total: 0,
+            // 弹出层标题
+            title: '',
+            // 是否显示弹出层
+            open: false,
+            isEdit: false,
+            // 类型数据字典
+            typeOptions: [],
+            memberWithdrawalLogList: [],
+            statusOptions: [],
+            // 关系表类型
+
+            // 查询参数
+            queryParams: {
+                pageIndex: 1,
+                pageSize: 10,
+                networkName: undefined,
+                status: undefined,
+                idOrder: "desc"
+            },
+            showApprove: false,
+            showApproveTitle: "",
+            approveData: {},
+            // 表单参数
+            form: {
+            },
+            // 表单校验
+            rules: {
+                networkName: [{ required: true, message: '网络名称不能为空', trigger: 'blur' }],
+                status: [{ required: true, message: '提现状态(member_withdrawal_status)不能为空', trigger: 'blur' }],
+            }
+        }
+    },
+    created() {
+        this.getList()
+        this.getDicts('member_withdrawal_status').then(response => {
+            this.statusOptions = response.data
+        })
+    },
+    methods: {
+        /** 查询参数列表 */
+        getList() {
+            this.loading = true
+            listMemberWithdrawalLog(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+                this.memberWithdrawalLogList = response.data.list
+                this.total = response.data.count
+                this.loading = false
+            }
+            )
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false
+            this.reset()
+        },
+        // 表单重置
+        reset() {
+            this.form = {
+
+                id: undefined,
+                networkId: undefined,
+                networkName: undefined,
+                userId: undefined,
+                amount: undefined,
+                status: undefined,
+                confirmTime: undefined,
+                fee: undefined,
+                remark: undefined,
+            }
+            this.resetForm('form')
+        },
+        getImgList: function () {
+            this.form[this.fileIndex] = this.$refs['fileChoose'].resultList[0].fullUrl
+        },
+        fileClose: function () {
+            this.fileOpen = false
+        },
+        statusFormat(status) {
+            return this.selectDictLabel(this.statusOptions, status)
+        },
+        handleApprove(row, title) {
+            this.showApprove = true
+            this.showApproveTitle = title
+            this.approveData = {statusName:this.statusFormat(row.status),...row}
+        },
+        // 关系
+        // 文件
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageIndex = 1
+            this.getList()
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.dateRange = []
+            this.resetForm('queryForm')
+            this.handleQuery()
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.reset()
+            this.open = true
+            this.title = '添加用户提现记录'
+            this.isEdit = false
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map(item => item.id)
+            this.single = selection.length !== 1
+            this.multiple = !selection.length
+        },
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            this.reset()
+            const id =
+                row.id || this.ids
+            getMemberWithdrawalLog(id).then(response => {
+                this.form = response.data
+                this.open = true
+                this.title = '修改用户提现记录'
+                this.isEdit = true
+            })
+        },
+        handleClose(){
+            this.getList()
+        },
+        /** 提交按钮 */
+        submitForm: function () {
+            this.$refs['form'].validate(valid => {
+                if (valid) {
+                    if (this.form.id !== undefined) {
+                        updateMemberWithdrawalLog(this.form).then(response => {
+                            if (response.code === 200) {
+                                this.msgSuccess(response.msg)
+                                this.open = false
+                                this.getList()
+                            } else {
+                                this.msgError(response.msg)
+                            }
+                        })
+                    } else {
+                        addMemberWithdrawalLog(this.form).then(response => {
+                            if (response.code === 200) {
+                                this.msgSuccess(response.msg)
+                                this.open = false
+                                this.getList()
+                            } else {
+                                this.msgError(response.msg)
+                            }
+                        })
+                    }
+                }
+            })
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            var Ids = (row.id && [row.id]) || this.ids
+
+            this.$confirm('是否确认删除编号为"' + Ids + '"的数据项?', '警告', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(function () {
+                return delMemberWithdrawalLog({ 'ids': Ids })
+            }).then((response) => {
+                if (response.code === 200) {
+                    this.msgSuccess(response.msg)
+                    this.open = false
+                    this.getList()
+                } else {
+                    this.msgError(response.msg)
+                }
+            }).catch(function () {
+            })
+        }
+    }
+}
+</script>