From 3720c0c2cf009cc3ad7728cfa970a6b0f8a93636 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Wed, 29 Nov 2023 11:40:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BE=AE=E4=BF=A1=E6=94=B6=E6=AC=BE?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webht/third_party/pay/views/payment_gai_setting.php | 8 ++++----
 webht/third_party/pay/views/payment_list.php        | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/webht/third_party/pay/views/payment_gai_setting.php b/webht/third_party/pay/views/payment_gai_setting.php
index b57a44b8..e5635d7c 100644
--- a/webht/third_party/pay/views/payment_gai_setting.php
+++ b/webht/third_party/pay/views/payment_gai_setting.php
@@ -9,7 +9,7 @@
         </thead>
         <?php foreach ($gai_info as $key => $value) { ?>
         <tr>
-            <td><?php echo $value->GAI_COLI_ID; ?></td>
+            <td><?php echo $value->orderId; ?></td>
             <td><?php echo $value->GAI_SQJE; ?>&nbsp;<?php echo $value->GAI_SQJECurrency; ?></td>
             <td><?php echo $value->GAI_SSJE; ?>&nbsp;CNY</td>
         </tr>
@@ -31,11 +31,11 @@
         </dl>
     <?php } ?>
     <div class="input-group">
-        <input type="text" class="form-control" id="pn_invoice" name="pn_invoice" value="<?php echo !empty($new_order) ? $new_order : $old_order; ?>" placeholder="输入订单号搜索匹配" 
-        <?php 
+        <input type="text" class="form-control" id="pn_invoice" name="pn_invoice" value="<?php echo !empty($new_order) ? $new_order : $old_order; ?>" placeholder="输入订单号搜索匹配"
+        <?php
         if ($group_accout_info['GAI_State'] > 0) { ?>
             disabled="disabled"
-        <?php }  ?> 
+        <?php }  ?>
         >
         <span class="input-group-addon search-btn" onclick="show_gai_modal('<?php echo $note->OPN_SN; ?>', $('#pn_invoice').val())"></span>
     </div>
diff --git a/webht/third_party/pay/views/payment_list.php b/webht/third_party/pay/views/payment_list.php
index ce6a6117..9847b740 100644
--- a/webht/third_party/pay/views/payment_list.php
+++ b/webht/third_party/pay/views/payment_list.php
@@ -27,6 +27,8 @@
         .alipay-color {background-color: #00AAEE;}
         .ipaylinks-color,.creditcard-color,.creditcard-ipaylinks-color {background-color: #A31022;}
         .modal {background-color: rgba(0,0,0,0.075);}
+        .cht-color {background-color: #A31022;}
+        .trippest-color {background-color: #E83201;}
     </style>
     <style type="text/css" media="screen and (max-width:767px)">
         .navbar-header h1 {display: block; font-size: 20px;}
@@ -213,6 +215,7 @@
                         <tr>
                             <td><?php echo $key+1; ?></td>
                             <td><span class="brand_text <?php echo strtolower(str_replace(" ","",$item->brand_name))."-color"; ?>"><?php echo $item->brand_name; ?></span>
+                            <span class="brand_text <?php echo strtolower(str_replace(" ","",$item->OPN_fundSource))."-color"; ?>"><?php echo $item->OPN_fundSource; ?></span>
                                 <?php echo $item->OPN_orderId . ' / ' . $item->OPN_orderAmount . $item->OPN_currency; ?></td>
                             <td class="hidden-xs">
                                 <?php