فهرست منبع

add show info

stanley-king 4 سال پیش
والد
کامیت
159532ff7b
2فایلهای تغییر یافته به همراه7 افزوده شده و 6 حذف شده
  1. 6 5
      admin/control/merchant.php
  2. 1 1
      admin/templates/default/refill.order.index.php

+ 6 - 5
admin/control/merchant.php

@@ -853,6 +853,8 @@ class merchantControl extends SystemControl
             }
         }
 
+        $fToday = false;
+
         if(!$fSingle)
         {
             $start_unixtime = intval(strtotime($_GET['query_start_time']));
@@ -870,6 +872,7 @@ class merchantControl extends SystemControl
             else {
                 $start = strtotime(date('Y-m-d',time()));
                 $condition['refill_order.order_time'] = ['egt', $start];
+                $fToday = true;
             }
 
             if (in_array($_GET['order_state'], ['0', '10', '20', '30', '40']))
@@ -899,12 +902,9 @@ class merchantControl extends SystemControl
         {
             $order_list[$order_id]['card_type_text'] = $this->scard_type($order_info['card_type']);
             $order_list[$order_id]['mch_name'] = $merchants[$order_info['mchid']]['company_name'];
-            if($order_info['notify_time'] > 0)
-            {
+            if ($order_info['notify_time'] > 0) {
                 $diff_time = $order_info['notify_time'] - $order_info['order_time'];
-            }
-            else
-            {
+            } else {
                 $diff_time = time() - $order_info['order_time'];
             }
             $order_list[$order_id]['diff_time_text'] = $this->elapse_time($diff_time);
@@ -919,6 +919,7 @@ class merchantControl extends SystemControl
             ->select();
 
         Tpl::output('stat', $stat);
+        Tpl::output('ftoday', $fToday);
         Tpl::output('order_list', $order_list);
         Tpl::output('provider_list', $provider_list);
         Tpl::output('merchant_list', $merchant_list);

+ 1 - 1
admin/templates/default/refill.order.index.php

@@ -166,7 +166,7 @@
         <tbody>
           <tr class="space odd">
             <th colspan="12"><div class="title"><h5>
-    金额统计</h5><span class="arrow"></span></div></th>
+    金额统计<?php echo $output['ftoday'] == true ? "(今日)" : "" ?></h5><span class="arrow"></span></div></th>
           </tr>
           <tr>
             <td>