From ac10a564db63c7f9060a2e99c9cb7cc17f9832b7 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 11 Nov 2020 16:07:13 +0800
Subject: [PATCH] modify

---
 src/main/resources/templates/febs/views/modules/member/chargeUsdt.html |   61 ++++++++++++++++--------------
 1 files changed, 32 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 7db30a2..bb5441d 100644
--- a/src/main/resources/templates/febs/views/modules/member/chargeUsdt.html
+++ b/src/main/resources/templates/febs/views/modules/member/chargeUsdt.html
@@ -19,6 +19,7 @@
                                                 <option value="0"></option>
                                                 <option value="1">新建</option>
                                                 <option value="2">已付款</option>
+                                                <option value="3">已审核</option>
                                                 <option value="4">撤单</option>
                                                 <option value="5">系统取消</option>
                                             </select>
@@ -46,30 +47,6 @@
         </div>
     </div>
 </div>
-<!-- 表格字段状态格式化 start -->
-<script type="text/html" id="order-Status">
-    {{#
-    var orderStatus = {
-    1: {title: '新建' , color: 'gray'},
-    2: {title: '已付款' , color: 'red'},
-    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 -->
@@ -169,12 +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'},
-                    {field: 'createTime', title: '充值时间', minWidth: 180,align:'center'},
-                    {title: '付款状态', templet: '#order-Status', minWidth: 100,align:'center'},
-                    {field: 'orderNo', title: '订单编号', minWidth: 150,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'},
-                    {title: '收款方式', templet: '#payment-Type', minWidth: 100,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) {
@@ -184,7 +185,9 @@
                             }else {
                                 return ''
                             }
-                        },minWidth: 200,align:'center'}
+                        },minWidth: 200,align:'center'},
+                    {field: 'orderNo', title: '订单编号', minWidth: 150,align:'center'},
+                    {field: 'createTime', title: '充值时间', minWidth: 180,align:'center'}
                 ]]
             });
         }

--
Gitblit v1.9.1