Merge branch 'master' of /data/git/tiantian2

app/Http/Controllers/Manager/OrdersController.php

@@ -282,7 +282,9 @@ class OrdersController extends CommonController
             "orderItems" => function ($query) {
                 $query->orderBy("service_date", "desc");
             },
-            "recharges",
+            "recharges" => function ($query) {
+                $query->withCount("refunds");
+            },
             "refunds"
         ])->find($id);
 

resources/views/admin/orders/index.blade.php

@@ -174,7 +174,7 @@
                 $("#modal-box form input[name=item_id]").val(item_id);
                 $("#modal-box form input[name=serial]").val(res.order.serial);
                 $("#modal-box form input[name=service_date]").val(res.service_date);
-                $("#modal-box form input[name=total]").val(res.total);
+                $("#modal-box form input[name=total]").val(res.total).prop("disabled", false);
                 $("#factor-box").html("");
                 try {
                     var factors = JSON.parse(res.factors);