update merchant_order

mobile/control/merchant_order.php

@@ -20,7 +20,7 @@ class merchant_orderControl extends mbMerchantControl
         if ($_GET['start_time'] > 0 && $_GET['end_time'] > 0) {
             $cond['refill_order.order_time'] = ['between', [$_GET['start_time'], $_GET['end_time']]];
         }
-        $fields = 'refill_order.order_id,refill_order.order_sn,refill_order.mchid,refill_order.card_no,refill_order.mch_order,refill_order.card_type,refill_order.order_time,refill_order.notify_time,refill_order.mch_amount,vr_order.order_state';
+        $fields = 'refill_order.order_id,refill_order.order_sn,refill_order.mchid,refill_order.card_no,refill_order.mch_order,refill_order.card_type,refill_order.order_time,refill_order.notify_time,refill_order.refill_amount,refill_order.mch_amount,vr_order.order_state';
         $order_list = $model_vr_order->getMerchantOrderList($cond, $this->page, $fields, 'refill_order.order_id desc');
         $order_list = $this->merchant_order_format($order_list);
         $result['data'] = $order_list;
@@ -58,16 +58,16 @@ class merchant_orderControl extends mbMerchantControl
                 $text = '已取消';
                 break;
             case ORDER_STATE_NEW:
-                $text = '待付款';
+                $text = '新订单';
                 break;
             case ORDER_STATE_SEND:
-                $text = '已发货';
+                $text = '充值中';
                 break;
             case ORDER_STATE_PAY:
-                $text = '已支付';
+                $text = '支付成功';
                 break;
             case ORDER_STATE_SUCCESS:
-                $text = '已完成';
+                $text = '充值成功';
                 break;
             default:
                 $text = '未知状态';