From 4181ab4d695d65d4e3a3ec953f59044aef67d809 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 29 Sep 2020 15:29:27 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin_manage
---
src/main/resources/templates/febs/views/modules/member/chargeUsdt.html | 59 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/src/main/resources/templates/febs/views/modules/member/chargeUsdt.html b/src/main/resources/templates/febs/views/modules/member/chargeUsdt.html
index b3f10f8..bb5441d 100644
--- a/src/main/resources/templates/febs/views/modules/member/chargeUsdt.html
+++ b/src/main/resources/templates/febs/views/modules/member/chargeUsdt.html
@@ -48,31 +48,6 @@
</div>
</div>
<!-- 表格字段状态格式化 start -->
-<script type="text/html" id="order-Status">
- {{#
- var orderStatus = {
- 1: {title: '新建' , color: 'gray'},
- 2: {title: '已付款' , color: 'red'},
- 3: {title: '已审核' , color: 'green'},
- 4: {title: '撤单' , color: 'gray'},
- 5: {title: '系统取消' , color: 'blue'}
- }[d.orderStatus];
- }}
- <span class="layui-badge febs-tag-{{orderStatus.color}}">{{ orderStatus.title }}</span>
-</script>
-<script type="text/html" id="payment-Type">
- {{#
- var paymentType = {
- null: {title: '无' },
- 1: {title: '支付宝' },
- 2: {title: '微信'},
- 3: {title: '银行卡' }
- }[d.paymentType];
- }}
- <span >{{ paymentType.title }}</span>
-</script>
-
-<!-- 表格字段状态格式化 start -->
<!-- 表格操作栏 start -->
<script type="text/html" id="user-option">
@@ -171,7 +146,36 @@
{field: 'amountCny', title: '人民币金额', minWidth: 120,align:'center',totalRow: true},
{field: 'amountUsdt', title: 'USDT金额', minWidth: 120,align:'center',totalRow: true},
{field: 'unitPrice', title: '单价', minWidth: 80,align:'center'},
- {title: '付款状态', templet: '#order-Status', minWidth: 100,align:'center'},
+ {field: 'orderStatus', title: '付款状态',
+ templet: function (d) {
+ if (d.orderStatus === 1) {
+ return '<span style="color:gray;">新建</span>'
+ } else if(d.orderStatus === 2){
+ return '<span style="color:red;">已付款</span>'
+ } else if(d.orderStatus === 3){
+ return '<span style="color:green;">已审核</span>'
+ } else if(d.orderStatus === 4){
+ return '<span style="color:gray;">撤单</span>'
+ } else if(d.orderStatus === 5){
+ return '<span style="color:blue;">系统取消</span>'
+ }else{
+ return ''
+ }
+ }, minWidth: 120,align:'center'},
+ {field: 'paymentName', title: '收款人', minWidth: 150,align:'center'},
+ {field: 'paymentAccount', title: '收款账号', minWidth: 150,align:'center'},
+ {field: 'paymentType', title: '收款方式',
+ templet: function (d) {
+ if (d.status === 1) {
+ return '<span>支付宝</span>'
+ } else if(d.status === 2){
+ return '<span>微信</span>'
+ } else if(d.status === 3){
+ return '<span>银行卡</span>'
+ }else{
+ return '<span style="color:red;">无</span>'
+ }
+ }, minWidth: 150,align:'center'},
{title: '操作',
templet: function (d) {
if (d.orderStatus === 2) {
@@ -182,9 +186,6 @@
return ''
}
},minWidth: 200,align:'center'},
- {field: 'paymentName', title: '收款人', minWidth: 150,align:'center'},
- {field: 'paymentAccount', title: '收款账号', minWidth: 150,align:'center'},
- {title: '收款方式', templet: '#payment-Type', minWidth: 100,align:'center'},
{field: 'orderNo', title: '订单编号', minWidth: 150,align:'center'},
{field: 'createTime', title: '充值时间', minWidth: 180,align:'center'}
]]
--
Gitblit v1.9.1