From 1aaa39259b1634f990e763b1fb8a8d82e7dbdedf Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 18 May 2021 17:48:26 +0800
Subject: [PATCH] 20210518

---
 src/main/java/com/xcong/excoin/modules/otc/entity/OtcEntrustOrderEntity.java |    2 +-
 src/main/resources/templates/febs/views/modules/otc/otcEntrustList.html      |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/otc/entity/OtcEntrustOrderEntity.java b/src/main/java/com/xcong/excoin/modules/otc/entity/OtcEntrustOrderEntity.java
index ac311d7..b876fde 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/entity/OtcEntrustOrderEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/entity/OtcEntrustOrderEntity.java
@@ -38,7 +38,7 @@
     public static final String ORDERTYPE_B = "B";
     public static final String ORDERTYPE_S = "S";
 
-    //上下线 1-上线2-下线
+    //上下线 1-上线2-下线 3-取消
     private Integer status;
     public static final Integer STATUS_ONE = 1;
     public static final Integer STATUS_TWO = 2;
diff --git a/src/main/resources/templates/febs/views/modules/otc/otcEntrustList.html b/src/main/resources/templates/febs/views/modules/otc/otcEntrustList.html
index 3dc942e..2246ec2 100644
--- a/src/main/resources/templates/febs/views/modules/otc/otcEntrustList.html
+++ b/src/main/resources/templates/febs/views/modules/otc/otcEntrustList.html
@@ -142,6 +142,8 @@
                                 return '<span style="color:blue;">上线</span>'
                             } else if (d.status === 2) {
                                 return '<span style="color:green;">下线</span>'
+                            }else if (d.status === 3) {
+                                return '<span>取消</span>'
                             } else{
                                 return ''
                             }

--
Gitblit v1.9.1