Merge branch 'zjl_cancel_order_20190213' into development

public/js/orderamount.js

@@ -38,10 +38,8 @@
 
 
                 function orderAmountInfo(status, type) {
                 function orderAmountInfo(status, type) {
                     var type        = $('input[name=type]').val(),
                     var type        = $('input[name=type]').val(),
-                        checkTime   = $('#checkTime').val(),
                         time_start  = $('input[name="time_start"]').val(),
                         time_start  = $('input[name="time_start"]').val(),
-                        time_end    = $('input[name="time_end"]').val(),
-                        checkStatus = $('#status').val();
+                        time_end    = $('input[name="time_end"]').val();
 
 
                     if(time_start){
                     if(time_start){
                         time_start = Date.parse(time_start) / 1000;
                         time_start = Date.parse(time_start) / 1000;

resources/views/amount/content.blade.php

@@ -128,11 +128,11 @@
 </div>
 </div>
 
 
 <script>
 <script>
-    $.lie.orderamount.index();
-
     var checkTime = '{{$checkTime}}';
     var checkTime = '{{$checkTime}}';
     var checkStatus = '{{$checkStatus}}';
     var checkStatus = '{{$checkStatus}}';
 
 
     $('#checkTime').val(checkTime);
     $('#checkTime').val(checkTime);
     $('#checkStatus').val(checkStatus);
     $('#checkStatus').val(checkStatus);
+
+    $.lie.orderamount.index();
 </script>
 </script>
\ No newline at end of file