refill order list update

admin/control/merchant.php

@@ -924,7 +924,12 @@ class merchantControl extends SystemControl
             $tmp[] = array('data'=>$v['card_no']);
             $tmp[] = array('data'=>$this->scard_type($v['card_type']));
             $tmp[] = array('data'=>date('Y-m-d H:i:s',$v['order_time']));
-            $tmp[] = array('data'=>date('Y-m-d H:i:s',$v['notify_time']));
+            if(empty($v['notify_time'])) {
+                $tmp[] = array('data'=>'');
+            }else{
+                $tmp[] = array('data'=>date('Y-m-d H:i:s',$v['notify_time']));
+            }
+
             $tmp[] = array('data'=>$v['official_sn']);
             $tmp[] = array('data'=>orderState($v));
             $tmp[] = array('data'=>$v['mch_amount']);

admin/templates/default/refill.order.index.php

@@ -378,6 +378,7 @@
             $('input[name="export"]').val('1');
             $('input[name="op"]').val('refill_order');
             $('#formSearch').submit();
+            $('input[name="export"]').val('');
         })
         // 日期选择器
         laydate.render({