From 674e727921171497767f4da3ff683884de00681e Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Wed, 25 Mar 2020 09:12:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=B8=A0=E9=81=93=E6=84=8F?=
 =?UTF-8?q?=E6=84=BF=E7=BB=9F=E8=AE=A1=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Application/Admin/Controller/PayChannelIntentionController.class.php b/Application/Admin/Controller/PayChannelIntentionController.class.php
index d139558b1..a72dfa3bf 100644
--- a/Application/Admin/Controller/PayChannelIntentionController.class.php
+++ b/Application/Admin/Controller/PayChannelIntentionController.class.php
@@ -57,7 +57,7 @@ class PayChannelIntentionController extends AdminController
            tab_pay_channel_intention.pay_amount,CASE WHEN is_submit = 0 THEN 2 ELSE pay_status END as pay_status,tab_pay_channel_intention.pay_order_number,create_time')
 //           ->join('left join tab_spend on tab_pay_channel_intention.pay_order_number=tab_spend.pay_order_number')
            ->group('tab_pay_channel_intention.pay_order_number')
-           ->order('tab_pay_channel_intention.create_time ASC')
+           ->order('tab_pay_channel_intention.create_time DESC')
            ->select(false);
 
        $data = M()->table('('.$show_data.') as a')
@@ -173,7 +173,7 @@ class PayChannelIntentionController extends AdminController
            tab_pay_channel_intention.pay_amount,CASE WHEN is_submit = 0 THEN 2 ELSE pay_status END as pay_status,tab_pay_channel_intention.pay_order_number')
 //           ->join('left join tab_spend on tab_pay_channel_intention.pay_order_number=tab_spend.pay_order_number')
            ->group('tab_pay_channel_intention.pay_order_number')
-           ->order('tab_pay_channel_intention.create_time ASC')
+           ->order('tab_pay_channel_intention.create_time DESC')
            ->select(false);
 
        $data = M()->table('('.$show_data.') as a')
diff --git a/Application/Admin/View/PayChannelIntention/index.html b/Application/Admin/View/PayChannelIntention/index.html
index 170c6434e..980323aea 100644
--- a/Application/Admin/View/PayChannelIntention/index.html
+++ b/Application/Admin/View/PayChannelIntention/index.html
@@ -216,7 +216,7 @@
 
       <div class="input-list input-list-server search_label_rehab">
         <select id="pay_type" name="pay_type" class="select_gallery" >
-          <option value="">选择支付类型</option>
+          <option value="">请选择最终使用方式</option>
           <option value="alipay" <if condition="$_GET['pay_type']  eq 'alipay'">selected</if>>支付宝</option>
           <option value="wxpay" <if condition="$_GET['pay_type']  eq 'wxpay'">selected</if>>微信支付</option>
           <option value="shorcut" <if condition="$_GET['pay_type']  eq 'shorcut'">selected</if>>易宝支付</option>