From dc5437d7cb93d128ad3eafdd37b4e99cf81aad75 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Mon, 30 Mar 2020 09:13:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=B8=A0=E9=81=93?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=AE=A2=E5=8D=95=E5=BD=95=E5=85=A5bug?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=8C=E6=94=AF=E4=BB=98=E6=84=8F=E6=84=BF?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/TestOrder/lists.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Application/Admin/View/TestOrder/lists.html b/Application/Admin/View/TestOrder/lists.html
index a0f51960f..cce37590a 100644
--- a/Application/Admin/View/TestOrder/lists.html
+++ b/Application/Admin/View/TestOrder/lists.html
@@ -84,8 +84,6 @@
           <option value="9" <if condition="$_GET['pay_way']  eq '9'">selected</if>>双乾支付-支付宝</option>
           <option value="10" <if condition="$_GET['pay_way']  eq '10'">selected</if>>双乾支付-银联</option>
           <option value="15" <if condition="$_GET['pay_way']  eq '15'">selected</if>>双乾支付-快捷</option>
-          <option value="0" <if condition="$_GET['pay_way']  eq '0'">selected</if>>平台币</option>
-          <option value="-1" <if condition="$_GET['pay_way']  eq '-1'">selected</if>>绑币</option>
           <option value="17" <if condition="$_GET['pay_way']  eq '17'">selected</if>>易宝支付</option>
         </select>
       </div>

From d4aafd298305514630110827e78a7c7289c9bb76 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Mon, 30 Mar 2020 13:47:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=B8=A0=E9=81=93?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=AE=A2=E5=8D=95=E5=BD=95=E5=85=A5bug?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=8C=E6=94=AF=E4=BB=98=E6=84=8F=E6=84=BF?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/PayChannelIntentionController.class.php      | 5 +++--
 Application/Admin/View/PayChannelIntention/index.html       | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Application/Admin/Controller/PayChannelIntentionController.class.php b/Application/Admin/Controller/PayChannelIntentionController.class.php
index 7552a4502..482d57b8a 100644
--- a/Application/Admin/Controller/PayChannelIntentionController.class.php
+++ b/Application/Admin/Controller/PayChannelIntentionController.class.php
@@ -381,8 +381,9 @@ class PayChannelIntentionController extends AdminController
            $pay_type = $_REQUEST['pay_ways'];
        }
 
-       $this->assign('pay_type',$pay_type);
-//       var_dump($pay_type);die();
+       if ($_REQUEST['pay_ways']) {
+           $this->assign('pay_type',$pay_type);
+       }
 
        if ($_REQUEST['user_account']) {
            $map['user_account'] = $_REQUEST['user_account'];
diff --git a/Application/Admin/View/PayChannelIntention/index.html b/Application/Admin/View/PayChannelIntention/index.html
index f73416cf1..537069c5c 100644
--- a/Application/Admin/View/PayChannelIntention/index.html
+++ b/Application/Admin/View/PayChannelIntention/index.html
@@ -293,11 +293,11 @@
               <td >{$index}</td>
               <td >{$data.pay_ways_ch}</td>
               <td >{$data.pay_way}</td>
-              <td ><a class="detail" data-way="{$data.pay_ways}" data-status="1" data-start="{$_REQUEST['timestart']}" data-end="{$_REQUEST['timeend']}">{$data.success_invest_count}</a></td>
+              <td ><a class="detail" data-ways="{$_GET['pay_type']}" data-way="{$data.pay_ways}" data-status="1" data-start="{$_REQUEST['timestart']}" data-end="{$_REQUEST['timeend']}">{$data.success_invest_count}</a></td>
               <td >{$data.success_invest_amount}</td>
-              <td ><a class="detail" data-way="{$data.pay_ways}" data-status="0" data-start="{$_REQUEST['timestart']}" data-end="{$_REQUEST['timeend']}">{$data.fail_invest_count}</a></td>
+              <td ><a class="detail" data-ways="{$_GET['pay_type']}" data-way="{$data.pay_ways}" data-status="0" data-start="{$_REQUEST['timestart']}" data-end="{$_REQUEST['timeend']}">{$data.fail_invest_count}</a></td>
               <td >{$data.fail_invest_amount}</td>
-              <td ><a class="detail" data-way="{$data.pay_ways}" data-status="2" data-start="{$_REQUEST['timestart']}" data-end="{$_REQUEST['timeend']}">{$data.nothing_invest_count}</a></td>
+              <td ><a class="detail" data-ways="{$_GET['pay_type']}" data-way="{$data.pay_ways}" data-status="2" data-start="{$_REQUEST['timestart']}" data-end="{$_REQUEST['timeend']}">{$data.nothing_invest_count}</a></td>
               <td >{$data.nothing_invest_amount}</td>
             </tr>
           </volist>