From 6dacb9d52735533c431cc4de6bdfec3de84854b1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 11 Nov 2022 12:00:58 +0800
Subject: [PATCH] 20221021
---
src/main/resources/templates/febs/views/dapp/member.html | 3 -
src/main/resources/mapper/dapp/DappMemberDao.xml | 2
src/main/resources/templates/febs/views/dapp/money-change-flow.html | 75 +++++++++++++++++++++++--------------
3 files changed, 48 insertions(+), 32 deletions(-)
diff --git a/src/main/resources/mapper/dapp/DappMemberDao.xml b/src/main/resources/mapper/dapp/DappMemberDao.xml
index d5185c8..d4c663f 100644
--- a/src/main/resources/mapper/dapp/DappMemberDao.xml
+++ b/src/main/resources/mapper/dapp/DappMemberDao.xml
@@ -34,7 +34,7 @@
and a.withdraw_able = #{record.withdrawAble}
</if>
<if test="record.inviteId != null and record.inviteId != ''">
- and a.invite_id = #{record.inviteId}
+ and (a.invite_id = #{record.inviteId} or a.address = #{record.inviteId})
</if>
</where>
order by a.create_time desc
diff --git a/src/main/resources/templates/febs/views/dapp/member.html b/src/main/resources/templates/febs/views/dapp/member.html
index 4d7f82b..9eb0ac7 100644
--- a/src/main/resources/templates/febs/views/dapp/member.html
+++ b/src/main/resources/templates/febs/views/dapp/member.html
@@ -8,9 +8,8 @@
<div class="layui-col-md10">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">邀请码</label>
<div class="layui-input-inline">
- <input type="text" name="inviteId" autocomplete="off" class="layui-input">
+ <input type="text" name="inviteId" autocomplete="off" placeholder="输入地址或邀请码" class="layui-input">
</div>
</div>
<div class="layui-inline">
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 b9ab1ae..470dcb7 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,7 +9,7 @@
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline">
- <input type="text" name="address" autocomplete="off" placeholder="输入地址或邀请码" class="layui-input">
+ <input type="text" name="address" autocomplete="off" placeholder="输入地址" class="layui-input">
</div>
</div>
<div class="layui-inline">
@@ -17,10 +17,18 @@
<div class="layui-input-inline">
<select name="type">
<option value=""></option>
- <option value="1">兑换</option>
- <option value="2">提现</option>
- <option value="3">采矿</option>
- <option value="4">代理返利</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>
</select>
</div>
</div>
@@ -34,16 +42,16 @@
<!-- </select>-->
<!-- </div>-->
<!-- </div>-->
- <div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">可提现</label>
- <div class="layui-input-inline">
- <select name="withdrawAble">
- <option value=""></option>
- <option value="2">否</option>
- <option value="1">是</option>
- </select>
- </div>
- </div>
+<!-- <div class="layui-inline">-->
+<!-- <label class="layui-form-label layui-form-label-sm">可提现</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <select name="withdrawAble">-->
+<!-- <option value=""></option>-->
+<!-- <option value="2">否</option>-->
+<!-- <option value="1">是</option>-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
</div>
</div>
<div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
@@ -147,25 +155,34 @@
id: 'moneyChangeTable',
url: ctx + 'flow/fundFlow',
cols: [[
- {field: 'address', title: '地址', minWidth: 150},
- {field: 'preAmount', title: '变化前金额', minWidth: 100},
- {field: 'amount', title: '金额', minWidth: 100},
- {title: '类型', templet: '#flow-type'},
- {title: '提现状态', templet: '#flow-status'},
- {field: 'fee', title: '手续费', minWidth: 130},
- {field: 'createTime', title: '创建时间', minWidth: 180}
+ {field: 'address', title: '地址', minWidth: 380},
+ {title: '类型', minWidth: 100,templet: '#flow-type',align:'center'},
+ {field: 'amount', title: '金额',
+ templet: function (d) {
+ if (d.amount > 0) {
+ return '<span style="color:green;">'+d.amount+'</span>'
+ } else if (d.amount < 0) {
+ return '<span style="color:red;">'+d.amount+'</span>'
+ }else{
+ return d.amount
+ }
+ }, minWidth: 80,align:'center'},
+ {field: 'fee', title: '手续费', minWidth: 80},
+ {field: 'createTime', title: '创建时间', minWidth: 150},
+ {field: 'fromHash', title: 'fromHash', minWidth: 150},
+ {field: 'toHash', title: 'toHash', minWidth: 150},
]]
});
}
function getQueryParams() {
- // return {
- // inviteId: $searchForm.find('input[name="inviteId"]').val().trim(),
- // changeAble: $searchForm.find("select[name='changeAble']").val(),
- // accountStatus: $searchForm.find("select[name='accountStatus']").val(),
- // withdrawAble: $searchForm.find("input[name='withdrawAble']").val(),
- // invalidate_ie_cache: new Date()
- // };
+ return {
+ address: $searchForm.find('input[name="address"]').val().trim(),
+ type: $searchForm.find("select[name='type']").val(),
+ // accountStatus: $searchForm.find("select[name='accountStatus']").val(),
+ // withdrawAble: $searchForm.find("input[name='withdrawAble']").val(),
+ // invalidate_ie_cache: new Date()
+ };
}
function changeStatus(url) {
--
Gitblit v1.9.1