From c3ed9a07b0765834136afb6400d350d895584b51 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 01 Jul 2024 14:03:23 +0800
Subject: [PATCH] 后台

---
 src/main/resources/templates/febs/views/modules/news/productBuyListNew.html |   36 +++++++++++++++++++++++++++++-------
 1 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/news/productBuyListNew.html b/src/main/resources/templates/febs/views/modules/news/productBuyListNew.html
index eb86ec8..599e77c 100644
--- a/src/main/resources/templates/febs/views/modules/news/productBuyListNew.html
+++ b/src/main/resources/templates/febs/views/modules/news/productBuyListNew.html
@@ -5,13 +5,30 @@
                 <div class="layui-card-body febs-table-full">
                     <form class="layui-form layui-table-form" lay-filter="user-table-form">
                         <div class="layui-row">
-
                             <div class="layui-col-md10">
                                 <div class="layui-form-item">
                                     <div class="layui-inline">
                                         <label class="layui-form-label">登录账户:</label>
                                         <div class="layui-input-inline">
                                             <input type="text" placeholder="登录账户" name="accountLogin" autocomplete="off" class="layui-input">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">编号:</label>
+                                        <div class="layui-input-inline">
+                                            <input type="text" placeholder="编号" name="orderNo" autocomplete="off" class="layui-input">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">预约状态:</label>
+                                        <div class="layui-input-inline">
+                                            <select name="state">
+                                                <option value="">请选择</option>
+                                                <option value="0">失败</option>
+                                                <option value="1">进行中</option>
+                                                <option value="2">超时</option>
+                                                <option value="3">已完成</option>
+                                            </select>
                                         </div>
                                     </div>
                                 </div>
@@ -89,6 +106,8 @@
     <span class="layui-badge febs-bg-green">已确认</span>
     {{# } else if(d.state === 5) { }}
     <span class="layui-badge febs-bg-green">已完成</span>
+    {{# } else if(d.state === 6) { }}
+    <span class="layui-badge febs-bg-red">投诉</span>
     {{# } else { }}
     {{# } }}
 </script>
@@ -240,14 +259,15 @@
                 url: ctx + 'admin/news/getBuyList',
                 cols: [[
                     {field: 'accountLogin', title: '登录账户', minWidth: 120,align:'center'},
-                    {field: 'nftTotal', title: '预约额度', minWidth: 120,align:'center'},
-                    {field: 'nftAva', title: '可分配', minWidth: 120,align:'center'},
-                    {field: 'orderTime', title: '匹配时间', minWidth: 120,align:'center'},
-                    {templet: '#isBuyState', title: '预约状态', minWidth: 120,align:'center'},
-                    {templet: '#isBuyMateState', title: '匹配状态', minWidth: 120,align:'center'},
+                    {field: 'orderNo', title: '编号', minWidth: 200,align:'center'},
+                    {field: 'nftTotal', title: '预约额度', minWidth: 100,align:'center'},
+                    {field: 'nftAva', title: '可分配', minWidth: 100,align:'center'},
+                    {field: 'payTime', title: '匹配时间', minWidth: 120,align:'center'},
+                    {templet: '#isBuyState', title: '预约状态', minWidth: 100,align:'center'},
+                    {templet: '#isBuyMateState', title: '匹配状态', minWidth: 100,align:'center'},
                     {title: '操作',
                         templet: function (d) {
-                            if(d.state == 1){
+                            if(d.state == 1 && d.buttonState == 1){
                                 return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="productSellPick" shiro:hasPermission="user:update">手动匹配</button>'
                             }else{
                                 return ''
@@ -279,6 +299,8 @@
         function getQueryParams() {
             return {
                 accountLogin: $searchForm.find('input[name="accountLogin"]').val().trim(),
+                orderNo: $searchForm.find('input[name="orderNo"]').val().trim(),
+                state: $searchForm.find("select[name='state']").val(),
             };
         }
 

--
Gitblit v1.9.1