moonsflyer 5 mesiacov pred
rodič
commit
40b0e970cb

+ 9 - 0
app/admin/logic/finance/DividendCashLogic.php

@@ -97,6 +97,15 @@ class DividendCashLogic extends Logic
     {
         $where = [];
 
+
+        if (isset($get['status']) && $get['status'] <>'') {
+            $where[] = ['do.status', '=', $get['status']];
+        }
+
+        if (isset($get['is_exchange']) && $get['is_exchange'] <>'') {
+            $where[] = ['do.is_exchange', '=', $get['is_exchange']];
+        }
+
         if (empty($get['start_time']) && empty($get['end_time'])) {
             $where[] = ['do.create_time', '>=', strtotime(date("Y-m-d", time()))];
             $where[] = ['do.create_time', '<=', strtotime(date("Y-m-d", time())) + 86399];

+ 20 - 1
app/admin/view/finance/dividend/dividend_order.html

@@ -27,7 +27,26 @@
             <div class="layui-card-body layui-form">
                 <div class="layui-form-item">
                     <div class="layui-row">
-
+                        <div class="layui-inline">
+                            <label class="layui-form-label">排队状态:</label>
+                            <div class="layui-input-block">
+                                <select name="status" id="status">
+                                    <option value="">全部</option>
+                                    <option value="0">排队中</option>
+                                    <option value="1">排队结束</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">兑换状态:</label>
+                            <div class="layui-input-block">
+                                <select name="is_exchange" id="is_exchange">
+                                    <option value="">全部</option>
+                                    <option value="0">未兑换</option>
+                                    <option value="1">已兑换</option>
+                                </select>
+                            </div>
+                        </div>
                         <div class="layui-inline">
                             <label class="layui-form-label">记录时间:</label>
                             <div class="layui-input-inline">