Browse Source

admin update

xiaoyu 3 years ago
parent
commit
60ddf6a163

+ 1 - 1
admin/control/refill_order.php

@@ -323,7 +323,7 @@ class refill_orderControl extends SystemControl
         $condition['refill_order.order_time'] = ['egt', $order_time];
         $condition['refill_order.mchid'] = $mchid;
 
-        $field = 'refill_order.commit_time,refill_order.notify_time,refill_order.channel_name,vr_order.order_state';
+        $field = 'refill_order.order_sn,refill_order.commit_time,refill_order.notify_time,refill_order.channel_name,vr_order.order_state';
         $order_list = $model_refill_order->getMerchantOrderList($condition, 1000, $field);
 
         foreach ($order_list as $order_id => $order_info) {

+ 1 - 1
admin/include/menu.php

@@ -98,7 +98,7 @@ $arr = array(
 					array('args'=>'index,refill_order,merchant',			'text'=>'订单列表'),
 					array('args'=>'index,provider,merchant',				'text'=>'通道列表'),
 					array('args'=>'index,provider_group,merchant',			'text'=>'通道组管理'),
-					array('args'=>'index,ordersendlist,merchant',			'text'=>'问题订单监控'),
+					array('args'=>'index,ordersendlist,merchant',			'text'=>'订单监控'),
 					array('args'=>'index,orderstats,merchant',				'text'=>'对账管理'),
 					array('args'=>'stats,card_key,merchant',				'text'=>'卡密管理'),
 					array('args'=>'index,refill_stock,merchant',			'text'=>'库存管理'),

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

@@ -523,7 +523,6 @@
                 order_sn:db_click
             }, function(data) {
                 data = JSON.parse(data)
-           
                 if (data.state == 1) {
                     
                 var dbclick = data.data
@@ -533,6 +532,7 @@
                     var item = dbclick[i];
                     html += `
                     <tr>
+                                         <td class="db-center">${item.order_sn}</td>
                                          <td class="db-center">${item.commit_time_text}</td>
                                          <td class="db-center">${item.notify_time_text}</td>
                                          <td class="db-center">${item.diff_time_text}</td>
@@ -550,7 +550,7 @@
                    content: `<table>
                    <thead>
                              <tr>
-
+                                        <th class="db-right">订单号</th>
                                          <th class="db-right">下单日期</th>
                                          <th class="db-right">回调日期</th>
                                          <th class="db-right">耗时</th>

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

@@ -356,6 +356,7 @@
                     var item = dbclick[i];
                     html += `
                     <tr>
+                                        <td class="db-center">${item.order_sn}</td>
                                          <td class="db-center">${item.commit_time_text}</td>
                                          <td class="db-center">${item.notify_time_text}</td>
                                          <td class="db-center">${item.diff_time_text}</td>
@@ -373,7 +374,7 @@
                    content: `<table>
                    <thead>
                              <tr>
-
+                                         <th class="db-right">订单号</th>
                                          <th class="db-right">下单日期</th>
                                          <th class="db-right">回调日期</th>
                                          <th class="db-right">耗时</th>