Merge branch 'exchange_vue_single'

# Conflicts:
#	src/views/dev-tools/gen/editTable.vue

.env.development

@@ -2,5 +2,5 @@
 ENV = 'development'
 
 # base api
-VUE_APP_BASE_API = 'http://192.168.1.11:6789'
+VUE_APP_BASE_API = 'http://192.168.2.102:6789'
 

.gitignore

@@ -18,6 +18,8 @@ selenium-debug.log
 *.njsproj
 *.sln
 *.local
+*.rar
+*.zip
 
 package-lock.json
 yarn.lock

src/api/admin/line-api-user-group.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询LineApiUserGroup列表
+export function listLineApiUserGroup(query) {
+  return request({
+    url: '/api/v1/line-api-user-group',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询LineApiUserGroup详细
+export function getLineApiUserGroup(id) {
+  return request({
+    url: '/api/v1/line-api-user-group/' + id,
+    method: 'get'
+  })
+}
+
+// 新增LineApiUserGroup
+export function addLineApiUserGroup(data) {
+  return request({
+    url: '/api/v1/line-api-user-group',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改LineApiUserGroup
+export function updateLineApiUserGroup(data) {
+  return request({
+    url: '/api/v1/line-api-user-group/' + data.id,
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除LineApiUserGroup
+export function delLineApiUserGroup(data) {
+  return request({
+    url: '/api/v1/line-api-user-group',
+    method: 'delete',
+    data: data
+  })
+}
+
+export function getLineApiUserGroupList(query) {
+  return request({
+    url: '/api/v1/line-api-user-group/options',
+    method: 'get',
+    params: query
+  })
+}

src/api/admin/line-pre-order.js

@@ -82,13 +82,6 @@ export function orderMarginType(data) {
     data
   })
 }
-export function manuallyCover(data) {
-  return request({
-    url: '/api/v1/line-pre-order/manuallyCover',
-    method: 'post',
-    data
-  })
-}
 export function closePosition(data) {
   return request({
     url: '/api/v1/line-pre-order/closePosition',
@@ -134,3 +127,29 @@ export function getOrderPage(params) {
   })
 }
 
+// aicoin买入点
+export function aiCoinPrice(data) {
+  return request({
+    url: '/api/v1/line-pre-order/aiCoinPrice',
+    method: 'post',
+    data
+  })
+}
+// aicoin交易对
+export function aicoinSymbol(params) {
+  return request({
+    url: '/api/v1/line-direction/symbol',
+    method: 'get',
+    params
+  })
+}
+
+// 获取止盈点
+export function calculate(data) {
+  return request({
+    url: '/api/v1/line-pre-order/calculate',
+    method: 'post',
+    data
+  })
+}
+

src/api/admin/line-reduce-strategy.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+
+// 查询LineReduceStrategy列表
+export function listLineReduceStrategy(query) {
+  return request({
+    url: '/api/v1/line-reduce-strategy',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询LineReduceStrategy详细
+export function getLineReduceStrategy(id) {
+  return request({
+    url: '/api/v1/line-reduce-strategy/' + id,
+    method: 'get'
+  })
+}
+
+// 新增LineReduceStrategy
+export function addLineReduceStrategy(data) {
+  return request({
+    url: '/api/v1/line-reduce-strategy',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改LineReduceStrategy
+export function updateLineReduceStrategy(data) {
+  return request({
+    url: '/api/v1/line-reduce-strategy/' + data.id,
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除LineReduceStrategy
+export function delLineReduceStrategy(data) {
+  return request({
+    url: '/api/v1/line-reduce-strategy',
+    method: 'delete',
+    data: data
+  })
+}
+

src/api/admin/line-strategy-template.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+
+// 查询LineStrategyTemplate列表
+export function listLineStrategyTemplate(query) {
+  return request({
+    url: '/api/v1/line-strategy-template',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询LineStrategyTemplate详细
+export function getLineStrategyTemplate(id) {
+  return request({
+    url: '/api/v1/line-strategy-template/' + id,
+    method: 'get'
+  })
+}
+
+// 新增LineStrategyTemplate
+export function addLineStrategyTemplate(data) {
+  return request({
+    url: '/api/v1/line-strategy-template',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改LineStrategyTemplate
+export function updateLineStrategyTemplate(data) {
+  return request({
+    url: '/api/v1/line-strategy-template/' + data.id,
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除LineStrategyTemplate
+export function delLineStrategyTemplate(data) {
+  return request({
+    url: '/api/v1/line-strategy-template',
+    method: 'delete',
+    data: data
+  })
+}
+

src/api/admin/line-symbol-black.js

@@ -2,46 +2,52 @@ import request from '@/utils/request'
 
 // 查询LineSymbolBlack列表
 export function listLineSymbolBlack(query) {
-    return request({
+  return request({
-        url: '/api/v1/line-symbol-black',
+    url: '/api/v1/line-symbol-black',
-        method: 'get',
+    method: 'get',
-        params: query
+    params: query
-    })
+  })
 }
 
 // 查询LineSymbolBlack详细
-export function getLineSymbolBlack (id) {
+export function getLineSymbolBlack(id) {
-    return request({
+  return request({
-        url: '/api/v1/line-symbol-black/' + id,
+    url: '/api/v1/line-symbol-black/' + id,
-        method: 'get'
+    method: 'get'
-    })
+  })
 }
 
-
 // 新增LineSymbolBlack
 export function addLineSymbolBlack(data) {
-    return request({
+  return request({
-        url: '/api/v1/line-symbol-black',
+    url: '/api/v1/line-symbol-black',
-        method: 'post',
+    method: 'post',
-        data: data
+    data: data
-    })
+  })
 }
 
 // 修改LineSymbolBlack
 export function updateLineSymbolBlack(data) {
-    return request({
+  return request({
-        url: '/api/v1/line-symbol-black/'+data.id,
+    url: '/api/v1/line-symbol-black/' + data.id,
-        method: 'put',
+    method: 'put',
-        data: data
+    data: data
-    })
+  })
 }
 
 // 删除LineSymbolBlack
 export function delLineSymbolBlack(data) {
-    return request({
+  return request({
-        url: '/api/v1/line-symbol-black',
+    url: '/api/v1/line-symbol-black',
-        method: 'delete',
+    method: 'delete',
-        data: data
+    data: data
-    })
+  })
 }
 
+// 重新加载交易对
+export function reloadSymbol() {
+  return request({
+    url: '/api/v1/line-symbol-black/reload-symbol',
+    method: 'get'
+  })
+}

src/api/admin/line-symbol-price.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+
+// 查询LineSymbolPrice列表
+export function listLineSymbolPrice(query) {
+  return request({
+    url: '/api/v1/line-symbol-price',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询LineSymbolPrice详细
+export function getLineSymbolPrice(id) {
+  return request({
+    url: '/api/v1/line-symbol-price/' + id,
+    method: 'get'
+  })
+}
+
+// 新增LineSymbolPrice
+export function addLineSymbolPrice(data) {
+  return request({
+    url: '/api/v1/line-symbol-price',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改LineSymbolPrice
+export function updateLineSymbolPrice(data) {
+  return request({
+    url: '/api/v1/line-symbol-price/' + data.id,
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除LineSymbolPrice
+export function delLineSymbolPrice(data) {
+  return request({
+    url: '/api/v1/line-symbol-price',
+    method: 'delete',
+    data: data
+  })
+}
+

src/api/admin/line-symbol.js

@@ -51,4 +51,20 @@ export function getSameSymbol(params) {
     params
   })
 }
+// 导出交易对
+export function exportSymbols(params) {
+  return request({
+    url: '/api/v1/line-symbol/export',
+    method: 'get',
+    responseType: 'blob',
+    params
+  })
+}
+export function symbolAll(params) {
+  return request({
+    url: '/api/v1/line-symbol/all',
+    method: 'get',
+    params
+  })
+}
 

src/api/admin/line-user.js

@@ -2,46 +2,52 @@ import request from '@/utils/request'
 
 // 查询LineUser列表
 export function listLineUser(query) {
-    return request({
+  return request({
-        url: '/api/v1/line-user',
+    url: '/api/v1/line-user',
-        method: 'get',
+    method: 'get',
-        params: query
+    params: query
-    })
+  })
 }
 
 // 查询LineUser详细
-export function getLineUser (id) {
+export function getLineUser(id) {
-    return request({
+  return request({
-        url: '/api/v1/line-user/' + id,
+    url: '/api/v1/line-user/' + id,
-        method: 'get'
+    method: 'get'
-    })
+  })
 }
 
-
 // 新增LineUser
 export function addLineUser(data) {
-    return request({
+  return request({
-        url: '/api/v1/line-user',
+    url: '/api/v1/line-user',
-        method: 'post',
+    method: 'post',
-        data: data
+    data: data
-    })
+  })
 }
 
 // 修改LineUser
 export function updateLineUser(data) {
-    return request({
+  return request({
-        url: '/api/v1/line-user/'+data.id,
+    url: '/api/v1/line-user/' + data.id,
-        method: 'put',
+    method: 'put',
-        data: data
+    data: data
-    })
+  })
 }
 
 // 删除LineUser
 export function delLineUser(data) {
-    return request({
+  return request({
-        url: '/api/v1/line-user',
+    url: '/api/v1/line-user',
-        method: 'delete',
+    method: 'delete',
-        data: data
+    data: data
-    })
+  })
 }
 
+export function reloadProperty(data) {
+  return request({
+    url: '/api/v1/line-user/property',
+    method: 'put',
+    data: data
+  })
+}

src/api/admin/member-balance-log.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+
+// 查询MemberBalanceLog列表
+export function listMemberBalanceLog(query) {
+  return request({
+    url: '/api/v1/member-balance-log',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询MemberBalanceLog详细
+export function getMemberBalanceLog(id) {
+  return request({
+    url: '/api/v1/member-balance-log/' + id,
+    method: 'get'
+  })
+}
+
+// 新增MemberBalanceLog
+export function addMemberBalanceLog(data) {
+  return request({
+    url: '/api/v1/member-balance-log',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改MemberBalanceLog
+export function updateMemberBalanceLog(data) {
+  return request({
+    url: '/api/v1/member-balance-log/' + data.id,
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除MemberBalanceLog
+export function delMemberBalanceLog(data) {
+  return request({
+    url: '/api/v1/member-balance-log',
+    method: 'delete',
+    data: data
+  })
+}
+

src/api/admin/member-balance.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+
+// 查询MemberBalance列表
+export function listMemberBalance(query) {
+  return request({
+    url: '/api/v1/member-balance',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询MemberBalance详细
+export function getMemberBalance(id) {
+  return request({
+    url: '/api/v1/member-balance/' + id,
+    method: 'get'
+  })
+}
+
+// 新增MemberBalance
+export function addMemberBalance(data) {
+  return request({
+    url: '/api/v1/member-balance',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改MemberBalance
+export function updateMemberBalance(data) {
+  return request({
+    url: '/api/v1/member-balance/' + data.id,
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除MemberBalance
+export function delMemberBalance(data) {
+  return request({
+    url: '/api/v1/member-balance',
+    method: 'delete',
+    data: data
+  })
+}
+

src/api/admin/member-renwa-log.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+
+// 查询MemberRenwaLog列表
+export function listMemberRenwaLog(query) {
+  return request({
+    url: '/api/v1/member-renwa-log',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询MemberRenwaLog详细
+export function getMemberRenwaLog(id) {
+  return request({
+    url: '/api/v1/member-renwa-log/' + id,
+    method: 'get'
+  })
+}
+
+// 新增MemberRenwaLog
+export function addMemberRenwaLog(data) {
+  return request({
+    url: '/api/v1/member-renwa-log',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改MemberRenwaLog
+export function updateMemberRenwaLog(data) {
+  return request({
+    url: '/api/v1/member-renwa-log/' + data.id,
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除MemberRenwaLog
+export function delMemberRenwaLog(data) {
+  return request({
+    url: '/api/v1/member-renwa-log',
+    method: 'delete',
+    data: data
+  })
+}
+

src/api/admin/member-renwal-config.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+
+// 查询MemberRenwalConfig列表
+export function listMemberRenwalConfig(query) {
+  return request({
+    url: '/api/v1/member-renwal-config',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询MemberRenwalConfig详细
+export function getMemberRenwalConfig(id) {
+  return request({
+    url: '/api/v1/member-renwal-config/' + id,
+    method: 'get'
+  })
+}
+
+// 新增MemberRenwalConfig
+export function addMemberRenwalConfig(data) {
+  return request({
+    url: '/api/v1/member-renwal-config',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改MemberRenwalConfig
+export function updateMemberRenwalConfig(data) {
+  return request({
+    url: '/api/v1/member-renwal-config/' + data.id,
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除MemberRenwalConfig
+export function delMemberRenwalConfig(data) {
+  return request({
+    url: '/api/v1/member-renwal-config',
+    method: 'delete',
+    data: data
+  })
+}
+

src/api/admin/member-withdrawal-log.js

@@ -0,0 +1,64 @@
+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
+  })
+}

src/api/admin/spider-listen-symbol.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+
+// 查询SpiderListenSymbol列表
+export function listSpiderListenSymbol(query) {
+  return request({
+    url: '/api/v1/spider-listen-symbol',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询SpiderListenSymbol详细
+export function getSpiderListenSymbol(id) {
+  return request({
+    url: '/api/v1/spider-listen-symbol/' + id,
+    method: 'get'
+  })
+}
+
+// 新增SpiderListenSymbol
+export function addSpiderListenSymbol(data) {
+  return request({
+    url: '/api/v1/spider-listen-symbol',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改SpiderListenSymbol
+export function updateSpiderListenSymbol(data) {
+  return request({
+    url: '/api/v1/spider-listen-symbol/' + data.id,
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除SpiderListenSymbol
+export function delSpiderListenSymbol(data) {
+  return request({
+    url: '/api/v1/spider-listen-symbol',
+    method: 'delete',
+    data: data
+  })
+}
+

src/layout/components/TagsView/index.vue

@@ -220,6 +220,7 @@ export default {
         // you can adjust it according to your needs.
         if (view.name === 'Dashboard') {
           // to reload home page
+
           this.$router.replace({ path: '/redirect' + view.fullPath })
         } else {
           this.$router.push('/')

src/utils/request.js

@@ -44,6 +44,9 @@ service.interceptors.response.use(
    * You can also judge the status by HTTP Status Code
    */
   response => {
+    if (['blob'].includes(response.config.responseType)) {
+      return response.data
+    }
     const code = response.data.code
     if (code === 401) {
       store.dispatch('user/resetToken')

src/utils/zipdownload.js

@@ -32,17 +32,15 @@ export function downLoadFile(str) {
  * @param {*} res blob响应内容
  * @param {String} mimeType MIME类型
  */
-export function resolveBlob(res, mimeType) {
+export function resolveBlob(res, name, mimeType) {
   const aLink = document.createElement('a')
-  var blob = new Blob([res.data], { type: mimeType })
+  var blob = new Blob([res], { type: mimeType || 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' })
   // //从response的headers中获取filename, 后端response.setHeader("Content-disposition", "attachment; filename=xxxx.docx") 设置的文件名;
-  var patt = new RegExp('filename=([^;]+\\.[^\\.;]+);*')
+  // var patt = new RegExp('filename=([^;]+\\.[^\\.;]+);*')
-  var contentDisposition = decodeURI(res.headers['content-disposition'])
+  // var contentDisposition = decodeURI(res.headers['content-disposition'])
-  var result = patt.exec(contentDisposition)
+  // var result = patt.exec(contentDisposition)
-  var fileName = result[1]
-  fileName = fileName.replace(/\"/g, '')
   aLink.href = URL.createObjectURL(blob)
-  aLink.setAttribute('download', fileName) // 设置下载文件名称
+  aLink.setAttribute('download', name) // 设置下载文件名称
   document.body.appendChild(aLink)
   aLink.click()
   document.body.appendChild(aLink)

src/views/admin/dict/data.vue

@@ -5,12 +5,7 @@
         <el-form ref="queryForm" :model="queryParams" :inline="true">
           <el-form-item label="字典名称" prop="dictType">
             <el-select v-model="queryParams.dictType" size="small">
-              <el-option
+              <el-option v-for="item in typeOptions" :key="item.dictId" :label="item.dictName" :value="item.dictType" />
-                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">
@@ -24,12 +19,7 @@
           </el-form-item>
           <el-form-item label="状态" prop="status">
             <el-select v-model="queryParams.status" placeholder="数据状态" clearable size="small">
-              <el-option
+              <el-option v-for="dict in statusOptions" :key="dict.value" :label="dict.label" :value="dict.value" />
-                v-for="dict in statusOptions"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
             </el-select>
           </el-form-item>
           <el-form-item>
@@ -104,7 +94,7 @@
         </el-table>
 
         <pagination
-          v-show="total>0"
+          v-show="total > 0"
           :total="total"
           :page.sync="queryParams.pageIndex"
           :limit.sync="queryParams.pageSize"
@@ -128,16 +118,33 @@
             </el-form-item>
             <el-form-item label="状态" prop="status">
               <el-radio-group v-model="form.status">
-                <el-radio
+                <el-radio v-for="dict in statusOptions" :key="dict.value" :label="dict.value">{{ dict.label
-                  v-for="dict in statusOptions"
+                }}</el-radio>
-                  :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"
+                  round
+                  @click="luanguageDel(index)"
+                />
+              </div>
+            </el-form-item>
           </el-form>
           <div slot="footer" class="dialog-footer">
             <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -298,6 +305,7 @@ export default {
     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 => {
@@ -340,7 +348,7 @@ export default {
         } else {
           this.msgError(response.msg)
         }
-      }).catch(function() {})
+      }).catch(function() { })
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -353,8 +361,29 @@ export default {
         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>

src/views/admin/line-api-user-group/index.vue

@@ -0,0 +1,367 @@
+<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="groupName"><el-input
+            v-model="queryParams.groupName"
+            placeholder="请输入分组名称"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+          />
+          </el-form-item>
+
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              v-permisaction="['admin:lineApiUserGroup: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:lineApiUserGroup: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:lineApiUserGroup: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="lineApiUserGroupList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center" />
+
+          <el-table-column label="交易所" align="center" prop="exchangeType" :show-overflow-tooltip="true">
+            <template #default="{ row }">
+              {{ exchangeTypeFormat(row) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="分组名称" align="center" prop="groupName" :show-overflow-tooltip="true" />
+          <el-table-column label="数量" align="center" prop="count" />
+          <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:lineApiUserGroup: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:lineApiUserGroup: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="交易所" prop="exchangeType">
+              <el-select
+                v-model="form.exchangeType"
+                style="width: 100%;"
+                placeholder="请选择交易所"
+                clearable
+                filterable
+                size="small"
+                @change="exchangeTypeChange"
+              >
+                <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="groupName">
+              <el-input v-model="form.groupName" show-word-limit maxlength="30" placeholder="请输入分组名称" />
+
+            </el-form-item>
+            <el-form-item label="api用户" prop="userIds">
+              <el-select
+                v-model="form.userIds"
+                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"
+                  :disabled="dict.openStatus === 0"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="状态" prop="status">
+              <el-radio-group v-model="form.status">
+                <el-radio :label="1">开启</el-radio>
+                <el-radio :label="0">关闭</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-form>
+          <div slot="footer" class="dialog-footer">
+            <el-button v-loading="loading" type="primary" @click="submitForm">确 定</el-button>
+            <el-button @click="cancel">取 消</el-button>
+          </div>
+        </el-dialog>
+      </el-card>
+    </template>
+  </BasicLayout>
+</template>
+
+<script>
+import { addLineApiUserGroup, delLineApiUserGroup, getLineApiUserGroup, listLineApiUserGroup, updateLineApiUserGroup } from '@/api/admin/line-api-user-group'
+import { listLineApiUser } from '@/api/admin/line-api-user'
+
+export default {
+  name: 'LineApiUserGroup',
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 总条数
+      total: 0,
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      isEdit: false,
+      // 类型数据字典
+      typeOptions: [],
+      lineApiUserGroupList: [],
+      lineUsers: [],
+      lineTotal: 0,
+      // 关系表类型
+
+      // 查询参数
+      queryParams: {
+        pageIndex: 1,
+        pageSize: 10,
+        groupName: undefined
+
+      },
+      // 表单参数
+      form: {
+      },
+      // 表单校验
+      rules: {
+        groupName: [{ required: true, message: '分组名称不能为空', trigger: 'blur' }],
+        userIds: [{ required: true, message: '用户不能为空', trigger: 'blur' }]
+      },
+      exchangeTypes: []
+    }
+  },
+  created() {
+    this.getList()
+    // 获取交易所字典数据
+    this.getDicts('exchange_type').then(response => {
+      this.exchangeTypes = response.data
+    })
+  },
+  methods: {
+    exchangeTypeFormat(row) {
+      return this.selectDictLabel(this.exchangeTypes || [], row.exchangeType)
+    },
+    /** 查询参数列表 */
+    getList() {
+      this.loading = true
+      listLineApiUserGroup(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+        this.lineApiUserGroupList = response.data.list
+        this.total = response.data.count
+        this.loading = false
+      }
+      )
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        exchangeType: this.exchangeTypes.length ? this.exchangeTypes[0].value : '',
+        groupName: undefined,
+        userId: undefined,
+        status: 1,
+        userIds: []
+      }
+      this.resetForm('form')
+    },
+    getImgList: function() {
+      this.form[this.fileIndex] = this.$refs['fileChoose'].resultList[0].fullUrl
+    },
+    fileClose: function() {
+      this.fileOpen = false
+    },
+    getLineApiUser() {
+      listLineApiUser({ pageIndex: 1, pageSize: 999, exchangeType: this.form.exchangeType }).then(response => {
+        this.lineUsers = response.data.list
+        this.lineTotal = response.data.count
+      })
+    },
+    // 关系
+    // 文件
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageIndex = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = []
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = '添加api用户分组'
+      this.isEdit = false
+
+      this.getLineApiUser()
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      this.getLineApiUser()
+      const id =
+                row.id || this.ids
+      getLineApiUserGroup(id).then(response => {
+        this.form = response.data
+        this.open = true
+        this.title = '修改api用户分组'
+        this.isEdit = true
+      })
+    },
+    exchangeTypeChange() {
+      this.form.userIds = []
+      this.getLineApiUser()
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          if (this.form.id !== undefined) {
+            updateLineApiUserGroup(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess(response.msg)
+                this.open = false
+                this.getList()
+              } else {
+                this.msgError(response.msg)
+              }
+            })
+          } else {
+            addLineApiUserGroup(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 delLineApiUserGroup({ '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>

src/views/admin/line-api-user/index.vue

@@ -97,14 +97,14 @@
           >
             <template #default="{row}">{{ ['现货','合约','现货合约'][row.affiliation-1] }}</template>
           </el-table-column> -->
-          <el-table-column
+          <!-- <el-table-column
             label="是否超管可见"
             align="center"
             prop="adminShow"
             :show-overflow-tooltip="true"
           >
             <template #default="{row}">{{ ['否','是'][row.adminShow] }}</template>
-          </el-table-column>
+          </el-table-column> -->
           <!-- <el-table-column
             label="允许下单的方向"
             align="center"
@@ -113,7 +113,7 @@
           >
             <template #default="{row}">{{ ['多','空','多空'][row.site-1] }}</template>
           </el-table-column> -->
-          <el-table-column
+          <!-- <el-table-column
             label="从属关系"
             align="center"
             prop="subordinate"
@@ -124,7 +124,8 @@
             <template slot-scope="scope">
               {{ groupIdFormat(scope.row) }}
             </template>
-          </el-table-column><el-table-column
+          </el-table-column> -->
+          <el-table-column
             label="开启状态"
             align="center"
             prop="openStatus"
@@ -300,7 +301,7 @@
 import { addLineApiUser, delLineApiUser, getLineApiUser, listLineApiUser, updateLineApiUser } from '@/api/admin/line-api-user'
 
 import { listLineUser } from '@/api/admin/line-user'
-import { listLineApiGroup } from '@/api/admin/line-api-group'
+// import { listLineApiGroup } from '@/api/admin/line-api-group'
 export default {
   name: 'LineApiUser',
   components: {
@@ -349,7 +350,7 @@ export default {
   created() {
     this.getList()
     this.getLineUserItems()
-    this.getLineApiGroupItems()
+    // this.getLineApiGroupItems()
     // 获取交易所字典数据
     this.getDicts('exchange_type').then(response => {
       this.exchangeTypes = response.data
@@ -414,11 +415,11 @@ export default {
         this.userIdOptions = this.setItems(res, 'id', 'username')
       })
     },
-    getLineApiGroupItems() {
+    // getLineApiGroupItems() {
-      this.getItems(listLineApiGroup, undefined).then(res => {
+    //   this.getItems(listLineApiGroup, undefined).then(res => {
-        this.groupIdOptions = this.setItems(res, 'id', 'groupName')
+    //     this.groupIdOptions = this.setItems(res, 'id', 'groupName')
-      })
+    //   })
-    },
+    // },
     // 文件
     /** 搜索按钮操作 */
     handleQuery() {

src/views/admin/line-coinnetwork/index.vue

@@ -1,110 +1,119 @@
-
 <template>
-    <BasicLayout>
+  <BasicLayout>
-        <template #wrapper>
+    <template #wrapper>
-            <el-card class="box-card">
+      <el-card class="box-card">
-                <el-form ref="queryForm" :model="queryParams" :inline="true" label-width="68px">
+        <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>
-                    </el-form-item>
-                </el-form>
 
-                <el-row :gutter="10" class="mb8">
+          <el-form-item>
-                    <el-col :span="1.5">
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-                        <el-button
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-                                v-permisaction="['admin:lineCoinnetwork:add']"
+          </el-form-item>
-                                type="primary"
+        </el-form>
-                                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>
-                    </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>
-                    </el-col>
-                </el-row>
 
-                <el-table v-loading="loading" :data="lineCoinnetworkList" @selection-change="handleSelectionChange">
+        <el-row :gutter="10" class="mb8">
-                    <el-table-column type="selection" width="55" align="center"/>
+          <el-col :span="1.5">
-                    <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <el-button
-                        <template slot-scope="scope">
+              v-permisaction="['admin:lineCoinnetwork:add']"
-                         <el-popconfirm
+              type="primary"
-                           class="delete-popconfirm"
+              icon="el-icon-plus"
-                           title="确认要修改吗?"
+              size="mini"
-                           confirm-button-text="修改"
+              @click="handleAdd"
-                           @confirm="handleUpdate(scope.row)"
+            >新增
-                         >
+            </el-button>
-                           <el-button
+          </el-col>
-                             slot="reference"
+          <el-col :span="1.5">
-                             v-permisaction="['admin:lineCoinnetwork:edit']"
+            <el-button
-                             size="mini"
+              v-permisaction="['admin:lineCoinnetwork:edit']"
-                             type="text"
+              type="success"
-                             icon="el-icon-edit"
+              icon="el-icon-edit"
-                           >修改
+              size="mini"
-                           </el-button>
+              :disabled="single"
-                         </el-popconfirm>
+              @click="handleUpdate"
-                         <el-popconfirm
+            >修改
-                            class="delete-popconfirm"
+            </el-button>
-                            title="确认要删除吗?"
+          </el-col>
-                            confirm-button-text="删除"
+          <el-col :span="1.5">
-                            @confirm="handleDelete(scope.row)"
+            <el-button
-                         >
+              v-permisaction="['admin:lineCoinnetwork:remove']"
-                            <el-button
+              type="danger"
-                              slot="reference"
+              icon="el-icon-delete"
-                              v-permisaction="['admin:lineCoinnetwork:remove']"
+              size="mini"
-                              size="mini"
+              :disabled="multiple"
-                              type="text"
+              @click="handleDelete"
-                              icon="el-icon-delete"
+            >删除
-                            >删除
+            </el-button>
-                            </el-button>
+          </el-col>
-                         </el-popconfirm>
+        </el-row>
-                        </template>
-                    </el-table-column>
-                </el-table>
 
-                <pagination
+        <el-table v-loading="loading" :data="lineCoinnetworkList" @selection-change="handleSelectionChange">
-                        v-show="total>0"
+          <el-table-column type="selection" width="55" align="center" />
-                        :total="total"
+          <el-table-column label="网络名称" prop="networkName" align="center" />
-                        :page.sync="queryParams.pageIndex"
+          <el-table-column label="最小提现金额" prop="minWithdrawal" align="center" />
-                        :limit.sync="queryParams.pageSize"
+          <el-table-column label="手续费" prop="fee" align="center" />
-                        @pagination="getList"
+          <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>
+            </template>
+          </el-table-column>
+        </el-table>
 
-                <!-- 添加或修改对话框 -->
+        <pagination
-                <el-dialog :title="title" :visible.sync="open" width="500px">
+          v-show="total > 0"
-                    <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+          :total="total"
-                        
+          :page.sync="queryParams.pageIndex"
-                                    <el-form-item label="网络名称" prop="networkName">
+          :limit.sync="queryParams.pageSize"
-                                        <el-input v-model="form.networkName" placeholder="网络名称"
+          @pagination="getList"
-                                                      />
+        />
-                                    </el-form-item>
+
-                                    <el-form-item label="网络token名称" prop="tokenName">
+        <!-- 添加或修改对话框 -->
+        <el-dialog :title="title" :visible.sync="open" width="500px">
+          <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-form-item>
+            <!-- <el-form-item label="网络token名称" prop="tokenName">
                                         <el-input v-model="form.tokenName" placeholder="网络token名称"
                                                       />
-                                    </el-form-item>
+                                    </el-form-item> -->
-                                    <el-form-item label="充值区块确认数" prop="arrivalNum">
+            <!-- <el-form-item label="充值区块确认数" prop="arrivalNum">
                                         <el-input v-model="form.arrivalNum" placeholder="充值区块确认数"
                                                       />
                                     </el-form-item>
@@ -115,191 +124,207 @@
                                     <el-form-item label="提现确认平均时间，单位分钟" prop="unlockTime">
                                         <el-input v-model="form.unlockTime" placeholder="提现确认平均时间，单位分钟"
                                                       />
-                                    </el-form-item>
+                                    </el-form-item> -->
-                                    <el-form-item label="网络手续费，该字段是动态的，后面会有服务定时更新该字段" prop="fee">
+            <el-form-item label="手续费(百分比)" prop="fee">
-                                        <el-input v-model="form.fee" placeholder="网络手续费，该字段是动态的，后面会有服务定时更新该字段"
+              <el-input v-model="form.fee" placeholder="手续费(百分比)" />
-                                                      />
+            </el-form-item>
-                                    </el-form-item>
+            <el-form-item label="状态" prop="status">
-                    </el-form>
+              <el-switch
-                    <div slot="footer" class="dialog-footer">
+                v-model="form.status"
-                        <el-button type="primary" @click="submitForm">确 定</el-button>
+                active-text="启用"
-                        <el-button @click="cancel">取 消</el-button>
+                :active-value="1"
-                    </div>
+                :inactive-value="2"
-                </el-dialog>
+                inactive-text="禁用"
-            </el-card>
+              />
-        </template>
+            </el-form-item>
-    </BasicLayout>
+          </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>
+    </template>
+  </BasicLayout>
 </template>
 
 <script>
-    import {addLineCoinnetwork, delLineCoinnetwork, getLineCoinnetwork, listLineCoinnetwork, updateLineCoinnetwork} from '@/api/admin/line-coinnetwork'
+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: {}
-        }
-        },
-        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 = {
-                
-                id: undefined,
-                networkName: undefined,
-                tokenName: undefined,
-                arrivalNum: undefined,
-                unlockNum: undefined,
-                unlockTime: 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 =
-                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)
-                                }
-                            })
-                        }
-                    }
-                })
-            },
-            /** 删除按钮操作 */
-            handleDelete(row) {
-                var Ids = (row.id && [row.id]) || this.ids
 
-                this.$confirm('是否确认删除编号为"' + Ids + '"的数据项?', '警告', {
+export default {
-                    confirmButtonText: '确定',
+  name: 'LineCoinnetwork',
-                    cancelButtonText: '取消',
+  components: {
-                    type: 'warning'
+  },
-                }).then(function () {
+  data() {
-                      return delLineCoinnetwork( { 'ids': Ids })
+    return {
-                }).then((response) => {
+      // 遮罩层
-                   if (response.code === 200) {
+      loading: true,
-                     this.msgSuccess(response.msg)
+      // 选中数组
-                     this.open = false
+      ids: [],
-                     this.getList()
+      // 非单个禁用
-                   } else {
+      single: true,
-                     this.msgError(response.msg)
+      // 非多个禁用
-                   }
+      multiple: true,
-                }).catch(function () {
+      // 总条数
-                })
+      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
+      }
+      )
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+
+        id: undefined,
+        networkName: 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 =
+                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)
+              }
+            })
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    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() {
+      })
+    }
+  }
+}
 </script>

src/views/admin/line-order/index.vue

@@ -1,4 +1,3 @@
-
 <template>
   <BasicLayout>
     <template #wrapper>
@@ -10,12 +9,7 @@
             clearable
             size="small"
           >
-            <el-option
+            <el-option v-for="dict in lineUsersAll" :key="dict.id" :label="dict.apiName" :value="dict.id" />
-              v-for="dict in apiIdOptions"
-              :key="dict.key"
-              :label="dict.value"
-              :value="dict.key"
-            />
           </el-select>
           </el-form-item>
           <el-form-item label="交易对" prop="symbol"><el-input
@@ -34,7 +28,7 @@
             @keyup.enter.native="handleQuery"
           />
           </el-form-item>
-          <el-form-item label="对标价类型" prop="signPriceType"><el-select
+          <!-- <el-form-item label="对标价类型" prop="signPriceType"><el-select
             v-model="queryParams.signPriceType"
             placeholder="请选择对标价类型"
             clearable
@@ -47,19 +41,14 @@
               :value="dict.v"
             />
           </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="购买方向" prop="site"><el-select
             v-model="queryParams.site"
             placeholder="请选择购买方向"
             clearable
             size="small"
           >
-            <el-option
+            <el-option v-for="dict in buyer" :key="dict.k" :label="dict.l" :value="dict.v" />
-              v-for="dict in buyer"
-              :key="dict.k"
-              :label="dict.l"
-              :value="dict.v"
-            />
           </el-select>
           </el-form-item>
           <el-form-item label="订单号" prop="orderSn"><el-input
@@ -70,27 +59,22 @@
             @keyup.enter.native="handleQuery"
           />
           </el-form-item>
-          <el-form-item label="订单类型" prop="orderType"><el-select
+          <el-form-item label="订单类型" prop="symbolType"><el-select
-            v-model="queryParams.orderType"
+            v-model="queryParams.symbolType"
             placeholder="请选择订单类型"
             clearable
             size="small"
           >
-            <el-option
+            <el-option v-for="dict in [{ l: '现货', v: 1 }, { l: '合约', v: 2 }]" :key="dict.k" :label="dict.l" :value="dict.v" />
-              v-for="dict in [{l:'现货',v:1},{l:'合约',v:2}]"
-              :key="dict.k"
-              :label="dict.l"
-              :value="dict.v"
-            />
           </el-select>
           </el-form-item>
-          <el-form-item label="对冲状态" prop="hedgeStatus"><el-select
+          <el-form-item label="减仓状态" prop="hedgeStatus"><el-select
             v-model="queryParams.hedgeStatus"
-            placeholder="请选择对冲状态"
+            placeholder="请选择减仓状态"
             size="small"
           >
             <el-option
-              v-for="dict in [{l:'全部',v:-1},{l:'未对冲',v:0},{l:'已对冲',v:1}]"
+              v-for="dict in [{ l: '全部', v: -1 }, { l: '未减仓', v: 0 }, { l: '已减仓', v: 1 }]"
               :key="dict.k"
               :label="dict.l"
               :value="dict.v"
@@ -103,7 +87,7 @@
             size="small"
           >
             <el-option
-              v-for="dict in [{l:'全部',v:-1},{l:'未加仓',v:0},{l:'已加仓',v:1}]"
+              v-for="dict in [{ l: '全部', v: -1 }, { l: '未加仓', v: 0 }, { l: '已加仓', v: 1 }]"
               :key="dict.k"
               :label="dict.l"
               :value="dict.v"
@@ -114,15 +98,29 @@
             v-model="queryParams.status"
             placeholder="请选择状态"
             size="small"
+            clearable
           >
-            <el-option
+            <el-option v-for="dict in statuss" :key="dict.k" :label="dict.l" :value="dict.v" />
-              v-for="dict in statuss"
-              :key="dict.k"
-              :label="dict.l"
-              :value="dict.v"
-            />
           </el-select>
           </el-form-item>
+
+          <el-form-item label="下单百分比">
+            <el-input
+              v-model="queryParams.percentStart"
+              placeholder="下单百分比"
+              style="width: 100px;"
+              clearable
+              size="small"
+            />
+            -
+            <el-input
+              v-model="queryParams.percentEnd"
+              placeholder="下单百分比"
+              style="width: 100px;"
+              clearable
+              size="small"
+            />
+          </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>
@@ -217,8 +215,8 @@
           row-key="id"
           lazy
           :load="onLoadChild"
-          :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+          :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-          height="590"
+          height="650"
           @selection-change="handleSelectionChange"
           @expand-change="onExpand"
         >
@@ -226,7 +224,7 @@
             <template slot-scope="scope">
               {{ apiIdFormat(scope.row) }}
             </template>
-          </el-table-column> -->
+</el-table-column> -->
           <!-- <el-table-column type="expand" /> -->
           <el-table-column
             label="交易对"
@@ -236,17 +234,13 @@
             :show-overflow-tooltip="true"
             fixed="left"
           >
-            <template #default="{row}">
+            <template #default="{ row }">
-              <span v-if="row.pid===0">（{{ row.child_num }}）</span>
+              <span v-if="row.pid === 0">（{{ row.child_num }}）</span>
+              <span v-else-if="row.child_num">（{{ row.child_num }}）</span>
               <span>{{ row.symbol }}</span>
             </template>
           </el-table-column>
-          <el-table-column
+          <el-table-column label="api用户名" align="center" prop="api_name" :show-overflow-tooltip="true" />
-            label="api用户名"
-            align="left"
-            prop="api_name"
-            :show-overflow-tooltip="true"
-          />
           <el-table-column
             label="对标价"
             align="center"
@@ -261,7 +255,7 @@
             :show-overflow-tooltip="true"
           >
             <template #default="{ row }">
-              {{ {new:'最新价',mixture:'标记价'}[row.signPriceType] }}
+              {{ { new: '最新价', mixture: '标记价' }[row.signPriceType] }}
             </template>
           </el-table-column>
           <el-table-column
@@ -294,44 +288,53 @@
             prop="site"
             :show-overflow-tooltip="true"
           >
-            <template #default="{row}">
+            <template #default="{ row }">
-              <el-tag size="mini" :type="row.site==='BUY'?'success':'danger'">{{ {BUY:'买(多)',SELL:'卖(空)'}[row.site] }}</el-tag>
+              <el-tag size="mini" :type="row.site === 'BUY' ? 'success' : 'danger'">{{ { BUY: '买(多)', SELL: '卖(空)' }[row.site]
+              }}</el-tag>
             </template>
           </el-table-column>
-          <el-table-column
+          <el-table-column label="订单类型" align="center" prop="orderType" :show-overflow-tooltip="true">
-            label="订单类型"
+            <template #default="{ row }">
-            align="center"
+              {{ orderTypeFormat(row) }}
-            prop="orderType"
-            :show-overflow-tooltip="true"
-          >
-            <template #default="{row}">
-              {{ orderTypes[row.orderType-1] ? orderTypes[row.orderType-1].l : '' }}
             </template>
           </el-table-column>
-          <el-table-column
+          <el-table-column label="交易对类型" align="center" prop="symbolType" min-width="90" :show-overflow-tooltip="true">
+            <template #default="{ row }">
+              {{ ['现货', '合约'][row.symbolType - 1] }}
+            </template>
+          </el-table-column>
+          <!-- <el-table-column
             label="补仓百分比"
             align="center"
             prop="coverRate"
             width="100"
             :show-overflow-tooltip="true"
-          /><el-table-column
+          /> -->
-            label="状态"
+          <el-table-column label="状态" align="center" prop="status" width="100" :show-overflow-tooltip="true">
-            align="center"
+            <template #default="{ row }">
-            prop="status"
-            width="100"
-            :show-overflow-tooltip="true"
-          >
-            <template #default="{row}">
               <span :style="comStatusStyle(row)">{{ status[row.status] ? status[row.status].l : '' }}</span>
             </template>
           </el-table-column>
+          <el-table-column label="减仓状态" align="center" prop="reduce_status" width="100" :show-overflow-tooltip="true">
+            <template #default="{ row }">
+              <el-tag v-if="row.pid === 0" size="mini" :type="['danger', 'success'][row.reduce_status]">{{
+                ['未减仓', '已减仓'][row.reduce_status] }}</el-tag>
+            </template>
+          </el-table-column>
           <el-table-column
-            label="订单描述"
+            label="加仓状态"
             align="center"
-            prop="desc"
+            prop="add_position_status"
+            width="100"
             :show-overflow-tooltip="true"
-          />
+          >
-          <el-table-column
+            <template #default="{ row }">
+              <el-tag v-if="row.pid === 0" size="mini" :type="['danger', 'success'][row.add_position_status]">{{
+                ['未加仓', '已加仓'][row.add_position_status] }}</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="订单描述" align="center" prop="desc" :show-overflow-tooltip="true" />
+          <!-- <el-table-column
             label="对冲状态"
             align="center"
             prop="status"
@@ -352,43 +355,18 @@
             <template #default="{row}">
               <el-tag v-if="row.pid===0" size="mini" :type="row.addPositionStatus===1?'success':'danger'">{{ ['未加仓','已加仓'][row.addPositionStatus] }}</el-tag>
             </template>
+          </el-table-column> -->
+          <el-table-column label="计价货币" align="center" prop="quoteSymbol" :show-overflow-tooltip="true" />
+          <el-table-column label="预估方向" align="center" prop="direction" :show-overflow-tooltip="true" />
+          <el-table-column label="订单号" align="center" prop="orderSn" width="200" :show-overflow-tooltip="true" />
+          <el-table-column label="触发时间" align="center" prop="triggerTime" width="150" :show-overflow-tooltip="true">
+            <template #default="{ row }">{{ row.triggerTime && parseTime(row.triggerTime) }}</template>
           </el-table-column>
-          <el-table-column
+          <el-table-column label="过期时间" align="center" prop="expireTime" width="150" :show-overflow-tooltip="true">
-            label="计价货币"
+            <template #default="{ row }">{{ parseTime(row.expireTime) }}</template>
-            align="center"
-            prop="quoteSymbol"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="预估方向"
-            align="center"
-            prop="direction"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="订单号"
-            align="center"
-            prop="orderSn"
-            width="200"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="过期时间"
-            align="center"
-            prop="expireTime"
-            width="150"
-            :show-overflow-tooltip="true"
-          >
-            <template #default="{row}">{{ parseTime(row.expireTime) }}</template>
           </el-table-column>
-          <el-table-column
+          <el-table-column label="创建时间" align="center" prop="createdAt" width="150" :show-overflow-tooltip="true">
-            label="创建时间"
+            <template #default="{ row }">{{ parseTime(row.createdAt) }}</template>
-            align="center"
-            prop="createdAt"
-            width="150"
-            :show-overflow-tooltip="true"
-          >
-            <template #default="{row}">{{ parseTime(row.createdAt) }}</template>
           </el-table-column>
           <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150" fixed="right">
             <template v-if="scope.row.pid===0" slot-scope="scope">
@@ -427,7 +405,7 @@
         </el-table>
 
         <pagination
-          v-show="total>0"
+          v-show="total > 0"
           :total="total"
           :page.sync="queryParams.pageIndex"
           :limit.sync="queryParams.pageSize"
@@ -436,7 +414,13 @@
 
         <!-- 添加或修改对话框 -->
         <el-dialog :title="title" :visible.sync="open" width="700px" :close-on-click-modal="false">
-          <el-form ref="form" :model="form" :rules="rules" label-width="120px" style="height: 600px;overflow: hidden auto;">
+          <el-form
+            ref="form"
+            :model="form"
+            :rules="rules"
+            label-width="120px"
+            style="height: 600px;overflow: hidden auto;"
+          >
             <el-form-item label="订单类型" prop="order_type">
               <el-radio-group v-model="form.order_type">
                 <el-radio label="1">现货</el-radio>
@@ -445,9 +429,9 @@
             </el-form-item>
             <el-form-item label="对冲类型" prop="cover_type">
               <el-radio-group v-model="form.cover_type">
-                <el-radio :label="1" :disabled="form.order_type==2">现货对合约</el-radio>
+                <el-radio :label="1" :disabled="form.order_type == 2">现货对合约</el-radio>
-                <el-radio :label="2" :disabled="form.order_type==1">合约对合约</el-radio>
+                <el-radio :label="2" :disabled="form.order_type == 1">合约对合约</el-radio>
-                <el-radio :label="3" :disabled="form.order_type==1">合约对现货</el-radio>
+                <el-radio :label="3" :disabled="form.order_type == 1">合约对现货</el-radio>
               </el-radio-group>
             </el-form-item>
             <el-form-item label="api用户" prop="api_id">
@@ -462,12 +446,7 @@
                     filterable
                     size="small"
                   >
-                    <el-option
+                    <el-option v-for="dict in apiIdOptions" :key="dict.id" :label="dict.apiName" :value="dict.id" />
-                      v-for="dict in apiIdOptions"
-                      :key="dict.key"
-                      :label="dict.value"
-                      :value="dict.key"
-                    />
                   </el-select>
                 </el-col>
                 <el-col :span="3">
@@ -481,9 +460,9 @@
                 placeholder="交易对组id"
               />
             </el-form-item> -->
-            <el-form-item v-if="title==='批量添加'" label="交易对组" prop="symbol_group_id">
+            <el-form-item v-if="title === '批量添加'" label="交易对组" prop="symbol_group_id">
               <el-select
-                v-if="title==='批量添加'"
+                v-if="title === '批量添加'"
                 v-model="form.symbol_group_id"
                 style="width: 100%;"
                 placeholder="请选择交易对组"
@@ -491,12 +470,7 @@
                 size="small"
                 filterable
               >
-                <el-option
+                <el-option v-for="dict in comSymbols" :key="dict.id" :label="dict.groupName" :value="dict.id" />
-                  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">
@@ -511,15 +485,10 @@
                 remote
                 size="small"
               >
-                <el-option
+                <el-option v-for="dict in comSymbols" :key="dict.id" :label="dict.symbol" :value="dict.symbol" />
-                  v-for="dict in comSymbols"
-                  :key="dict.id"
-                  :label="dict.symbol"
-                  :value="dict.symbol"
-                />
                 <div class="page">
                   <pagination
-                    v-show="symbol.total>0"
+                    v-show="symbol.total > 0"
                     :background="false"
                     :total="symbol.total"
                     layout="prev, pager, next"
@@ -533,34 +502,25 @@
             <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 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
+              <el-input v-model="form.buy_price" placeholder="购买金额（U）" />
-                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="mixture" :disabled="title === '批量添加'">主单实价委托百分比</el-radio>
               </el-radio-group>
             </el-form-item>
             <el-form-item v-if="form.price_pattern === 'percentage'" label="下单百分比" prop="price">
-              <el-input
+              <el-input v-model="form.price" placeholder="下单百分比" />
-                v-model="form.price"
-                placeholder="下单百分比"
-              />
             </el-form-item>
             <el-row v-else type="flex">
               <el-col :span="12">
                 <el-form-item label="下单价(实际价格)" prop="price">
-                  <el-input
+                  <el-input v-model="form.price" placeholder="下单价(实际价格)" />
-                    v-model="form.price"
-                    placeholder="下单价(实际价格)"
-                  />
                 </el-form-item>
               </el-col>
               <el-col :span="7">
@@ -573,40 +533,32 @@
               </el-col>
             </el-row>
             <el-form-item label="止盈百分比" prop="profit">
-              <el-input
+              <el-input v-model="form.profit" placeholder="止盈百分比" />
-                v-model="form.profit"
-                placeholder="止盈百分比"
-              />
             </el-form-item>
             <el-form-item label="亏损百分比" prop="stop_price">
-              <el-input
+              <el-input v-model="form.stop_price" placeholder="亏损百分比" />
-                v-model="form.stop_price"
-                placeholder="亏损百分比"
-              />
             </el-form-item>
             <el-form-item label="对冲百分比" prop="cover_rate">
-              <el-input
+              <el-input v-model="form.cover_rate" placeholder="对冲百分比" />
-                v-model="form.cover_rate"
-                placeholder="对冲百分比"
-              />
             </el-form-item>
             <el-form-item label="对冲后盈利比例" prop="profit_rate">
-              <el-input
+              <el-input v-model="form.profit_rate" placeholder="对冲后盈利比例" />
-                v-model="form.profit_rate"
-                placeholder="对冲后盈利比例"
-              />
             </el-form-item>
             <el-form-item label="对冲平仓最大次数" prop="hedge_close_count">
-              <el-input
+              <el-input v-model.number="form.hedge_close_count" type="number" placeholder="对冲平仓最大次数" />
-                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
-                <el-col :span="11"><el-input v-model.number="form.hedge_trigger_percent_max" type="number" placeholder="最大值"><template #append>最大值</template></el-input></el-col>
+                  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">
@@ -640,24 +592,14 @@
               </el-radio-group>
             </el-form-item>
             <el-form-item label="订单过期时间" prop="profit_rate">
-              <el-input
+              <el-input v-model.number="form.expire_hour" class="hour" type="number" placeholder="订单过期时间">
-                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-form-item v-if="title === '批量添加'" label="批量下单次数" prop="order_num">
-              <el-input
+              <el-input v-model.number="form.order_num" min="1" type="number" placeholder="批量下单次数" />
-                v-model.number="form.order_num"
-                min="1"
-                type="number"
-                placeholder="批量下单次数"
-              />
             </el-form-item>
-            <el-form-item v-if="title==='批量添加'" label="执行类型" prop="script">
+            <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>
@@ -671,10 +613,7 @@
               </el-radio-group>
             </el-form-item>
             <el-form-item label="模板名称" prop="template_name">
-              <el-input
+              <el-input v-model="form.template_name" placeholder="模板名称" />
-                v-model="form.template_name"
-                placeholder="模板名称"
-              />
             </el-form-item>
 
           </el-form>
@@ -698,12 +637,7 @@
                     filterable
                     size="small"
                   >
-                    <el-option
+                    <el-option v-for="dict in lineUsers" :key="dict.id" :label="dict.apiName" :value="dict.id" />
-                      v-for="dict in lineUsers"
-                      :key="dict.id"
-                      :label="dict.apiName"
-                      :value="dict.id"
-                    />
                   </el-select>
                 </el-col>
                 <el-col :span="3">
@@ -719,26 +653,21 @@
                 clearable
                 multiple
                 filterable
-                :remote-method="(e)=>getSymbol(e,2)"
+                :remote-method="(e) => getSymbol(e, 2)"
                 :loading="searchLoding"
                 remote
                 size="small"
               >
-                <el-option
+                <el-option v-for="dict in symbol.symbolList" :key="dict.id" :label="dict.symbol" :value="dict.symbol" />
-                  v-for="dict in symbol.symbolList"
-                  :key="dict.id"
-                  :label="dict.symbol"
-                  :value="dict.symbol"
-                />
                 <div class="page">
                   <pagination
-                    v-show="symbol.total>0"
+                    v-show="symbol.total > 0"
                     :background="false"
                     :total="symbol.total"
                     layout="prev, pager, next"
                     :page.sync="symbol.pageIndex"
                     :limit.sync="symbol.pageSize"
-                    @pagination="getSymbol($event,2)"
+                    @pagination="getSymbol($event, 2)"
                   />
                 </div>
               </el-select>
@@ -752,22 +681,11 @@
                 filterable
                 size="small"
               >
-                <el-option
+                <el-option v-for="dict in symbolGroups" :key="dict.id" :label="dict.groupName" :value="dict.id" />
-                  v-for="dict in symbolGroups"
-                  :key="dict.id"
-                  :label="dict.groupName"
-                  :value="dict.id"
-                />
               </el-select>
             </el-form-item>
-            <el-form-item v-if="mode.modeTitle==='设置杠杆'" label="杠杆倍数" prop="leverage">
+            <el-form-item v-if="mode.modeTitle === '设置杠杆'" label="杠杆倍数" prop="leverage">
-              <el-inputNumber
+              <el-inputNumber v-model.number="modeForm.leverage" :min="1" :max="125" step-strictly placeholder="杠杆倍数" />
-                v-model.number="modeForm.leverage"
-                :min="1"
-                :max="125"
-                step-strictly
-                placeholder="杠杆倍数"
-              />
             </el-form-item>
             <el-form-item v-else label="保证金模式" prop="margin_type">
               <el-radio-group v-model="modeForm.margin_type">
@@ -776,14 +694,20 @@
               </el-radio-group>
             </el-form-item>
             <el-form-item label="全部交易对" prop="is_all">
-              <el-radio-group v-model="modeForm.is_all" :disabled="!!modeForm.group_id || !!(modeForm.symbol && modeForm.symbol.length)">
+              <el-radio-group
+                v-model="modeForm.is_all"
+                :disabled="!!modeForm.group_id || !!(modeForm.symbol && modeForm.symbol.length)"
+              >
                 <el-radio :label="0">否</el-radio>
                 <el-radio :label="1"> 是</el-radio>
               </el-radio-group>
-              <span v-if="modeForm.is_all===1" style="color: red;margin-left: 20px;">耗时比较久，请耐心等待</span>
+              <span v-if="modeForm.is_all === 1" style="color: red;margin-left: 20px;">耗时比较久，请耐心等待</span>
             </el-form-item>
           </el-form>
-          <div style="color: red;"><i class="el-icon-warning-outline" style="margin-right: 4px;" />请保证该操作下的交易对无仓位，否则会直接失败</div>
+          <div style="color: red;"><i
+            class="el-icon-warning-outline"
+            style="margin-right: 4px;"
+          />请保证该操作下的交易对无仓位，否则会直接失败</div>
           <div slot="footer" class="dialog-footer">
             <el-button type="primary" :loading="btnLoading" @click="modeConfirm">确 定</el-button>
             <el-button @click="modeCancel">取 消</el-button>
@@ -801,12 +725,7 @@
                 filterable
                 size="small"
               >
-                <el-option
+                <el-option v-for="dict in apiIdOptions" :key="dict.id" :label="dict.apiName" :value="dict.id" />
-                  v-for="dict in apiIdOptions"
-                  :key="dict.key"
-                  :label="dict.value"
-                  :value="dict.key"
-                />
               </el-select>
             </el-form-item>
             <el-form-item label="加仓账户" prop="cover_account">
@@ -830,26 +749,21 @@
                 clearable
                 multiple
                 filterable
-                :remote-method="(e)=>getSymbol(e,storeForm.symbol_type)"
+                :remote-method="(e) => getSymbol(e, storeForm.symbol_type)"
                 :loading="searchLoding"
                 remote
                 size="small"
               >
-                <el-option
+                <el-option v-for="dict in symbol.symbolList" :key="dict.id" :label="dict.symbol" :value="dict.symbol" />
-                  v-for="dict in symbol.symbolList"
-                  :key="dict.id"
-                  :label="dict.symbol"
-                  :value="dict.symbol"
-                />
                 <div class="page">
                   <pagination
-                    v-show="symbol.total>0"
+                    v-show="symbol.total > 0"
                     :background="false"
                     :total="symbol.total"
                     layout="prev, pager, next"
                     :page.sync="symbol.pageIndex"
                     :limit.sync="symbol.pageSize"
-                    @pagination="getSymbol($event,2)"
+                    @pagination="getSymbol($event, 2)"
                   />
                 </div>
               </el-select>
@@ -860,11 +774,8 @@
                 <el-radio label="LIMIT">限价</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item v-if="storeForm.cover_account_a_type==='LIMIT'" label="加仓主账号溢价比例" prop="cover_account_a_rate">
+            <el-form-item v-if="storeForm.cover_account_a_type === 'LIMIT'" label="加仓主账号溢价比例" prop="cover_account_a_rate">
-              <el-input
+              <el-input v-model="storeForm.cover_account_a_rate" placeholder="加仓主账号溢价比例" />
-                v-model="storeForm.cover_account_a_rate"
-                placeholder="加仓主账号溢价比例"
-              />
             </el-form-item>
             <el-form-item label="加仓副账号类型" prop="cover_account_b_type">
               <el-radio-group v-model="storeForm.cover_account_b_type">
@@ -872,11 +783,8 @@
                 <el-radio label="LIMIT">限价</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item v-if="storeForm.cover_account_b_type==='LIMIT'" label="加仓副账号溢价比例" prop="cover_account_b_rate">
+            <el-form-item v-if="storeForm.cover_account_b_type === 'LIMIT'" label="加仓副账号溢价比例" prop="cover_account_b_rate">
-              <el-input
+              <el-input v-model="storeForm.cover_account_b_rate" placeholder="加仓副账号溢价比例" />
-                v-model="storeForm.cover_account_b_rate"
-                placeholder="加仓副账号溢价比例"
-              />
             </el-form-item>
             <el-form-item label="加仓类型" prop="cover_type">
               <el-radio-group v-model="storeForm.cover_type">
@@ -884,11 +792,8 @@
                 <el-radio :label="2">金额</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item :label="`加仓数值${storeForm.cover_type===2?'(U)':''}`" prop="value">
+            <el-form-item :label="`加仓数值${storeForm.cover_type === 2 ? '(U)' : ''}`" prop="value">
-              <el-input
+              <el-input v-model="storeForm.value" :placeholder="`加仓数值${storeForm.cover_type === 2 ? '(U)' : ''}`" />
-                v-model="storeForm.value"
-                :placeholder="`加仓数值${storeForm.cover_type===2?'(U)':''}`"
-              />
             </el-form-item>
           </el-form>
           <div slot="footer" class="dialog-footer">
@@ -914,12 +819,7 @@
                 filterable
                 size="small"
               >
-                <el-option
+                <el-option v-for="dict in apiIdOptions" :key="dict.id" :label="dict.apiName" :value="dict.id" />
-                  v-for="dict in apiIdOptions"
-                  :key="dict.key"
-                  :label="dict.value"
-                  :value="dict.key"
-                />
               </el-select>
             </el-form-item>
             <el-form-item label="交易对" prop="symbol">
@@ -929,26 +829,21 @@
                 placeholder="请选择交易对"
                 clearable
                 filterable
-                :remote-method="(e)=>getSymbol(e,positionForm.close_type)"
+                :remote-method="(e) => getSymbol(e, positionForm.close_type)"
                 :loading="searchLoding"
                 remote
                 size="small"
               >
-                <el-option
+                <el-option v-for="dict in symbol.symbolList" :key="dict.id" :label="dict.symbol" :value="dict.symbol" />
-                  v-for="dict in symbol.symbolList"
-                  :key="dict.id"
-                  :label="dict.symbol"
-                  :value="dict.symbol"
-                />
                 <div class="page">
                   <pagination
-                    v-show="symbol.total>0"
+                    v-show="symbol.total > 0"
                     :background="false"
                     :total="symbol.total"
                     layout="prev, pager, next"
                     :page.sync="symbol.pageIndex"
                     :limit.sync="symbol.pageSize"
-                    @pagination="getSymbol($event,2)"
+                    @pagination="getSymbol($event, 2)"
                   />
                 </div>
               </el-select>
@@ -957,7 +852,8 @@
               <el-input v-model="positionForm.rate" placeholder="平仓行情百分比" />
             </el-form-item>
           </el-form>
-          <div style="color: red;"><i class="el-icon-warning-outline" style="margin-right: 4px;" />该功能仅适用于本系统内的下单数据</div>
+          <div style="color: red;"><i class="el-icon-warning-outline" style="margin-right: 4px;" />该功能仅适用于本系统内的下单数据
+          </div>
           <div slot="footer" class="dialog-footer">
             <el-button type="primary" @click="positionConfirm">确 定</el-button>
             <el-button @click="positionCancel">取 消</el-button>
@@ -967,7 +863,7 @@
         <!-- 取消委托 -->
         <el-dialog title="取消委托" :visible.sync="cancelOpen" width="700px" :close-on-click-modal="false">
           <el-form ref="formCancel" :model="cancelForm" label-width="80px">
-            <el-form-item label="api用户" prop="api_id" :rules="[{required: true,message: 'api用户不能为空', trigger: 'blur'}]">
+            <el-form-item label="api用户" prop="api_id" :rules="[{ required: true, message: 'api用户不能为空', trigger: 'blur' }]">
               <el-select
                 v-model="cancelForm.api_id"
                 style="width: 100%;"
@@ -976,12 +872,7 @@
                 filterable
                 size="small"
               >
-                <el-option
+                <el-option v-for="dict in apiIdOptions" :key="dict.id" :label="dict.apiName" :value="Number(dict.id)" />
-                  v-for="dict in apiIdOptions"
-                  :key="dict.key"
-                  :label="dict.value"
-                  :value="Number(dict.key)"
-                />
               </el-select>
             </el-form-item>
             <el-form-item label="订单类型" prop="close_type">
@@ -991,7 +882,8 @@
               </el-radio-group>
             </el-form-item>
           </el-form>
-          <div style="color: red;"><i class="el-icon-warning-outline" style="margin-right: 4px;" />该功能仅适用于本系统内的下单数据</div>
+          <div style="color: red;"><i class="el-icon-warning-outline" style="margin-right: 4px;" />该功能仅适用于本系统内的下单数据
+          </div>
           <div slot="footer" class="dialog-footer">
             <el-button type="primary" @click="handleCancel('formCancel')">确 定</el-button>
             <el-button @click="cancelOpen = false">取 消</el-button>
@@ -1022,18 +914,11 @@ export default {
       ],
       // :1=现货;2=合约;3=合约止盈;4=合约止损;5=现货止盈;6=现货止损;7=止损补仓;8=现货加仓；9=现货平仓;10 = 合约止损补仓,11=合约加仓；12=合约平仓
       orderTypes: [
-        { v: 1, l: '现货' },
+        { v: 0, l: '主单' },
-        { v: 2, l: '合约' },
+        { v: 1, l: '止盈' },
-        { v: 3, l: '合约止盈' },
+        { v: 2, l: '止损' },
-        { v: 4, l: '合约亏损' },
+        { v: 3, l: '平仓' },
-        { v: 5, l: '现货止盈' },
+        { v: 4, l: '减仓' }
-        { v: 6, l: '现货亏损' },
-        { v: 7, l: '现货对冲' },
-        { v: 8, l: '现货加仓' },
-        { v: 9, l: '现货平仓' },
-        { v: 10, l: '合约对冲' },
-        { v: 11, l: '合约加仓' },
-        { v: 12, l: '合约平仓' }
       ],
       buyer: [
         { v: 'BUY', l: '买（多）' },
@@ -1044,28 +929,22 @@ export default {
         { v: 0, l: '待触发' },
         { v: 1, l: '已触发' },
         { v: 2, l: '下单失败' },
-        { v: 3, l: '已记录' },
+        { v: 3, l: '未知' },
         { v: 4, l: '已取消' },
         { v: 5, l: '委托中' },
-        { v: 6, l: '已平仓' },
+        { v: 6, l: '已成交' },
-        { v: 7, l: '已补单' },
+        { v: 7, l: '未知' },
-        { v: 8, l: '补单失败' },
+        { v: 8, l: '未知' },
-        { v: 9, l: '现货已成交' },
+        { v: 9, l: '已平仓' }
-        { v: 10, l: '合约已补单' },
-        { v: 11, l: '合约补单失败' },
-        { v: 12, l: '合约已成交' },
-        { v: 13, l: '已开仓' }
       ],
       statuss: [
-        { v: '0', l: '待触发' },
+        { v: 0, l: '待触发' },
-        { v: '1', l: '已触发' },
+        { v: 1, l: '已触发' },
-        { v: '2', l: '下单失败' },
+        { v: 2, l: '下单失败' },
-        { v: '4', l: '已取消' },
+        { v: 4, l: '已取消' },
-        { v: '5', l: '委托中' },
+        { v: 5, l: '委托中' },
-        { v: '6', l: '已平仓' },
+        { v: 6, l: '已成交' },
-        { v: '9', l: '现货已成交' },
+        { v: 9, l: '已平仓' }
-        { v: '12', l: '合约已成交' },
-        { v: '13', l: '已开仓' }
       ],
       // 遮罩层
       loading: true,
@@ -1100,11 +979,13 @@ export default {
         rate: undefined,
         site: undefined,
         orderSn: undefined,
-        orderType: undefined,
+        symbolType: undefined,
         idOrder: 'desc',
         addPositionStatus: -1,
         hedgeStatus: -1,
-        status: ''
+        status: '',
+        percentStart: undefined,
+        percentEnd: undefined
       },
       // 表单参数
       form: {
@@ -1138,6 +1019,7 @@ export default {
         modeTitle: '',
         modeOpen: false
       },
+      lineUsersAll: [],
       lineUsers: [],
       lineTotal: 0,
       storeOpen: false,
@@ -1217,9 +1099,10 @@ export default {
   },
   created() {
     this.getList()
-    this.getLineApiUserItems()
+    // this.getLineApiUserItems()
     this.getSymbolGroup()
     this.getListLineApiUser()
+    listLineApiUser({ pageIndex: 1, pageSize: 999, exchangeType: '' }).then(response => { this.lineUsersAll = response?.data?.list || [] })
   },
   methods: {
     onSelectAll() {
@@ -1237,8 +1120,8 @@ export default {
       this.modeForm.api_user_ids = this.lineUsers.map(item => item.id)
     },
     // 获取杠杆api用户
-    getListLineApiUser() {
+    getListLineApiUser(exchangeType) {
-      listLineApiUser({ pageIndex: 1, pageSize: 999 }).then(response => {
+      listLineApiUser({ pageIndex: 1, pageSize: 999, exchangeType: exchangeType || this.form.exchange_type }).then(response => {
         this.lineUsers = response.data.list
         this.lineTotal = response.data.count
       })
@@ -1280,29 +1163,31 @@ export default {
       }
     },
     onExpand(row, expanded) {
-      const { symbol, id } = row
+      const { symbol, id, mainId } = row
 
       // 查询后更新数据
       if (Object.keys(row).length > 0) {
         for (const x in this.cacheRefresh) {
           // 当前的刷新
-          if (`${row.symbol}${row.id}` === x) {
+          if (`${symbol}${id}` === x) {
             const curr = this.cacheRefresh[`${symbol}${id}`]
             curr.expandCount++
             // 如果是展开状态，且展开次数大于1，且上一次的状态为折叠，则请求api数据，不需要更新子菜单
             if (expanded && curr.expandCount > 1 && !curr.prevStatus) {
               getChildOrder({ id }).then(res => {
                 curr.resolve(res.data)
-              }).finally(() => {})
+              }).finally(() => { })
             }
             curr.expandCount = 1
             curr.prevStatus = expanded
           } else {
-            if (this.cacheRefresh[x].prevStatus) {
+            if (this.cacheRefresh[x].prevStatus && mainId !== this.cacheRefresh[x].mainId) {
               const flag = this.linePreOrderList.findIndex(item => `${item.symbol}${item.id}` === x)
-              this.cacheRefresh[x].expandCount = 0
+              if (flag >= 0) {
-              this.cacheRefresh[x].prevStatus = false
+                this.cacheRefresh[x].expandCount = 0
-              this.$refs.table.toggleRowExpansion(this.linePreOrderList[flag], false)
+                this.cacheRefresh[x].prevStatus = false
+                this.$refs.table && this.$refs.table.toggleRowExpansion(this.linePreOrderList[flag], false)
+              }
             }
           }
         }
@@ -1313,11 +1198,13 @@ export default {
       const { symbol, id } = tree
       this.currentExpandId = tree.id
       this.cacheRefresh[`${symbol}${id}`] = {}
+      this.cacheRefresh[`${symbol}${id}`].mainId = id
       this.cacheRefresh[`${symbol}${id}`].resolve = resolve
       this.cacheRefresh[`${symbol}${id}`].expandCount = 0
       getChildOrder({ id }).then(res => {
-        resolve(res.data)
+        const r = res.data.map((item) => ({ ...item, hasChildren: item.child_num > 0 }))
-      }).finally(() => {})
+        resolve(r)
+      }).finally(() => { })
     },
     /** 查询参数列表 */
     getList() {
@@ -1582,7 +1469,7 @@ export default {
       this.title = '修改委托管理'
       this.reset()
       const id =
-                row.id || this.ids
+        row.id || this.ids
       getLinePreOrder(id).then(response => {
         this.form = response.data
         this.open = true
@@ -1667,7 +1554,7 @@ export default {
         } else {
           this.msgError(response.msg)
         }
-      }).catch(function() {})
+      }).catch(function() { })
     },
     /** 删除按钮操作 */
     handleDelete(row) {
@@ -1724,18 +1611,26 @@ export default {
         }
       }).catch(function() {
       })
+    },
+    orderTypeFormat(row) {
+      if (row.orderCategory === 3 && row.orderType === 0) {
+        return '加仓'
+      } else {
+        return this.orderTypes[row.orderType] ? this.orderTypes[row.orderType].l : ''
+      }
     }
   }
 }
 </script>
 <style lang="scss" scoped>
-.hour{
+.hour {
-  ::v-deep.el-input__inner{
+  ::v-deep.el-input__inner {
     line-height: 1;
   }
 }
-.page{
+
-  .pagination-container{
+.page {
+  .pagination-container {
     padding: 0 !important;
     margin-top: 0;
     margin-bottom: 0;
@@ -1744,12 +1639,14 @@ export default {
     justify-content: center;
     align-items: center;
   }
-  ::v-deep.el-pagination{
+
+  ::v-deep.el-pagination {
     width: 100%;
   }
 }
-::v-deep.el-table{
+
-  .el-table__row--level-0{
+::v-deep.el-table {
+  .el-table__row--level-0 {
     background: #f5f5f5;
   }
 }

src/views/admin/line-pre-order/AddPosition.vue

@@ -0,0 +1,428 @@
+<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>
+
+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>

src/views/admin/line-reduce-strategy/index.vue

@@ -0,0 +1,448 @@
+<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="name"><el-input
+            v-model="queryParams.name"
+            placeholder="请输入策略名称"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+          />
+          </el-form-item>
+          <el-form-item label="状态" prop="status">
+            <el-select v-model="queryParams.status" size="mini" placeholder="请选择订单类型" clearable>
+              <el-option
+                v-for="(item2, index2) in statusOptions"
+                :key="'queryStatus.' + index2"
+                :label="item2.label"
+                :value="item2.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:lineReduceStrategy: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:lineReduceStrategy: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:lineReduceStrategy: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="lineReduceStrategyList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="策略名称" align="center" prop="name" :show-overflow-tooltip="true" />
+          <el-table-column label="状态" align="center" prop="status" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              {{ statusFormat(scope.row.status) }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="创建时间"
+            align="center"
+            prop="createdAt"
+            width="150"
+            :show-overflow-tooltip="true"
+          >
+            <template #default="{ row }">{{ parseTime(row.createdAt) }}</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:lineReduceStrategy: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:lineReduceStrategy: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="800px">
+          <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+            <el-form-item label="策略名称" prop="name">
+              <el-input v-model="form.name" placeholder="减仓策略名称" show-word-limit maxlength="50" />
+            </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-group>
+            </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="onAddItem"
+              >新增减仓</el-button></el-col>
+            </el-row>
+            <el-row
+              v-for="(item, index) in form.items"
+              :key="'item_' + index"
+              style="margin-top: 10px;"
+              :gutter="20"
+            >
+              <!-- <el-card shadow="hover"> -->
+              <el-col :span="6">
+                <el-form-item
+                  label="亏损比例"
+                  :prop="'items.' + index + '.lossPercent'"
+                  :rules="rules.lossPercent"
+                >
+                  <el-input v-model="item.lossPercent" size="mini" placeholder="请输入亏损比例" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="减仓比例" :prop="'items.' + index + '.quantityPercent'" :rules="rules.quantityPercent">
+                  <el-input v-model="item.quantityPercent" size="mini" placeholder="请输入减仓数量比例" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item
+                  label="订单类型"
+                  :prop="'items.' + index + '.orderType'"
+                  :rules="rules.orderType"
+                >
+                  <el-select v-model="item.orderType" size="mini" placeholder="请选择订单类型">
+                    <el-option
+                      v-for="(item2, index2) in orderTypeOptions"
+                      :key="index + '.orderType.' + index2"
+                      :label="item2.label"
+                      :value="item2.value"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <!-- <el-form-item> -->
+              <!-- </el-form-item> -->
+              <el-col :span="4" style="height: 36px; line-height: 36px;"><el-button
+                size="mini"
+                type="danger"
+                @click="removeItem(index)"
+              >删除</el-button></el-col>
+              <!-- </el-card> -->
+            </el-row>
+
+          </el-form>
+          <div slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="submitForm">确 定</el-button>
+            <el-button @click="cancel">取 消</el-button>
+          </div>
+        </el-dialog>
+      </el-card>
+    </template>
+  </BasicLayout>
+</template>
+
+<script>
+import { addLineReduceStrategy, delLineReduceStrategy, getLineReduceStrategy, listLineReduceStrategy, updateLineReduceStrategy } from '@/api/admin/line-reduce-strategy'
+
+export default {
+  name: 'LineReduceStrategy',
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 总条数
+      total: 0,
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      isEdit: false,
+      // 类型数据字典
+      typeOptions: [],
+      lineReduceStrategyList: [],
+      orderTypeOptions: [{
+        value: 'LIMIT',
+        label: '限价'
+      }, {
+        value: 'MARKET',
+        label: '市价'
+      }],
+      statusOptions: [{
+        value: 1,
+        label: '启用'
+      }, {
+        value: 2,
+        label: '禁用'
+      }],
+      // 关系表类型
+
+      // 查询参数
+      queryParams: {
+        pageIndex: 1,
+        pageSize: 10,
+        name: undefined,
+        status: undefined,
+        idOrder: 'desc'
+      },
+      // 表单参数
+      form: {
+      },
+      // 表单校验
+      rules: {
+        name: [{ required: true, message: '减仓策略名称不能为空', trigger: 'blur' }],
+        status: [{ required: true, message: '状态 1-启用 2-禁用不能为空', trigger: 'blur' }],
+        lossPercent: [{ required: true, message: '亏损百分比不能为空', trigger: 'blur' },
+          { validator: this.validateOrderType, trigger: 'blur' }],
+        orderType: [{ required: true, message: '订单类型不能为空', trigger: 'blur' }
+        ],
+        quantityPercent: [{ required: true, message: '减仓数量百分比不能为空', trigger: 'blur' },
+          { validator: this.validateQuantityPercent, trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    // 校验节点百分比
+    validateOrderType(rule, value, callback) {
+      const index = rule.fullField.split('.')[1] // 获取索引
+      const item = this.form.items[index]
+
+      if (value === '') {
+        callback(new Error('不能为空'))
+      } else if (isNaN(value)) {
+        callback(new Error('必须输入数字'))
+      } else if (value < 0) {
+        callback(new Error('百分比不能小于 0'))
+      }
+
+      if (index > 0 && item.lossPercent <= this.form.items[index - 1].lossPercent) {
+        callback(new Error('亏损百分比不能小于上一节点'))
+      } else {
+        callback()
+      }
+    },
+    validateQuantityPercent(rule, value, callback) {
+      // const index = rule.fullField.split('.')[1] // 获取索引
+
+      if (value === '') {
+        callback(new Error('不能为空'))
+      } else if (isNaN(value)) {
+        callback(new Error('必须输入数字'))
+      } else if (value < 0) {
+        callback(new Error('百分比不能小于 0'))
+      } else if (value > 100) {
+        callback(new Error('百分比不能大于 100'))
+      } else {
+        callback()
+      }
+    },
+    /** 查询参数列表 */
+    getList() {
+      this.loading = true
+      listLineReduceStrategy(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+        this.lineReduceStrategyList = response.data.list
+        this.total = response.data.count
+        this.loading = false
+      }
+      )
+    },
+    statusFormat(status) {
+      const op = this.statusOptions.find(x => x.value === status)
+
+      if (op) {
+        return op.label
+      }
+
+      return ''
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+
+        id: undefined,
+        name: undefined,
+        status: 1,
+        items: []
+      }
+      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
+      getLineReduceStrategy(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) {
+            updateLineReduceStrategy(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess(response.msg)
+                this.open = false
+                this.getList()
+              } else {
+                this.msgError(response.msg)
+              }
+            })
+          } else {
+            addLineReduceStrategy(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 delLineReduceStrategy({ 'ids': Ids })
+      }).then((response) => {
+        if (response.code === 200) {
+          this.msgSuccess(response.msg)
+          this.open = false
+          this.getList()
+        } else {
+          this.msgError(response.msg)
+        }
+      }).catch(function() {
+      })
+    },
+    onAddItem() {
+      this.form.items.push({ lossPercent: undefined, orderType: 'LIMIT' })
+    },
+    removeItem(index) {
+      this.form.items.splice(index, 1)
+    }
+  }
+}
+</script>

src/views/admin/line-strategy-template/index.vue

@@ -0,0 +1,416 @@
+<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="direction">
+            <el-select v-model="queryParams.direction" placeholder="请选择涨跌方向" clearable>
+              <el-option
+                v-for="item in directionOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="比较类型" prop="compareType">
+            <el-select v-model="queryParams.compareType" placeholder="请选择比较类型" clearable>
+              <el-option
+                v-for="item in compareTypeOptions"
+                :key="item.value"
+                :label="item.description"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="策略名称" prop="name" />
+          <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:lineStrategyTemplate: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:lineStrategyTemplate: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:lineStrategyTemplate: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="lineStrategyTemplateList"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="策略名称" align="center" prop="name" />
+          <el-table-column label="涨跌方向" align="center" prop="direction" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              {{ directionFormat(scope.row.direction) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="涨跌点数" align="center" prop="percentag" :show-overflow-tooltip="true" />
+          <el-table-column label="比较类型" align="center" prop="compareType" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              {{ compareTypeFormat(scope.row.compareType) }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="时间段(分)"
+            align="center"
+            prop="timeSlotStart"
+            :show-overflow-tooltip="true"
+          />
+          <!-- <el-table-column label="时间断截至(分)" align="center" prop="timeSlotEnd" :show-overflow-tooltip="true" /> -->
+
+          <el-table-column
+            label="创建时间"
+            align="center"
+            prop="createdAt"
+            width="150"
+            :show-overflow-tooltip="true"
+          >
+            <template #default="{ row }">{{ parseTime(row.createdAt) }}</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:lineStrategyTemplate: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:lineStrategyTemplate: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="120px">
+            <el-form-item label="策略名称" prop="name">
+              <el-input v-model="form.name" placeholder="策略名称" maxlength="50" show-word-limit />
+            </el-form-item>
+            <el-form-item label="涨跌方向" prop="direction">
+              <el-radio-group v-model="form.direction">
+                <el-radio v-for="dict in directionOptions" :key="dict.value" :label="dict.value">{{
+                  dict.label
+                }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="涨跌点数" prop="percentag">
+              <el-input v-model="form.percentag" placeholder="涨跌点数" />
+            </el-form-item>
+            <el-form-item label="比较类型" prop="compareType">
+              <el-select v-model="form.compareType" placeholder="请选择">
+                <el-option
+                  v-for="dict in compareTypeOptions"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="时间段(分)" prop="timeSlotStart">
+              <el-input v-model.number="form.timeSlotStart" placeholder="时间段(分)" />
+            </el-form-item>
+            <!-- <el-form-item label="时间断截至(分)" prop="timeSlotEnd">
+              <el-input v-model.number="form.timeSlotEnd" 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>
+    </template>
+  </BasicLayout>
+</template>
+
+<script>
+import { addLineStrategyTemplate, delLineStrategyTemplate, getLineStrategyTemplate, listLineStrategyTemplate, updateLineStrategyTemplate } from '@/api/admin/line-strategy-template'
+
+export default {
+  name: 'LineStrategyTemplate',
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 总条数
+      total: 0,
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      isEdit: false,
+      // 类型数据字典
+      typeOptions: [],
+      lineStrategyTemplateList: [],
+
+      // 关系表类型
+
+      // 查询参数
+      queryParams: {
+        pageIndex: 1,
+        pageSize: 10,
+        direction: undefined,
+        percentag: undefined,
+        compareType: undefined,
+        idOrder: 'desc'
+      },
+      directionOptions: [
+        {
+          value: 1,
+          label: '涨'
+        }, {
+          value: 2,
+          label: '跌'
+        }
+      ],
+      compareTypeOptions: [{
+        value: 1,
+        label: '>',
+        description: '大于'
+      }, {
+        value: 2,
+        label: '>=',
+        description: '大于等于'
+      },
+      // {
+      //   value: 3,
+      //   label: '<',
+      //   description: '小于'
+      // }, {
+      //   value: 4,
+      //   label: '<=',
+      //   description: '小于等于'
+      // },
+      {
+        value: 5,
+        label: '=',
+        description: '等于'
+      }],
+      // 表单参数
+      form: {
+      },
+      // 表单校验
+      rules: {
+        direction: [{ required: true, message: '涨跌方向不能为空', trigger: 'blur' }],
+        compareType: [{ required: true, message: '比较类型不能为空', trigger: 'blur' }],
+        percentag: [{ required: true, message: '涨跌点数不能为空', trigger: 'blur' }],
+        timeSlotStart: [{ required: true, message: '时间段开始', trigger: 'blur' }],
+        timeSlotEnd: [{ required: true, message: '时间段截至', trigger: 'blur' }],
+        name: [{ required: true, message: '策略名称不能为空', trigger: 'blur' }]
+      }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    compareTypeFormat(compareType) {
+      const op = this.compareTypeOptions.find(x => x.value === compareType)
+
+      if (op && op.description) {
+        return op.description
+      }
+    },
+    directionFormat(direction) {
+      const op = this.directionOptions.find(x => x.value === direction)
+
+      if (op && op.label) {
+        return op.label
+      }
+    },
+    /** 查询参数列表 */
+    getList() {
+      this.loading = true
+      listLineStrategyTemplate(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+        this.lineStrategyTemplateList = response.data.list
+        this.total = response.data.count
+        this.loading = false
+      }
+      )
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+
+        id: undefined,
+        direction: 1,
+        percentag: undefined,
+        compareType: undefined,
+        timeSlotStart: undefined,
+        timeSlotEnd: 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 =
+                row.id || this.ids
+      getLineStrategyTemplate(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) {
+            updateLineStrategyTemplate(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess(response.msg)
+                this.open = false
+                this.getList()
+              } else {
+                this.msgError(response.msg)
+              }
+            })
+          } else {
+            addLineStrategyTemplate(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 delLineStrategyTemplate({ '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>

src/views/admin/line-symbol-black/index.vue

@@ -66,6 +66,16 @@
             >删除
             </el-button>
           </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              icon="el-icon-download"
+              size="mini"
+              @click="handleReload"
+            >重置交易对
+            </el-button>
+
+          </el-col>
         </el-row>
 
         <el-table v-loading="loading" :data="lineSymbolBlackList" @selection-change="handleSelectionChange">
@@ -161,7 +171,7 @@
 </template>
 
 <script>
-import { addLineSymbolBlack, delLineSymbolBlack, getLineSymbolBlack, listLineSymbolBlack, updateLineSymbolBlack } from '@/api/admin/line-symbol-black'
+import { addLineSymbolBlack, delLineSymbolBlack, getLineSymbolBlack, listLineSymbolBlack, updateLineSymbolBlack, reloadSymbol } from '@/api/admin/line-symbol-black'
 
 export default {
   name: 'LineSymbolBlack',
@@ -195,8 +205,8 @@ export default {
         pageIndex: 1,
         pageSize: 10,
         symbol: undefined,
-        type: undefined
+        type: undefined,
-
+        idOrder: 'desc'
       },
       // 表单参数
       form: {
@@ -337,6 +347,21 @@ export default {
       }).catch(() => {
         this.loading = false
       })
+    },
+    /** 重置交易对按钮操作 */
+    handleReload() {
+      this.loading = true
+      reloadSymbol().then((response) => {
+        if (response.code === 200) {
+          this.msgSuccess(response.msg)
+          this.open = false
+          this.getList()
+        } else {
+          this.msgError(response.msg)
+        }
+      }).finally(() => {
+        this.loading = false
+      })
     }
   }
 }

src/views/admin/line-symbol-group/index.vue

@@ -57,7 +57,18 @@
             align="center"
             prop="groupName"
             :show-overflow-tooltip="true"
-          /><el-table-column
+          />
+          <el-table-column
+            label="交易所"
+            align="center"
+            prop="exchangeType"
+            :show-overflow-tooltip="true"
+          >
+            <template #default="{row}">
+              {{ exchangeTypeFormat(row) }}
+            </template>
+          </el-table-column>
+          <el-table-column
             label="交易对"
             align="center"
             prop="symbol"
@@ -72,8 +83,7 @@
               {{ ['现货','合约'][row.type-1] || '' }}
             </template>
           </el-table-column>
-          <el-table-column label="数量" prop="count">
+          <el-table-column label="数量" prop="count" />
-          </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-popconfirm
@@ -120,61 +130,95 @@
 
         <!-- 添加或修改对话框 -->
         <el-dialog :title="title" :visible.sync="open" width="600px">
-          <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+          <div v-loading="formLoading">
+            <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+              <el-form-item label="交易所" prop="exchangeType">
+                <el-select
+                  v-model="form.exchangeType"
+                  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="groupName">
+                <el-input
+                  v-model="form.groupName"
+                  placeholder="交易对组名称"
+                />
+              </el-form-item>
 
-            <el-form-item label="交易对组名称" prop="groupName">
+              <!-- <el-form-item label="分组类型:1=普通类型" prop="groupType">
-              <el-input
-                v-model="form.groupName"
-                placeholder="交易对组名称"
-              />
-            </el-form-item>
-
-            <!-- <el-form-item label="分组类型:1=普通类型" prop="groupType">
                                         <el-input v-model="form.groupType" placeholder="分组类型:1=普通类型"
                                                       />
                                     </el-form-item> -->
-            <el-form-item label="类型" prop="type">
+              <el-form-item label="类型" prop="type">
-              <el-radio-group v-model="form.type">
+                <el-radio-group v-model="form.type" @change="onchangeForm">
-                <el-radio label="1">现货</el-radio>
+                  <el-radio label="1">现货</el-radio>
-                <el-radio label="2">合约</el-radio>
+                  <el-radio label="2">合约</el-radio>
-              </el-radio-group>
+                </el-radio-group>
-            </el-form-item>
+              </el-form-item>
-            <el-form-item label="交易对" prop="symbol">
+              <el-form-item label="交易对" prop="curChange">
-              <el-select
+                <el-radio-group v-model="curChange" @change="form.symbol = undefined">
-                v-model="form.symbol"
+                  <el-radio :label="1">输入</el-radio>
-                style="width: 100%;"
+                  <el-radio :label="2">选择</el-radio>
-                placeholder="请选择"
+                </el-radio-group>
-                multiple
+              </el-form-item>
-                clearable
+              <el-form-item v-if="curChange===2" label="" prop="symbol">
-                filterable
+                <el-select
-                :remote-method="getSymbol"
+                  v-model="form.symbol"
-                :loading="searchLoding"
+                  style="width: 100%;"
-                remote
+                  placeholder="请选择交易对"
-                size="small"
+                  multiple
-              >
+                  clearable
-                <el-option
+                  filterable
-                  v-for="dict in symbol.symbolList"
+                  :remote-method="getSymbol"
-                  :key="dict.id"
+                  :loading="searchLoding"
-                  :label="dict.symbol"
+                  remote
-                  :value="dict.symbol"
+                  size="small"
-                />
+                >
-                <div class="page">
+                  <el-option
-                  <pagination
+                    v-for="dict in symbol.symbolList"
-                    v-show="symbol.total>0"
+                    :key="dict.id"
-                    :background="false"
+                    :label="dict.symbol"
-                    :total="symbol.total"
+                    :value="dict.symbol"
-                    layout="prev, pager, next"
-                    :page.sync="symbol.pageIndex"
-                    :limit.sync="symbol.pageSize"
-                    @pagination="getSymbol"
                   />
-                </div>
+                  <div class="page">
-              </el-select>
+                    <pagination
-            </el-form-item>
+                      v-show="symbol.total>0"
-          </el-form>
+                      :background="false"
-          <div slot="footer" class="dialog-footer">
+                      :total="symbol.total"
-            <el-button type="primary" @click="submitForm">确 定</el-button>
+                      layout="prev, pager, next"
-            <el-button @click="cancel">取 消</el-button>
+                      :page.sync="symbol.pageIndex"
+                      :limit.sync="symbol.pageSize"
+                      @pagination="getSymbol"
+                    />
+                  </div>
+                </el-select>
+              </el-form-item>
+              <el-form-item v-else label="" prop="symbol">
+                <el-input
+                  v-model="form.symbol"
+                  type="textarea"
+                  :autosize="{ minRows: 4, maxRows: 10 }"
+                  placeholder="请输入交易对"
+                />
+              </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer" style="text-align: right;">
+              <el-button @click="onAll">所有交易对</el-button>
+              <el-button type="primary" @click="submitForm">确 定</el-button>
+              <el-button @click="cancel">取 消</el-button>
+            </div>
           </div>
         </el-dialog>
       </el-card>
@@ -183,7 +227,7 @@
 </template>
 
 <script>
-import { listLineSymbol } from '@/api/admin/line-symbol'
+import { symbolAll, listLineSymbol } from '@/api/admin/line-symbol'
 import { addLineSymbolGroup, delLineSymbolGroup, getLineSymbolGroup, listLineSymbolGroup, updateLineSymbolGroup } from '@/api/admin/line-symbol-group'
 
 export default {
@@ -218,13 +262,16 @@ export default {
         pageIndex: 1,
         pageSize: 10,
         type: undefined,
-        idOrder:"desc"
+        idOrder: 'desc'
       },
       // 表单参数
       form: {
       },
       // 表单校验
-      rules: { type: [{ required: true, message: '类型:1=现货,2=合约不能为空', trigger: 'blur' }]
+      rules: {
+        type: [{ required: true, message: '类型:1=现货,2=合约不能为空', trigger: 'blur' }],
+        symbol: [{ required: true, message: '交易对不能为空', trigger: 'blur' }],
+        exchangeType: [{ required: true, message: '交易所不能为空', trigger: 'blur' }]
       },
       symbol: {
         symbolList: [],
@@ -232,26 +279,42 @@ export default {
         pageIndex: 1,
         pageSize: 6
       },
-      searchLoding: false
+      searchLoding: false,
+      exchangeTypes: [],
+      curChange: 1,
+      formLoading: false
     }
   },
-  watch: {
-    'form.type'() {
-      this.form.symbol = undefined
-      this.getSymbol({})
-    }
-  },
-
   created() {
     this.getList()
+    // 获取交易所字典数据
+    this.getDicts('exchange_type').then(response => {
+      this.exchangeTypes = response.data
+    })
   },
   methods: {
+    exchangeTypeFormat(row) {
+      return this.selectDictLabel(this.exchangeTypes || [], row.exchangeType)
+    },
+    onchangeForm() {
+      this.form.symbol = undefined
+      this.getSymbol({})
+    },
+    onAll() {
+      this.formLoading = true
+      const { exchangeType, type } = this.form
+      symbolAll({ exchangeType, type }).then(response => {
+        this.form.symbol = response.data.toString()
+      }).finally(() => {
+        this.formLoading = false
+      })
+    },
     // 交易对列表
     getSymbol(e, type) {
       this.searchLoding = true
       const { pageIndex } = this.symbol
       const symbol = typeof e === 'object' ? '' : e
-      listLineSymbol({ pageIndex, pageSize: 6, type: type || this.form.type, symbol }).then(res => {
+      listLineSymbol({ pageIndex, pageSize: 6, type: type || this.form.type, symbol, exchangeType: this.form.exchangeType }).then(res => {
         this.symbol.total = res.data.count
         this.symbol.symbolList = res.data.list
       }).finally(() => {
@@ -275,8 +338,10 @@ export default {
     },
     // 表单重置
     reset() {
+      this.curChange = 1
       this.form = {
 
+        exchangeType: this.exchangeTypes.length ? this.exchangeTypes[0].value : '',
         id: undefined,
         groupName: undefined,
         symbol: undefined,
@@ -307,6 +372,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset()
+      this.getSymbol()
       this.open = true
       this.title = '添加交易对组列表'
       this.isEdit = false
@@ -324,7 +390,7 @@ export default {
                 row.id || this.ids
       getLineSymbolGroup(id).then(response => {
         this.form = response.data
-        this.form.symbol = response.data.symbol ? response.data.symbol.split(',') : undefined
+        // this.form.symbol = response.data.symbol ? response.data.symbol.split(',') : undefined
         this.getSymbol()
         this.open = true
         this.title = '修改交易对组列表'
@@ -335,23 +401,28 @@ export default {
     submitForm: function() {
       this.$refs['form'].validate(valid => {
         if (valid) {
+          this.formLoading = true
           if (this.form.id !== undefined) {
             updateLineSymbolGroup({ ...this.form, symbol: this.form.symbol.toString() }).then(response => {
               if (response.code === 200) {
+                this.formLoading = false
                 this.msgSuccess(response.msg)
                 this.open = false
                 this.getList()
               } else {
+                this.formLoading = false
                 this.msgError(response.msg)
               }
             })
           } else {
             addLineSymbolGroup({ ...this.form, symbol: this.form.symbol.toString() }).then(response => {
               if (response.code === 200) {
+                this.formLoading = false
                 this.msgSuccess(response.msg)
                 this.open = false
                 this.getList()
               } else {
+                this.formLoading = false
                 this.msgError(response.msg)
               }
             })

src/views/admin/line-symbol-price/index.vue

@@ -0,0 +1,330 @@
+<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="symbol"><el-input
+            v-model="queryParams.symbol"
+            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>
+              <el-option
+                v-for="item in statusOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.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:lineSymbolPrice: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:lineSymbolPrice: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:lineSymbolPrice: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="lineSymbolPriceList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="交易对" align="center" prop="symbol" :show-overflow-tooltip="true" />
+          <el-table-column label="状态" align="center" prop="status" :show-overflow-tooltip="true">
+            <template slot-scope="scope">{{ scope.row.status === 1 ? "已启用" : "禁用" }} </template>
+          </el-table-column>
+          <el-table-column
+            label="创建时间"
+            align="center"
+            prop="createdAt"
+            width="150"
+            :show-overflow-tooltip="true"
+          >
+            <template #default="{ row }">{{ parseTime(row.createdAt) }}</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:lineSymbolPrice: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:lineSymbolPrice: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="交易对" prop="symbol">
+              <el-input v-model="form.symbol" placeholder="交易对" />
+            </el-form-item>
+            <el-form-item label="状态" prop="status">
+              <el-radio-group v-model="form.status">
+                <el-radio :label="1">启用</el-radio>
+                <el-radio :label="2">禁用</el-radio>
+              </el-radio-group>
+              <!-- <el-select v-model="form.status" placeholder="请选择">
+                                <el-option v-for="dict in statusOptions" :key="dict.value" :label="dict.label"
+                                    :value="dict.value" />
+                            </el-select> -->
+            </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>
+    </template>
+  </BasicLayout>
+</template>
+
+<script>
+import { addLineSymbolPrice, delLineSymbolPrice, getLineSymbolPrice, listLineSymbolPrice, updateLineSymbolPrice } from '@/api/admin/line-symbol-price'
+
+export default {
+  name: 'LineSymbolPrice',
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 总条数
+      total: 0,
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      isEdit: false,
+      // 类型数据字典
+      typeOptions: [],
+      lineSymbolPriceList: [],
+      statusOptions: [{
+        label: '启用',
+        value: 1
+      }, {
+        label: '禁用',
+        value: 2
+      }],
+      // 关系表类型
+
+      // 查询参数
+      queryParams: {
+        pageIndex: 1,
+        pageSize: 10,
+        symbol: undefined,
+        status: undefined,
+        idOrder: 'desc'
+      },
+      // 表单参数
+      form: {
+      },
+      // 表单校验
+      rules: {
+        symbol: [{ required: true, message: '交易对不能为空', trigger: 'blur' }],
+        status: [{ required: true, message: '状态不能为空', trigger: 'blur' }]
+      }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    /** 查询参数列表 */
+    getList() {
+      this.loading = true
+      listLineSymbolPrice(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+        this.lineSymbolPriceList = response.data.list
+        this.total = response.data.count
+        this.loading = false
+      }
+      )
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+
+        id: undefined,
+        symbol: undefined,
+        status: 1
+      }
+      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
+      getLineSymbolPrice(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) {
+            updateLineSymbolPrice(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess(response.msg)
+                this.open = false
+                this.getList()
+              } else {
+                this.msgError(response.msg)
+              }
+            })
+          } else {
+            addLineSymbolPrice(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 delLineSymbolPrice({ '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>

src/views/admin/line-symbol/index.vue

@@ -62,6 +62,16 @@
             >修改
             </el-button>
           </el-col>
+          <el-col :span="1.5">
+            <el-button
+              v-permisaction="['admin:lineSymbol:edit']"
+              type="warning"
+              icon="el-icon-upload"
+              size="mini"
+              @click="handleExport"
+            >导出
+            </el-button>
+          </el-col>
           <el-col :span="1.5">
             <el-button
               v-permisaction="['admin:lineSymbol:remove']"
@@ -212,7 +222,8 @@
 </template>
 
 <script>
-import { addLineSymbol, delLineSymbol, getLineSymbol, listLineSymbol, updateLineSymbol } from '@/api/admin/line-symbol'
+import { resolveBlob } from '@/utils/zipdownload'
+import { addLineSymbol, delLineSymbol, getLineSymbol, listLineSymbol, updateLineSymbol, exportSymbols } from '@/api/admin/line-symbol'
 
 export default {
   name: 'LineSymbol',
@@ -308,7 +319,7 @@ export default {
     /** 查询参数列表 */
     getList() {
       this.loading = true
-      listLineSymbol(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      listLineSymbol(this.queryParams).then(response => {
         this.lineSymbolList = response.data.list
         this.total = response.data.count
         this.loading = false
@@ -426,6 +437,18 @@ export default {
         }
       }).catch(function() {
       })
+    },
+    handleExport() {
+      this.$confirm('确认导出此数据吗?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        exportSymbols(this.queryParams).then(res => {
+          resolveBlob(res, '交易对导出数据')
+          this.msgSuccess('导出成功')
+        })
+      })
     }
   }
 }

src/views/admin/line-system-setting/index.vue

@@ -5,15 +5,25 @@
       <el-card class="box-card">
         <el-table ref="table" v-loading="loading" :data="linePreOrderList">
           <el-table-column
-            label="副账号限价对冲溢价买入百分比"
+            label="限价止损溢价"
-            align="center"
-            prop="coverOrderTypeBRate"
-          />
-          <el-table-column
-            label="止损溢价百分比"
             align="center"
             prop="stopLossPremium"
           />
+          <el-table-column
+            label="限价加仓溢价"
+            align="center"
+            prop="addPositionPremium"
+          />
+          <el-table-column
+            label="限价减仓溢价"
+            align="center"
+            prop="reducePremium"
+          />
+          <el-table-column
+            label="减仓策略提前触发百分比"
+            align="center"
+            prop="reduceEarlyTriggerPercent"
+          />
           <!-- <el-table-column
             label="主账号加仓溢价百分比"
             align="center"
@@ -128,12 +138,18 @@
 
         <!-- 添加或修改对话框 -->
         <el-dialog :title="title" :visible.sync="open" width="700px">
-          <el-form ref="form" :model="form" :rules="rules" label-width="120px" style="height: 600px;overflow: hidden auto;">
+          <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-            <el-form-item label="副账号限价对冲溢价买入百分比" prop="coverOrderTypeBRate">
+            <el-form-item label="限价止损溢价" prop="stopLossPremium">
-              <el-input v-model="form.coverOrderTypeBRate" placeholder="副账号限价对冲溢价买入百分比" />
+              <el-input v-model="form.stopLossPremium" placeholder="限价止损溢价" />
             </el-form-item>
-            <el-form-item label="止损溢价百分比" prop="stopLossPremium">
+            <el-form-item label="限价加仓溢价" prop="addPositionPremium">
-              <el-input v-model="form.stopLossPremium" placeholder="止损溢价百分比" />
+              <el-input v-model="form.addPositionPremium" placeholder="限价加仓溢价" />
+            </el-form-item>
+            <el-form-item label="限价减仓溢价" prop="reducePremium">
+              <el-input v-model="form.reducePremium" placeholder="限价减仓溢价" />
+            </el-form-item>
+            <el-form-item label="减仓策略提前触发百分比" prop="reduceEarlyTriggerPercent">
+              <el-input v-model="form.reduceEarlyTriggerPercent" placeholder="减仓策略提前触发百分比" />
             </el-form-item>
             <!-- <el-form-item label="主账号加仓溢价百分比" prop="scaleOrderTypeARate">
               <el-input v-model="form.scaleOrderTypeARate" placeholder="主账号限价加仓买入百分比" />
@@ -211,8 +227,10 @@ export default {
       },
       // 表单校验
       rules: {
-        scaleOrderTypeARate: [{ required: true, message: '主账号限价加仓买入百分比不能为空', trigger: 'blur' }],
+        stopLossPremium: [{ required: true, message: '限价止损溢价不能为空', trigger: 'blur' }],
-        stopLossPremium: [{ required: true, message: '止损溢价百分比', trigger: 'blur' }]
+        addPositionPremium: [{ required: true, message: '限价加仓溢价不能为空', trigger: 'blur' }],
+        reducePremium: [{ required: true, message: '限价减仓溢价不能为空', trigger: 'blur' }],
+        reduceEarlyTriggerPercent: [{ required: true, message: '减仓策略提前触发百分比不能为空', trigger: 'blur' }]
       }
 
     }

src/views/admin/line-user/index.vue

@@ -1,4 +1,3 @@
-
 <template>
   <BasicLayout>
     <template #wrapper>
@@ -52,17 +51,35 @@
           <el-table-column label="保证金" prop="money" align="center" />
           <el-table-column label="邮箱" prop="email" align="center" />
           <el-table-column label="状态" prop="status" align="center">
-            <template #default="{row}">
+            <template #default="{ row }">
-              <el-tag size="mini" :type="row.status==='normal'?'success':'danger'">{{ {normal:'正常',verify:'未验证'}[row.status] || '未知' }}</el-tag>
+              <el-tag size="mini" :type="row.status === 'normal' ? 'success' : 'danger'">{{
+                { normal: '正常', verify: '未验证' }[row.status] || '未知' }}</el-tag>
             </template>
           </el-table-column>
+          <el-table-column label="最小下单金额" prop="minOrderAmount" align="center" />
+          <el-table-column label="现货可用U" prop="spotFreeAmount" align="center" />
+          <el-table-column label="合约可用U" prop="futureFreeAmount" align="center" />
+          <el-table-column label="更新时间" align="center" prop="assetUpdateTime" width="150" :show-overflow-tooltip="true">
+            <template #default="{ row }">{{ parseTime(row.assetUpdateTime) }}</template>
+          </el-table-column>
           <el-table-column label="启动状态" prop="open_status" align="center">
-            <template #default="{row}">
+            <template #default="{ row }">
-              <el-tag size="mini" :type="row.open_status?'success':'danger'">{{ ['停止','启动'][row.open_status] || '未知' }}</el-tag>
+              <el-tag size="mini" :type="row.open_status ? 'success' : 'danger'">{{ ['停止', '启动'][row.open_status] || '未知'
+              }}</el-tag>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
+              <el-popconfirm
+                v-if="scope.row.open_status===1"
+                class="delete-popconfirm"
+                title="确认要新资产吗?"
+                confirm-button-text="更新"
+                @confirm="handleReload(scope.row)"
+              >
+                <el-button slot="reference" size="mini" type="text" icon="el-icon-edit">更新资产
+                </el-button>
+              </el-popconfirm>
               <el-popconfirm
                 class="delete-popconfirm"
                 title="确认要修改吗?"
@@ -98,7 +115,7 @@
         </el-table>
 
         <pagination
-          v-show="total>0"
+          v-show="total > 0"
           :total="total"
           :page.sync="queryParams.pageIndex"
           :limit.sync="queryParams.pageSize"
@@ -175,10 +192,7 @@
               />
             </el-form-item> -->
             <el-form-item label="保证金" prop="money">
-              <el-input
+              <el-input v-model="form.money" placeholder="保证金" />
-                v-model="form.money"
-                placeholder="保证金"
-              />
             </el-form-item>
             <!-- <el-form-item label="积分" prop="score">
               <el-input
@@ -259,7 +273,7 @@
 </template>
 
 <script>
-import { addLineUser, delLineUser, getLineUser, listLineUser, updateLineUser } from '@/api/admin/line-user'
+import { addLineUser, delLineUser, getLineUser, listLineUser, updateLineUser, reloadProperty } from '@/api/admin/line-user'
 
 export default {
   name: 'LineUser',
@@ -291,7 +305,8 @@ export default {
       // 查询参数
       queryParams: {
         pageIndex: 1,
-        pageSize: 10
+        pageSize: 10,
+        idOrder: 'desc'
       },
       // 表单参数
       form: {
@@ -387,7 +402,7 @@ export default {
     handleUpdate(row) {
       this.reset()
       const id =
-                row.id || this.ids
+        row.id || this.ids
       getLineUser(id).then(response => {
         this.form = response.data
         this.open = true
@@ -443,6 +458,25 @@ export default {
         }
       }).catch(function() {
       })
+    },
+    /*
+    更新资产
+     */
+    handleReload(row) {
+      this.loading = true
+
+      reloadProperty({ userId: row.id })
+        .then(response => {
+          if (response.code === 200) {
+            this.msgSuccess(response.msg)
+            this.getList()
+          } else {
+            this.msgError(response.msg)
+          }
+        })
+        .finally(() => {
+          this.loading = false
+        })
     }
   }
 }

src/views/admin/member-balance-log/index.vue

@@ -0,0 +1,391 @@
+
+<template>
+  <BasicLayout>
+    <template #wrapper>
+      <el-card class="box-card">
+        <el-form ref="queryForm" :model="queryParams" :inline="true" label-width="68px">
+          <el-form-item label="变更来源 (member_change_source)" prop="changeSource"><el-select
+            v-model="queryParams.changeSource"
+            placeholder="用户余额变更记录变更来源 (member_change_source)"
+            clearable
+            size="small"
+          >
+            <el-option
+              v-for="dict in changeSourceOptions"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+          </el-form-item>
+          <el-form-item label="变更类别 1-收入 2-支出" prop="changeType"><el-input
+            v-model="queryParams.changeType"
+            placeholder="请输入变更类别 1-收入 2-支出"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+          />
+          </el-form-item>
+
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              v-permisaction="['admin:memberBalanceLog: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:memberBalanceLog: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:memberBalanceLog: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="memberBalanceLogList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center" /><el-table-column
+            label="变更来源 (member_change_source)"
+            align="center"
+            prop="changeSource"
+            :formatter="changeSourceFormat"
+            width="100"
+          >
+            <template slot-scope="scope">
+              {{ changeSourceFormat(scope.row) }}
+            </template>
+          </el-table-column><el-table-column
+            label="变更类别 1-收入 2-支出"
+            align="center"
+            prop="changeType"
+            :show-overflow-tooltip="true"
+          /><el-table-column
+            label="变更金额"
+            align="center"
+            prop="amount"
+            :show-overflow-tooltip="true"
+          /><el-table-column
+            label="变更前余额"
+            align="center"
+            prop="balanceBefore"
+            :show-overflow-tooltip="true"
+          /><el-table-column
+            label="变更后余额"
+            align="center"
+            prop="balanceAfter"
+            :show-overflow-tooltip="true"
+          />
+          <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:memberBalanceLog: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:memberBalanceLog: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="userId">
+              <el-input
+                v-model="form.userId"
+                placeholder="用户id"
+              />
+            </el-form-item>
+            <el-form-item label="变更来源 (member_change_source)" prop="changeSource">
+              <el-radio-group v-model="form.changeSource">
+                <el-radio
+                  v-for="dict in changeSourceOptions"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{ dict.label }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="变更类别 1-收入 2-支出" prop="changeType">
+              <el-input
+                v-model="form.changeType"
+                placeholder="变更类别 1-收入 2-支出"
+              />
+            </el-form-item>
+            <el-form-item label="变更金额" prop="amount">
+              <el-input
+                v-model="form.amount"
+                placeholder="变更金额"
+              />
+            </el-form-item>
+            <el-form-item label="变更前余额" prop="balanceBefore">
+              <el-input
+                v-model="form.balanceBefore"
+                placeholder="变更前余额"
+              />
+            </el-form-item>
+            <el-form-item label="变更后余额" prop="balanceAfter">
+              <el-input
+                v-model="form.balanceAfter"
+                placeholder="变更后余额"
+              />
+            </el-form-item>
+            <el-form-item label="备注" prop="remark">
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                :rows="2"
+                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>
+    </template>
+  </BasicLayout>
+</template>
+
+<script>
+import { addMemberBalanceLog, delMemberBalanceLog, getMemberBalanceLog, listMemberBalanceLog, updateMemberBalanceLog } from '@/api/admin/member-balance-log'
+
+export default {
+  name: 'MemberBalanceLog',
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 总条数
+      total: 0,
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      isEdit: false,
+      // 类型数据字典
+      typeOptions: [],
+      memberBalanceLogList: [],
+      changeSourceOptions: [],
+      // 关系表类型
+
+      // 查询参数
+      queryParams: {
+        pageIndex: 1,
+        pageSize: 10,
+        changeSource: undefined,
+        changeType: undefined
+
+      },
+      // 表单参数
+      form: {
+      },
+      // 表单校验
+      rules: { changeSource: [{ required: true, message: '变更来源 (member_change_source)不能为空', trigger: 'blur' }],
+        changeType: [{ required: true, message: '变更类别 1-收入 2-支出不能为空', trigger: 'blur' }]
+      }
+    }
+  },
+  created() {
+    this.getList()
+    this.getDicts('member_change_source').then(response => {
+      this.changeSourceOptions = response.data
+    })
+  },
+  methods: {
+    /** 查询参数列表 */
+    getList() {
+      this.loading = true
+      listMemberBalanceLog(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+        this.memberBalanceLogList = response.data.list
+        this.total = response.data.count
+        this.loading = false
+      }
+      )
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+
+        id: undefined,
+        userId: undefined,
+        changeSource: undefined,
+        changeType: undefined,
+        amount: undefined,
+        balanceBefore: undefined,
+        balanceAfter: undefined,
+        remark: undefined
+      }
+      this.resetForm('form')
+    },
+    getImgList: function() {
+      this.form[this.fileIndex] = this.$refs['fileChoose'].resultList[0].fullUrl
+    },
+    fileClose: function() {
+      this.fileOpen = false
+    },
+    changeSourceFormat(row) {
+      return this.selectDictLabel(this.changeSourceOptions, row.changeSource)
+    },
+    // 关系
+    // 文件
+    /** 搜索按钮操作 */
+    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
+      getMemberBalanceLog(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) {
+            updateMemberBalanceLog(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess(response.msg)
+                this.open = false
+                this.getList()
+              } else {
+                this.msgError(response.msg)
+              }
+            })
+          } else {
+            addMemberBalanceLog(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 delMemberBalanceLog({ '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>

src/views/admin/member-balance/index.vue

@@ -0,0 +1,296 @@
+
+<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>
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              v-permisaction="['admin:memberBalance: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:memberBalance: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:memberBalance: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="memberBalanceList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center" />
+          <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:memberBalance: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:memberBalance: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="总余额" prop="totalAmont">
+              <el-input
+                v-model="form.totalAmont"
+                placeholder="总余额"
+              />
+            </el-form-item>
+            <el-form-item label="可用余额" prop="freeAmount">
+              <el-input
+                v-model="form.freeAmount"
+                placeholder="可用余额"
+              />
+            </el-form-item>
+            <el-form-item label="冻结金额" prop="frozenAmount">
+              <el-input
+                v-model="form.frozenAmount"
+                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>
+    </template>
+  </BasicLayout>
+</template>
+
+<script>
+import { addMemberBalance, delMemberBalance, getMemberBalance, listMemberBalance, updateMemberBalance } from '@/api/admin/member-balance'
+
+export default {
+  name: 'MemberBalance',
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 总条数
+      total: 0,
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      isEdit: false,
+      // 类型数据字典
+      typeOptions: [],
+      memberBalanceList: [],
+
+      // 关系表类型
+
+      // 查询参数
+      queryParams: {
+        pageIndex: 1,
+        pageSize: 10
+
+      },
+      // 表单参数
+      form: {
+      },
+      // 表单校验
+      rules: {}
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    /** 查询参数列表 */
+    getList() {
+      this.loading = true
+      listMemberBalance(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+        this.memberBalanceList = response.data.list
+        this.total = response.data.count
+        this.loading = false
+      }
+      )
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+
+        id: undefined,
+        totalAmont: undefined,
+        freeAmount: undefined,
+        frozenAmount: 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 =
+                row.id || this.ids
+      getMemberBalance(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) {
+            updateMemberBalance(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess(response.msg)
+                this.open = false
+                this.getList()
+              } else {
+                this.msgError(response.msg)
+              }
+            })
+          } else {
+            addMemberBalance(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 delMemberBalance({ '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>

src/views/admin/member-renwa-log/index.vue

@@ -0,0 +1,356 @@
+<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>
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <!-- <el-col :span="1.5">
+                        <el-button
+                                v-permisaction="['admin:memberRenwaLog: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:memberRenwaLog: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: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="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
+                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"
+        />
+
+        <!-- 添加或修改对话框 -->
+        <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="订单状态" 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-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>
+    </template>
+  </BasicLayout>
+</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,
+        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
+      }
+      )
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+
+        id: undefined,
+        renwalId: undefined,
+        renwalName: undefined,
+        renwalDuration: undefined,
+        status: undefined,
+        payableAmount: undefined,
+        actualPaymentAmount: undefined,
+        fromAddress: undefined,
+        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(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)
+              }
+            })
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    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() {
+      })
+    }
+  }
+}
+</script>

src/views/admin/member-renwal-config/index.vue

@@ -0,0 +1,414 @@
+<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="packageName"><el-input
+            v-model="queryParams.packageName"
+            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:memberRenwalConfig: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:memberRenwalConfig: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:memberRenwalConfig: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="memberRenwalConfigList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="套餐名称" align="center" prop="packageName" :show-overflow-tooltip="true" />
+          <el-table-column label="续期时间(天)" align="center" prop="durationDay" :show-overflow-tooltip="true" />
+          <el-table-column
+            label="原始单价（U）"
+            align="center"
+            prop="originalPrice"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column label="折扣价格（U）" align="center" prop="discountPrice" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              {{ scope.row.discountPrice > 0 ? scope.row.discountPrice : '' }}
+            </template>
+          </el-table-column>
+          <el-table-column label="排序" align="center" prop="sort" />
+          <el-table-column label="是否可见" align="center" prop="isDefault">
+            <template slot-scope="scope">
+              {{ defaultFormat(scope.row.isVisible) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="是否默认套餐" align="center" :default-format="statusFormat" prop="isDefault">\
+            <template slot-scope="scope">
+              {{ defaultFormat(scope.row.isDefault) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="套餐状态" 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" 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:memberRenwalConfig: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:memberRenwalConfig: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="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>
+            <el-form-item label="原始单价" prop="originalPrice">
+              <el-input v-model="form.originalPrice" placeholder="原始单价" />
+            </el-form-item>
+            <el-form-item label="折扣价格" prop="discountPrice">
+              <el-input v-model="form.discountPrice" placeholder="折扣价格" />
+            </el-form-item>
+            <el-form-item label="排序(顺序)" prop="sort">
+              <el-input v-model="form.sort" type="number" :min="1" placeholder="排序(顺序)" />
+            </el-form-item>
+            <el-form-item label="是否可见 " prop="isVisible">
+              <el-radio-group v-model="form.isVisible">
+                <el-radio
+                  v-for="dict in defaultOptions"
+                  :key="'default' + dict.value"
+                  :label="dict.value"
+                >{{ dict.label
+                }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="是否默认套餐 " prop="isDefault">
+              <el-radio-group v-model="form.isDefault">
+                <el-radio
+                  v-for="dict in defaultOptions"
+                  :key="'default' + dict.value"
+                  :label="dict.value"
+                >{{ dict.label
+                }}</el-radio>
+              </el-radio-group>
+            </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-group>
+            </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>
+    </template>
+  </BasicLayout>
+</template>
+
+<script>
+import { addMemberRenwalConfig, delMemberRenwalConfig, getMemberRenwalConfig, listMemberRenwalConfig, updateMemberRenwalConfig } from '@/api/admin/member-renwal-config'
+
+export default {
+  name: 'MemberRenwalConfig',
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 总条数
+      total: 0,
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      isEdit: false,
+      // 类型数据字典
+      typeOptions: [],
+      defaultOptions: [{
+        label: '是',
+        value: 1
+      }, {
+        label: '否',
+        value: 2
+      }],
+      memberRenwalConfigList: [],
+      statusOptions: [],
+      // 关系表类型
+
+      // 查询参数
+      queryParams: {
+        pageIndex: 1,
+        pageSize: 10,
+        packageName: undefined,
+        status: undefined,
+        sortOrder: 'asc'
+      },
+      // 表单参数
+      form: {
+      },
+      // 表单校验
+      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' }]
+      }
+    }
+  },
+  created() {
+    this.getList()
+    this.getDicts('member_renwal_config_status').then(response => {
+      this.statusOptions = response.data
+    })
+  },
+  methods: {
+    /** 查询参数列表 */
+    getList() {
+      this.loading = true
+      listMemberRenwalConfig(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+        this.memberRenwalConfigList = response.data.list
+        this.total = response.data.count
+        this.loading = false
+      }
+      )
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+
+        id: undefined,
+        packageName: undefined,
+        durationDay: undefined,
+        originalPrice: undefined,
+        discountPrice: undefined,
+        isDefault: 1,
+        isVisible: 1,
+        sort: 0,
+        status: 'enable'
+      }
+      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)
+    },
+    defaultFormat(val) {
+      var label = ''
+
+      this.defaultOptions.forEach(element => {
+        if (element.value === val) {
+          label = element.label
+        }
+      })
+
+      return label
+    },
+    // 关系
+    // 文件
+    /** 搜索按钮操作 */
+    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
+      getMemberRenwalConfig(id).then(response => {
+        this.form = response.data
+        this.open = true
+        this.title = '修改会员套餐'
+        this.isEdit = true
+      })
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          this.form.originalPrice = Number(this.form.originalPrice)
+          this.form.durationDay = Number(this.form.durationDay)
+          this.form.sort = Number(this.form.sort)
+
+          if (this.form.id !== undefined) {
+            updateMemberRenwalConfig(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess(response.msg)
+                this.open = false
+                this.getList()
+              } else {
+                this.msgError(response.msg)
+              }
+            })
+          } else {
+            addMemberRenwalConfig(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 delMemberRenwalConfig({ '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>

src/views/admin/member-withdrawal-log/approve.vue

@@ -0,0 +1,159 @@
+<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 v-if="form.status==='approved'" label="交易Hash" prop="hash">
+        <el-input v-model="form.hash" placeholder="交易Hash" />
+      </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: () => { }
+    }
+  },
+  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
+        }
+      ]
+    }
+  },
+  watch: {
+    open(val) {
+      this.dialogVisible = val
+    },
+    data(val) {
+      this.form = { approveStatus: 1, ...val }
+    }
+  },
+  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, hash: this.form.hash }).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>

src/views/admin/member-withdrawal-log/index.vue

@@ -0,0 +1,390 @@
+<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-if="scope.row.status == 'pending'"
+                v-permisaction="['admin:memberWithdrawalLog:approve']"
+                size="mini"
+                type="text"
+                @click="handleApprove(scope.row, '提现审核')"
+              >审核
+              </el-button>
+              <el-button
+                v-if="scope.row.status == 'approved'"
+                v-permisaction="['admin:memberWithdrawalLog:confirm']"
+                size="mini"
+                type="text"
+                @click="handleApprove(scope.row, '确认到账')"
+              >确认到账
+              </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-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" />
+    </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>

src/views/admin/spider-listen-symbol/index.vue

@@ -0,0 +1,324 @@
+
+<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="symbol"><el-input
+            v-model="queryParams.symbol"
+            placeholder="请输入交易对"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+          />
+          </el-form-item>
+
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              v-permisaction="['admin:spiderListenSymbol: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:spiderListenSymbol: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:spiderListenSymbol: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="spiderListenSymbolList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center" /><el-table-column
+            label="交易对"
+            align="center"
+            prop="symbol"
+            :show-overflow-tooltip="true"
+          /><el-table-column
+            label="代币"
+            align="center"
+            prop="coin"
+            :show-overflow-tooltip="true"
+          /><el-table-column
+            label="计价货币"
+            align="center"
+            prop="currency"
+            :show-overflow-tooltip="true"
+          />
+          <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:spiderListenSymbol: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:spiderListenSymbol: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="交易对" prop="symbol">
+              <el-input
+                v-model="form.symbol"
+                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="currency">
+              <el-input
+                v-model="form.currency"
+                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>
+    </template>
+  </BasicLayout>
+</template>
+
+<script>
+import { addSpiderListenSymbol, delSpiderListenSymbol, getSpiderListenSymbol, listSpiderListenSymbol, updateSpiderListenSymbol } from '@/api/admin/spider-listen-symbol'
+
+export default {
+  name: 'SpiderListenSymbol',
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 总条数
+      total: 0,
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      isEdit: false,
+      // 类型数据字典
+      typeOptions: [],
+      spiderListenSymbolList: [],
+
+      // 关系表类型
+
+      // 查询参数
+      queryParams: {
+        pageIndex: 1,
+        pageSize: 10,
+        symbol: undefined
+
+      },
+      // 表单参数
+      form: {
+      },
+      // 表单校验
+      rules: {
+        coin: [{ required: true, message: '代币不能为空', trigger: 'blur' }],
+        currency: [{ required: true, message: '计价货币不能为空', trigger: 'blur' }]
+        // symbol: [{ required: true, message: '交易对不能为空', trigger: 'blur' }]
+      }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    /** 查询参数列表 */
+    getList() {
+      this.loading = true
+      listSpiderListenSymbol(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+        this.spiderListenSymbolList = response.data.list
+        this.total = response.data.count
+        this.loading = false
+      }
+      )
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+
+        id: undefined,
+        symbol: undefined,
+        coin: undefined,
+        currency: 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 =
+                row.id || this.ids
+      getSpiderListenSymbol(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) {
+            updateSpiderListenSymbol(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess(response.msg)
+                this.open = false
+                this.getList()
+              } else {
+                this.msgError(response.msg)
+              }
+            })
+          } else {
+            addSpiderListenSymbol(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 delSpiderListenSymbol({ '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>

src/views/admin/sys-api/index.vue

@@ -315,7 +315,8 @@ export default {
         paths: undefined,
         action: undefined,
         parentId: undefined,
-        sort: undefined
+        sort: undefined,
+        type: 'BUS'
       }
       this.resetForm('form')
     },

src/views/dev-tools/gen/editTable.vue

@@ -33,12 +33,11 @@
           <el-table-column label="go类型" width="120">
             <template slot-scope="scope">
               <el-select v-model="scope.row.goType">
-                <el-option label="int" value="int" />
+                <el-option label="int64" value="int64" />
                 <el-option label="string" value="string" />
-                <el-option label="decimal" value="decimal.Decimal" />
+                <el-option label="int" value="int" />
+                <el-option label="decimal.Decimal" value="decimal.Decimal" />
                 <el-option label="bool" value="bool" />
-                <!-- <el-option label="int" value="int" />
-                <el-option label="bool" value="bool" /> -->
               </el-select>
             </template>
           </el-table-column>