From ceef4d902103ef92cf660ce3ff589c7fbd15b190 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 16 May 2023 10:06:49 +0800
Subject: [PATCH] twoCoin项目修改
---
src/main/resources/templates/febs/views/dapp/money-change-flow.html | 91 ++++++++++++++++++++++++++++++++-------------
1 files changed, 65 insertions(+), 26 deletions(-)
diff --git a/src/main/resources/templates/febs/views/dapp/money-change-flow.html b/src/main/resources/templates/febs/views/dapp/money-change-flow.html
index 470dcb7..feb502d 100644
--- a/src/main/resources/templates/febs/views/dapp/money-change-flow.html
+++ b/src/main/resources/templates/febs/views/dapp/money-change-flow.html
@@ -9,26 +9,32 @@
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline">
+ <input type="text" name="systemProfitId" autocomplete="off" placeholder="输入动能编号" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
<input type="text" name="address" autocomplete="off" placeholder="输入地址" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input type="text" name="fromHash" autocomplete="off" placeholder="输入FromHash" class="layui-input">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label layui-form-label-sm">类型</label>
<div class="layui-input-inline">
<select name="type">
+<!-- 1-加入动能 2-技术方收益 3-直推收益 4-层级收益 5-剩余层级收益给系统 6-复投动能 7-动能收益-->
<option value=""></option>
- <option value="1">买入</option>
- <option value="2">矩阵收益</option>
+ <option value="1">加入动能</option>
+ <option value="2">技术方收益</option>
<option value="3">直推收益</option>
- <option value="4">保险池</option>
- <option value="5">提现</option>
- <option value="6">手续费充值</option>
- <option value="7">手续费扣除</option>
- <option value="8">结算</option>
- <option value="9">冻结</option>
- <option value="10">冻结释放</option>
- <option value="11">产矿</option>
- <option value="12">手续费返利</option>
+ <option value="4">层级收益</option>
+ <option value="5">剩余层级收益</option>
+ <option value="6">复投动能</option>
+ <option value="7">出局收益</option>
</select>
</div>
</div>
@@ -88,21 +94,26 @@
<script type="text/html" id="flow-type">
{{#
var type = {
- 1: {title: '买入'},
- 2: {title: '矩阵收益'},
+ 1: {title: '加入动能'},
+ 2: {title: '技术方收益'},
3: {title: '直推收益'},
- 4: {title: '保险池'},
- 5: {title: '提现'},
- 6: {title: '手续费充值'},
- 7: {title: '手续费扣除'},
- 8: {title: '结算'},
- 9: {title: '冻结'},
- 10: {title: '冻结释放'},
- 11: {title: '产矿'},
- 12: {title: '手续费返利'},
+ 4: {title: '层级收益'},
+ 5: {title: '剩余层级收益'},
+ 6: {title: '复投动能'},
+ 7: {title: '出局收益'},
}[d.type];
}}
<span>{{ type.title }}</span>
+</script>
+<script type="text/html" id="status-able">
+ {{#
+ var status = {
+ 1: {title: '进行中', color: 'blue'},
+ 2: {title: '成功', color: 'green'},
+ 3: {title: '失败', color: 'red'}
+ }[d.status];
+ }}
+ <span class="layui-badge febs-bg-{{status.color}}">{{ status.title }}</span>
</script>
<script data-th-inline="none" type="text/javascript">
layui.use(['dropdown', 'jquery', 'laydate', 'form', 'table', 'febs', 'treeSelect'], function () {
@@ -126,7 +137,24 @@
table.on('tool(moneyChangeTable)', function (obj) {
var data = obj.data,
layEvent = obj.event;
+ // if (layEvent === 'transferManual') {
+ // febs.modal.confirm('人工操作', '是否人工转账？', function () {
+ // transferManual("flow/withdrawAgree/" + data.id);
+ // });
+ // }
+ if (layEvent === 'transferManual') {
+ febs.modal.confirm('人工操作', '是否人工转账？', function () {
+ transferManual(data.id);
+ });
+ }
});
+
+ function transferManual(id) {
+ febs.get(ctx + 'flow/transferManual/' + id, null, function () {
+ febs.alert.success('操作成功');
+ $reset.click();
+ });
+ }
table.on('sort(moneyChangeTable)', function (obj) {
sortObject = obj;
@@ -155,7 +183,8 @@
id: 'moneyChangeTable',
url: ctx + 'flow/fundFlow',
cols: [[
- {field: 'address', title: '地址', minWidth: 380},
+ {field: 'address', title: '地址', minWidth: 400},
+ {field: 'systemProfitId', title: '动能编号', minWidth: 100},
{title: '类型', minWidth: 100,templet: '#flow-type',align:'center'},
{field: 'amount', title: '金额',
templet: function (d) {
@@ -167,17 +196,27 @@
return d.amount
}
}, minWidth: 80,align:'center'},
- {field: 'fee', title: '手续费', minWidth: 80},
+ // {field: 'fee', title: '手续费', minWidth: 80},
{field: 'createTime', title: '创建时间', minWidth: 150},
- {field: 'fromHash', title: 'fromHash', minWidth: 150},
- {field: 'toHash', title: 'toHash', minWidth: 150},
+ {title: '状态', templet: '#status-able', minWidth: 80},
+ {field: 'fromHash', title: 'FromHash', minWidth: 150},
+ // {title: '操作',
+ // templet: function (d) {
+ // if(d.status == 1){
+ // return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="transferManual" shiro:hasPermission="transferManual:update">手动转账</button>'
+ // }else{
+ // return ''
+ // }
+ // },minWidth: 100,align:'center'}
]]
});
}
function getQueryParams() {
return {
+ systemProfitId: $searchForm.find('input[name="systemProfitId"]').val().trim(),
address: $searchForm.find('input[name="address"]').val().trim(),
+ fromHash: $searchForm.find('input[name="fromHash"]').val().trim(),
type: $searchForm.find("select[name='type']").val(),
// accountStatus: $searchForm.find("select[name='accountStatus']").val(),
// withdrawAble: $searchForm.find("input[name='withdrawAble']").val(),
--
Gitblit v1.9.1