From 69bbf347abc63a82e5dcd9f53f18b203d7cd7fcb Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Tue, 16 Jun 2020 18:36:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E6=AC=BE=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/PaymentController.class.php    |  2 +
 Application/Payment/View/Payment/lists.html   | 45 +++++++++++++++++--
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/Application/Payment/Controller/PaymentController.class.php b/Application/Payment/Controller/PaymentController.class.php
index 401ef67bb..da58a6c46 100644
--- a/Application/Payment/Controller/PaymentController.class.php
+++ b/Application/Payment/Controller/PaymentController.class.php
@@ -7,6 +7,7 @@ namespace Payment\Controller;
 class PaymentController extends BaseController
 {
     public $PayStatus=[
+        "-2"=>"信息配置不全",
         "-1"=>"打款失败",
         "0"=>"未打款",
         "1"=>"打款成功"
@@ -79,6 +80,7 @@ class PaymentController extends BaseController
         $this->assign("data",$CompanyInfo);
         $this->assign("money",$money);
         $this->assign("CompanyType", $this->CompanyType);
+        $this->assign("PayStatus", $this->PayStatus);
         $this->display();
     }
     //查看
diff --git a/Application/Payment/View/Payment/lists.html b/Application/Payment/View/Payment/lists.html
index 477e6e70f..ce23f9460 100644
--- a/Application/Payment/View/Payment/lists.html
+++ b/Application/Payment/View/Payment/lists.html
@@ -121,9 +121,6 @@
                 </select>
             </div>
 
-            
-
-
 
             <div class="input-list">
                 <input type="text" readonly id="time_start" name="time_start" class="" value="{:I('time_start')}" placeholder="结算开始时间" />
@@ -134,6 +131,33 @@
                 </div>
             </div>
 
+            <div class="input-list input-list-promote search_label_rehab">
+                <select id="pay_status" name="pay_status" class="select_gallery" >
+                    <option value="">结算单类型</option>
+                    <volist name="PayStatus" id="vo">
+                        <option value="{$key}" <if condition="isset($_GET['pay_status']) && $key eq I('pay_status')">selected</if> >{$vo}</option>
+                    </volist>
+                </select>
+            </div>
+
+            <div class="input-list input-list-promote search_label_rehab">
+                <select id="pay_type" name="pay_type" class="select_gallery" >
+                    <option value="">打款方式</option>
+                    <option value="1" <if condition="isset($_GET['pay_type']) && I('pay_status') eq 1">selected</if> >提现</option>
+                    <option value="2" <if condition="isset($_GET['pay_type']) && I('pay_status') eq 2">selected</if> >线上打款</option>
+                </select>
+            </div>
+
+
+            <div class="input-list">
+                <input type="text" readonly id="time_start2" name="pay_time" class="" value="{:I('pay_time_start')}" placeholder="支付开始时间" />
+                &nbsp;-&nbsp;
+                <div class="input-append date" id="datetimepicker2"  style="display:inline-block">
+                    <input type="text" readonly id="time_end" name="pay_time" class="" value="{:I('pay_time_end')}" placeholder="支付结束时间" />
+                    <span class="add-on"><i class="icon-th"></i></span>
+                </div>
+            </div>
+
 
 
             <div class="input-list">
@@ -330,6 +354,21 @@
                 pickerPosition: 'bottom-left'
             })
 
+            $('#time_start2').datetimepicker({
+                format: 'yyyy-mm-dd',
+                language: "zh-CN",
+                minView: 2,
+                autoclose: true
+            });
+
+            $('#datetimepicker2').datetimepicker({
+                format: 'yyyy-mm-dd',
+                language: "zh-CN",
+                minView: 2,
+                autoclose: true,
+                pickerPosition: 'bottom-left'
+            })
+
            
             //回车自动提交
             $('.jssearch').find('input').keyup(function(event){